From f00524154907d0f9fcb7d65be2b8dd7291c349df Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 4 Nov 2026 15:09:30 -0500 Subject: [PATCH] fix(desktop): download language packs from the release that has them (#2096) * fix(desktop): download language packs from the release that has them The Ubuntu runtime's release has no language packs or index, so the desktop stayed in English for every language. * fix(desktop): reinstall language packs when their release changes --- .../com/droiddeck/launcher/runtime/DesktopLanguage.kt | 10 ++++++---- .../droiddeck/launcher/runtime/DesktopLanguageTest.kt | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt index c1bb3a192d..83bfa6748a 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.runtime import android.content.Context import android.util.Log +import com.droiddeck.launcher.BuildConfig import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils import com.droiddeck.launcher.core.Hashes @@ -39,15 +40,16 @@ object DesktopLanguage { val root = LinuxRuntime.rootDir(context) if (!DesktopCatalog.desktopInstalled(root)) return true val entry = DesktopCatalog.desktopEntry(context) - val pending = candidates(locale).filterNot { marker(root, entry.version, it).isFile } + val tag = "${entry.version}-${BuildConfig.DESKTOP_KDE_TAG}" + val pending = candidates(locale).filterNot { marker(root, tag, it).isFile } if (pending.isEmpty()) return true - val base = baseUrl(entry.url) + val base = baseUrl(BuildConfig.DESKTOP_KDE_URL) val index = parseIndex(Downloader.downloadString(base + INDEX) ?: return false) var complete = true for (name in pending) { val pack = index[name] if (pack == null) { - FileUtils.writeString(marker(root, entry.version, name), ABSENT) + FileUtils.writeString(marker(root, tag, name), ABSENT) continue } val download = File(context.cacheDir, "i18n-$name-${pack.sha256.take(12)}.download") @@ -56,7 +58,7 @@ object DesktopLanguage { base + "desktop-kde-i18n-$name.tar.zst", download, true, pack.sha256, java.util.function.Consumer { }, ) && pack.sha256.equals(Hashes.sha256(download), ignoreCase = true) && LinuxRuntimeInstaller.extract(context, download, root, null) - if (ok) FileUtils.writeString(marker(root, entry.version, name), pack.sha256) else complete = false + if (ok) FileUtils.writeString(marker(root, tag, name), pack.sha256) else complete = false } catch (e: Exception) { Log.w(TAG, "language pack $name: $e") complete = false diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt index 909e6b4d95..ba2ddc2137 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt @@ -26,7 +26,7 @@ class DesktopLanguageTest { assertTrue(DesktopLanguage.candidates(Locale.forLanguageTag("sw")).isEmpty()) } - @Test fun packsLiveBesideTheDesktopArchive() { + @Test fun packsLiveBesideTheKdeArchive() { assertEquals("https://h/r/t/", DesktopLanguage.baseUrl("https://h/r/t/desktop-kde.tar.zst")) } }