From 6673a892e25c3339b5ffc1e883d0fb0507429424 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 30 Oct 2026 19:03:27 -0400 Subject: [PATCH] fix: x86 Flatpak bundles are refused with a clear message instead of installing and failing to start (#1873) --- .../launcher/runtime/FlatpakManager.kt | 6 +- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../overlay/usr/local/bin/droiddeck-flatpak | 7 +- tools/tests/test_flatpak_bundle_arch.py | 89 +++++++++++++++++++ 36 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 tools/tests/test_flatpak_bundle_arch.py diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt index 56340b111e..c3dc83da55 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt @@ -117,7 +117,11 @@ object FlatpakManager { when (o.optString("e")) { "op" -> { step = stage(context, o); onProgress(step, overall(o, 0)) } "progress" -> onProgress(step, overall(o, o.optInt("percent"))) - "error" -> { error = o.optString("message"); Log.w(TAG, "$verb $id: $error") } + "error" -> { + error = if (o.optString("code") == "arch") context.getString(R.string.flatpakmgr_wrong_arch, o.optString("id"), o.optString("arch")) + else o.optString("message") + Log.w(TAG, "$verb $id: ${o.optString("message")}") + } "warning" -> Log.w(TAG, "$verb $id: ${o.optString("message")}") "done" -> onDone(o) } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b2fb0e8227..82a731f572 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1892,6 +1892,7 @@ أعِدّ Flatpak أولاً جارٍ البدء خرج Flatpak بالحالة %1$d + تم بناء %1$s لمعمارية %2$s، لكن تطبيقات Flatpak هنا يجب أن تكون لمعمارية ARM64. استخدم ملف AppImage للتطبيق بدلًا من ذلك؛ يشغّل DroidDeck ملفات AppImage لمعمارية x86 عبر FEX. جارٍ تثبيت %1$s جارٍ تحديث %1$s جارٍ إزالة %1$s diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index f5622c3c45..3a69ffa5c6 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1884,6 +1884,7 @@ Configura Flatpak primero Iniciando Flatpak terminó con el código %1$d + %1$s está compilado para %2$s, pero aquí las apps Flatpak deben ser para ARM64. Usa el AppImage de la app; DroidDeck ejecuta los AppImage x86 con FEX. Instalando %1$s Actualizando %1$s Quitando %1$s diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e47fb40b97..598ce8af9b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1800,6 +1800,7 @@ Настрой Flatpak първо Стартиране Flatpak приключи със код %1$d + %1$s е създадено за %2$s, но приложенията Flatpak тук трябва да са за ARM64. Използвайте AppImage на приложението; DroidDeck изпълнява x86 AppImage чрез FEX. Инсталиране на %1$s Актуализиране на %1$s Премахване на %1$s diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 3af67794d8..722c7640b8 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1846,6 +1846,7 @@ Nejprve nastavte Flatpak Spouštění Flatpak skončil s návratovým kódem %1$d + %1$s je sestaveno pro %2$s, ale aplikace Flatpak zde musí být pro ARM64. Použijte AppImage aplikace; DroidDeck spouští x86 AppImage přes FEX. Instalování %1$s Aktualizování %1$s Odstraňování %1$s diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ee63a7a7f3..f6ec5613eb 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1800,6 +1800,7 @@ Opsæt Flatpak først Starter Flatpak afsluttede med status %1$d + %1$s er bygget til %2$s, men Flatpak-apps her skal være bygget til ARM64. Brug appens AppImage i stedet; DroidDeck kører x86-AppImages gennem FEX. Installerer %1$s Opdaterer %1$s Fjerner %1$s diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0e1d2e5973..62c85fd4d9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1792,6 +1792,7 @@ Richte zuerst Flatpak ein Wird gestartet Flatpak wurde mit Status %1$d beendet + %1$s wurde für %2$s gebaut, Flatpak-Apps müssen hier aber für ARM64 gebaut sein. Nutze stattdessen das AppImage der App; DroidDeck führt x86-AppImages über FEX aus. %1$s wird installiert %1$s wird aktualisiert %1$s wird entfernt diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index cad6dc4b3a..1d831f4f3f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1800,6 +1800,7 @@ Ρυθμίστε πρώτα το Flatpak Γίνεται εκκίνηση Το Flatpak έκλεισε με κατάσταση %1$d + Το %1$s είναι φτιαγμένο για %2$s, αλλά οι εφαρμογές Flatpak εδώ πρέπει να είναι για ARM64. Χρησιμοποιήστε το AppImage της εφαρμογής· το DroidDeck εκτελεί x86 AppImage μέσω FEX. Εγκατάσταση %1$s Ενημέρωση %1$s Κατάργηση %1$s diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 40575afe3b..296663e356 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1823,6 +1823,7 @@ Configura Flatpak primero Iniciando Flatpak terminó con el código %1$d + %1$s está compilado para %2$s, pero aquí las apps Flatpak deben ser para ARM64. Usa el AppImage de la app; DroidDeck ejecuta los AppImage x86 con FEX. Instalando %1$s Actualizando %1$s Quitando %1$s diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index d3c89dc569..fa54539189 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1800,6 +1800,7 @@ Asenna Flatpak ensin Käynnistetään Flatpak sulkeutui tilakoodilla %1$d + %1$s on tehty alustalle %2$s, mutta Flatpak-sovellusten täytyy täällä olla ARM64-sovelluksia. Käytä sovelluksen AppImagea; DroidDeck ajaa x86-AppImaget FEXin kautta. Asennetaan %1$s Päivitetään %1$s Poistetaan %1$s diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d45b088c44..152be92912 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1823,6 +1823,7 @@ Configurez d\'abord Flatpak Démarrage Flatpak s\'est arrêté avec le code %1$d + %1$s est compilée pour %2$s, mais ici les applis Flatpak doivent l\'être pour ARM64. Utilisez plutôt l\'AppImage de l\'appli ; DroidDeck exécute les AppImage x86 avec FEX. Installation : %1$s Mise à jour : %1$s Suppression : %1$s diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 92c34ee39d..52cd825fe6 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1800,6 +1800,7 @@ पहले Flatpak सेट करें शुरू हो रहा है Flatpak status %1$d के साथ बंद हुआ + %1$s %2$s के लिए बना है, पर यहाँ Flatpak ऐप ARM64 के लिए बने होने चाहिए। इसके बजाय ऐप का AppImage इस्तेमाल करें; DroidDeck x86 AppImage को FEX से चलाता है। %1$s इंस्टॉल हो रहा है %1$s अपडेट हो रहा है %1$s हटाया जा रहा है diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c0c9780b7f..de4841b55c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1800,6 +1800,7 @@ Előbb állítsa be a Flatpakot Indítás A Flatpak %1$d állapotkóddal lépett ki + A(z) %1$s %2$s rendszerre készült, de az itteni Flatpak-alkalmazásoknak ARM64-re kell készülniük. Használd inkább az alkalmazás AppImage-ét; a DroidDeck az x86 AppImage-eket FEX-en keresztül futtatja. %1$s telepítése %1$s frissítése %1$s eltávolítása diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 352b1f4091..2a80cb98a8 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1777,6 +1777,7 @@ Siapkan Flatpak terlebih dahulu Memulai Flatpak keluar dengan status %1$d + %1$s dibuat untuk %2$s, tetapi aplikasi Flatpak di sini harus dibuat untuk ARM64. Gunakan AppImage aplikasi tersebut; DroidDeck menjalankan AppImage x86 melalui FEX. Menginstal %1$s Memperbarui %1$s Menghapus %1$s diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 83ae91570b..a8a8742dfc 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1815,6 +1815,7 @@ Configura prima Flatpak Avvio Flatpak è terminato con stato %1$d + %1$s è compilata per %2$s, ma qui le app Flatpak devono essere per ARM64. Usa invece l\'AppImage dell\'app; DroidDeck esegue le AppImage x86 tramite FEX. Installazione di %1$s Aggiornamento di %1$s Rimozione di %1$s diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 170d629cd3..c559f74b7b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1748,6 +1748,7 @@ 先にFlatpakをセットアップしてください 開始中 Flatpakがステータス%1$dで終了しました + %1$s は %2$s 向けにビルドされていますが、ここでは Flatpak アプリは ARM64 向けである必要があります。代わりにアプリの AppImage を使ってください。DroidDeck は x86 の AppImage を FEX で実行します。 %1$sをインストール中 %1$sを更新中 %1$sを削除中 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index fc06ee55f7..2fbb3c93ff 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1777,6 +1777,7 @@ 먼저 Flatpak을 설정하세요 시작 중 Flatpak이 종료되었습니다(상태 %1$d) + %1$s은(는) %2$s용으로 빌드되었지만 여기서는 Flatpak 앱이 ARM64용이어야 합니다. 대신 앱의 AppImage를 사용하세요. DroidDeck은 x86 AppImage를 FEX로 실행합니다. %1$s 설치 중 %1$s 업데이트 중 %1$s 제거 중 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 3b7d400cb6..81909ac342 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1777,6 +1777,7 @@ Sediakan Flatpak dahulu Memulakan Flatpak keluar dengan status %1$d + %1$s dibina untuk %2$s, tetapi apl Flatpak di sini mesti dibina untuk ARM64. Gunakan AppImage apl itu; DroidDeck menjalankan AppImage x86 melalui FEX. Memasang %1$s Mengemas kini %1$s Mengalih keluar %1$s diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index e045755c54..765cb4e48a 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1800,6 +1800,7 @@ Sett opp Flatpak først Starter Flatpak avsluttet med status %1$d + %1$s er bygget for %2$s, men Flatpak-apper her må være bygget for ARM64. Bruk appens AppImage i stedet; DroidDeck kjører x86-AppImages gjennom FEX. Installerer %1$s Oppdaterer %1$s Fjerner %1$s diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f2f0d05e0e..3079c44bd4 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1800,6 +1800,7 @@ Stel eerst Flatpak in Starten Flatpak is gestopt met status %1$d + %1$s is gebouwd voor %2$s, maar Flatpak-apps moeten hier voor ARM64 zijn gebouwd. Gebruik de AppImage van de app; DroidDeck draait x86-AppImages via FEX. %1$s installeren %1$s updaten %1$s verwijderen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f02ee09bca..636b39d7fb 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1846,6 +1846,7 @@ Najpierw skonfiguruj Flatpak Rozpoczynanie Flatpak zakończył działanie z kodem %1$d + %1$s zbudowano dla %2$s, a aplikacje Flatpak muszą tu być zbudowane dla ARM64. Użyj AppImage tej aplikacji; DroidDeck uruchamia AppImage x86 przez FEX. Instalowanie %1$s Aktualizowanie %1$s Usuwanie %1$s diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index a8853ae4c3..33d391c620 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1815,6 +1815,7 @@ Configure primeiro o Flatpak A iniciar O Flatpak terminou com o código %1$d + %1$s foi compilado para %2$s, mas aqui as apps Flatpak têm de ser para ARM64. Use antes o AppImage da app; o DroidDeck executa AppImages x86 através do FEX. A instalar %1$s A atualizar %1$s A remover %1$s diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 9e3383ebcb..9507ac50df 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1815,6 +1815,7 @@ Configure o Flatpak primeiro Iniciando O Flatpak terminou com o código %1$d + %1$s foi compilado para %2$s, mas aqui os apps Flatpak precisam ser para ARM64. Use o AppImage do app; o DroidDeck executa AppImages x86 pelo FEX. Instalando %1$s Atualizando %1$s Removendo %1$s diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index c212d5013e..04ef1a7010 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1823,6 +1823,7 @@ Configurează mai întâi Flatpak Se pornește Flatpak s-a închis cu starea %1$d + %1$s este construită pentru %2$s, dar aici aplicațiile Flatpak trebuie să fie pentru ARM64. Folosește în schimb AppImage-ul aplicației; DroidDeck rulează AppImage-urile x86 prin FEX. Se instalează %1$s Se actualizează %1$s Se elimină %1$s diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 570dba2d5d..f1605e0af9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1846,6 +1846,7 @@ Сначала настройте Flatpak Запуск Flatpak завершился с кодом %1$d + %1$s собрано для %2$s, а приложения Flatpak здесь должны быть собраны для ARM64. Используйте AppImage этого приложения: DroidDeck запускает x86 AppImage через FEX. Установка %1$s Обновление %1$s Удаление %1$s diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 030497822d..4d11c867b1 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1800,6 +1800,7 @@ Konfigurera Flatpak först Startar Flatpak avslutades med status %1$d + %1$s är byggd för %2$s, men Flatpak-appar här måste vara byggda för ARM64. Använd appens AppImage i stället; DroidDeck kör x86-AppImages via FEX. Installerar %1$s Uppdaterar %1$s Tar bort %1$s diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index d95e891fe0..6e3ac5c290 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1777,6 +1777,7 @@ ตั้งค่า Flatpak ก่อน กำลังเริ่ม Flatpak ออกด้วยสถานะ %1$d + %1$s สร้างมาสำหรับ %2$s แต่แอป Flatpak ที่นี่ต้องสร้างสำหรับ ARM64 ให้ใช้ AppImage ของแอปแทน DroidDeck จะเรียกใช้ AppImage x86 ผ่าน FEX กำลังติดตั้ง %1$s กำลังอัปเดต %1$s กำลังลบ %1$s diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4a0d5f7c6c..a008247d7d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1792,6 +1792,7 @@ Önce Flatpak\'i kurun Başlatılıyor Flatpak %1$d durum koduyla çıktı + %1$s %2$s için derlenmiş, ancak buradaki Flatpak uygulamaları ARM64 için derlenmiş olmalı. Bunun yerine uygulamanın AppImage dosyasını kullanın; DroidDeck x86 AppImage dosyalarını FEX ile çalıştırır. %1$s yükleniyor %1$s güncelleniyor %1$s kaldırılıyor diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7c1a942f2f..a178dc4d30 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1846,6 +1846,7 @@ Спершу налаштуйте Flatpak Запуск Flatpak завершився з кодом %1$d + %1$s зібрано для %2$s, а застосунки Flatpak тут мають бути зібрані для ARM64. Використайте AppImage цього застосунку: DroidDeck запускає x86 AppImage через FEX. Встановлення %1$s Оновлення %1$s Видалення %1$s diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 08c3ff0f52..02c4ed55ab 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1777,6 +1777,7 @@ Thiết lập Flatpak trước Đang khởi động Flatpak đã thoát với mã %1$d + %1$s được dựng cho %2$s, nhưng ứng dụng Flatpak ở đây phải dựng cho ARM64. Hãy dùng bản AppImage của ứng dụng; DroidDeck chạy AppImage x86 qua FEX. Đang cài %1$s Đang cập nhật %1$s Đang gỡ %1$s diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 669cf14908..8cca0454f3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1825,6 +1825,7 @@ 请先配置 Flatpak 启动中 Flatpak 已退出,状态码 %1$d + %1$s 是为 %2$s 构建的,但这里的 Flatpak 应用必须为 ARM64 构建。请改用该应用的 AppImage;DroidDeck 会通过 FEX 运行 x86 AppImage。 正在安装 %1$s 正在更新 %1$s 正在移除 %1$s diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 8faa836c89..9662dab64f 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1748,6 +1748,7 @@ 請先設定 Flatpak 正在開始 Flatpak 已結束,狀態為 %1$d + %1$s 是為 %2$s 建置的,但這裡的 Flatpak 應用程式必須為 ARM64 建置。請改用該應用程式的 AppImage;DroidDeck 會透過 FEX 執行 x86 AppImage。 正在安裝 %1$s 正在更新 %1$s 正在移除 %1$s diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index bb9bdb199a..ee7925bed2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1748,6 +1748,7 @@ 請先設定 Flatpak 正在啟動 Flatpak 已結束,狀態碼 %1$d + %1$s 是為 %2$s 建置的,但這裡的 Flatpak 應用程式必須為 ARM64 建置。請改用該應用程式的 AppImage;DroidDeck 會透過 FEX 執行 x86 AppImage。 正在安裝 %1$s 正在更新 %1$s 正在移除 %1$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 421dd380c2..dd9ceabf40 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1904,6 +1904,7 @@ Set up Flatpak first Starting Flatpak exited with status %1$d + %1$s is built for %2$s, but Flatpak apps here must be built for ARM64. Use the app\'s AppImage instead; DroidDeck runs x86 AppImages through FEX. Installing %1$s Updating %1$s Removing %1$s diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak index d91cae6ad3..0ca582d6f6 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak @@ -141,10 +141,15 @@ def install_bundle(path): inst = installation() bundle = Gio.File.new_for_path(path) try: - app_id = Flatpak.BundleRef.new(bundle).get_name() + ref = Flatpak.BundleRef.new(bundle) + app_id = ref.get_name() except GLib.Error as err: emit(e="error", message="%s is not a Flatpak bundle (%s)" % (os.path.basename(path), err.message)) return 1 + if ref.get_arch() != Flatpak.get_default_arch(): + emit(e="error", code="arch", id=app_id, arch=ref.get_arch(), + message="%s is built for %s, not %s" % (app_id, ref.get_arch(), Flatpak.get_default_arch())) + return 1 if app_ref(inst, app_id) is not None: emit(e="done", id=app_id, note="already installed") return 0 diff --git a/tools/tests/test_flatpak_bundle_arch.py b/tools/tests/test_flatpak_bundle_arch.py new file mode 100644 index 0000000000..8b899d9fb7 --- /dev/null +++ b/tools/tests/test_flatpak_bundle_arch.py @@ -0,0 +1,89 @@ +import importlib.machinery +import importlib.util +import io +import json +from pathlib import Path +import sys +import types +import unittest +from contextlib import redirect_stdout + +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-flatpak" + + +class FakeRef: + def __init__(self, arch): + self.arch = arch + + def get_name(self): + return "io.github.ebkr.r2modman" + + def get_arch(self): + return self.arch + + +def load(bundle_arch, installs): + flatpak = types.SimpleNamespace( + get_default_arch=lambda: "aarch64", + BundleRef=types.SimpleNamespace(new=lambda bundle: FakeRef(bundle_arch)), + ) + repository = types.ModuleType("gi.repository") + repository.Flatpak = flatpak + repository.Gio = types.SimpleNamespace(File=types.SimpleNamespace(new_for_path=lambda path: path)) + repository.GLib = types.SimpleNamespace(Error=RuntimeError) + gi = types.ModuleType("gi") + gi.require_version = lambda *args: None + gi.repository = repository + saved = {name: sys.modules.get(name) for name in ("gi", "gi.repository")} + sys.modules["gi"] = gi + sys.modules["gi.repository"] = repository + try: + loader = importlib.machinery.SourceFileLoader("droiddeck_flatpak", str(SCRIPT)) + module = importlib.util.module_from_spec(importlib.util.spec_from_loader(loader.name, loader)) + loader.exec_module(module) + finally: + for name, value in saved.items(): + if value is None: + sys.modules.pop(name, None) + else: + sys.modules[name] = value + module.installation = lambda: object() + module.app_ref = lambda inst, app_id: None + + def transaction(inst): + installs.append("bundle") + raise AssertionError("the bundle reached a transaction") + + module.transaction = transaction + return module + + +class FlatpakBundleArchTest(unittest.TestCase): + def run_install(self, arch): + installs = [] + module = load(arch, installs) + out = io.StringIO() + with redirect_stdout(out): + try: + rc = module.install_bundle("/tmp/r2modman.flatpak") + except AssertionError: + rc = None + return rc, [json.loads(line) for line in out.getvalue().splitlines()], installs + + def test_a_bundle_for_another_architecture_is_refused_before_installing(self): + rc, events, installs = self.run_install("x86_64") + self.assertEqual(rc, 1) + self.assertEqual(installs, []) + self.assertEqual(events[0]["e"], "error") + self.assertEqual(events[0]["code"], "arch") + self.assertEqual(events[0]["arch"], "x86_64") + self.assertEqual(events[0]["id"], "io.github.ebkr.r2modman") + + def test_a_bundle_for_this_device_goes_on_to_install(self): + rc, events, installs = self.run_install("aarch64") + self.assertEqual(installs, ["bundle"]) + self.assertEqual(events, []) + + +if __name__ == "__main__": + unittest.main()