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

We now detect and use the newapi if the device doesn't offer the old one

Browse source
This commit is contained in:
geeksville 2020-04-23 11:54:47 -07:00
parent 17edf75b95
commit a3db3eca06
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -916,8 +916,6 @@ class MeshService : Service(), Logging {
/// msecs since 1970 we started this connection
private var connectTimeMsec = 0L
private val useOldApi = false
/// Called when we gain/lose connection to our radio
private fun onConnectionChanged(c: ConnectionState) {
debug("onConnectionChanged=$c")
@ -969,7 +967,7 @@ class MeshService : Service(), Logging {
// Do our startup init
try {
connectTimeMsec = System.currentTimeMillis()
if (useOldApi)
if (RadioInterfaceService.isOldApi!!)
reinitFromRadioREV1()
else
startConfig()
@ -1231,7 +1229,7 @@ class MeshService : Service(), Logging {
val parsed = MeshProtos.RadioConfig.parseFrom(payload)
// Update our device
if (useOldApi)
if (RadioInterfaceService.isOldApi!!)
connectedRadio.writeRadioConfig(payload)
else
sendToRadio(ToRadio.newBuilder().apply {
@ -1261,7 +1259,7 @@ class MeshService : Service(), Logging {
}
// set my owner info
if (useOldApi)
if (RadioInterfaceService.isOldApi!!)
connectedRadio.writeOwner(user.toByteArray())
else sendToRadio(ToRadio.newBuilder().apply {
this.setOwner = user