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

config clean up and updates (#522)

Browse source
This commit is contained in:
Andre K 2022-11-15 12:19:59 -03:00 • committed by GitHub
parent e328b5b5d9
commit 9442c1d510
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 436 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/geeksville/mesh/model/NodeDB.kt
View file

@ -1,6 +1,7 @@
package com.geeksville.mesh.model
import androidx.lifecycle.LiveData
import androidx.lifecycle.MediatorLiveData
import androidx.lifecycle.MutableLiveData
import com.geeksville.mesh.MeshProtos
import com.geeksville.mesh.MeshUser
@ -62,5 +63,14 @@ class NodeDB(private val ui: UIViewModel) {
}
/// Could be null if we haven't received our node DB yet
val ourNodeInfo get() = nodes.value?.get(myId.value)
val ourNodeInfo = MediatorLiveData<NodeInfo?>()
init {
ourNodeInfo.addSource(_nodes) { updatedValue ->
ourNodeInfo.value = updatedValue[_myId.value]
}
ourNodeInfo.addSource(_myId) { updatedValue ->
ourNodeInfo.value = _nodes.value?.get(updatedValue)
}
}
}

17
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View file

@ -56,7 +56,7 @@ import kotlin.math.roundToInt
/// 3 or more characters, use the first three characters. If not, just take the first 3 characters of the
/// original name.
fun getInitials(nameIn: String): String {
val nchars = 3
val nchars = 4
val minchars = 2
val name = nameIn.trim()
val words = name.split(Regex("\\s+")).filter { it.isNotEmpty() }
@ -263,7 +263,7 @@ class UIViewModel @Inject constructor(
try {
// Pull down our real node ID - This must be done AFTER reading the nodedb because we need the DB to find our nodeinof object
nodeDB.setMyId(service.myId)
val ownerName = nodeDB.ourNodeInfo?.user?.longName
val ownerName = nodeDB.ourNodeInfo.value?.user?.longName
_ownerName.value = ownerName
} catch (ex: Exception) {
warn("Ignoring failure to get myId, service is probably just uninited... ${ex.message}")
@ -364,13 +364,10 @@ class UIViewModel @Inject constructor(
// clean up all this nasty owner state management FIXME
fun setOwner(longName: String? = null, shortName: String? = null, isLicensed: Boolean? = null) {
if (longName != null) {
_ownerName.value = longName
// note: we allow an empty userstring to be written to prefs
preferences.edit {
putString("owner", longName)
}
longName?.trim()?.let { ownerName ->
// note: we allow an empty user string to be written to prefs
_ownerName.value = ownerName
preferences.edit { putString("owner", ownerName) }
}
// Note: we are careful to not set a new unique ID
@ -379,7 +376,7 @@ class UIViewModel @Inject constructor(
meshService?.setOwner(
null,
_ownerName.value,
shortName ?: getInitials(_ownerName.value!!),
shortName?.trim() ?: getInitials(_ownerName.value!!),
isLicensed ?: false
) // Note: we use ?. here because we might be running in the emulator
} catch (ex: RemoteException) {