diff --git a/app/src/main/aidl/com/geeksville/mesh/IMeshService.aidl b/app/src/main/aidl/com/geeksville/mesh/IMeshService.aidl index bf13bc7aa..b07374ca7 100644 --- a/app/src/main/aidl/com/geeksville/mesh/IMeshService.aidl +++ b/app/src/main/aidl/com/geeksville/mesh/IMeshService.aidl @@ -22,7 +22,7 @@ The intent you use to reach the service should look like this: Once you have bound to the service you should register your broadcast receivers per https://developer.android.com/guide/components/broadcasts#context-registered-receivers - // com.geeksville.com.geeksville.mesh.x broadcast intents, where x is: + // com.geeksville.mesh.x broadcast intents, where x is: // RECEIVED_DATA for data received from other nodes. payload will contain a DataPacket // NODE_CHANGE for new IDs appearing or disappearing // CONNECTION_CHANGED for losing/gaining connection to the packet radio 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 a673dd6e8..a73508656 100644 --- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt @@ -28,7 +28,7 @@ fun getInitials(nameIn: String): String { val initials = when (words.size) { in 0..minchars - 1 -> { - val nm = name.filterNot { c -> c.toLowerCase() in "aeiou" } + val nm = name.first() + name.drop(1).filterNot { c -> c.toLowerCase() in "aeiou" } if (nm.length >= nchars) nm else name } else -> words.map { it.first() }.joinToString("") 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 9bdeda6ae..ee460c9ca 100644 --- a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt +++ b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt @@ -5,6 +5,7 @@ import android.content.Context import android.os.Build import android.os.DeadObjectException import android.os.Handler +import android.os.Looper import com.geeksville.android.GeeksvilleApplication import com.geeksville.android.Logging import com.geeksville.concurrent.CallbackContinuation @@ -97,7 +98,7 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD * skanky hack to restart BLE if it says it is hosed * https://stackoverflow.com/questions/35103701/ble-android-onconnectionstatechange-not-being-called */ - private val mHandler: Handler = Handler() + private val mHandler: Handler = Handler(Looper.getMainLooper()) fun restartBle() { GeeksvilleApplication.analytics.track("ble_restart") // record # of times we needed to use this nasty hack