devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

catching errors when attempting to mark the current room as read 

- fixes crash whilst offline
This commit is contained in:
Adam Brown 2022-04-02 22:58:06 +01:00
parent 9eae45c73a
commit ee2643c003
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
features/messenger/src/main/kotlin/app/dapk/st/messenger/DecryptingFetcher.kt
View File

@ -27,6 +27,9 @@ class DecryptingFetcher : Fetcher<RoomEvent.Image> {
private val http = OkHttpClient() private val http = OkHttpClient()
override suspend fun fetch(pool: BitmapPool, data: RoomEvent.Image, size: Size, options: Options): FetchResult { override suspend fun fetch(pool: BitmapPool, data: RoomEvent.Image, size: Size, options: Options): FetchResult {
val response = http.newCall(Request.Builder().url(data.imageMeta.url).build()).execute()
val outputStream = Buffer()
val keys = data.imageMeta.keys!! val keys = data.imageMeta.keys!!
val key = Base64.decode(keys.k.replace('-', '+').replace('_', '/'), Base64.DEFAULT) val key = Base64.decode(keys.k.replace('-', '+').replace('_', '/'), Base64.DEFAULT)
val initVectorBytes = Base64.decode(keys.iv, Base64.DEFAULT) val initVectorBytes = Base64.decode(keys.iv, Base64.DEFAULT)
@ -42,9 +45,6 @@ class DecryptingFetcher : Fetcher<RoomEvent.Image> {
val d = ByteArray(CRYPTO_BUFFER_SIZE) val d = ByteArray(CRYPTO_BUFFER_SIZE)
var decodedBytes: ByteArray var decodedBytes: ByteArray
val response = http.newCall(Request.Builder().url(data.imageMeta.url).build()).execute()
val outputStream = Buffer()
response.body()?.let { response.body()?.let {
it.byteStream().use { it.byteStream().use {
read = it.read(d) read = it.read(d)

6
features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerViewModel.kt
View File

@ -70,8 +70,10 @@ internal class MessengerViewModel(
private fun CoroutineScope.updateRoomReadStateAsync(latestReadEvent: EventId, state: MessengerState): Deferred<Unit> { private fun CoroutineScope.updateRoomReadStateAsync(latestReadEvent: EventId, state: MessengerState): Deferred<Unit> {
return async { return async {
roomService.markFullyRead(state.roomState.roomOverview.roomId, latestReadEvent) runCatching {
roomStore.markRead(state.roomState.roomOverview.roomId) roomService.markFullyRead(state.roomState.roomOverview.roomId, latestReadEvent)
roomStore.markRead(state.roomState.roomOverview.roomId)
}
} }
} }