BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226673
Change subject: Hygiene: Add new preference for experimental json page load
......................................................................
Hygiene: Add new preference for experimental json page load
Renamed the methods for the old HTML preference
Bug: T104714
Change-Id: Ib166e24a63d2ceb7ce064bf7d1dfc683e2f22ef7
---
M wikipedia/res/values/preference_keys.xml
M wikipedia/res/xml/developer_preferences.xml
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/settings/Prefs.java
4 files changed, 21 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/73/226673/1
diff --git a/wikipedia/res/values/preference_keys.xml
b/wikipedia/res/values/preference_keys.xml
index 9eef114..2de5ee6 100644
--- a/wikipedia/res/values/preference_keys.xml
+++ b/wikipedia/res/values/preference_keys.xml
@@ -21,7 +21,8 @@
<string
name="preference_key_feature_select_text_and_share_tutorials_enabled">featureSelectTextAndShareTutorialsEnabled</string>
<string
name="preference_key_toc_tutorial_enabled">tocTutorialEnabled</string>
<string name="preference_key_show_images">showImages</string>
- <string name="preference_key_exp_page_load">expPageLoad</string>
+ <string name="preference_key_exp_html_page_load">expHtmlPageLoad</string>
+ <string name="preference_key_exp_json_page_load">expJsonPageLoad</string>
<string
name="preference_key_daily_event_time_task_name">dailyEventTask</string>
<string name="preference_key_login_username">username</string>
<string name="preference_key_login_password">password</string>
diff --git a/wikipedia/res/xml/developer_preferences.xml
b/wikipedia/res/xml/developer_preferences.xml
index c82e108..c85fd2c 100644
--- a/wikipedia/res/xml/developer_preferences.xml
+++ b/wikipedia/res/xml/developer_preferences.xml
@@ -18,8 +18,12 @@
android:title="@string/preference_key_link_preview_version" />
<CheckBoxPreference
- android:key="@string/preference_key_exp_page_load"
- android:title="@string/preference_key_exp_page_load" />
+ android:key="@string/preference_key_exp_json_page_load"
+ android:title="@string/preference_key_exp_json_page_load" />
+
+ <CheckBoxPreference
+ android:key="@string/preference_key_exp_html_page_load"
+ android:title="@string/preference_key_exp_html_page_load" />
</PreferenceCategory>
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 1432ee5..aac3baa 100755
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -186,7 +186,7 @@
super.onCreate(savedInstanceState);
app = (WikipediaApp) getActivity().getApplicationContext();
model = new PageViewModel();
- if (Prefs.isExperimentalPageLoadEnabled()) {
+ if (Prefs.isExperimentalHtmlPageLoadEnabled()) {
pageLoadStrategy = new HtmlPageLoadStrategy();
} else {
pageLoadStrategy = new JsonPageLoadStrategy();
@@ -309,7 +309,7 @@
}
};
- if (!Prefs.isExperimentalPageLoadEnabled()) {
+ if (!Prefs.isExperimentalHtmlPageLoadEnabled()) {
bridge.injectStyleBundle(StyleBundle.getAvailableBundle(StyleBundle.BUNDLE_PAGEVIEW));
}
diff --git a/wikipedia/src/main/java/org/wikipedia/settings/Prefs.java
b/wikipedia/src/main/java/org/wikipedia/settings/Prefs.java
index 3f54322..7d38748 100644
--- a/wikipedia/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/wikipedia/src/main/java/org/wikipedia/settings/Prefs.java
@@ -215,14 +215,21 @@
return getBoolean(R.string.preference_key_eventlogging_opt_in, true);
}
- public static boolean isExperimentalPageLoadEnabled() {
- return getBoolean(R.string.preference_key_exp_page_load, false);
+ public static boolean isExperimentalHtmlPageLoadEnabled() {
+ return getBoolean(R.string.preference_key_exp_html_page_load, false);
}
- public static void setExperimentalPageLoadEnabled(boolean enabled) {
- setBoolean(R.string.preference_key_exp_page_load, enabled);
+ public static void setExperimentalHtmlPageLoadEnabled(boolean enabled) {
+ setBoolean(R.string.preference_key_exp_html_page_load, enabled);
}
+ public static boolean isExperimentalJsonPageLoadEnabled() {
+ return getBoolean(R.string.preference_key_exp_json_page_load, false);
+ }
+
+ public static void setExperimentalJsonPageLoadEnabled(boolean enabled) {
+ setBoolean(R.string.preference_key_exp_json_page_load, enabled);
+ }
@NonNull
public static long getLastRunTime(@NonNull String task) {
--
To view, visit https://gerrit.wikimedia.org/r/226673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib166e24a63d2ceb7ce064bf7d1dfc683e2f22ef7
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
