filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-02 12:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5659 from SpiritCroc/permalink-failure

Browse Source 
Fix endless loading timeline if opened at non-existing event
This commit is contained in:
ganfra 2022-04-06 17:57:48 +02:00 committed by GitHub
commit 94099f4908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5659.bugfix Normal file
View File

@ -0,0 +1 @@
Fix endless loading if the event from a permalink is not found

18
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
View File

@ -223,7 +223,15 @@ internal class DefaultTimeline(private val roomId: String,
updateState(direction) {
it.copy(loading = true)
}
val loadMoreResult = strategy.loadMore(count, direction, fetchOnServerIfNeeded)
val loadMoreResult = try {
strategy.loadMore(count, direction, fetchOnServerIfNeeded)
} catch (throwable: Throwable) {
// Timeline could not be loaded with a (likely) permanent issue, such as the
// server now knowing the initialEventId, so we want to show an error message
// and possibly restart without initialEventId.
onTimelineFailure(throwable)
return false
}
Timber.v("$baseLogMessage: result $loadMoreResult")
val hasMoreToLoad = loadMoreResult != LoadMoreResult.REACHED_END
updateState(direction) {
@ -342,6 +350,14 @@ internal class DefaultTimeline(private val roomId: String,
}
}
private fun onTimelineFailure(throwable: Throwable) {
timelineScope.launch(coroutineDispatchers.main) {
listeners.forEach {
tryOrNull { it.onTimelineFailure(throwable) }
}
}
}
private fun buildStrategy(mode: LoadTimelineStrategy.Mode): LoadTimelineStrategy {
return LoadTimelineStrategy(
roomId = roomId,

6
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
View File

@ -24,6 +24,8 @@ import io.realm.RealmResults
import io.realm.kotlin.createObject
import kotlinx.coroutines.CompletableDeferred
import org.matrix.android.sdk.api.extensions.orFalse
import org.matrix.android.sdk.api.failure.Failure
import org.matrix.android.sdk.api.failure.MatrixError
import org.matrix.android.sdk.api.session.room.send.SendState
import org.matrix.android.sdk.api.session.room.timeline.Timeline
import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@ -194,6 +196,10 @@ internal class LoadTimelineStrategy(
getContextLatch?.await()
getContextLatch = null
} catch (failure: Throwable) {
if (failure is Failure.ServerError && failure.error.code in listOf(MatrixError.M_NOT_FOUND, MatrixError.M_FORBIDDEN)) {
// This failure is likely permanent, so handle in DefaultTimeline to restart without eventId
throw failure
}
return LoadMoreResult.FAILURE
}
}