From bc6fa0b1bb48e1c39d321d3bbdc7b946ccb3aca9 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Sat, 4 Jul 2020 11:33:24 -0700
Subject: [PATCH] If we have an exception thrown *back to us* complain and
 ignore it?

---
 .../java/com/geeksville/mesh/service/SafeBluetooth.kt    | 9 ++++++++-
 geeksville-androidlib                                    | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
index 411956758..1e7b6ea07 100644
--- a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
@@ -426,7 +426,14 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD
         synchronized(workQueue) {
             warn("Failing ${workQueue.size} works, because ${ex.message}")
             workQueue.forEach {
-                it.completion.resumeWithException(ex)
+                try {
+                    it.completion.resumeWithException(ex)
+                } catch (ex: Exception) {
+                    errormsg(
+                        "Mystery exception, why were we informed about our own exceptions?",
+                        ex
+                    )
+                }
             }
             workQueue.clear()
             stopCurrentWork()
diff --git a/geeksville-androidlib b/geeksville-androidlib
index 95c5a9aa9..99dbf61fa 160000
--- a/geeksville-androidlib
+++ b/geeksville-androidlib
@@ -1 +1 @@
-Subproject commit 95c5a9aa950f917857a3cc0c7cd84a4a56993032
+Subproject commit 99dbf61fad087db910be7f74867a8f14aba877a4