meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into task/run-safebluetooth-handler-on-main-thread

Browse source
This commit is contained in:
Kevin Hester 2020-09-27 13:04:22 -07:00 • committed by GitHub
commit 06801d79b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 101 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View file

@ -735,6 +735,8 @@ class MainActivity : AppCompatActivity(), Logging,
}
}
private var connectionJob: Job? = null
private
val mesh = object :
ServiceClient<com.geeksville.mesh.IMeshService>({
@ -777,7 +779,7 @@ class MainActivity : AppCompatActivity(), Logging,
at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run (RuntimeInit.java:493)
at com.android.internal.os.ZygoteInit.main (ZygoteInit.java:1076)
*/
mainScope.handledLaunch {
connectionJob = mainScope.handledLaunch {
model.meshService = service
usbDevice?.let { usb ->
@ -813,6 +815,7 @@ class MainActivity : AppCompatActivity(), Logging,
}
debug("connected to mesh service, isConnected=${model.isConnected.value}")
connectionJob = null
}
}
@ -825,8 +828,12 @@ class MainActivity : AppCompatActivity(), Logging,
private fun bindMeshService() {
debug("Binding to mesh service!")
// we bind using the well known name, to make sure 3rd party apps could also
if (model.meshService != null)
if (model.meshService != null) {
/* This problem can occur if we unbind, but there is already an onConnected job waiting to run. That job runs and then makes meshService != null again
I think I've fixed this by cancelling connectionJob. We'll see!
*/
Exceptions.reportError("meshService was supposed to be null, ignoring (but reporting a bug)")
}
try {
MeshService.startService(this) // Start the service so it stays running even after we unbind
@ -844,6 +851,11 @@ class MainActivity : AppCompatActivity(), Logging,
// it, then now is the time to unregister.
// if we never connected, do nothing
debug("Unbinding from mesh service!")
connectionJob?.let { job ->
connectionJob = null
warn("We had a pending onConnection job, so we are cancelling it")
job.cancel("unbinding")
}
mesh.close()
model.meshService = null
}

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