From 3ac78c82c9efac38986ca1699aad1f7654192440 Mon Sep 17 00:00:00 2001
From: Conny Duck <git@connyduck.at>
Date: Mon, 8 May 2023 19:24:57 +0200
Subject: [PATCH] don't crash on unexpected json responses

---
 .../tusky/components/accountlist/AccountListFragment.kt     | 2 +-
 .../tusky/components/timeline/util/TimelineUtils.kt         | 3 ++-
 .../timeline/viewmodel/CachedTimelineRemoteMediator.kt      | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt
index 552744586..15f36f268 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt
@@ -313,7 +313,7 @@ class AccountListFragment : Fragment(R.layout.fragment_account_list), AccountAct
 
                 val linkHeader = response.headers()["Link"]
                 onFetchAccountsSuccess(accountList, linkHeader)
-            } catch (exception: IOException) {
+            } catch (exception: Exception) {
                 onFetchAccountsFailure(exception)
             }
         }
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/util/TimelineUtils.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/util/TimelineUtils.kt
index c8d95fd81..4a1d75f92 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/timeline/util/TimelineUtils.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/util/TimelineUtils.kt
@@ -1,9 +1,10 @@
 package com.keylesspalace.tusky.components.timeline.util
 
+import com.google.gson.JsonParseException
 import retrofit2.HttpException
 import java.io.IOException
 
-fun Throwable.isExpected() = this is IOException || this is HttpException
+fun Throwable.isExpected() = this is IOException || this is HttpException || this is JsonParseException
 
 inline fun <T> ifExpected(
     t: Throwable,
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt
index 89afefecd..2746b1acf 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt
@@ -15,6 +15,7 @@
 
 package com.keylesspalace.tusky.components.timeline.viewmodel
 
+import android.util.Log
 import androidx.paging.ExperimentalPagingApi
 import androidx.paging.LoadType
 import androidx.paging.PagingState
@@ -117,6 +118,7 @@ class CachedTimelineRemoteMediator(
             return MediatorResult.Success(endOfPaginationReached = statuses.isEmpty())
         } catch (e: Exception) {
             return ifExpected(e) {
+                Log.w(TAG, "Failed to load timeline", e)
                 MediatorResult.Error(e)
             }
         }
@@ -175,4 +177,8 @@ class CachedTimelineRemoteMediator(
         }
         return overlappedStatuses
     }
+
+    companion object {
+        private const val TAG = "CachedTimelineRM"
+    }
 }