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

refactor: use MeshUser object as setOwner parameter

Browse source
This commit is contained in:
andrekir 2023-03-27 15:30:42 -03:00
parent 451a20d207
commit 2d9f0a56f2
5 changed files with 26 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -460,10 +460,9 @@ class UIViewModel @Inject constructor(
}
}
// clean up all this nasty owner state management FIXME
fun setOwner(longName: String? = null, shortName: String? = null, isLicensed: Boolean? = null) {
fun setOwner(user: MeshUser) = with(user) {
longName?.trim()?.let { ownerName ->
longName.trim().let { ownerName ->
// note: we allow an empty user string to be written to prefs
_ownerName.value = ownerName
preferences.edit { putString("owner", ownerName) }
@ -472,12 +471,8 @@ class UIViewModel @Inject constructor(
// Note: we are careful to not set a new unique ID
if (_ownerName.value!!.isNotEmpty())
try {
meshService?.setOwner(
null,
_ownerName.value,
shortName?.trim() ?: getInitials(_ownerName.value!!),
isLicensed ?: false
) // Note: we use ?. here because we might be running in the emulator
// Note: we use ?. here because we might be running in the emulator
meshService?.setOwner(user)
} catch (ex: RemoteException) {
errormsg("Can't set username on device, is device offline? ${ex.message}")
}