bida/busky
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

don't crash on unexpected json responses (#3635)

Browse source
This commit is contained in:
Levi Bard 2023-09-05 09:34:20 +02:00 committed by GitHub
commit 7016fa3abc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt
View file

@ -332,7 +332,7 @@ class AccountListFragment :
val linkHeader = response.headers()["Link"] val linkHeader = response.headers()["Link"]
onFetchAccountsSuccess(accountList, linkHeader) onFetchAccountsSuccess(accountList, linkHeader)
} catch (exception: IOException) { } catch (exception: Exception) {
onFetchAccountsFailure(exception) onFetchAccountsFailure(exception)
} }
} }

3
app/src/main/java/com/keylesspalace/tusky/components/timeline/util/TimelineUtils.kt
View file

@ -1,9 +1,10 @@
package com.keylesspalace.tusky.components.timeline.util package com.keylesspalace.tusky.components.timeline.util
import com.google.gson.JsonParseException
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException 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( inline fun <T> ifExpected(
t: Throwable, t: Throwable,

6
app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt
View file

@ -15,6 +15,7 @@
package com.keylesspalace.tusky.components.timeline.viewmodel package com.keylesspalace.tusky.components.timeline.viewmodel
import android.util.Log
import androidx.paging.ExperimentalPagingApi import androidx.paging.ExperimentalPagingApi
import androidx.paging.LoadType import androidx.paging.LoadType
import androidx.paging.PagingState import androidx.paging.PagingState
@ -117,6 +118,7 @@ class CachedTimelineRemoteMediator(
return MediatorResult.Success(endOfPaginationReached = statuses.isEmpty()) return MediatorResult.Success(endOfPaginationReached = statuses.isEmpty())
} catch (e: Exception) { } catch (e: Exception) {
return ifExpected(e) { return ifExpected(e) {
Log.w(TAG, "Failed to load timeline", e)
MediatorResult.Error(e) MediatorResult.Error(e)
} }
} }
@ -175,4 +177,8 @@ class CachedTimelineRemoteMediator(
} }
return overlappedStatuses return overlappedStatuses
} }
companion object {
private const val TAG = "CachedTimelineRM"
}
} }

6
app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/NetworkTimelineRemoteMediator.kt
View file

@ -15,6 +15,7 @@
package com.keylesspalace.tusky.components.timeline.viewmodel package com.keylesspalace.tusky.components.timeline.viewmodel
import android.util.Log
import androidx.paging.ExperimentalPagingApi import androidx.paging.ExperimentalPagingApi
import androidx.paging.LoadType import androidx.paging.LoadType
import androidx.paging.PagingState import androidx.paging.PagingState
@ -106,8 +107,13 @@ class NetworkTimelineRemoteMediator(
return MediatorResult.Success(endOfPaginationReached = statuses.isEmpty()) return MediatorResult.Success(endOfPaginationReached = statuses.isEmpty())
} catch (e: Exception) { } catch (e: Exception) {
return ifExpected(e) { return ifExpected(e) {
Log.w(TAG, "Failed to load timeline", e)
MediatorResult.Error(e) MediatorResult.Error(e)
} }
} }
} }
companion object {
private const val TAG = "NetworkTimelineRM"
}
} }