Merge branch 'refs/heads/master' into develop

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v2.0.2
+- Fix crash when opening app from a notification (#223)
+- Fix Fever API synchronization error (#228)
+
 # v2.0.1
 
 - Make Timeline tab filters persistent (#138)

api/src/main/java/com/readrops/api/services/fever/adapters/FeverFeedsAdapter.kt

@@ -31,14 +31,12 @@ class FeverFeedsAdapter : JsonAdapter<FeverFeeds>() {
 
             beginObject()
 
-            // skip based fields (api_version, auth, last_refreshed...)
+            while (nextName() != "feeds") {
-            repeat(3) {
+                skipValue()
-                skipField()
             }
 
-            nextName() // beginning of feeds array
+            // feeds array
             beginArray()
-
             while (hasNext()) {
                 beginObject()
 
@@ -62,9 +60,12 @@ class FeverFeedsAdapter : JsonAdapter<FeverFeeds>() {
 
             endArray()
 
-            nextName()
+            while (nextName() != "feeds_groups") {
-            beginArray()
+                skipValue()
+            }
 
+            // feeds_groups array
+            beginArray()
             while (hasNext()) {
                 beginObject()
 
@@ -83,6 +84,11 @@ class FeverFeedsAdapter : JsonAdapter<FeverFeeds>() {
             }
 
             endArray()
+
+            while (peek() != JsonReader.Token.END_OBJECT) {
+                skipField()
+            }
+
             endObject()
 
             FeverFeeds(

api/src/test/resources/services/fever/feeds.json

@@ -1,7 +1,6 @@
 {
   "api_version": 3,
   "auth": 1,
-  "last_refreshed_on_time": 1640284745,
   "feeds": [
     {
       "id": 32,
@@ -13,10 +12,12 @@
       "last_updated_on_time": 1640364024
     }
   ],
+  "last_refreshed_on_time": 1640284745,
   "feeds_groups": [
     {
       "group_id": 3,
       "feed_ids": "5,4"
     }
-  ]
+  ],
+  "another_field": "another_value"
 }

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         applicationId = "com.readrops.app"
 
-        versionCode = 18
+        versionCode = 19
-        versionName = "2.0.1"
+        versionName = "2.0.2"
     }
 
     buildTypes {

fastlane/metadata/android/en-US/changelogs/19.txt

@@ -0,0 +1,2 @@
+* Fix crash when opening app from a notification (#223)
+* Fix Fever API synchronization error (#228)