jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Don't keep unnecessary Activity in settings.
......................................................................
Hygiene: Don't keep unnecessary Activity in settings.
Change-Id: I3dfd7d9e90331947453477dc4a0de59bc154346f
---
M app/src/main/java/org/wikipedia/settings/AboutActivity.java
M app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
2 files changed, 11 insertions(+), 26 deletions(-)
Approvals:
Mholloway: Looks good to me, but someone else must approve
jenkins-bot: Verified
Niedzielski: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/settings/AboutActivity.java
b/app/src/main/java/org/wikipedia/settings/AboutActivity.java
index 9a63719..7b3400a 100644
--- a/app/src/main/java/org/wikipedia/settings/AboutActivity.java
+++ b/app/src/main/java/org/wikipedia/settings/AboutActivity.java
@@ -57,7 +57,7 @@
RichTextUtil.removeUnderlinesFromLinks(feedbackTextView);
RichTextUtil.removeUnderlinesFromLinks(librariesTextView);
- findViewById(R.id.about_logo_image).setOnClickListener(new
AboutLogoClickListener(this));
+ findViewById(R.id.about_logo_image).setOnClickListener(new
AboutLogoClickListener());
//if there's no Email app, hide the Feedback link.
if (!mailAppExists(this)) {
@@ -111,23 +111,17 @@
private static class AboutLogoClickListener implements
View.OnClickListener {
private static final int SECRET_CLICK_LIMIT = 7;
-
- private final Activity mActivity;
private int mSecretClickCount;
-
- AboutLogoClickListener(Activity activity) {
- mActivity = activity;
- }
@Override
public void onClick(View v) {
++mSecretClickCount;
if (isSecretClickLimitMet()) {
if (Prefs.isShowDeveloperSettingsEnabled()) {
- showSettingAlreadyEnabledMessage();
+ showSettingAlreadyEnabledMessage((Activity)
v.getContext());
} else {
Prefs.setShowDeveloperSettingsEnabled(true);
- showSettingEnabledMessage();
+ showSettingEnabledMessage((Activity) v.getContext());
}
}
}
@@ -136,13 +130,12 @@
return mSecretClickCount == SECRET_CLICK_LIMIT;
}
- private void showSettingEnabledMessage() {
- FeedbackUtil.showMessage(mActivity,
R.string.show_developer_settings_enabled);
+ private void showSettingEnabledMessage(@NonNull Activity activity) {
+ FeedbackUtil.showMessage(activity,
R.string.show_developer_settings_enabled);
}
- private void showSettingAlreadyEnabledMessage() {
- FeedbackUtil.showMessage(mActivity,
- R.string.show_developer_settings_already_enabled);
+ private void showSettingAlreadyEnabledMessage(@NonNull Activity
activity) {
+ FeedbackUtil.showMessage(activity,
R.string.show_developer_settings_already_enabled);
}
}
}
diff --git
a/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
b/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
index 9629c37..c71debc 100644
--- a/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
+++ b/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
@@ -1,10 +1,8 @@
package org.wikipedia.settings;
-import android.app.Activity;
import android.content.DialogInterface;
import android.content.Intent;
import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceFragmentCompat;
@@ -15,11 +13,9 @@
/** UI code for app settings used by PreferenceFragment. */
public class SettingsPreferenceLoader extends BasePreferenceLoader {
- private final Activity activity;
/*package*/ SettingsPreferenceLoader(@NonNull PreferenceFragmentCompat
fragment) {
super(fragment);
- activity = fragment.getActivity();
}
@Override
@@ -49,14 +45,14 @@
.setOnPreferenceClickListener(new
Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
- LanguagePreferenceDialog langPrefDialog = new
LanguagePreferenceDialog(activity, false);
+ LanguagePreferenceDialog langPrefDialog = new
LanguagePreferenceDialog(getActivity(), false);
langPrefDialog.setOnDismissListener(new
DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
String name =
StringUtil.emptyIfNull(WikipediaApp.getInstance().getAppOrSystemLanguageLocalizedName());
if
(!findPreference(R.string.preference_key_language).getSummary().equals(name)) {
findPreference(R.string.preference_key_language).setSummary(name);
-
activity.setResult(SettingsActivity.ACTIVITY_RESULT_LANGUAGE_CHANGED);
+
getActivity().setResult(SettingsActivity.ACTIVITY_RESULT_LANGUAGE_CHANGED);
}
}
});
@@ -81,8 +77,8 @@
@Override
public boolean onPreferenceClick(Preference preference) {
Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setClass(activity, AboutActivity.class);
- activity.startActivity(intent);
+ intent.setClass(getActivity(), AboutActivity.class);
+ getActivity().startActivity(intent);
return true;
}
});
@@ -91,9 +87,5 @@
private void updateLanguagePrefSummary() {
Preference languagePref =
findPreference(R.string.preference_key_language);
languagePref.setSummary(WikipediaApp.getInstance().getAppOrSystemLanguageLocalizedName());
- }
-
- private String getString(@StringRes int id) {
- return activity.getString(id);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/319325
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3dfd7d9e90331947453477dc4a0de59bc154346f
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
