Skip to content

Context instead of Activity in SiteSettingsInterface - Review fixes #6829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nbradbury merged 2 commits into from
Nov 6, 2017
Merged

Context instead of Activity in SiteSettingsInterface - Review fixes #6829

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8976bd6
Small optimization by using the builder pattern
hypest Nov 6, 2017
3fd613f
Let the Listener check Activity finish if needed
hypest Nov 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -940,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;
}

Expand All @@ -955,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;
}

Expand All @@ -973,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;
}

Expand All @@ -991,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
Expand Down