jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/358385 )
Change subject: Add settings option to allow syncing reading lists
......................................................................
Add settings option to allow syncing reading lists
Bug: T167182
Change-Id: I4e43cf0b7a32707e2e7e04a532be26dc4a35d705
---
M app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/xml/preferences.xml
6 files changed, 26 insertions(+), 12 deletions(-)
Approvals:
Niedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
index e1efffd..e741175 100644
---
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
+++
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
@@ -31,6 +31,7 @@
import static
org.wikipedia.readinglist.sync.RemoteReadingLists.RemoteReadingList;
import static
org.wikipedia.readinglist.sync.RemoteReadingLists.RemoteReadingListPage;
+import static org.wikipedia.settings.Prefs.isReadingListSyncEnabled;
public class ReadingListSynchronizer {
private static final String READING_LISTS_SYNC_OPTION =
"userjs-reading-lists-v1";
@@ -58,8 +59,8 @@
syncSavedPages();
return;
}
- if (!User.isLoggedIn()) {
- L.d("Not logged in, so skipping sync of reading lists.");
+ if (!User.isLoggedIn() || !isReadingListSyncEnabled()) {
+ L.d("Skipping sync of reading lists.");
syncSavedPages();
return;
}
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 1a0defd..411fe49 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -484,5 +484,9 @@
setInt(R.string.preference_key_total_anon_descriptions_edited,
getTotalAnonDescriptionsEdited() + 1);
}
+ public static boolean isReadingListSyncEnabled() {
+ return getBoolean(R.string.preference_key_sync_reading_lists, true);
+ }
+
private Prefs() { }
}
diff --git a/app/src/main/res/values-qq/strings.xml
b/app/src/main/res/values-qq/strings.xml
index e02bc61..6233904 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -120,6 +120,9 @@
<string name="edit_preview_fetching_dialog_message">Message shown to the
user while the user is waiting for the preview of their edit to be
shown</string>
<string name="send_feedback">Text to show for link used for sending feedback
about the app.</string>
<string name="create_account_account_created_toast">Message shown in a small
toast when account creation is successful.\n*
{{msg-mw|Accountcreatedtext|message}}</string>
+ <string name="preferences_heading_storage_and_syncing">Section title for
preferences related to syncing and storing user data</string>
+ <string name="preference_title_sync_reading_lists">Title of preference that,
when checked, enables syncing the user\'s reading lists across devices</string>
+ <string name="preference_summary_sync_reading_lists">Description of
preference that, when checked, enables syncing the user\'s reading lists across
devices</string>
<string name="preferences_privacy_settings_heading">Section title for
privacy related settings\n{{Identical|Privacy}}</string>
<string name="preference_title_eventlogging_opt_in">Title of preference that
when checked enables data collection of user behavior.\n\nShown in the
preferences screen along with the following:\n*
{{msg-wikimedia|Wikipedia-android-strings-preference title show images}}\n*
{{msg-wikimedia|Wikipedia-android-strings-preference title language}}\n*
{{msg-wikimedia|Wikipedia-android-strings-preference title show link
previews}}\n* {{msg-wikimedia|Wikipedia-android-strings-preference title
eventlogging opt in}}\n* {{msg-wikimedia|Wikipedia-android-strings-zero warn
when leaving}}</string>
<string name="preference_summary_eventlogging_opt_in">Description of
preference that when checked enables data collection of user behavior.</string>
diff --git a/app/src/main/res/values/preference_keys.xml
b/app/src/main/res/values/preference_keys.xml
index 1146d4d..51b2b85 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -50,4 +50,5 @@
<string
name="preference_key_description_edit_tutorial_enabled">descriptionEditTutorialEnabled</string>
<string
name="preference_key_last_description_edit_time">lastDescriptionEditTime</string>
<string
name="preference_key_total_anon_descriptions_edited">totalAnonDescriptionsEdited</string>
+ <string name="preference_key_sync_reading_lists">syncReadingLists</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index 4181a98..33fff95 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -134,6 +134,9 @@
<string name="edit_preview_fetching_dialog_message">Fetching
preview…</string>
<string name="send_feedback">Send app feedback</string>
<string name="create_account_account_created_toast">Account
created!</string>
+ <string name="preferences_heading_storage_and_syncing">Storage and
syncing</string>
+ <string name="preference_title_sync_reading_lists">Sync reading
lists</string>
+ <string name="preference_summary_sync_reading_lists">Allow Wikimedia to
sync your reading lists when you log in</string>
<string name="preferences_privacy_settings_heading">Privacy</string>
<string name="preference_title_eventlogging_opt_in">Send usage
reports</string>
<string name="preference_summary_eventlogging_opt_in">Allow Wikimedia to
collect information about how you use the app to make the app better</string>
diff --git a/app/src/main/res/xml/preferences.xml
b/app/src/main/res/xml/preferences.xml
index e24ba3f..37b7170 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -2,8 +2,7 @@
<android.support.v7.preference.PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android";>
- <PreferenceCategory
- android:title="@string/preferences_general_heading">
+ <PreferenceCategory android:title="@string/preferences_general_heading">
<org.wikipedia.settings.PreferenceMultiLine
android:key="@string/preference_key_language"
android:title="@string/preference_title_language">
@@ -12,27 +11,30 @@
android:key="@string/preference_key_show_images"
android:defaultValue="true"
android:title="@string/preference_title_show_images"
- android:summary="@string/preference_summary_show_images"
- />
+ android:summary="@string/preference_summary_show_images" />
<SwitchPreferenceCompat
android:key="@string/preference_key_show_link_previews"
android:defaultValue="true"
android:title="@string/preference_title_show_link_previews"
- android:summary="@string/preference_summary_show_link_previews"
- />
+ android:summary="@string/preference_summary_show_link_previews" />
+ </PreferenceCategory>
+ <PreferenceCategory
android:title="@string/preferences_heading_storage_and_syncing">
+ <SwitchPreferenceCompat
+ android:key="@string/preference_key_sync_reading_lists"
+ android:defaultValue="true"
+ android:title="@string/preference_title_sync_reading_lists"
+ android:summary="@string/preference_summary_sync_reading_lists" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/preferences_privacy_settings_heading">
<SwitchPreferenceCompat
android:key="@string/preference_key_eventlogging_opt_in"
android:defaultValue="true"
android:title="@string/preference_title_eventlogging_opt_in"
- android:summary="@string/preference_summary_eventlogging_opt_in"
- />
+ android:summary="@string/preference_summary_eventlogging_opt_in" />
<SwitchPreferenceCompat
android:key="@string/preference_key_auto_upload_crash_reports"
android:defaultValue="true"
android:title="@string/preference_title_auto_upload_crash_reports"
-
android:summary="@string/preference_summary_auto_upload_crash_reports"
- />
+
android:summary="@string/preference_summary_auto_upload_crash_reports" />
</PreferenceCategory>
</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/358385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e43cf0b7a32707e2e7e04a532be26dc4a35d705
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
