mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-17 13:28:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

never let getMyNodeInfo ever return null. fixes an autobug for device removal

Browse Source
This commit is contained in:
geeksville
2020-06-09 18:56:34 -07:00
parent 5d9648f602
commit cff90c5bd7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/aidl/com/geeksville/mesh/IMeshService.aidl
View File

@@ -64,7 +64,8 @@ interface IMeshService {
/// Users should not call this directly, only used internally by the MeshUtil activity
void setDeviceAddress(String deviceAddr);
/// Get basic device hardware info about our connected radio
/// Get basic device hardware info about our connected radio. Will never return NULL. Will throw
/// RemoteException if no my node info is available
MyNodeInfo getMyNodeInfo();
/// Start updating the radios firmware

4
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View File

@@ -1488,7 +1488,9 @@ class MeshService : Service(), Logging {
doFirmwareUpdate()
}
override fun getMyNodeInfo(): MyNodeInfo? = this@MeshService.myNodeInfo
override fun getMyNodeInfo(): MyNodeInfo = toRemoteExceptions {
this@MeshService.myNodeInfo ?: throw RadioNotConnectedException("No MyNodeInfo")
}
override fun getMyId() = toRemoteExceptions { myNodeID }