caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

comboctl-main: Catch getParsedDisplayFrame() exceptions and rethrow later

Browse source 
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
This commit is contained in:
Carlos Rafael Giani 2022-11-20 18:31:44 +01:00
parent 8d6171db49
commit 03a32f09cf
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/main/RTNavigation.kt
View file

@ -395,7 +395,16 @@ suspend fun longPressRTButtonUntil(
rtNavigationContext.getParsedDisplayFrame(filterDuplicates = true) rtNavigationContext.getParsedDisplayFrame(filterDuplicates = true)
} }
} catch (e: TimeoutCancellationException) { } catch (e: TimeoutCancellationException) {
// Timeout expired, and we got no new frame. Stop waiting
// for one and continue long-pressing the button. We might
// be on a screen that does not update on its own.
null null
} catch (t: Throwable) {
// An exception that's not TimeoutCancellationException
// was thrown. Catch it, store it to rethrow it later,
// and end the long button press.
thrownDuringButtonPress = t
return@startLongButtonPress false
} ?: return@startLongButtonPress true } ?: return@startLongButtonPress true
// It is possible that we got a parsed display frame very quickly. // It is possible that we got a parsed display frame very quickly.