mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-17 05:17:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix recent bug where sometimes phone would not auto-reconnect to devices

Browse Source
This commit is contained in:
geeksville
2020-06-07 18:05:18 -07:00
parent 6a5cb0ddc7
commit 7a3cda314e
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
View File

@@ -214,7 +214,10 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD
debug("queuing a reconnection callback")
assert(currentWork == null)
// note - we don't need an init fn (because that would normally redo the connectGatt call - which we don't need
if (!currentConnectIsAuto) // we must have been running during that 1-time manual connect, switch to auto-mode from now on
lowLevelConnect(true)
// note - we don't need an init fn (because that would normally redo the connectGatt call - which we don't need)
queueWork("reconnect", CallbackContinuation(cb)) { -> true }
} else {
debug("No connectionCallback registered")
@@ -465,7 +468,13 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD
// Is the gatt trying to repeatedly connect as needed?
private var autoConnect = false
/// True if the current active connection is auto (possible for this to be false but autoConnect to be true
/// if we are in the first non-automated lowLevel connect.
private var currentConnectIsAuto = false
private fun lowLevelConnect(autoNow: Boolean): BluetoothGatt? {
currentConnectIsAuto = autoNow
val g = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
device.connectGatt(
context,