Fix discovered devices stepping on each other (#7)

kmod-midori · Jan 27, 2025 · d1365fb · d1365fb
1 parent 0305a2c
commit d1365fb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/app/img.png b/app/img.png
diff --git a/app/src/main/java/moe/reimu/catshare/ShareActivity.kt b/app/src/main/java/moe/reimu/catshare/ShareActivity.kt
@@ -232,6 +232,7 @@ fun deviceScanner(): List<DiscoveredDevice> {
     LifecycleResumeEffect(context) {
         val manager = context.getSystemService(BluetoothManager::class.java)
         val adapter = manager.adapter
+        val devicesLock = Object()
 
         val callback = object : ScanCallback() {
             override fun onScanFailed(errorCode: Int) {
@@ -292,18 +293,20 @@ fun deviceScanner(): List<DiscoveredDevice> {
                     result.device, senderId, deviceName, brand, supports5Ghz
                 )
                 var replaced = false
-                val newList = discoveredDevices.map {
-                    if (it.id == senderId) {
-                        replaced = true
-                        newDevice
-                    } else {
-                        it
+                synchronized(devicesLock) {
+                    val newList = discoveredDevices.map {
+                        if (it.id == senderId) {
+                            replaced = true
+                            newDevice
+                        } else {
+                            it
+                        }
+                    }.toMutableList()
+                    if (!replaced) {
+                        newList.add(newDevice)
                     }
-                }.toMutableList()
-                if (!replaced) {
-                    newList.add(newDevice)
+                    discoveredDevices = newList
                 }
-                discoveredDevices = newList
             }
         }