From 9f7ab46bbe99becfba07ab8bc9796c6cea24085e Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 6 Mar 2020 20:55:47 -0800 Subject: [PATCH] fix crashlytics report: if user turns off bluetooth, disabling scan might fail --- app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt b/app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt index b4b67d222..a39423cf3 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt @@ -45,7 +45,11 @@ object ScanState : Logging { fun stopScan() { if (callback != null) { debug("stopping scan") - scanner!!.stopScan(callback) + try { + scanner!!.stopScan(callback) + } catch (ex: IllegalStateException) { + warn("Ignoring error stopping scan, user probably disabled bluetooth: $ex") + } callback = null } }