TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 00:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify JobCancellationException

Browse Source
This commit is contained in:
Andrew 2024-06-17 19:45:32 +09:30
parent af99390643
commit c59637f7ec
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessageViewModel.kt
View File

@ -84,18 +84,22 @@ class NewMessageViewModel @Inject constructor(
_state.update { it.copy(loading = false) }
onPublicKey(onsNameOrPublicKey)
}
} catch (e: Exception) {
// JobCancellationException is thrown if we cancel the job
// but it is internal, so this excludes other subclasses of CancellationException
// than TimeoutCancellationException
if (e is TimeoutCancellationException == e is CancellationException) {
_state.update { it.copy(loading = false, error = GetString(e) { it.toMessage() }) }
} catch (e: CancellationException) {
if (e is TimeoutCancellationException) {
// Ignore JobCancellationException, which is called when we cancel the job.
onError(e)
}
} catch (e: Exception) {
onError(e)
}
}
}
}
private fun onError(e: Exception) {
_state.update { it.copy(loading = false, error = GetString(e) { it.toMessage() }) }
}
private fun onPublicKey(onsNameOrPublicKey: String) {
viewModelScope.launch { _event.send(Event.Success(onsNameOrPublicKey)) }
}