diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index b094c98915..6bdfbbca38 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -23,6 +23,7 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf @@ -1135,6 +1136,10 @@ class FrontEndActivity : ComponentActivity() { applyLauncherFullscreen() updates.start() setContent { + val prootPack by com.droiddeck.launcher.core.AddonPack.PROOT.state.collectAsState() + androidx.compose.runtime.LaunchedEffect(prootPack) { + if (prootPack == com.droiddeck.launcher.core.AddonPack.State.Ready && installed == null) refresh() + } DroidDeckTheme(theme, appScale = appScale) { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize().exposeTestTags()) { if (decky.deckyPendingZip != null) com.droiddeck.launcher.ui.DeckyZipWarningDialog( diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index 21a40a92ae..cf613008bb 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -82,8 +82,12 @@ public final class LinuxRuntimeInstaller { private LinuxRuntimeInstaller() {} public static String installedVersion(Context context) { + return LinuxRuntime.isInstalled(context) ? rootfsVersion(context) : null; + } + + private static String rootfsVersion(Context context) { File marker = new File(LinuxRuntime.rootDir(context), VERSION_FILE); - if (!marker.isFile() || !LinuxRuntime.isInstalled(context)) return null; + if (!marker.isFile()) return null; String v = FileUtils.readString(marker); return v == null ? null : v.trim(); } @@ -144,6 +148,10 @@ public final class LinuxRuntimeInstaller { } }; boolean desktop = DesktopCatalog.INSTANCE.desktopInstalled(app); + if (packsOnly(app, release, progress)) { + job.ok = true; + return true; + } job.ok = installOnce(app, release, progress); if (job.ok && desktop) keepDesktop(app, progress); return job.ok; @@ -283,6 +291,31 @@ public final class LinuxRuntimeInstaller { for (File file : files) file.delete(); } + private static kotlin.jvm.functions.Function1 packProgress(ProgressListener listener, String stage) { + return state -> { + if (listener != null && state instanceof AddonPack.State.Downloading) { + listener.onProgress(Step.DOWNLOADING, stage, Math.round(((AddonPack.State.Downloading) state).getProgress() * 100f)); + } + return kotlin.Unit.INSTANCE; + }; + } + + private static boolean packsOnly(Context context, Release release, ProgressListener listener) { + if (!LinuxRuntime.hasRootfs(context) || LinuxRuntime.isInstalled(context) || !release.version.equals(rootfsVersion(context))) return false; + File root = LinuxRuntime.rootDir(context); + try { + recoverInterruptedSwap(root, new File(root.getParentFile(), LinuxRuntime.DIR + ".new"), new File(root.getParentFile(), LinuxRuntime.DIR + ".old")); + } catch (IOException e) { + Log.w(TAG, "packs only: " + e); + return false; + } + String downloading = context.getString(R.string.rtinst_downloading); + if (listener != null) listener.onProgress(Step.DOWNLOADING, downloading, 0); + return AddonPack.PROOT.await(context, () -> true, packProgress(listener, downloading)) + && AddonPack.DIRECTAUDIO.await(context, () -> true, packProgress(listener, downloading)) + && LinuxRuntime.isInstalled(context); + } + private static boolean installOnce(Context context, Release release, ProgressListener listener) { File archive = new File(context.getCacheDir(), archiveName(release)); boolean keepPartial = false; @@ -294,10 +327,10 @@ public final class LinuxRuntimeInstaller { emptyTrash(LinuxRuntime.rootDir(context).getParentFile()); String downloading = context.getString(R.string.rtinst_downloading); if (listener != null) listener.onProgress(Step.DOWNLOADING, downloading, 0); - if (!LinuxRuntime.patchedProot(context) && !AddonPack.PROOT.await(context) + if (!LinuxRuntime.patchedProot(context) && !AddonPack.PROOT.await(context, () -> true, packProgress(listener, downloading)) && !SessionPrefs.allowStockProot(context)) throw new IOException("Cannot download proot"); - if (!AddonPack.DIRECTAUDIO.await(context)) throw new IOException("Cannot download DirectAudio"); + if (!AddonPack.DIRECTAUDIO.await(context, () -> true, packProgress(listener, downloading))) throw new IOException("Cannot download DirectAudio"); boolean ok = Downloader.downloadFile(release.url, archive, true, release.sha256, (fraction) -> { if (listener != null) { listener.onProgress(Step.DOWNLOADING, downloading,