fix(update): fix misc issues with auto update

JunkFood02 · Apr 4, 2024 · 62d0b86 · 62d0b86
1 parent 3033129
commit 62d0b86
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/app/src/main/java/com/junkfood/seal/ui/page/HomeEntry.kt b/app/src/main/java/com/junkfood/seal/ui/page/HomeEntry.kt
@@ -26,12 +26,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import androidx.navigation.navigation
+import com.junkfood.seal.Downloader
 import com.junkfood.seal.R
 import com.junkfood.seal.ui.common.LocalWindowWidthState
 import com.junkfood.seal.ui.common.Route
@@ -203,10 +205,16 @@ fun HomeEntry(
         WelcomeDialog {
             navController.navigate(Route.SETTINGS)
         }
+
+        val downloaderState by Downloader.downloaderState.collectAsStateWithLifecycle()
+
         LaunchedEffect(Unit) {
-            if (!YT_DLP_UPDATE.getBoolean()
-                && YT_DLP.getString().isNotEmpty()
+            if (downloaderState !is Downloader.State.Idle) return@LaunchedEffect
+
+            if (!YT_DLP_UPDATE.getBoolean() && YT_DLP.getString()
+                    .isNotEmpty()
             ) return@LaunchedEffect
+
             runCatching {
                 withContext(Dispatchers.IO) {
                     val res = UpdateUtil.updateYtDlp()
@@ -218,6 +226,7 @@ fun HomeEntry(
                 it.printStackTrace()
             }
         }
+
         LaunchedEffect(Unit) {
             if (!PreferenceUtil.isNetworkAvailableForDownload() || !PreferenceUtil.isAutoUpdateEnabled()
             )

diff --git a/app/src/main/java/com/junkfood/seal/ui/page/settings/about/UpdatePage.kt b/app/src/main/java/com/junkfood/seal/ui/page/settings/about/UpdatePage.kt
@@ -35,7 +35,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.junkfood.seal.App
 import com.junkfood.seal.R
-import com.junkfood.seal.ui.common.booleanState
 import com.junkfood.seal.ui.common.intState
 import com.junkfood.seal.ui.component.BackButton
 import com.junkfood.seal.ui.component.HorizontalDivider
@@ -47,6 +46,7 @@ import com.junkfood.seal.ui.component.PreferenceSwitchWithContainer
 import com.junkfood.seal.ui.page.UpdateDialog
 import com.junkfood.seal.util.AUTO_UPDATE
 import com.junkfood.seal.util.PRE_RELEASE
+import com.junkfood.seal.util.PreferenceUtil
 import com.junkfood.seal.util.PreferenceUtil.updateBoolean
 import com.junkfood.seal.util.PreferenceUtil.updateInt
 import com.junkfood.seal.util.STABLE
@@ -64,7 +64,7 @@ fun UpdatePage(onNavigateBack: () -> Unit) {
         rememberTopAppBarState(),
         canScroll = { true }
     )
-    var autoUpdate by AUTO_UPDATE.booleanState
+    var autoUpdate by remember { mutableStateOf(PreferenceUtil.isAutoUpdateEnabled()) }
     var updateChannel by UPDATE_CHANNEL.intState
     val scope = rememberCoroutineScope()
     val context = LocalContext.current