Catch error properly when app update check fails (fixes #8019)
Cette révision appartient à :
Parent
83871fc013
révision
7ec822503a
3 fichiers modifiés avec 12 ajouts et 12 suppressions
|
@ -133,10 +133,10 @@ class AppUpdateService : Service() {
|
|||
throw Exception("Unsuccessful response")
|
||||
}
|
||||
notifier.promptInstall(apkFile.getUriCompat(this))
|
||||
} catch (error: Exception) {
|
||||
logcat(LogPriority.ERROR, error)
|
||||
if (error is CancellationException ||
|
||||
(error is StreamResetException && error.errorCode == ErrorCode.CANCEL)
|
||||
} catch (e: Exception) {
|
||||
logcat(LogPriority.ERROR, e)
|
||||
if (e is CancellationException ||
|
||||
(e is StreamResetException && e.errorCode == ErrorCode.CANCEL)
|
||||
) {
|
||||
notifier.cancel()
|
||||
} else {
|
||||
|
|
|
@ -45,9 +45,9 @@ class AboutController : BasicFullComposeController() {
|
|||
activity!!.toast(R.string.update_check_look_for_updates)
|
||||
|
||||
viewScope.launchIO {
|
||||
try {
|
||||
val result = updateChecker.checkForUpdate(activity!!, isUserPrompt = true)
|
||||
withUIContext {
|
||||
try {
|
||||
when (result) {
|
||||
is AppUpdateResult.NewUpdate -> {
|
||||
NewUpdateDialogController(result).showDialog(router)
|
||||
|
@ -57,10 +57,10 @@ class AboutController : BasicFullComposeController() {
|
|||
}
|
||||
else -> {}
|
||||
}
|
||||
} catch (error: Exception) {
|
||||
activity?.toast(error.message)
|
||||
logcat(LogPriority.ERROR, error)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
withUIContext { activity?.toast(e.message) }
|
||||
logcat(LogPriority.ERROR, e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,9 +37,9 @@ fun Call.asObservable(): Observable<Response> {
|
|||
subscriber.onNext(response)
|
||||
subscriber.onCompleted()
|
||||
}
|
||||
} catch (error: Exception) {
|
||||
} catch (e: Exception) {
|
||||
if (!subscriber.isUnsubscribed) {
|
||||
subscriber.onError(error)
|
||||
subscriber.onError(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Référencer dans un nouveau ticket