Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-31 01:51:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Let folder display name default to folder name

Browse Source
This commit is contained in:
M66B
2018-09-20 13:05:01 +00:00
parent 6acb12f0c0
commit 97b623b3e6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/FragmentFolder.java
View File

@@ -120,7 +120,7 @@ public class FragmentFolder extends FragmentEx {
boolean unified = args.getBoolean("unified");
String after = args.getString("after");
if (TextUtils.isEmpty(display))
if (TextUtils.isEmpty(display) || display.equals(name))
display = null;
int days = (TextUtils.isEmpty(after) ? EntityFolder.DEFAULT_USER_SYNC : Integer.parseInt(after));
@@ -312,7 +312,7 @@ public class FragmentFolder extends FragmentEx {
if (savedInstanceState == null) {
etRename.setText(folder == null ? null : folder.name);
etDisplay.setText(folder == null ? null : folder.display);
etDisplay.setText(folder == null ? null : (folder.display == null ? folder.name : folder.display));
etDisplay.setHint(folder == null ? null : folder.name);
cbUnified.setChecked(folder == null ? false : folder.unified);
etAfter.setText(Integer.toString(folder == null ? EntityFolder.DEFAULT_USER_SYNC : folder.after));