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

WIP - cleaned up BLE vs serial interface approximately works

Browse source
This commit is contained in:
geeksville 2020-06-07 17:11:30 -07:00
parent e99e8695fe
commit 30137efc68
10 changed files with 411 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View file

@ -167,7 +167,7 @@ class MainActivity : AppCompatActivity(), Logging,
}
private val btStateReceiver = BluetoothStateReceiver { enabled ->
private val btStateReceiver = BluetoothStateReceiver { _ ->
updateBluetoothEnabled()
}
@ -638,7 +638,7 @@ class MainActivity : AppCompatActivity(), Logging,
MeshService.ACTION_MESSAGE_STATUS -> {
debug("received message status from service")
val id = intent.getIntExtra(EXTRA_PACKET_ID, 0)
val status = intent.getParcelableExtra<MessageStatus>(EXTRA_STATUS)
val status = intent.getParcelableExtra<MessageStatus>(EXTRA_STATUS)!!
model.messagesState.updateStatus(id, status)
}
@ -733,8 +733,7 @@ class MainActivity : AppCompatActivity(), Logging,
bindMeshService()
val bonded =
BluetoothInterfaceService.getBondedDeviceAddress(this) != null
val bonded = RadioInterfaceService.getBondedDeviceAddress(this) != null
if (!bonded)
pager.currentItem = 5
}