diff --git a/.idea/dictionaries/kevinh.xml b/.idea/dictionaries/kevinh.xml index 18120162..9de6060e 100644 --- a/.idea/dictionaries/kevinh.xml +++ b/.idea/dictionaries/kevinh.xml @@ -2,6 +2,7 @@ crashlytics + errormsg geeksville meshtastic diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt index 4a3c6229..36587b14 100644 --- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt @@ -5,12 +5,13 @@ import android.os.RemoteException import android.util.Base64 import androidx.compose.mutableStateOf import androidx.core.content.edit +import com.geeksville.android.Logging import com.geeksville.mesh.IMeshService import com.geeksville.mesh.MeshProtos import com.geeksville.mesh.ui.getInitials /// FIXME - figure out how to merge this staate with the AppStatus Model -object UIState { +object UIState: Logging { /// Kinda ugly - created in the activity but used from Compose - figure out if there is a cleaner way GIXME // lateinit var googleSignInClient: GoogleSignInClient @@ -59,7 +60,7 @@ object UIState { getInitials(ownerName) ) // Note: we use ?. here because we might be running in the emulator } catch (ex: RemoteException) { - error("Can't set username on device, is device offline? ${ex.message}") + errormsg("Can't set username on device, is device offline? ${ex.message}") } } } diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 1717a6af..bfa620d1 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -182,7 +182,7 @@ class MeshService : Service(), Logging { } locationSettingsResponse.addOnFailureListener { exception -> - error("Failed to listen to GPS") + errormsg("Failed to listen to GPS") if (exception is ResolvableApiException) { Exceptions.report(exception) // FIXME, not yet implemented, report failure to mothership exceptionReporter { diff --git a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt index 7b410c89..7dd7b4d8 100644 --- a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt @@ -298,7 +298,7 @@ class RadioInterfaceService : Service(), Logging { if (on) { val address = getBondedDeviceAddress(this) if (address == null) - error("No bonded mesh radio, can't create service") + errormsg("No bonded mesh radio, can't create service") else { // Note: this call does no comms, it just creates the device object (even if the // device is off/not connected) @@ -316,7 +316,7 @@ class RadioInterfaceService : Service(), Logging { // more info s.asyncConnect(true, ::onConnect, ::onDisconnect) } else { - error("Bluetooth adapter not found, assuming running on the emulator!") + errormsg("Bluetooth adapter not found, assuming running on the emulator!") } if (logSends) diff --git a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt index fc866755..891aa28f 100644 --- a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt +++ b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt @@ -111,7 +111,7 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD fun restartBle() { GeeksvilleApplication.analytics.track("ble_restart") // record # of times we needed to use this nasty hack - error("Doing emergency BLE restart") + errormsg("Doing emergency BLE restart") val mgr = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager val adp = mgr.adapter