jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/396277 )
Change subject: Clean up some code in Developer Preferences.
......................................................................
Clean up some code in Developer Preferences.
Remove a lot of unnecessary methods and use lambdas.
Change-Id: I92f626e924f7aa3dd39636cc65feddd6d8c04bbe
---
M
app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
M app/src/main/res/xml/developer_preferences.xml
2 files changed, 58 insertions(+), 135 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git
a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
index 429058a..51629eb 100644
---
a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
+++
b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
@@ -20,9 +20,8 @@
import java.util.ArrayList;
import java.util.List;
-/*package*/ class DeveloperSettingsPreferenceLoader extends
BasePreferenceLoader {
+class DeveloperSettingsPreferenceLoader extends BasePreferenceLoader {
@NonNull private final Context context;
- public static final int MAX_LISTS = 100;
@NonNull private final Preference.OnPreferenceChangeListener
setRestBaseManuallyChangeListener
= new Preference.OnPreferenceChangeListener() {
@@ -78,7 +77,6 @@
}
};
- /*package*/
DeveloperSettingsPreferenceLoader(@NonNull PreferenceFragmentCompat
fragment) {
super(fragment);
this.context = fragment.getActivity();
@@ -90,15 +88,45 @@
setUpRestBaseCheckboxes();
setUpMediaWikiSettings();
setUpCookies((PreferenceCategory)
findPreference(R.string.preferences_developer_cookies_key));
- setUpCrashButton(findPreference(getCrashButtonKey()));
- setUpUserOptionButton(findPreference(getUserOptionButtonKey()));
-
setUpRemoteLogButton(findPreference(R.string.preference_key_remote_log));
- setUpAddArticles(findPreference(R.string.preference_key_add_articles));
-
setUpAddLists(findPreference(R.string.preference_key_add_reading_lists));
+
+
findPreference(context.getString(R.string.preferences_developer_crash_key))
+ .setOnPreferenceClickListener(preference -> {
+ throw new TestException("User tested crash
functionality.");
+ });
+
+
findPreference(context.getString(R.string.preferences_developer_user_option_key))
+ .setOnPreferenceClickListener(preference -> {
+
context.startActivity(UserOptionRowActivity.newIntent(context));
+ return true;
+ });
+
+ findPreference(R.string.preference_key_remote_log)
+ .setOnPreferenceChangeListener((preference, newValue) -> {
+ L.logRemoteError(new
RemoteLogException(newValue.toString()));
+ WikipediaApp.getInstance().checkCrashes(getActivity());
+ return true;
+ });
+
+ findPreference(R.string.preference_key_add_articles)
+ .setOnPreferenceChangeListener((preference, newValue) -> {
+ if (!newValue.toString().trim().equals("") &&
!newValue.toString().trim().equals("0")) {
+ createTestReadingList("Test reading list",
Integer.valueOf(newValue.toString().trim()));
+ }
+ return true;
+ });
+
+ findPreference(R.string.preference_key_add_reading_lists)
+ .setOnPreferenceChangeListener((preference, newValue) -> {
+ if (newValue.toString().trim().equals("") ||
newValue.toString().trim().equals("0")) {
+ return true;
+ }
+ int numOfLists =
Integer.valueOf(newValue.toString().trim());
+ for (int i = 1; i <= numOfLists; i++) {
+ createTestReadingList("Reading list " + i, 10);
+ }
+ return true;
+ });
}
-
-
- // --- RESTBase settings start ---
private void setUpRestBaseCheckboxes() {
TwoStatePreference manualPreference = (TwoStatePreference)
findPreference(getManualKey());
@@ -125,92 +153,19 @@
return context.getString(R.string.preference_key_use_restbase);
}
- // --- RESTBase settings end ---
-
- // --- MediaWiki settings start ---
-
private void setUpMediaWikiSettings() {
- Preference uriPreference = findPreference(getMediaWikiBaseUriKey());
+ Preference uriPreference =
findPreference(context.getString(R.string.preference_key_mediawiki_base_uri));
uriPreference.setOnPreferenceChangeListener(setMediaWikiBaseUriChangeListener);
TwoStatePreference multiLangPreference
- = (TwoStatePreference)
findPreference(getMediaWikiSupportsMultipleLanguages());
+ = (TwoStatePreference)
findPreference(context.getString(R.string.preference_key_mediawiki_base_uri_supports_lang_code));
multiLangPreference.setOnPreferenceChangeListener(setMediaWikiMultiLangSupportChangeListener);
- }
-
- private String getMediaWikiBaseUriKey() {
- return context.getString(R.string.preference_key_mediawiki_base_uri);
- }
-
- private String getMediaWikiSupportsMultipleLanguages() {
- return
context.getString(R.string.preference_key_mediawiki_base_uri_supports_lang_code);
}
private void resetMediaWikiSettings() {
WikipediaApp.getInstance().resetWikiSite();
}
- // --- MediaWiki settings end ---
-
-
- private String getCrashButtonKey() {
- return context.getString(R.string.preferences_developer_crash_key);
- }
-
- private String getUserOptionButtonKey() {
- return
context.getString(R.string.preferences_developer_user_option_key);
- }
-
- private void setUpCrashButton(Preference button) {
- button.setOnPreferenceClickListener(buildCrashButtonClickListener());
- }
-
- private void setUpUserOptionButton(Preference button) {
-
button.setOnPreferenceClickListener(buildUserOptionButtonClickListener());
- }
-
- private Preference.OnPreferenceClickListener
buildCrashButtonClickListener() {
- return new Preference.OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- throw new TestException("User tested crash functionality.");
- }
- };
- }
-
- private Preference.OnPreferenceClickListener
buildUserOptionButtonClickListener() {
- return new Preference.OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference preference) {
-
context.startActivity(UserOptionRowActivity.newIntent(context));
- return true;
- }
- };
- }
-
- private void setUpRemoteLogButton(Preference button) {
-
button.setOnPreferenceChangeListener(buildRemoteLogPreferenceChangeListener());
- }
-
- private void setUpAddArticles(Preference button) {
-
button.setOnPreferenceChangeListener(buildAddArticlesPreferenceChangeListener());
- }
-
- private Preference.OnPreferenceChangeListener
buildAddArticlesPreferenceChangeListener() {
- return new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object
newValue) {
- if (newValue.toString().trim().equals("") ||
newValue.toString().trim().equals("0")) {
- return true;
- }
- String title = "Test reading list";
- int listSize = Integer.valueOf(newValue.toString().trim());
- createReadingList(title, listSize);
- return true;
- }
- };
- }
-
- private void createReadingList(String title, int listSize) {
+ private void createTestReadingList(String title, int listSize) {
long now = System.currentTimeMillis();
final ReadingList list = ReadingList
.builder()
@@ -219,7 +174,7 @@
.mtime(now)
.atime(now)
.description(null)
- .pages(new ArrayList<ReadingListPage>())
+ .pages(new ArrayList<>())
.build();
ReadingList.DAO.addList(list);
for (int i = 0; i < listSize; i++) {
@@ -227,38 +182,6 @@
final ReadingListPage page = ReadingListDaoProxy.page(list,
pageTitle);
ReadingList.DAO.addTitleToList(list, page, false);
}
- }
-
- private void setUpAddLists(Preference button) {
-
button.setOnPreferenceChangeListener(buildAddListsPreferenceChangeListener());
- }
-
- private Preference.OnPreferenceChangeListener
buildAddListsPreferenceChangeListener() {
- return new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object
newValue) {
- if (newValue.toString().trim().equals("") ||
newValue.toString().trim().equals("0")) {
- return true;
- }
- int numOfLists = Integer.valueOf(newValue.toString().trim());
- numOfLists = numOfLists > MAX_LISTS ? MAX_LISTS :
Integer.valueOf(newValue.toString().trim());
- for (int i = 1; i <= numOfLists; i++) {
- createReadingList("Reading list " + i, 10);
- }
- return true;
- }
- };
- }
-
- private Preference.OnPreferenceChangeListener
buildRemoteLogPreferenceChangeListener() {
- return new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object
newValue) {
- L.logRemoteError(new RemoteLogException(newValue.toString()));
- WikipediaApp.getInstance().checkCrashes(getActivity());
- return true;
- }
- };
}
private void setUpCookies(@NonNull PreferenceCategory cat) {
diff --git a/app/src/main/res/xml/developer_preferences.xml
b/app/src/main/res/xml/developer_preferences.xml
index cc14073..8248b78 100644
--- a/app/src/main/res/xml/developer_preferences.xml
+++ b/app/src/main/res/xml/developer_preferences.xml
@@ -6,21 +6,6 @@
</PreferenceCategory>
- <PreferenceCategory
android:title="@string/preferences_developer_reading_list_category">
- <org.wikipedia.settings.EditTextAutoSummarizePreference
- style="@style/EditTextAutoSummarizePreference"
-
android:dialogMessage="@string/preferences_developer_summary_configure_articles"
- android:key="@string/preference_key_add_articles"
- android:title="@string/preferences_developer_add_articles" />
-
- <org.wikipedia.settings.EditTextAutoSummarizePreference
- style="@style/EditTextAutoSummarizePreference"
-
android:dialogMessage="@string/preferences_developer_summary_configure_reading_lists"
- android:key="@string/preference_key_add_reading_lists"
- android:title="@string/preferences_developer_add_lists" />
-
- </PreferenceCategory>
-
<PreferenceCategory
android:title="@string/preferences_developer_restbase_heading">
<SwitchPreferenceCompat
@@ -215,6 +200,21 @@
</PreferenceCategory>
+ <PreferenceCategory
android:title="@string/preferences_developer_reading_list_category">
+ <org.wikipedia.settings.EditTextAutoSummarizePreference
+ style="@style/EditTextAutoSummarizePreference"
+
android:dialogMessage="@string/preferences_developer_summary_configure_articles"
+ android:key="@string/preference_key_add_articles"
+ android:title="@string/preferences_developer_add_articles" />
+
+ <org.wikipedia.settings.EditTextAutoSummarizePreference
+ style="@style/EditTextAutoSummarizePreference"
+
android:dialogMessage="@string/preferences_developer_summary_configure_reading_lists"
+ android:key="@string/preference_key_add_reading_lists"
+ android:title="@string/preferences_developer_add_lists" />
+
+ </PreferenceCategory>
+
<PreferenceCategory
android:title="@string/preferences_developer_cookies_heading"
android:key="@string/preferences_developer_cookies_key">
--
To view, visit https://gerrit.wikimedia.org/r/396277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92f626e924f7aa3dd39636cc65feddd6d8c04bbe
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Cooltey <cf...@wikimedia.org>
Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
