meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #82 from geeksville/dev

Browse source 
0.7.88 oops - if no work is pending, we also try to reconnect
This commit is contained in:
Kevin Hester 2020-07-02 14:31:20 -07:00 • committed by GitHub
commit de97911262
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -17,8 +17,8 @@ android {
applicationId "com.geeksville.mesh"
minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
targetSdkVersion 29
versionCode 10787 // format is Mmmss (where M is 1+the numeric major number
versionName "0.7.87"
versionCode 10788 // format is Mmmss (where M is 1+the numeric major number
versionName "0.7.88"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {

4
app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
View file

@ -162,7 +162,9 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD
info("Lost connection - aborting current work: $currentWork")
// If we get a disconnect, just try again otherwise fail all current operations
if (currentWork?.isConnect() == true)
// Note: if no work is pending (likely) we also just totally teardown and restart the connection, because we won't be
// throwing a lost connection exception to any worker.
if (currentWork == null || currentWork?.isConnect() == true)
dropAndReconnect()
else
lostConnection("lost connection")