From 8976bd6bea2f4464153e274d4f72ad6096519bc0 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Mon, 6 Nov 2017 09:18:19 +0200 Subject: [PATCH 1/2] Small optimization by using the builder pattern --- .../wordpress/android/ui/prefs/SiteSettingsInterface.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java index 08f2b769de2a..4bb72154c07f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java @@ -227,9 +227,11 @@ protected void finalize() throws Throwable { public void saveSettings() { SiteSettingsTable.saveSettings(mSettings); - siteSettingsPreferences(mContext).edit().putString(LANGUAGE_PREF_KEY, mSettings.language).apply(); - siteSettingsPreferences(mContext).edit().putInt(DEF_CATEGORY_PREF_KEY, mSettings.defaultCategory).apply(); - siteSettingsPreferences(mContext).edit().putString(DEF_FORMAT_PREF_KEY, mSettings.defaultPostFormat).apply(); + siteSettingsPreferences(mContext).edit() + .putString(LANGUAGE_PREF_KEY, mSettings.language) + .putInt(DEF_CATEGORY_PREF_KEY, mSettings.defaultCategory) + .putString(DEF_FORMAT_PREF_KEY, mSettings.defaultPostFormat) + .apply(); } public @NonNull String getTitle() { From 3fd613fa58db089678bb2d651f506eb367e88bf3 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Mon, 6 Nov 2017 09:26:09 +0200 Subject: [PATCH 2/2] Let the Listener check Activity finish if needed --- .../android/ui/prefs/SiteSettingsInterface.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java index 4bb72154c07f..9813ec1ef03b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java @@ -942,9 +942,7 @@ public void run() { } protected void notifyFetchErrorOnUiThread(final Exception error) { - if (mContext == null - || (mContext instanceof Activity && ((Activity) mContext).isFinishing()) - || mListener == null) { + if (mListener == null) { return; } @@ -957,9 +955,7 @@ public void run() { } protected void notifySaveErrorOnUiThread(final Exception error) { - if (mContext == null - || (mContext instanceof Activity && ((Activity) mContext).isFinishing()) - || mListener == null) { + if (mListener == null) { return; } @@ -975,9 +971,7 @@ public void run() { * Notifies listener that settings have been updated with the latest remote data. */ protected void notifyUpdatedOnUiThread() { - if (mContext == null - || (mContext instanceof Activity && ((Activity) mContext).isFinishing()) - || mListener == null) { + if (mListener == null) { return; } @@ -993,7 +987,9 @@ public void run() { * Notifies listener that settings have been saved or an error occurred while saving. */ protected void notifySavedOnUiThread() { - if (mContext == null || mListener == null) return; + if (mListener == null) { + return; + } new Handler().post(new Runnable() { @Override