Fix ConcurrentModificationException and NullPointerException

Author: angelix

common/build.gradle.kts

@@ -135,6 +135,7 @@ kotlin {
             /** ----------------------------------------------------------------------------------------- */
 
             /**  --- Misc. ------------------------------------------------------------------------------ */
+            api(libs.stately.concurrent.collections)
             api(libs.sqldelight.coroutines.extensions)
             api(libs.kmp.observableviewmodel)
             api(libs.uri.kmp)

common/src/commonMain/kotlin/com/blockstream/common/extensions/LinkedHashMapExtensions.kt

@@ -1,6 +1,6 @@
 package com.blockstream.common.extensions
 
-fun <K, V> LinkedHashMap<K, V>.toSortedLinkedHashMap(comparator: Comparator<K>): LinkedHashMap<K, V> {
+fun <K, V> MutableMap<K, V>.toSortedLinkedHashMap(comparator: Comparator<K>): LinkedHashMap<K, V> {
     val sorted = linkedMapOf<K, V>()
 
     keys.sortedWith(comparator).forEach { k ->
@@ -10,4 +10,4 @@ fun <K, V> LinkedHashMap<K, V>.toSortedLinkedHashMap(comparator: Comparator<K>):
     }
 
     return sorted
-}
+}

common/src/commonMain/kotlin/com/blockstream/common/gdk/GdkSession.kt

@@ -6,6 +6,7 @@ import breez_sdk.InvoicePaidDetails
 import breez_sdk.LnUrlPayResult
 import breez_sdk.ReceivePaymentResponse
 import breez_sdk.SwapInfo
+import co.touchlab.stately.collections.ConcurrentMutableMap
 import com.blockstream.common.BTC_POLICY_ASSET
 import com.blockstream.common.BTC_UNIT
 import com.blockstream.common.CountlyBase
@@ -376,7 +377,7 @@ class GdkSession constructor(
 
     val activeSinglesig get() = listOfNotNull(activeBitcoinSinglesig, activeLiquidSinglesig)
 
-    val gdkSessions = linkedMapOf<Network, GASession>()
+    val gdkSessions: ConcurrentMutableMap<Network, GASession> = ConcurrentMutableMap()
     val activeSessions = mutableSetOf<Network>()
 
     fun hasActiveNetwork(network: Network?) = activeSessions.contains(network)

common/src/commonMain/kotlin/com/blockstream/common/models/lightning/LnUrlWithdrawViewModel.kt

@@ -22,6 +22,7 @@ import com.blockstream.common.events.Event
 import com.blockstream.common.events.Events
 import com.blockstream.common.extensions.logException
 import com.blockstream.common.extensions.previewWallet
+import com.blockstream.common.extensions.tryCatch
 import com.blockstream.common.lightning.domain
 import com.blockstream.common.lightning.maxReceivableSatoshi
 import com.blockstream.common.lightning.maxWithdrawableSatoshi
@@ -32,8 +33,8 @@ import com.blockstream.common.utils.Loggable
 import com.blockstream.common.utils.StringHolder
 import com.blockstream.common.utils.UserInput
 import com.blockstream.common.utils.toAmountLook
-import com.rickclephas.kmp.observableviewmodel.coroutineScope
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState
+import com.rickclephas.kmp.observableviewmodel.coroutineScope
 import com.rickclephas.kmp.observableviewmodel.launch
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -125,8 +126,10 @@ class LnUrlWithdrawViewModel(greenWallet: GreenWallet, val requestData: LnUrlWit
         }
 
         amount.onEach {
-            updateExchange()
-            check()
+            tryCatch {
+                updateExchange()
+                check()
+            }
         }.launchIn(viewModelScope.coroutineScope)
 
         combine(session.lightningSdk.nodeInfoStateFlow, denomination) { nodeState, denomination ->

gradle/libs.versions.toml

@@ -16,6 +16,7 @@ android-gradle-plugin = "8.7.3"
 androidCompileSdk = "34"
 androidTargetSdk = "34"
 androidMinSdk = "24"
+statelyConcurrentCollections = "2.1.0"
 buildTools = "34.0.0"
 breez = "0.6.6"
 androidx-junit = "1.2.1"
@@ -93,6 +94,7 @@ phosphor-icon = { module = "com.adamglin:phosphor-icon", version.ref = "phosphor
 tuulbox-coroutines = { module = "com.juul.tuulbox:coroutines", version.ref = "tuulbox-coroutines" }
 desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" }
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
+stately-concurrent-collections = { module = "co.touchlab:stately-concurrent-collections", version.ref = "statelyConcurrentCollections" }
 androidx-biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
 androidx-browser = { module = "androidx.browser:browser", version.ref = "browser" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }