kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1.1.7
rodzic
52a2f40b1b
commit
46f283c630
|
@ -30,8 +30,8 @@ android {
|
||||||
applicationId "com.geeksville.mesh"
|
applicationId "com.geeksville.mesh"
|
||||||
minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
|
minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
versionCode 20106 // format is Mmmss (where M is 1+the numeric major number
|
versionCode 20107 // format is Mmmss (where M is 1+the numeric major number
|
||||||
versionName "1.1.6"
|
versionName "1.1.7"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|
|
@ -1108,6 +1108,7 @@ class MeshService : Service(), Logging {
|
||||||
private fun updateRegion() {
|
private fun updateRegion() {
|
||||||
ignoreException {
|
ignoreException {
|
||||||
// Try to pull our region code from the new preferences field
|
// 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
|
val curConfigRegion = radioConfig?.preferences?.region ?: MeshProtos.RegionCode.Unset
|
||||||
if (curConfigRegion != MeshProtos.RegionCode.Unset) {
|
if (curConfigRegion != MeshProtos.RegionCode.Unset) {
|
||||||
info("Using device region $curConfigRegion (code ${curConfigRegion.number})")
|
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
|
haveNodeDB = true // we now have nodes from real hardware
|
||||||
processEarlyPackets() // send receive any packets that were queued up
|
processEarlyPackets() // send receive any packets that were queued up
|
||||||
|
|
||||||
updateRegion()
|
|
||||||
|
|
||||||
// broadcast an intent with our new connection state
|
// broadcast an intent with our new connection state
|
||||||
serviceBroadcasts.broadcastConnection()
|
serviceBroadcasts.broadcastConnection()
|
||||||
onNodeDBChanged()
|
onNodeDBChanged()
|
||||||
reportConnection()
|
reportConnection()
|
||||||
|
|
||||||
|
updateRegion()
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
warn("Ignoring stale config complete")
|
warn("Ignoring stale config complete")
|
||||||
|
|
Ładowanie…
Reference in New Issue