Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405939 )
Change subject: POC: check whether reading lists are disabled server-side.
......................................................................
POC: check whether reading lists are disabled server-side.
Change-Id: Ibd1fe9a123c10649dc48727ed8b837f052aeda65
---
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSyncAdapter.java
2 files changed, 13 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/39/405939/1
diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index 494f6e3..57c6c43 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -26,6 +26,7 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.crash.CrashReportActivity;
import org.wikipedia.events.NetworkConnectEvent;
+import org.wikipedia.events.ReadingListsNotSetUpEvent;
import org.wikipedia.events.SplitLargeListsEvent;
import org.wikipedia.events.ThemeChangeEvent;
import org.wikipedia.events.WikipediaZeroEnterEvent;
@@ -235,6 +236,14 @@
.setPositiveButton(android.R.string.ok, null)
.show();
}
+
+ @Subscribe public void on(ReadingListsNotSetUpEvent event) {
+ Prefs.setReadingListSyncEnabled(false);
+ new AlertDialog.Builder(BaseActivity.this)
+ .setMessage("Reading lists are no longer set up!")
+ .setPositiveButton(android.R.string.ok, null)
+ .show();
+ }
}
}
diff --git
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSyncAdapter.java
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSyncAdapter.java
index 090fcab..f88b6cb 100644
---
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSyncAdapter.java
+++
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSyncAdapter.java
@@ -15,6 +15,7 @@
import org.wikipedia.auth.AccountUtil;
import org.wikipedia.csrf.CsrfTokenClient;
import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.events.ReadingListsNotSetUpEvent;
import org.wikipedia.page.PageTitle;
import org.wikipedia.readinglist.database.ReadingList;
import org.wikipedia.readinglist.database.ReadingListDbHelper;
@@ -408,18 +409,15 @@
}
} catch (Throwable t) {
- /*
- // In case we want to automatically setup lists for the user:
if (client.isErrorType(t, "not-set-up")) {
try {
- L.d("Setting up remote reading lists...");
- client.setup(getCsrfToken(wiki, csrfToken));
- shouldRetry = true;
+
+ WikipediaApp.getInstance().getBus().post(new
ReadingListsNotSetUpEvent());
+
} catch (Throwable caught) {
t = caught;
}
}
- */
if (client.isErrorType(t, "notloggedin")) {
try {
L.d("Server doesn't believe we're logged in, so logging
in...");
--
To view, visit https://gerrit.wikimedia.org/r/405939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd1fe9a123c10649dc48727ed8b837f052aeda65
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
