fix deep link

2026-08-08 08:52:18 +03:00
parent 64ee936aa6
commit 023395e09d
9 changed files with 74 additions and 71 deletions
@@ -12,8 +12,8 @@ android {
        applicationId = namespace
        minSdk = libs.versions.proj.min.get().toInt()
        targetSdk = libs.versions.proj.target.get().toInt()
-        versionCode = 48
-        versionName = "1.24.4"
+        versionCode = 49
+        versionName = "1.25.0"
    }
 }

@@ -30,6 +30,7 @@
            android:exported="true"
            android:icon="@mipmap/ic_launcher"
            android:label="@string/app_name"
+            android:launchMode="singleInstance"
            android:supportsPictureInPicture="true">

            <intent-filter>
@@ -56,10 +57,6 @@
                    android:host="box.shadowsparky.ru"
                    android:scheme="https" />
            </intent-filter>
-
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
        </activity>

        <activity-alias
@@ -95,10 +92,6 @@
                    android:host="box.shadowsparky.ru"
                    android:scheme="https" />
            </intent-filter>
-
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
        </activity-alias>

        <receiver
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
@@ -29,19 +30,14 @@ class MainActivity : ComponentActivity() {
        edgeToEdge(false)
        super.onCreate(savedInstanceState)
        root = retainedComponent { componentContext ->
-            val routeFromIntent = obtainRouteOrNull(intent?.data)
-            val route = if (routeFromIntent == null) {
-                listOf(Route.default)
-            } else {
-                listOf(Route.default, routeFromIntent)
-            }
-            koin.get<RootFactory>().create(componentContext, route)
+            koin.get<RootFactory>().create(componentContext, listOf(Route.default))
        }
        if (openSavedIfNeeded(intent) || openUrlIfNeeded(intent.data)) {
            intent = Intent(intent)
                .setData(null)
                .setAction(null)
        }
+        log("onCreate $intent")
        val isPiggyActivity = componentName?.className == PigReceiver.PIGGY_CLS
        setContent {
            if (isPiggyActivity) {
@@ -54,10 +50,9 @@ class MainActivity : ComponentActivity() {
            edgeToEdge(isSystemInDarkTheme())
        }
        lifecycleScope.launch {
-            root.onFinish.collect {
-                finishAndRemoveTask()
-            }
+            root.onFinish.collect { finishAndRemoveTask() }
        }
+        if (savedInstanceState == null) handleIntent(intent)
    }

    private fun edgeToEdge(isDarkTheme: Boolean) {
@@ -84,15 +79,42 @@ class MainActivity : ComponentActivity() {

    override fun onNewIntent(intent: Intent) {
        super.onNewIntent(intent)
-        if (!openSavedIfNeeded(intent)) {
-            val uri = intent.data ?: return
-            val route = obtainRouteOrNull(uri)
-            if (route != null) {
-                root.nav(route, true)
-            } else {
-                openUrlIfNeeded(uri)
-            }
+        log("onNewIntent $intent")
+        setIntent(intent)
+        handleIntent(intent)
+    }
+
+    private fun handleIntent(intent: Intent?) {
+        intent ?: return
+        if (openSavedIfNeeded(intent)) {
+            clearIntent(intent)
+            return
        }
+        val uri = intent.data ?: return
+        val route = obtainRouteOrNull(uri)
+        if (route != null) {
+            val currentRoute = root.childStack.value.active.configuration
+            if (currentRoute != route) {
+                root.nav(route, true)
+            }
+        } else {
+            openUrlIfNeeded(uri)
+        }
+        clearIntent(intent)
+    }
+
+    private fun clearIntent(intent: Intent) {
+        intent.data = null
+        intent.action = null
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        log("onDestroy")
+    }
+
+    private fun log(msg: String) {
+        Log.d("MainActivityDebug", msg)
    }

    private fun openUrlIfNeeded(uri: Uri?): Boolean {
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/baseline_saved_search_24"
-        android:shortcutId="saved_movies"
-        android:shortcutLongLabel="@string/saved_movies_long"
-        android:shortcutShortLabel="@string/saved_movies">
-        <intent
-            android:action="ru.shadowsparky.vbox.action.OPEN_SAVED_MOVIES"
-            android:targetClass="ru.shadowsparky.videobox.multiplatform.MainActivity"
-            android:targetPackage="ru.shadowsparky.videobox.multiplatform" />
-    </shortcut>
-</shortcuts>
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shortcuts></shortcuts>
@@ -102,6 +102,7 @@ object UrlRoutes {
            }
        ),

+        // "/chat
        rule(
            match = { it is Route.Chat },
            build = {
@@ -110,7 +111,13 @@ object UrlRoutes {
                    emptyMap()
                )
            },
-            parse = { _, _ -> Route.Chat() }
+            parse = { segs, _ ->
+                if (segs.size == 1 && segs[0] == Seg.CHAT) {
+                    Route.Chat()
+                } else {
+                    null
+                }
+            }
        ),

        // "/search"
@@ -10,7 +10,6 @@ import com.arkivanov.essenty.lifecycle.coroutines.repeatOnLifecycle
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.serialization.KSerializer
 import org.koin.core.Koin
@@ -27,26 +26,29 @@ import ru.shadowsparky.vbox.shared.presentation.nav.Route
 class VBoxRootComponent(
    componentContext: ComponentContext,
    tokenStorage: TokenStorage,
-    override val initStack: List<Route>,
+    private val initRoute: Route,
    private val healthCheck: HeathCheck,
    val imageLoaderProvider: ImageLoaderProvider,
    updateComponentFactory: UpdateComponentFactory,
    private val remoteEventListener: RemoteEventListener,
+    override val initStack: List<Route> = listOf(initRoute),
    override val serializer: KSerializer<Route> = Route.serializer(),
    override val koin: Koin = ru.shadowsparky.koin
 ) : RootComponent<Route>(componentContext), WebNavigationOwner {
    val updateComponent = updateComponentFactory.create(childContext("UpdateComponentRoot"))
    private val scope = createComponentScope()
-    val isLoggedIn = tokenStorage.token.map {
-        if (it != null) {
-            runCatching { healthCheck.check() }.getOrNull() ?: return@map false
-            true
-        } else {
-            false
-        }
-    }

    init {
+        scope.launch {
+            repeatOnLifecycle {
+                tokenStorage.token.collect {
+                    if (it != null) {
+                        val invalid = runCatching { healthCheck.check() }.getOrNull() == null
+                        if (invalid) { navReplace(initRoute) }
+                    }
+                } // i love you
+            }
+        }
        scope.launch {
            repeatOnLifecycle {
                tokenStorage.token.flatMapLatest {
@@ -103,7 +105,7 @@ class RootFactory(
        return VBoxRootComponent(
            context,
            tokenStorage,
-            listOf(Route.Loading(next = initStack.toSet())),
+            Route.Loading(next = initStack.toSet()),
            heathCheck,
            imageLoaderProvider,
            updateComponentFactory,
@@ -33,6 +33,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
@@ -292,12 +293,15 @@ private fun OverviewDescription(
            style = MaterialTheme.typography.titleMedium,
            modifier = Modifier.padding(vertical = 8.dp)
        )
-        Text(
-            text = details.desc.trim(),
-            style = MaterialTheme.typography.bodyLarge,
-            maxLines = if (showDetails.value) Int.MAX_VALUE else 3,
-            overflow = TextOverflow.Ellipsis
-        )
+
+        SelectionContainer {
+            Text(
+                text = details.desc.trim(),
+                style = MaterialTheme.typography.bodyLarge,
+                maxLines = if (showDetails.value) Int.MAX_VALUE else 3,
+                overflow = TextOverflow.Ellipsis
+            )
+        }

        AnimatedVisibility(
            visible = !showDetails.value,
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -86,13 +84,6 @@ fun mainInternal() {
            r.onFinish.collect { r.navReplace(Route.Loading()) }
        }

-        val isLoggedIn by r.isLoggedIn.collectAsState(null)
-        LaunchedEffect(isLoggedIn) {
-            if (isLoggedIn == false) {
-                r.navReplace(Route.Loading())
-            }
-        }
-
        Box(Modifier.fillMaxSize().padding(WindowInsets.safeDrawing.asPaddingValues())) {
            Nav(r)
        }