remove health check
This commit is contained in:
+1
-1
@@ -12,7 +12,7 @@ private val controller = koin.get<PlayerController>()
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun TestPlayer() {
|
fun TestPlayer() {
|
||||||
VideoPlayer(controller, modifier = Modifier.fillMaxSize())
|
VideoPlayer(controller, modifier = Modifier.fillMaxSize(), onBack = {})
|
||||||
LaunchedEffect(controller) {
|
LaunchedEffect(controller) {
|
||||||
controller.load("https://samplelib.com/mp4/sample-30s-720p.mp4")
|
controller.load("https://samplelib.com/mp4/sample-30s-720p.mp4")
|
||||||
controller.play()
|
controller.play()
|
||||||
|
|||||||
-19
@@ -8,7 +8,6 @@ import com.arkivanov.decompose.router.webhistory.WebNavigation
|
|||||||
import com.arkivanov.decompose.router.webhistory.WebNavigationOwner
|
import com.arkivanov.decompose.router.webhistory.WebNavigationOwner
|
||||||
import com.arkivanov.essenty.lifecycle.coroutines.repeatOnLifecycle
|
import com.arkivanov.essenty.lifecycle.coroutines.repeatOnLifecycle
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import kotlinx.coroutines.flow.firstOrNull
|
|
||||||
import kotlinx.coroutines.flow.flatMapLatest
|
import kotlinx.coroutines.flow.flatMapLatest
|
||||||
import kotlinx.coroutines.flow.flowOf
|
import kotlinx.coroutines.flow.flowOf
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
@@ -19,7 +18,6 @@ import ru.shadowsparky.http.domain.TokenStorage
|
|||||||
import ru.shadowsparky.ui.nav.RootComponent
|
import ru.shadowsparky.ui.nav.RootComponent
|
||||||
import ru.shadowsparky.updater.presentation.UpdateComponentFactory
|
import ru.shadowsparky.updater.presentation.UpdateComponentFactory
|
||||||
import ru.shadowsparky.vbox.shared.di.factory.ImageLoaderProvider
|
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.domain.RemoteEventListener
|
||||||
import ru.shadowsparky.vbox.shared.presentation.nav.Route
|
import ru.shadowsparky.vbox.shared.presentation.nav.Route
|
||||||
|
|
||||||
@@ -28,7 +26,6 @@ class VBoxRootComponent(
|
|||||||
componentContext: ComponentContext,
|
componentContext: ComponentContext,
|
||||||
tokenStorage: TokenStorage,
|
tokenStorage: TokenStorage,
|
||||||
private val initRoute: Route,
|
private val initRoute: Route,
|
||||||
private val healthCheck: HealthCheck,
|
|
||||||
val imageLoaderProvider: ImageLoaderProvider,
|
val imageLoaderProvider: ImageLoaderProvider,
|
||||||
updateComponentFactory: UpdateComponentFactory,
|
updateComponentFactory: UpdateComponentFactory,
|
||||||
private val remoteEventListener: RemoteEventListener,
|
private val remoteEventListener: RemoteEventListener,
|
||||||
@@ -40,20 +37,6 @@ class VBoxRootComponent(
|
|||||||
private val scope = createComponentScope()
|
private val scope = createComponentScope()
|
||||||
|
|
||||||
init {
|
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 {
|
scope.launch {
|
||||||
repeatOnLifecycle {
|
repeatOnLifecycle {
|
||||||
tokenStorage.token.flatMapLatest {
|
tokenStorage.token.flatMapLatest {
|
||||||
@@ -91,7 +74,6 @@ class VBoxRootComponent(
|
|||||||
@Factory
|
@Factory
|
||||||
class RootFactory(
|
class RootFactory(
|
||||||
private val tokenStorage: TokenStorage,
|
private val tokenStorage: TokenStorage,
|
||||||
private val healthCheck: HealthCheck,
|
|
||||||
private val imageLoaderProvider: ImageLoaderProvider,
|
private val imageLoaderProvider: ImageLoaderProvider,
|
||||||
private val updateComponentFactory: UpdateComponentFactory,
|
private val updateComponentFactory: UpdateComponentFactory,
|
||||||
private val remoteEventListener: RemoteEventListener
|
private val remoteEventListener: RemoteEventListener
|
||||||
@@ -111,7 +93,6 @@ class RootFactory(
|
|||||||
context,
|
context,
|
||||||
tokenStorage,
|
tokenStorage,
|
||||||
Route.Loading(next = initStack.toSet()),
|
Route.Loading(next = initStack.toSet()),
|
||||||
healthCheck,
|
|
||||||
imageLoaderProvider,
|
imageLoaderProvider,
|
||||||
updateComponentFactory,
|
updateComponentFactory,
|
||||||
remoteEventListener
|
remoteEventListener
|
||||||
|
|||||||
Reference in New Issue
Block a user