permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-25 00:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: bookmark removal persistence (#424)

Browse Source
This commit is contained in:
lollerfirst
2025-09-14 16:38:39 +02:00
committed by GitHub
parent 9c7567e62e
commit a4ef2ef29c
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/geohash/GeohashBookmarksStore.kt
+22 -6
View File
@@ -68,8 +68,9 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
val gh = normalize(geohash) val gh = normalize(geohash)
if (gh.isEmpty() || membership.contains(gh)) return if (gh.isEmpty() || membership.contains(gh)) return
membership.add(gh) membership.add(gh)
_bookmarks.postValue(listOf(gh) + (_bookmarks.value ?: emptyList())) val updated = listOf(gh) + (_bookmarks.value ?: emptyList())
persist() _bookmarks.postValue(updated)
persist(updated)
// Resolve friendly name asynchronously // Resolve friendly name asynchronously
resolveNameIfNeeded(gh) resolveNameIfNeeded(gh)
} }
@@ -78,14 +79,15 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
val gh = normalize(geohash) val gh = normalize(geohash)
if (!membership.contains(gh)) return if (!membership.contains(gh)) return
membership.remove(gh) membership.remove(gh)
_bookmarks.postValue((_bookmarks.value ?: emptyList()).filterNot { it == gh }) val updated = (_bookmarks.value ?: emptyList()).filterNot { it == gh }
_bookmarks.postValue(updated)
// Remove stored name to avoid stale cache growth // Remove stored name to avoid stale cache growth
val names = _bookmarkNames.value?.toMutableMap() ?: mutableMapOf() val names = _bookmarkNames.value?.toMutableMap() ?: mutableMapOf()
if (names.remove(gh) != null) { if (names.remove(gh) != null) {
_bookmarkNames.postValue(names) _bookmarkNames.postValue(names)
persistNames() persistNames(names)
} }
persist() persist(updated)
} }
// MARK: - Persistence // MARK: - Persistence
@@ -210,7 +212,7 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
val current = _bookmarkNames.value?.toMutableMap() ?: mutableMapOf() val current = _bookmarkNames.value?.toMutableMap() ?: mutableMapOf()
current[gh] = name current[gh] = name
_bookmarkNames.postValue(current) _bookmarkNames.postValue(current)
persistNames() persistNames(current)
} }
} catch (e: Exception) { } catch (e: Exception) {
Log.w(TAG, "Name resolution failed for #$gh: ${e.message}") Log.w(TAG, "Name resolution failed for #$gh: ${e.message}")
@@ -230,4 +232,18 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
else -> address.subLocality ?: address.locality ?: address.adminArea ?: address.countryName else -> address.subLocality ?: address.locality ?: address.adminArea ?: address.countryName
} }
} }
private fun persist(list: List<String>) {
try {
val json = gson.toJson(list)
prefs.edit().putString(STORE_KEY, json).apply()
} catch (_: Exception) {}
}
private fun persistNames(map: Map<String, String>) {
try {
val json = gson.toJson(map)
prefs.edit().putString(NAMES_STORE_KEY, json).apply()
} catch (_: Exception) {}
}
} }