Merge branch 'fix-42.2'

UweTrottmann · Apr 19, 2018 · 6b6dd34 · 6b6dd34
2 parents 4eb0fb4 + f3c193e
commit 6b6dd34
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,11 @@ Version 42
 * 🔨 Calendar: display correct date in headers on Android 5.1 and older.
 * 🔨 Android 8: Fix occasional crash when calculating season unwatched count.
 
+#### 42.2
+*(2018-04-19)*
+
+* 🔨 Correctly upload lists to Cloud even if one is broken.
+
 #### 42.1
 *(2018-04-19)*
 

diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/HexagonListsSync.java b/app/src/main/java/com/battlelancer/seriesguide/sync/HexagonListsSync.java
@@ -279,7 +279,6 @@ public boolean uploadAll() {
 
         while (listsQuery.moveToNext()) {
             SgList list = new SgList();
-            lists.add(list);
             // add list properties
             String listId = listsQuery.getString(ListsTools.Query.LIST_ID);
             String listName = listsQuery.getString(ListsTools.Query.NAME);
@@ -300,8 +299,12 @@ public boolean uploadAll() {
                 Timber.d("uploadAll: no items to upload for list %s.", listId);
             }
 
+            lists.add(list);
+
             if (lists.size() == LISTS_MAX_BATCH_SIZE || listsQuery.isLast()) {
-                if (!doUploadSomeLists(listsWrapper)) {
+                if (doUploadSomeLists(listsWrapper)) {
+                    lists.clear();
+                } else {
                     return false; // part upload failed, next sync will try again
                 }
             }

diff --git a/build.gradle b/build.gradle
@@ -27,8 +27,8 @@ buildscript {
             'threetenABP': '1.0.6', // github.com/UweTrottmann/ThreeTenABP/blob/master/CHANGELOG.md
 
             // version 15xxxyy -> min SDK 15, release xxx, build yy
-            'code': 1503006,
-            'name': '42.1',
+            'code': 1503007,
+            'name': '42.2',
     ]
 
     repositories {