From ca904aa03bb4708e65fc9497ac9077457bffdd48 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 6 Jun 2020 10:02:11 +0200 Subject: [PATCH] Refactoring --- .../java/eu/faircode/email/AdapterFolder.java | 2 +- .../eu/faircode/email/AdapterNavUnified.java | 4 ++-- .../java/eu/faircode/email/EntityFolder.java | 21 +++++++++++++++++-- .../eu/faircode/email/FragmentFolder.java | 2 +- .../eu/faircode/email/FragmentMessages.java | 2 +- .../java/eu/faircode/email/FragmentRule.java | 2 +- .../main/java/eu/faircode/email/Helper.java | 17 --------------- .../eu/faircode/email/TupleMessageEx.java | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java index 991cf106c4..d0f5b59642 100644 --- a/app/src/main/java/eu/faircode/email/AdapterFolder.java +++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java @@ -312,7 +312,7 @@ public class AdapterFolder extends RecyclerView.Adapter 0 ? context.getString(resid) : type); + } + + static String localizeName(Context context, String name) { + if (name != null && "INBOX".equals(name.toUpperCase(Locale.ROOT))) + return context.getString(R.string.title_folder_inbox); + else if ("OUTBOX".equals(name)) + return context.getString(R.string.title_folder_outbox); + else + return name; + } + @Override public boolean equals(Object obj) { if (obj instanceof EntityFolder) { diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java index 4ad99710f5..d82e8d6af7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolder.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java @@ -247,7 +247,7 @@ public class FragmentFolder extends FragmentBase { int interval = args.getInt("interval", EntityAccount.DEFAULT_KEEP_ALIVE_INTERVAL); etName.setText(folder == null ? null : folder.name); etDisplay.setText(folder == null ? null : folder.display); - etDisplay.setHint(folder == null ? null : Helper.localizeFolderName(getContext(), folder.name)); + etDisplay.setHint(folder == null ? null : EntityFolder.localizeName(getContext(), folder.name)); btnColor.setColor(folder == null ? null : folder.color); cbHide.setChecked(folder == null ? false : folder.hide); cbUnified.setChecked(folder == null ? false : folder.unified); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 25a8ee6611..2b58748918 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -3841,7 +3841,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (type == null) name = getString(R.string.title_folder_unified); else - name = Helper.localizeFolderType(getContext(), type); + name = EntityFolder.localizeType(getContext(), type); else { name = (folders.size() > 0 ? folders.get(0).getDisplayName(getContext()) : ""); if (folders.size() == 1) { diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java index fa9395f0f7..c68fe93bca 100644 --- a/app/src/main/java/eu/faircode/email/FragmentRule.java +++ b/app/src/main/java/eu/faircode/email/FragmentRule.java @@ -1066,7 +1066,7 @@ public class FragmentRule extends FragmentBase { public AccountFolder(EntityAccount account, EntityFolder folder, Context context) { this.account = account; this.folder = folder; - this.name = account.name + "/" + Helper.localizeFolderName(context, folder.name); + this.name = account.name + "/" + EntityFolder.localizeName(context, folder.name); } @NonNull diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 0520e72720..31af3b7bf5 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -718,23 +718,6 @@ public class Helper { return DateUtils.getRelativeTimeSpanString(context, millis); } - static String localizeFolderType(Context context, String type) { - int resid = context.getResources().getIdentifier( - "title_folder_" + type.toLowerCase(Locale.ROOT), - "string", - context.getPackageName()); - return (resid > 0 ? context.getString(resid) : type); - } - - static String localizeFolderName(Context context, String name) { - if (name != null && "INBOX".equals(name.toUpperCase(Locale.ROOT))) - return context.getString(R.string.title_folder_inbox); - else if ("OUTBOX".equals(name)) - return context.getString(R.string.title_folder_outbox); - else - return name; - } - static void linkPro(final TextView tv) { if (ActivityBilling.isPro(tv.getContext()) && !BuildConfig.DEBUG) hide(tv); diff --git a/app/src/main/java/eu/faircode/email/TupleMessageEx.java b/app/src/main/java/eu/faircode/email/TupleMessageEx.java index b9b9c3190e..d9f03c0755 100644 --- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java +++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java @@ -68,7 +68,7 @@ public class TupleMessageEx extends EntityMessage { String getFolderName(Context context) { return (folderDisplay == null - ? Helper.localizeFolderName(context, folderName) + ? EntityFolder.localizeName(context, folderName) : folderDisplay); }