diff --git a/apps/experimentarium/shared/src/commonMain/kotlin/ru/shadowsparky/experimentarium/shared/Test.kt b/apps/experimentarium/shared/src/commonMain/kotlin/ru/shadowsparky/experimentarium/shared/Test.kt index 6a945f1..79fe500 100644 --- a/apps/experimentarium/shared/src/commonMain/kotlin/ru/shadowsparky/experimentarium/shared/Test.kt +++ b/apps/experimentarium/shared/src/commonMain/kotlin/ru/shadowsparky/experimentarium/shared/Test.kt @@ -12,7 +12,7 @@ private val controller = koin.get() @Composable fun TestPlayer() { - VideoPlayer(controller, modifier = Modifier.fillMaxSize()) + VideoPlayer(controller, modifier = Modifier.fillMaxSize(), onBack = {}) LaunchedEffect(controller) { controller.load("https://samplelib.com/mp4/sample-30s-720p.mp4") controller.play() diff --git a/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/VBoxRootComponent.kt b/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/VBoxRootComponent.kt index 6febfeb..ee28ed3 100644 --- a/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/VBoxRootComponent.kt +++ b/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/VBoxRootComponent.kt @@ -8,7 +8,6 @@ import com.arkivanov.decompose.router.webhistory.WebNavigation import com.arkivanov.decompose.router.webhistory.WebNavigationOwner import com.arkivanov.essenty.lifecycle.coroutines.repeatOnLifecycle import kotlinx.coroutines.flow.collect -import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.launch @@ -19,7 +18,6 @@ import ru.shadowsparky.http.domain.TokenStorage import ru.shadowsparky.ui.nav.RootComponent import ru.shadowsparky.updater.presentation.UpdateComponentFactory import ru.shadowsparky.vbox.shared.di.factory.ImageLoaderProvider -import ru.shadowsparky.vbox.shared.domain.HealthCheck import ru.shadowsparky.vbox.shared.domain.RemoteEventListener import ru.shadowsparky.vbox.shared.presentation.nav.Route @@ -28,7 +26,6 @@ class VBoxRootComponent( componentContext: ComponentContext, tokenStorage: TokenStorage, private val initRoute: Route, - private val healthCheck: HealthCheck, val imageLoaderProvider: ImageLoaderProvider, updateComponentFactory: UpdateComponentFactory, private val remoteEventListener: RemoteEventListener, @@ -40,20 +37,6 @@ class VBoxRootComponent( private val scope = createComponentScope() init { - scope.launch { - repeatOnLifecycle { - var oldToken = tokenStorage.token.firstOrNull() - tokenStorage.token.collect { - if (it != null) { - val invalid = runCatching { healthCheck.check() }.getOrNull() == null - if (invalid) navReplace(initRoute) - } else if (oldToken != null) { - navReplace(initRoute) - } - oldToken = it - } - } - } scope.launch { repeatOnLifecycle { tokenStorage.token.flatMapLatest { @@ -91,7 +74,6 @@ class VBoxRootComponent( @Factory class RootFactory( private val tokenStorage: TokenStorage, - private val healthCheck: HealthCheck, private val imageLoaderProvider: ImageLoaderProvider, private val updateComponentFactory: UpdateComponentFactory, private val remoteEventListener: RemoteEventListener @@ -111,7 +93,6 @@ class RootFactory( context, tokenStorage, Route.Loading(next = initStack.toSet()), - healthCheck, imageLoaderProvider, updateComponentFactory, remoteEventListener