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

pull/40/head
geeksville 2020-06-09 18:56:34 -07:00
rodzic 5d9648f602
commit cff90c5bd7
2 zmienionych plików z 5 dodań i 2 usunięć

Wyświetl plik

@ -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

Wyświetl plik

@ -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 }