Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284984
Change subject: Reading List Page DAO interaction tweaks
......................................................................
Reading List Page DAO interaction tweaks
1) Change DiskRow.next() so that SAVED rather than ONLINE follows
OUTDATED; otherwise pages are in ONLINE state after saving, causing
all kinds of problems
2) Upsert all rows after changing a reading list's saved state so that
the service registers the change and saves or deletes as needed
Change-Id: Id299e7ae0263cec752139da29772b209cc664a62
---
M app/src/main/java/org/wikipedia/readinglist/ReadingList.java
M app/src/main/java/org/wikipedia/readinglist/page/database/disk/DiskRow.java
2 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/84/284984/1
diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
index b701ddc..a5bd6af 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
@@ -7,6 +7,7 @@
import org.wikipedia.database.contract.ReadingListContract;
import org.wikipedia.readinglist.database.ReadingListRow;
import org.wikipedia.readinglist.page.ReadingListPage;
+import org.wikipedia.readinglist.page.database.ReadingListPageDao;
import java.util.ArrayList;
import java.util.List;
@@ -77,6 +78,7 @@
public void setSaveOffline(boolean saved) {
for (ReadingListPage page : pages) {
page.savedOrSaving(saved);
+ ReadingListPageDao.instance().upsert(page);
}
}
diff --git
a/app/src/main/java/org/wikipedia/readinglist/page/database/disk/DiskRow.java
b/app/src/main/java/org/wikipedia/readinglist/page/database/disk/DiskRow.java
index 800e0c8..655752e 100644
---
a/app/src/main/java/org/wikipedia/readinglist/page/database/disk/DiskRow.java
+++
b/app/src/main/java/org/wikipedia/readinglist/page/database/disk/DiskRow.java
@@ -35,9 +35,10 @@
switch (current) {
case ONLINE:
case SAVED:
- case OUTDATED:
case UNSAVED:
return DiskStatus.ONLINE;
+ case OUTDATED:
+ return DiskStatus.SAVED;
case DELETED:
return DiskStatus.DELETED;
default:
--
To view, visit https://gerrit.wikimedia.org/r/284984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id299e7ae0263cec752139da29772b209cc664a62
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
