Fix sync crash and responsiveness for subs sync

Crashfixes.
2026-05-27 18:25:21 +02:00 · 2025-05-03 19:30:47 +02:00 · 2025-05-03 17:35:17 +02:00
4 changed files with 15 additions and 12 deletions
@@ -279,7 +279,7 @@ fun <T> findNewIndex(originalArr: List<T>, newArr: List<T>, item: T): Int{
        }
    }
    if(newIndex < 0)
-        return originalArr.size;
+        return newArr.size;
    else
        return newIndex;
 }
@@ -548,7 +548,7 @@ class StateSync {
                    added.map { it.channel.name }.joinToString("\n"));


-        if(pack.subscriptions.isNotEmpty()) {
+        if(pack.subscriptionRemovals.isNotEmpty()) {
            for (subRemoved in pack.subscriptionRemovals) {
                val removed = StateSubscriptions.instance.applySubscriptionRemovals(pack.subscriptionRemovals);
                if(removed.size > 3) {
@@ -645,12 +645,14 @@ class StateSync {
                val subPackage = Serializer.json.decodeFromString<SyncSubscriptionsPackage>(json);
                handleSyncSubscriptionPackage(session, subPackage);

-                val newestSub = subPackage.subscriptions.maxOf { it.creationTime };
+                if(subPackage.subscriptions.size > 0) {
+                    val newestSub = subPackage.subscriptions.maxOf { it.creationTime };

-                val sesData = getSyncSessionData(remotePublicKey);
-                if(newestSub > sesData.lastSubscription) {
-                    sesData.lastSubscription = newestSub;
-                    saveSyncSessionData(sesData);
+                    val sesData = getSyncSessionData(remotePublicKey);
+                    if (newestSub > sesData.lastSubscription) {
+                        sesData.lastSubscription = newestSub;
+                        saveSyncSessionData(sesData);
+                    }
                }
            }

@@ -129,9 +129,9 @@ class SyncSession : IAuthorizable {

    fun close() {
        synchronized(_channels) {
-            _channels.forEach { it.close() }
-            _channels.clear()
-        }
+            _channels.toTypedArray()
+        }.forEach { it.close() }
+
        _onClose(this)
    }

@@ -37,9 +37,10 @@ class SubscriptionAdapter : RecyclerView.Adapter<SubscriptionViewHolder> {
        _onDatasetChanged = onDatasetChanged;

        StateSubscriptions.instance.onSubscriptionsChanged.subscribe { _, _ -> if(Looper.myLooper() != Looper.getMainLooper())
-                StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) { updateDataset() }
+                StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) { updateDataset() }
            else
-                updateDataset(); }
+                updateDataset();
+        }
        updateDataset();
    }
Author	SHA1	Message	Date
Kelvin	9986078582	Fix sync crash and responsiveness for subs sync	2025-05-03 19:30:47 +02:00
Koen J	e047ab5684	Crashfixes.	2025-05-03 17:35:17 +02:00