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

Android can cache BLE service descriptors. But our device descriptors

Browse Source 
can change still (because 'progress').  So force android to reread those
descriptors while we are in alpha.
This commit is contained in:
geeksville
2020-03-30 16:44:48 -07:00
parent 4bc94da224
commit 81a1283148
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
View File

@@ -13,7 +13,9 @@ import com.geeksville.android.GeeksvilleApplication
import com.geeksville.android.Logging
import com.geeksville.concurrent.DeferredExecution
import com.geeksville.mesh.IRadioInterfaceService
import com.geeksville.util.exceptionReporter
import com.geeksville.util.toRemoteExceptions
import java.lang.reflect.Method
import java.util.*
@@ -268,12 +270,27 @@ class RadioInterfaceService : Service(), Logging {
isConnected = false
}
/**
* Android caches old services. But our service is still changing often, so force it to reread the service definitions every
* time
*/
private fun forceServiceRefresh() {
exceptionReporter {
// BluetoothGatt gatt
val gatt = safe!!.gatt!!
val refresh: Method = gatt.javaClass.getMethod("refresh")
refresh.invoke(gatt)
}
}
private fun onConnect(connRes: Result<Unit>) {
// This callback is invoked after we are connected
connRes.getOrThrow() // FIXME, instead just try to reconnect?
info("Connected to radio!")
forceServiceRefresh()
// FIXME - no need to discover services more than once - instead use lazy() to use them in future attempts
safe!!.asyncDiscoverServices { discRes ->
discRes.getOrThrow() // FIXME, instead just try to reconnect?
@@ -434,13 +451,16 @@ class RadioInterfaceService : Service(), Logging {
// A write of any size to nodeinfo means restart reading
override fun restartNodeInfo() = doWrite(BTM_NODEINFO_CHARACTER, ByteArray(0))
override fun readMyNode() = doRead(BTM_MYNODE_CHARACTER)!!
override fun readMyNode() =
doRead(BTM_MYNODE_CHARACTER) ?: throw Exception("Device returned empty MyNodeInfo")
override fun sendToRadio(a: ByteArray) = handleSendToRadio(a)
override fun readRadioConfig() = doRead(BTM_RADIO_CHARACTER)!!
override fun readRadioConfig() =
doRead(BTM_RADIO_CHARACTER) ?: throw Exception("Device returned empty RadioConfig")
override fun readOwner() = doRead(BTM_OWNER_CHARACTER)!!
override fun readOwner() =
doRead(BTM_OWNER_CHARACTER) ?: throw Exception("Device returned empty Owner")
override fun writeOwner(owner: ByteArray) = doWrite(BTM_OWNER_CHARACTER, owner)