From 7027699dc389b151e906bb8ae86041715f8def5f Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 3 Nov 2021 18:28:51 +0100 Subject: [PATCH] Refactoring --- .../java/eu/faircode/email/FragmentAccount.java | 8 ++++---- .../java/eu/faircode/email/FragmentBase.java | 6 ++++++ .../java/eu/faircode/email/FragmentCompose.java | 16 ++++++++-------- .../java/eu/faircode/email/FragmentFolder.java | 6 +++--- .../java/eu/faircode/email/FragmentFolders.java | 10 +++++----- .../java/eu/faircode/email/FragmentIdentity.java | 4 ++-- .../java/eu/faircode/email/FragmentMessages.java | 10 +++++----- .../main/java/eu/faircode/email/FragmentPop.java | 4 ++-- 8 files changed, 35 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index 3bf2663561..c18fbece1d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -662,7 +662,7 @@ public class FragmentAccount extends FragmentBase { @Override protected void onPreExecute(Bundle args) { saving = true; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, false); pbCheck.setVisibility(View.VISIBLE); tvIdle.setVisibility(View.GONE); @@ -677,7 +677,7 @@ public class FragmentAccount extends FragmentBase { @Override protected void onPostExecute(Bundle args) { saving = false; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, true); pbCheck.setVisibility(View.GONE); } @@ -891,7 +891,7 @@ public class FragmentAccount extends FragmentBase { @Override protected void onPreExecute(Bundle args) { saving = true; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, false); pbSave.setVisibility(View.VISIBLE); grpError.setVisibility(View.GONE); @@ -903,7 +903,7 @@ public class FragmentAccount extends FragmentBase { @Override protected void onPostExecute(Bundle args) { saving = false; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, true); pbSave.setVisibility(View.GONE); } diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java index 681755e57d..9d03051726 100644 --- a/app/src/main/java/eu/faircode/email/FragmentBase.java +++ b/app/src/main/java/eu/faircode/email/FragmentBase.java @@ -105,6 +105,12 @@ public class FragmentBase extends Fragment { updateSubtitle(); } + void invalidateOptionsMenu() { + FragmentActivity activity = getActivity(); + if (activity != null) + activity.invalidateOptionsMenu(); + } + void scrollTo(int resid, int offset) { scrollToResid = resid; scrollToOffset = offset; diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index e36a7194ab..59d72e8541 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -589,7 +589,7 @@ public class FragmentCompose extends FragmentBase { media_bar.inflateMenu(styling ? R.menu.action_compose_style_alt : R.menu.action_compose_media); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); } } }, 20); @@ -959,7 +959,7 @@ public class FragmentCompose extends FragmentBase { bottom_navigation.setVisibility(View.GONE); pbWait.setVisibility(View.VISIBLE); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, false); final DB db = DB.getInstance(getContext()); @@ -1762,7 +1762,7 @@ public class FragmentCompose extends FragmentBase { encrypt = EntityMessage.ENCRYPT_NONE; } - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Bundle args = new Bundle(); args.putLong("id", working); @@ -1846,7 +1846,7 @@ public class FragmentCompose extends FragmentBase { media_bar.inflateMenu(R.menu.action_compose_media); media_bar.setVisibility(media ? View.VISIBLE : View.GONE); style_bar.setVisibility(View.GONE); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); } private void onMenuCompact() { @@ -5072,7 +5072,7 @@ public class FragmentCompose extends FragmentBase { working = data.draft.id; encrypt = data.draft.ui_encrypt; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); subject = data.draft.subject; saved = args.getBoolean("saved"); @@ -5228,7 +5228,7 @@ public class FragmentCompose extends FragmentBase { finish(); else { encrypt = draft.ui_encrypt; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Log.i("Draft content=" + draft.content); if (draft.content && state == State.NONE) { @@ -6178,7 +6178,7 @@ public class FragmentCompose extends FragmentBase { private void setBusy(boolean busy) { state = (busy ? State.LOADING : State.LOADED); Helper.setViewsEnabled(view, !busy); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); } private static void addSignature(Context context, Document document, EntityMessage draft, EntityIdentity identity) { @@ -6238,7 +6238,7 @@ public class FragmentCompose extends FragmentBase { Helper.setViewsEnabled(view, true); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java index cd80bdb323..4829087cde 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolder.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java @@ -352,7 +352,7 @@ public class FragmentFolder extends FragmentBase { tvInboxRootHint.setVisibility(folder == null && parent == null ? View.VISIBLE : View.GONE); deletable = (folder != null && EntityFolder.USER.equals(folder.type)); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); } @Override @@ -465,7 +465,7 @@ public class FragmentFolder extends FragmentBase { @Override protected void onPreExecute(Bundle args) { saving = true; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, false); pbSave.setVisibility(View.VISIBLE); } @@ -473,7 +473,7 @@ public class FragmentFolder extends FragmentBase { @Override protected void onPostExecute(Bundle args) { saving = false; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, true); pbSave.setVisibility(View.GONE); } diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index fda0e76302..d83dd7bc60 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -724,7 +724,7 @@ public class FragmentFolders extends FragmentBase { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); prefs.edit().putBoolean("compact_folders", compact).apply(); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); adapter.setCompact(compact); rvFolder.post(new Runnable() { @Override @@ -744,7 +744,7 @@ public class FragmentFolders extends FragmentBase { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); prefs.edit().putBoolean("hidden_folders", show_hidden).apply(); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); adapter.setShowHidden(show_hidden); } @@ -754,7 +754,7 @@ public class FragmentFolders extends FragmentBase { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); prefs.edit().putBoolean("flagged_folders", show_flagged).apply(); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); adapter.setShowFlagged(show_flagged); rvFolder.post(new Runnable() { @Override @@ -772,7 +772,7 @@ public class FragmentFolders extends FragmentBase { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); boolean subscribed_only = !prefs.getBoolean("subscribed_only", false); prefs.edit().putBoolean("subscribed_only", subscribed_only).apply(); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); adapter.setSubscribedOnly(subscribed_only); } @@ -780,7 +780,7 @@ public class FragmentFolders extends FragmentBase { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); boolean sort_unread_atop = !prefs.getBoolean("sort_unread_atop", false); prefs.edit().putBoolean("sort_unread_atop", sort_unread_atop).apply(); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); adapter.setSortUnreadAtop(sort_unread_atop); } diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index e5511d4500..31000f4c23 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -682,7 +682,7 @@ public class FragmentIdentity extends FragmentBase { @Override protected void onPreExecute(Bundle args) { saving = true; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, false); pbSave.setVisibility(View.VISIBLE); grpError.setVisibility(View.GONE); @@ -694,7 +694,7 @@ public class FragmentIdentity extends FragmentBase { @Override protected void onPostExecute(Bundle args) { saving = false; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, true); if (auth != AUTH_TYPE_PASSWORD) { etUser.setEnabled(false); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 6e7317be61..72432956f2 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -4003,7 +4003,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (FragmentMessages.this.primary != primary || FragmentMessages.this.connected != connected) { FragmentMessages.this.primary = primary; FragmentMessages.this.connected = connected; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); } } }); @@ -4752,14 +4752,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. prefs.edit().putBoolean( viewType == AdapterMessage.ViewType.THREAD ? "ascending_thread" : "ascending_list", ascending).apply(); adapter.setAscending(ascending); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); loadMessages(true); } private void onMenuFilter(String name, boolean filter) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); prefs.edit().putBoolean(name, filter).apply(); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); if (selectionTracker != null) selectionTracker.clearSelection(); loadMessages(true); @@ -4861,7 +4861,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. private void onMenuFilterDuplicates(boolean filter) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); prefs.edit().putBoolean("filter_duplicates", filter).apply(); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); adapter.setFilterDuplicates(filter); } @@ -4886,7 +4886,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. adapter.setCompact(compact); adapter.setZoom(zoom); clearMeasurements(); - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); } private void onMenuTheme() { diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java index 02fba11faf..365c88438f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentPop.java +++ b/app/src/main/java/eu/faircode/email/FragmentPop.java @@ -332,7 +332,7 @@ public class FragmentPop extends FragmentBase { @Override protected void onPreExecute(Bundle args) { saving = true; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, false); pbSave.setVisibility(View.VISIBLE); grpError.setVisibility(View.GONE); @@ -341,7 +341,7 @@ public class FragmentPop extends FragmentBase { @Override protected void onPostExecute(Bundle args) { saving = false; - getActivity().invalidateOptionsMenu(); + invalidateOptionsMenu(); Helper.setViewsEnabled(view, true); pbSave.setVisibility(View.GONE); }