Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/406122 )

Change subject: D'oh: fix creation/import of Default list.
......................................................................

D'oh: fix creation/import of Default list.

Change-Id: I3d8539856a37a7bbb16097698a73e94706d6f983
---
M app/src/main/java/org/wikipedia/readinglist/database/ReadingListPageTable.java
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/22/406122/1

diff --git 
a/app/src/main/java/org/wikipedia/readinglist/database/ReadingListPageTable.java
 
b/app/src/main/java/org/wikipedia/readinglist/database/ReadingListPageTable.java
index be1aaf5..287d650 100644
--- 
a/app/src/main/java/org/wikipedia/readinglist/database/ReadingListPageTable.java
+++ 
b/app/src/main/java/org/wikipedia/readinglist/database/ReadingListPageTable.java
@@ -132,8 +132,8 @@
 
     private void renameListsWithIdenticalNameAsDefault(SQLiteDatabase db, 
List<ReadingList> lists) {
         for (ReadingList list : lists) {
-            if 
(list.title().equalsIgnoreCase(WikipediaApp.getInstance().getString(R.string.default_reading_list_name)))
 {
-                
list.title(String.format(WikipediaApp.getInstance().getString(R.string.reading_list_saved_list_rename),
 list.title()));
+            if 
(list.dbTitle().equalsIgnoreCase(WikipediaApp.getInstance().getString(R.string.default_reading_list_name)))
 {
+                
list.title(String.format(WikipediaApp.getInstance().getString(R.string.reading_list_saved_list_rename),
 list.dbTitle()));
                 ReadingListDbHelper.instance().updateList(db, list, false);
             }
         }
@@ -188,7 +188,7 @@
                     }
                     ReadingList origList = null;
                     for (ReadingList list : lists) {
-                        if (listKeys.contains(getListKey(list.title()))) {
+                        if (listKeys.contains(getListKey(list.dbTitle()))) {
                             origList = list;
                             break;
                         }
@@ -202,9 +202,9 @@
                     while (newList.pages().size() >= 
Constants.MAX_READING_LIST_ARTICLE_LIMIT) {
                         shouldShowLargeSplitMessage = true;
                         newList = null;
-                        String newListName = origList.title() + " (" + 
Integer.toString(++splitListIndex) + ")";
+                        String newListName = origList.dbTitle() + " (" + 
Integer.toString(++splitListIndex) + ")";
                         for (ReadingList list : lists) {
-                            if (list.title().equals(newListName)) {
+                            if (list.dbTitle().equals(newListName)) {
                                 newList = list;
                                 break;
                             }

-- 
To view, visit https://gerrit.wikimedia.org/r/406122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d8539856a37a7bbb16097698a73e94706d6f983
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

Reply via email to