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

Merge branch 'master' into chat-date-169

Browse Source
This commit is contained in:
Kevin Hester
2020-09-27 13:05:13 -07:00
committed by GitHub
parent c15e498b08 7b9cef512c
commit 33f2a126ea
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View File

@@ -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("")

3
app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
View File

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