diff --git a/app/build.gradle b/app/build.gradle index 742228ae3..0ce01405f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,8 +30,8 @@ android { applicationId "com.geeksville.mesh" minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works) targetSdkVersion 29 - versionCode 20106 // format is Mmmss (where M is 1+the numeric major number - versionName "1.1.6" + versionCode 20107 // format is Mmmss (where M is 1+the numeric major number + versionName "1.1.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index abbafbe6e..2cd528cf3 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1108,6 +1108,7 @@ class MeshService : Service(), Logging { private fun updateRegion() { ignoreException { // Try to pull our region code from the new preferences field + // FIXME - do not check net - figuring out why board is rebooting val curConfigRegion = radioConfig?.preferences?.region ?: MeshProtos.RegionCode.Unset if (curConfigRegion != MeshProtos.RegionCode.Unset) { info("Using device region $curConfigRegion (code ${curConfigRegion.number})") @@ -1171,12 +1172,12 @@ class MeshService : Service(), Logging { haveNodeDB = true // we now have nodes from real hardware processEarlyPackets() // send receive any packets that were queued up - updateRegion() - // broadcast an intent with our new connection state serviceBroadcasts.broadcastConnection() onNodeDBChanged() reportConnection() + + updateRegion() } } else warn("Ignoring stale config complete")