Updated submodules.

Fixed device vanishing while still being there in the case the device is blacklisted from starting a relay.
Merge branch 'add-plugin-curiosity-stream' into 'master'
2026-05-19 06:22:34 +02:00 · 2025-05-07 15:46:07 +02:00 · 2025-05-07 15:43:28 +02:00 · 2025-05-07 13:03:35 +00:00 · 2025-05-07 13:03:35 +00:00
11 changed files with 25 additions and 9 deletions
@@ -94,3 +94,9 @@
 [submodule "app/src/unstable/assets/sources/tedtalks"]
 	path = app/src/unstable/assets/sources/tedtalks
 	url = ../plugins/tedtalks.git
+[submodule "app/src/stable/assets/sources/curiositystream"]
+	path = app/src/stable/assets/sources/curiositystream
+	url = ../plugins/curiositystream.git
+[submodule "app/src/unstable/assets/sources/curiositystream"]
+	path = app/src/unstable/assets/sources/curiositystream
+	url = ../plugins/curiositystream.git
@@ -54,7 +54,6 @@ class SyncHomeActivity : AppCompatActivity() {
                val view = _viewMap[publicKey]
                if (!session.isAuthorized) {
                    if (view != null) {
-                        _layoutDevices.removeView(view)
                        _viewMap.remove(publicKey)
                    }
                    return@launch
@@ -108,11 +107,12 @@ class SyncHomeActivity : AppCompatActivity() {

    private fun updateDeviceView(syncDeviceView: SyncDeviceView, publicKey: String, session: SyncSession?): SyncDeviceView {
        val connected = session?.connected ?: false
+        val authorized = session?.isAuthorized ?: false

        syncDeviceView.setLinkType(session?.linkType ?: LinkType.None)
            .setName(session?.displayName ?: StateSync.instance.getCachedName(publicKey) ?: publicKey)
            //TODO: also display public key?
-            .setStatus(if (connected) "Connected" else "Disconnected")
+            .setStatus(if (connected && authorized) "Connected" else "Disconnected or unauthorized")
        return syncDeviceView
    }

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.stores

 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.stores.v2.JsonStoreSerializer
 import com.futo.platformplayer.stores.v2.ManagedStore
 import com.futo.platformplayer.stores.v2.StoreSerializer
@@ -124,7 +125,12 @@ class FragmentedStorage {
        }
        inline fun <reified T> load(fileName: String): T where T : FragmentedStorageFile {
            if (_filesDir == null) {
-                throw Exception("Files dir should be initialized before loading a file.")
+                if(StateApp.instance.contextOrNull == null)
+                    StateApp.instance.initializeFiles();
+
+                if (_filesDir == null) {
+                    throw Exception("Files dir should be initialized before loading a file.")
+                }
            }

            val storageFile = File(_filesDir, "${fileName}.json");
@@ -14,7 +14,8 @@
        "9c87e8db-e75d-48f4-afe5-2d203d4b95c5": "sources/dailymotion/build/DailymotionConfig.json",
        "e8b1ad5f-0c6d-497d-a5fa-0a785a16d902": "sources/bitchute/BitchuteConfig.json",
        "89ae4889-0420-4d16-ad6c-19c776b28f99": "sources/apple-podcasts/ApplePodcastsConfig.json",
-        "8d029a7f-5507-4e36-8bd8-c19a3b77d383": "sources/tedtalks/TedTalksConfig.json"
+        "8d029a7f-5507-4e36-8bd8-c19a3b77d383": "sources/tedtalks/TedTalksConfig.json",
+        "273b6523-5438-44e2-9f5d-78e0325a8fd9": "sources/curiositystream/CuriosityStreamConfig.json"
    },
    "SOURCES_EMBEDDED_DEFAULT": [
        "35ae969a-a7db-11ed-afa1-0242ac120002"
@@ -14,7 +14,8 @@
        "9c87e8db-e75d-48f4-afe5-2d203d4b95c5": "sources/dailymotion/build/DailymotionConfig.json",
        "e8b1ad5f-0c6d-497d-a5fa-0a785a16d902": "sources/bitchute/BitchuteConfig.json",
        "89ae4889-0420-4d16-ad6c-19c776b28f99": "sources/apple-podcasts/ApplePodcastsConfig.json",
-        "8d029a7f-5507-4e36-8bd8-c19a3b77d383": "sources/tedtalks/TedTalksConfig.json"
+        "8d029a7f-5507-4e36-8bd8-c19a3b77d383": "sources/tedtalks/TedTalksConfig.json",
+        "273b6523-5438-44e2-9f5d-78e0325a8fd9": "sources/curiositystream/CuriosityStreamConfig.json"
    },
    "SOURCES_EMBEDDED_DEFAULT": [
        "35ae969a-a7db-11ed-afa1-0242ac120002"
Author	SHA1	Message	Date
Koen J	5052bad824	Updated submodules.	2025-05-07 15:46:07 +02:00
Koen J	5be92052bb	Fixed device vanishing while still being there in the case the device is blacklisted from starting a relay.	2025-05-07 15:43:28 +02:00
Koen	e20945692e	Merge branch 'add-plugin-curiosity-stream' into 'master' add Curiosity Stream plugin See merge request videostreaming/grayjay!94	2025-05-07 13:03:35 +00:00
Stefan	191a6e2460	add Curiosity Stream plugin	2025-05-07 13:03:35 +00:00