mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fix an autobug - race condition on some phones BLE reconnect

pull/28/head
geeksville 2020-05-10 21:39:49 -07:00
rodzic 877006f26b
commit 0b7f853abc
1 zmienionych plików z 9 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
Wyświetl plik

@ -187,8 +187,10 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD
// Cancel any notifications - because when the device comes back it might have forgotten about us // Cancel any notifications - because when the device comes back it might have forgotten about us
notifyHandlers.clear() notifyHandlers.clear()
debug("calling lostConnect handler") lostConnectCallback?.let {
lostConnectCallback?.invoke() debug("calling lostConnect handler")
it.invoke()
}
// Queue a new connection attempt // Queue a new connection attempt
val cb = connectionCallback val cb = connectionCallback
@ -508,6 +510,10 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD
* cancelled and you'll need to recall connect to use this againt * cancelled and you'll need to recall connect to use this againt
*/ */
fun closeConnection() { fun closeConnection() {
// Set these to null _before_ calling gatt.disconnect(), because we don't want the old lostConnectCallback to get called
lostConnectCallback = null
connectionCallback = null
failAllWork(BLEException("Connection closing")) failAllWork(BLEException("Connection closing"))
if (gatt != null) { if (gatt != null) {
@ -515,8 +521,6 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD
gatt!!.disconnect() gatt!!.disconnect()
gatt!!.close() gatt!!.close()
gatt = null gatt = null
lostConnectCallback = null
connectionCallback = null
} }
} }