mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-06-29 07:55:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: migrate kotlinx-collections-immutable to participial method names (#5991)

Browse Source 
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
James Rich
2026-06-28 09:17:53 -05:00
committed by GitHub
parent 03009c4ded
commit eb7bfce4d4
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/NodeManagerImpl.kt
View File

@@ -71,19 +71,19 @@ class NodeManagerImpl(
var nextById = byId
// If the user.id changed (e.g. firmware reassigned the hex id) drop the stale id entry.
if (previous != null && previous.user.id.isNotEmpty() && previous.user.id != node.user.id) {
nextById = nextById.remove(previous.user.id)
nextById = nextById.removing(previous.user.id)
}
if (node.user.id.isNotEmpty()) {
nextById = nextById.put(node.user.id, node)
nextById = nextById.putting(node.user.id, node)
}
return NodeIndex(byNum = byNum.put(num, node), byId = nextById)
return NodeIndex(byNum = byNum.putting(num, node), byId = nextById)
}
fun remove(num: Int): NodeIndex {
val previous = byNum[num] ?: return this
return NodeIndex(
byNum = byNum.remove(num),
byId = if (previous.user.id.isNotEmpty()) byId.remove(previous.user.id) else byId,
byNum = byNum.removing(num),
byId = if (previous.user.id.isNotEmpty()) byId.removing(previous.user.id) else byId,
)
}
@@ -92,8 +92,8 @@ class NodeManagerImpl(
var byNum = persistentMapOf<Int, Node>()
var byId = persistentMapOf<String, Node>()
for ((num, node) in nodes) {
byNum = byNum.put(num, node)
if (node.user.id.isNotEmpty()) byId = byId.put(node.user.id, node)
byNum = byNum.putting(num, node)
if (node.user.id.isNotEmpty()) byId = byId.putting(node.user.id, node)
}
return NodeIndex(byNum, byId)
}

4
core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/RequestTimer.kt
View File

@@ -37,7 +37,7 @@ internal class RequestTimer {
/** Records the start time for [requestId]. */
fun start(requestId: Int) {
startTimes.update { it.put(requestId, nowMillis) }
startTimes.update { it.putting(requestId, nowMillis) }
}
/**
@@ -46,7 +46,7 @@ internal class RequestTimer {
*/
fun appendDuration(requestId: Int, text: String, logLabel: String): String {
val start = startTimes.value[requestId]
startTimes.update { it.remove(requestId) }
startTimes.update { it.removing(requestId) }
if (start == null) return text
val seconds = (nowMillis - start) / MILLIS_PER_SECOND
Logger.i { "$logLabel $requestId complete in $seconds s" }

2
core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/SessionManagerImpl.kt
View File

@@ -63,7 +63,7 @@ class SessionManagerImpl(private val clock: Clock) : SessionManager {
override fun recordSession(srcNodeNum: Int, passkey: ByteString) {
if (passkey.size == 0) return
val now = clock.now()
entries.update { it.put(srcNodeNum, SessionEntry(passkey, now)) }
entries.update { it.putting(srcNodeNum, SessionEntry(passkey, now)) }
Logger.d { "Recorded session refresh from $srcNodeNum (${passkey.size} bytes)" }
refreshFlow.tryEmit(srcNodeNum)
}

2
core/prefs/src/commonMain/kotlin/org/meshtastic/core/prefs/FlowCache.kt
View File

@@ -42,7 +42,7 @@ internal inline fun <K, V> cachedFlow(
current[key]?.let {
return it.value
}
if (cache.compareAndSet(current, current.put(key, newLazy))) {
if (cache.compareAndSet(current, current.putting(key, newLazy))) {
return newLazy.value
}
}