Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405836 )
Change subject: Fix undo of list deletion.
......................................................................
Fix undo of list deletion.
Bug: T185553
Change-Id: I6c9c3766591355a859325b5ebcf533511ed77afc
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
2 files changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/36/405836/1
diff --git
a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
index 9dbf0b2..56864c8 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
@@ -316,9 +316,13 @@
Snackbar snackbar = FeedbackUtil.makeSnackbar(getActivity(), message,
FeedbackUtil.LENGTH_DEFAULT);
snackbar.setAction(R.string.reading_list_item_delete_undo, v -> {
- ReadingListDbHelper.instance().addPagesToList(readingList, pages,
true);
- readingList.pages().addAll(pages);
- update();
+ List<ReadingListPage> newPages = new ArrayList<>();
+ for (ReadingListPage page : pages) {
+ newPages.add(new
ReadingListPage(ReadingListPage.toPageTitle(page)));
+ }
+ ReadingListDbHelper.instance().addPagesToList(readingList,
newPages, true);
+ readingList.pages().addAll(newPages);
+ updateReadingListData();
});
snackbar.show();
}
diff --git
a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
index 77d2dcb..cb4a3e0 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -405,9 +405,12 @@
String.format(getString(R.string.reading_list_deleted),
readingList.title()),
FeedbackUtil.LENGTH_DEFAULT);
snackbar.setAction(R.string.reading_list_item_delete_undo, v -> {
-
ReadingList newList =
ReadingListDbHelper.instance().createList(readingList.title(),
readingList.description());
- ReadingListDbHelper.instance().addPagesToList(newList,
readingList.pages(), true);
+ List<ReadingListPage> newPages = new ArrayList<>();
+ for (ReadingListPage page : readingList.pages()) {
+ newPages.add(new
ReadingListPage(ReadingListPage.toPageTitle(page)));
+ }
+ ReadingListDbHelper.instance().addPagesToList(newList, newPages,
true);
updateLists();
});
snackbar.show();
--
To view, visit https://gerrit.wikimedia.org/r/405836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c9c3766591355a859325b5ebcf533511ed77afc
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
