From e5b091e672b5b984a6dc71b3ac01c47357f7e27b Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Fri, 13 Nov 2026 21:19:16 -0600 Subject: [PATCH] K2GO-575 feat(about): show the phone, app and library architecture About > App version opens a details screen: Android version and API level, phone ABI and 32-bit support, app ABI, library ABI and Debian arch, and a copy action. Each value has its own source (ADR-K2GO-571). --- .../k2go/arch/data/AbiSource.java | 7 +- .../deviceinfo/data/PlatformInfoReader.java | 37 ++++++++++ .../k2go/deviceinfo/domain/PlatformInfo.java | 42 +++++++++++ .../k2go/redesign/SettingsSubFragment.java | 72 ++++++++++++++++++- .../app/src/main/res/values-ar/strings.xml | 18 +++++ .../app/src/main/res/values-az/strings.xml | 18 +++++ .../app/src/main/res/values-bg/strings.xml | 18 +++++ .../app/src/main/res/values-bn/strings.xml | 18 +++++ .../app/src/main/res/values-cs/strings.xml | 18 +++++ .../app/src/main/res/values-de/strings.xml | 18 +++++ .../app/src/main/res/values-el/strings.xml | 18 +++++ .../app/src/main/res/values-es/strings.xml | 18 +++++ .../app/src/main/res/values-fa/strings.xml | 18 +++++ .../app/src/main/res/values-fr/strings.xml | 18 +++++ .../app/src/main/res/values-gu/strings.xml | 18 +++++ .../app/src/main/res/values-hi/strings.xml | 18 +++++ .../app/src/main/res/values-hu/strings.xml | 18 +++++ .../app/src/main/res/values-in/strings.xml | 18 +++++ .../app/src/main/res/values-it/strings.xml | 18 +++++ .../app/src/main/res/values-ja/strings.xml | 18 +++++ .../app/src/main/res/values-ko/strings.xml | 18 +++++ .../app/src/main/res/values-lt/strings.xml | 18 +++++ .../app/src/main/res/values-nl/strings.xml | 18 +++++ .../app/src/main/res/values-no/strings.xml | 18 +++++ .../app/src/main/res/values-pl/strings.xml | 18 +++++ .../app/src/main/res/values-pt/strings.xml | 18 +++++ .../app/src/main/res/values-ro/strings.xml | 18 +++++ .../src/main/res/values-ru-rRU/strings.xml | 18 +++++ .../app/src/main/res/values-sk/strings.xml | 18 +++++ .../app/src/main/res/values-sr/strings.xml | 18 +++++ .../app/src/main/res/values-sw/strings.xml | 18 +++++ .../app/src/main/res/values-ta/strings.xml | 18 +++++ .../app/src/main/res/values-tr/strings.xml | 18 +++++ .../app/src/main/res/values-uk/strings.xml | 18 +++++ .../app/src/main/res/values-vi/strings.xml | 18 +++++ .../app/src/main/res/values-yo/strings.xml | 18 +++++ .../src/main/res/values-zh-rCN/strings.xml | 18 +++++ .../app/src/main/res/values/strings.xml | 19 +++++ .../deviceinfo/domain/PlatformInfoTest.java | 32 +++++++++ 39 files changed, 801 insertions(+), 2 deletions(-) create mode 100644 controller/app/src/main/java/org/appdevforall/k2go/deviceinfo/data/PlatformInfoReader.java create mode 100644 controller/app/src/main/java/org/appdevforall/k2go/deviceinfo/domain/PlatformInfo.java create mode 100644 controller/app/src/test/java/org/appdevforall/k2go/deviceinfo/domain/PlatformInfoTest.java diff --git a/controller/app/src/main/java/org/appdevforall/k2go/arch/data/AbiSource.java b/controller/app/src/main/java/org/appdevforall/k2go/arch/data/AbiSource.java index 61921651a..372899efc 100644 --- a/controller/app/src/main/java/org/appdevforall/k2go/arch/data/AbiSource.java +++ b/controller/app/src/main/java/org/appdevforall/k2go/arch/data/AbiSource.java @@ -52,10 +52,15 @@ public static String libraryOrAppAbi(Context ctx) { */ public static LibraryHost moduleHost(Context ctx) { java.io.File root = SystemStateEvaluator.rootfsDir(ctx); - if (!root.isDirectory()) return LibraryHost.freshInstall(appAbi()); + if (!libraryTreePresent(root)) return LibraryHost.freshInstall(appAbi()); return new LibraryHost(InstalledLibraryAbi.read(root), KiwixLibrarySupport.read(root)); } + /** True when a library tree exists at {@code root} (it may still be mid-restore or mid-Clone). */ + public static boolean libraryTreePresent(java.io.File root) { + return root != null && root.isDirectory(); + } + /** {@link LibraryArch#canRun(String, String, boolean)} for this app on this phone. */ public static boolean canRun(String libraryAbi) { return LibraryArch.canRun(libraryAbi, appAbi(), phoneRuns32Bit()); diff --git a/controller/app/src/main/java/org/appdevforall/k2go/deviceinfo/data/PlatformInfoReader.java b/controller/app/src/main/java/org/appdevforall/k2go/deviceinfo/data/PlatformInfoReader.java new file mode 100644 index 000000000..866787a5b --- /dev/null +++ b/controller/app/src/main/java/org/appdevforall/k2go/deviceinfo/data/PlatformInfoReader.java @@ -0,0 +1,37 @@ +/* + * ============================================================================ + * Name : PlatformInfoReader.java + * Author : AppDevForAll + * Copyright : Copyright (c) 2026 AppDevForAll + * Description : Reads PlatformInfo from the one source of each fact. Does a small file + * read (the library ABI), so call it off the main thread. + * ============================================================================ + */ +package org.appdevforall.k2go.deviceinfo.data; + +import android.content.Context; +import android.os.Build; + +import org.appdevforall.k2go.SystemStateEvaluator; +import org.appdevforall.k2go.arch.data.AbiSource; +import org.appdevforall.k2go.arch.data.InstalledLibraryAbi; +import org.appdevforall.k2go.deviceinfo.domain.GetDeviceArchUseCase; +import org.appdevforall.k2go.deviceinfo.domain.PlatformInfo; + +import java.io.File; + +public final class PlatformInfoReader { + + private PlatformInfoReader() {} + + public static PlatformInfo read(Context ctx) { + File root = SystemStateEvaluator.rootfsDir(ctx); + boolean tree = AbiSource.libraryTreePresent(root); + return new PlatformInfo( + Build.VERSION.RELEASE, Build.VERSION.SDK_INT, + new GetDeviceArchUseCase(new BuildDeviceAbiProvider()).execute(), + AbiSource.phoneRuns32Bit(), + AbiSource.appAbi(), + tree, tree ? InstalledLibraryAbi.read(root) : null); + } +} diff --git a/controller/app/src/main/java/org/appdevforall/k2go/deviceinfo/domain/PlatformInfo.java b/controller/app/src/main/java/org/appdevforall/k2go/deviceinfo/domain/PlatformInfo.java new file mode 100644 index 000000000..248121330 --- /dev/null +++ b/controller/app/src/main/java/org/appdevforall/k2go/deviceinfo/domain/PlatformInfo.java @@ -0,0 +1,42 @@ +/* + * ============================================================================ + * Name : PlatformInfo.java + * Author : AppDevForAll + * Copyright : Copyright (c) 2026 AppDevForAll + * Description : The three architectures a support case needs (phone, app, library) + * plus the Android version. Pure JVM. + * ============================================================================ + */ +package org.appdevforall.k2go.deviceinfo.domain; + +/** + * Since K2GO-565 the phone, the app process and the installed library can each have a different + * width (e.g. a 64-bit phone, a 64-bit app and a 32-bit library). Each value comes from its own + * source; nothing here derives one from another (ADR-K2GO-571). + */ +public final class PlatformInfo { + + /** What is known about the installed library. */ + public enum LibraryState { NOT_INSTALLED, KNOWN, UNKNOWN } + + public final String androidRelease; + public final int sdkInt; + public final String phoneAbi; + public final boolean phoneRuns32Bit; + public final String appAbi; + public final LibraryState libraryState; + /** The library ABI id when {@link #libraryState} is KNOWN, else {@code null}. */ + public final String libraryAbi; + + public PlatformInfo(String androidRelease, int sdkInt, String phoneAbi, boolean phoneRuns32Bit, + String appAbi, boolean libraryTreePresent, String libraryAbi) { + this.androidRelease = androidRelease; + this.sdkInt = sdkInt; + this.phoneAbi = phoneAbi; + this.phoneRuns32Bit = phoneRuns32Bit; + this.appAbi = appAbi; + this.libraryState = !libraryTreePresent ? LibraryState.NOT_INSTALLED + : libraryAbi != null ? LibraryState.KNOWN : LibraryState.UNKNOWN; + this.libraryAbi = this.libraryState == LibraryState.KNOWN ? libraryAbi : null; + } +} diff --git a/controller/app/src/main/java/org/appdevforall/k2go/redesign/SettingsSubFragment.java b/controller/app/src/main/java/org/appdevforall/k2go/redesign/SettingsSubFragment.java index 3998af3f0..cde2d739b 100644 --- a/controller/app/src/main/java/org/appdevforall/k2go/redesign/SettingsSubFragment.java +++ b/controller/app/src/main/java/org/appdevforall/k2go/redesign/SettingsSubFragment.java @@ -84,6 +84,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c switch (screen) { case "language": header.setTitle(getString(R.string.k2go_settings_language)); buildLanguage(ctx, list); break; case "about": header.setTitle(getString(R.string.k2go_settings_about)); buildAbout(ctx, list); break; + case "about:version": header.setTitle(getString(R.string.k2go_settings_app_version)); buildVersionDetails(ctx, list); break; case "advanced": header.setTitle(getString(R.string.k2go_settings_advanced)); buildAdvanced(ctx, list); break; case "dns": header.setTitle(getString(R.string.k2go_settings_network_dns)); buildDns(ctx, list); break; case "hotspot": header.setTitle(getString(R.string.k2go_settings_hotspot)); buildHotspot(ctx, list); break; @@ -182,7 +183,8 @@ private String endonymOf(String tag) { // ---- About ---- private void buildAbout(Context ctx, LinearLayout list) { - SettingsUi.infoRow(ctx, list, getString(R.string.k2go_settings_app_version), versionName(ctx)); + SettingsUi.row(ctx, list, getString(R.string.k2go_settings_app_version), null, versionName(ctx), + v -> openSub("about:version")); // ADFA-4984: manual OTA entry ("update on the air"). LibraryActivity owns the UpdateController. // K2GO-403: hidden in the fdroid build, which ships no in-app updater (updates come from F-Droid). if (org.appdevforall.k2go.BuildConfig.OTA_ENABLED) { @@ -213,6 +215,74 @@ private void buildAbout(Context ctx, LinearLayout list) { SettingsUi.preview(ctx, list, getString(R.string.k2go_settings_licenses), null); } + // ---- App version details: Android version and the phone / app / library architectures. + // Each value has its own source (ADR-K2GO-571); the file read runs off the main thread. ---- + private void buildVersionDetails(Context ctx, LinearLayout list) { + final Context app = ctx.getApplicationContext(); + org.appdevforall.k2go.util.AppExecutors.get().io().execute(() -> { + org.appdevforall.k2go.deviceinfo.domain.PlatformInfo p = + org.appdevforall.k2go.deviceinfo.data.PlatformInfoReader.read(app); + list.post(() -> { if (isAdded()) showVersionDetails(ctx, list, p); }); + }); + } + + private void showVersionDetails(Context ctx, LinearLayout list, + org.appdevforall.k2go.deviceinfo.domain.PlatformInfo p) { + StringBuilder copy = new StringBuilder(); + String phone = getString(R.string.k2go_about_sec_phone); + SettingsUi.sectionHeader(ctx, list, phone); + copy.append(phone).append('\n'); + detail(ctx, list, copy, getString(R.string.k2go_about_android), + getString(R.string.k2go_about_android_value, p.androidRelease, p.sdkInt)); + detail(ctx, list, copy, getString(R.string.k2go_about_processor), bits(p.phoneAbi, false)); + detail(ctx, list, copy, getString(R.string.k2go_about_runs_32), + getString(p.phoneRuns32Bit ? R.string.k2go_about_yes : R.string.k2go_about_no)); + + String app = getString(R.string.k2go_about_sec_app); + SettingsUi.sectionHeader(ctx, list, app); + copy.append(app).append('\n'); + detail(ctx, list, copy, getString(R.string.k2go_about_version), versionName(ctx)); + detail(ctx, list, copy, getString(R.string.k2go_about_runs_as), bits(p.appAbi, false)); + + String lib = getString(R.string.k2go_about_sec_library); + SettingsUi.sectionHeader(ctx, list, lib); + copy.append(lib).append('\n'); + String libValue; + switch (p.libraryState) { + case KNOWN: libValue = bits(p.libraryAbi, true); break; + case NOT_INSTALLED: libValue = getString(R.string.k2go_about_not_installed); break; + default: libValue = getString(R.string.k2go_about_unknown); + } + detail(ctx, list, copy, getString(R.string.k2go_about_architecture), libValue); + + final String text = copy.toString().trim(); + SettingsUi.row(ctx, list, getString(R.string.k2go_about_copy), null, null, v -> { + android.content.ClipboardManager cm = + (android.content.ClipboardManager) ctx.getSystemService(Context.CLIPBOARD_SERVICE); + if (cm != null) cm.setPrimaryClip(android.content.ClipData.newPlainText("K2Go", text)); + String msg = getString(R.string.k2go_about_copied); + com.google.android.material.snackbar.Snackbar.make(v, msg, + org.appdevforall.k2go.util.SnackbarDuration.millisForText(msg)).show(); + }); + // Room under the last row so the floating feedback button never covers a value. + list.addView(new View(ctx), new LinearLayout.LayoutParams(-1, SettingsUi.dp(ctx, 96))); + } + + private void detail(Context ctx, LinearLayout list, StringBuilder copy, String title, String value) { + SettingsUi.infoRow(ctx, list, title, value); + copy.append(title).append(": ").append(value).append('\n'); + } + + /** "64-bit (arm64-v8a)", or for the library "32-bit (Debian armhf)": width and the exact id, + * so a reader never has to infer one from the other. */ + private String bits(String abi, boolean debian) { + if (abi == null || abi.isEmpty() || "unknown".equals(abi)) return getString(R.string.k2go_about_unknown); + int b = org.appdevforall.k2go.arch.domain.LibraryArch.bitsOf(abi); + String id = debian ? org.appdevforall.k2go.arch.domain.LibraryArch.debArchOf(abi) : abi; + if (b == 0 || id == null) return abi; + return getString(debian ? R.string.k2go_about_bits_debian : R.string.k2go_about_bits_abi, b, id); + } + private void openAppSettings(Context ctx) { try { ctx.startActivity(new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, diff --git a/controller/app/src/main/res/values-ar/strings.xml b/controller/app/src/main/res/values-ar/strings.xml index c1c44425a..1ece70986 100644 --- a/controller/app/src/main/res/values-ar/strings.xml +++ b/controller/app/src/main/res/values-ar/strings.xml @@ -1583,4 +1583,22 @@ لاحقًا تم الحفظ. يُطبَّق التغيير في المرة القادمة التي يُفتح فيها التطبيق. جارٍ إعادة تشغيل %1$s. سيعود خلال نحو 30 ثانية. + + هذا الهاتف + تطبيق K2Go + المكتبة + المعالج + يشغّل تطبيقات 32 بت + نعم + لا + الإصدار + يعمل كـ + البنية + %1$d بت (%2$s) + %1$d بت (Debian %2$s) + غير مثبتة + غير معروف + نسخ التفاصيل + تم نسخ التفاصيل + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-az/strings.xml b/controller/app/src/main/res/values-az/strings.xml index 8cbd1f4c3..06d86ae43 100644 --- a/controller/app/src/main/res/values-az/strings.xml +++ b/controller/app/src/main/res/values-az/strings.xml @@ -1603,4 +1603,22 @@ Sonra Yadda saxlanıldı. Dəyişiklik tətbiq növbəti dəfə açılanda tətbiq olunur. %1$s yenidən başladılır. Təxminən 30 saniyəyə qayıdacaq. + + Bu telefon + K2Go tətbiqi + Kitabxana + Prosessor + 32-bit tətbiqləri işlədir + Bəli + Xeyr + Versiya + İşləmə rejimi + Arxitektura + %1$d-bit (%2$s) + %1$d-bit (Debian %2$s) + Quraşdırılmayıb + Naməlum + Təfərrüatları kopyala + Təfərrüatlar kopyalandı + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-bg/strings.xml b/controller/app/src/main/res/values-bg/strings.xml index 3000e426a..81efe3718 100644 --- a/controller/app/src/main/res/values-bg/strings.xml +++ b/controller/app/src/main/res/values-bg/strings.xml @@ -1590,4 +1590,22 @@ По-късно Запазено. Промяната се прилага при следващото отваряне на приложението. %1$s се рестартира. Връща се след около 30 секунди. + + Този телефон + Приложение K2Go + Библиотека + Процесор + Изпълнява 32-битови приложения + Да + Не + Версия + Работи като + Архитектура + %1$d-битова (%2$s) + %1$d-битова (Debian %2$s) + Не е инсталирана + Неизвестно + Копирай подробностите + Подробностите са копирани + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-bn/strings.xml b/controller/app/src/main/res/values-bn/strings.xml index 7b6ee7ba1..abd7ef138 100644 --- a/controller/app/src/main/res/values-bn/strings.xml +++ b/controller/app/src/main/res/values-bn/strings.xml @@ -1596,4 +1596,22 @@ পরে সংরক্ষিত হয়েছে। পরের বার অ্যাপ খুললে পরিবর্তনটি প্রয়োগ হবে। %1$s পুনরায় চালু হচ্ছে। প্রায় 30 সেকেন্ডে ফিরে আসবে। + + এই ফোন + K2Go অ্যাপ + লাইব্রেরি + প্রসেসর + ৩২-বিট অ্যাপ চালায় + হ্যাঁ + না + সংস্করণ + যেভাবে চলে + আর্কিটেকচার + %1$d-বিট (%2$s) + %1$d-বিট (Debian %2$s) + ইনস্টল করা নেই + অজানা + বিবরণ কপি করুন + বিবরণ কপি হয়েছে + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-cs/strings.xml b/controller/app/src/main/res/values-cs/strings.xml index 61590e92c..562e8149e 100644 --- a/controller/app/src/main/res/values-cs/strings.xml +++ b/controller/app/src/main/res/values-cs/strings.xml @@ -1590,4 +1590,22 @@ Později Uloženo. Změna se použije při příštím otevření aplikace. %1$s se restartuje. Bude zpět asi za 30 sekund. + + Tento telefon + Aplikace K2Go + Knihovna + Procesor + Spouští 32bitové aplikace + Ano + Ne + Verze + Běží jako + Architektura + %1$d bitů (%2$s) + %1$d bitů (Debian %2$s) + Nenainstalováno + Neznámé + Kopírovat podrobnosti + Podrobnosti zkopírovány + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-de/strings.xml b/controller/app/src/main/res/values-de/strings.xml index 6e4ebafdf..5fbf8781b 100644 --- a/controller/app/src/main/res/values-de/strings.xml +++ b/controller/app/src/main/res/values-de/strings.xml @@ -1583,4 +1583,22 @@ Später Gespeichert. Die Änderung gilt beim nächsten Öffnen der App. %1$s wird neu gestartet. In etwa 30 Sekunden wieder verfügbar. + + Dieses Telefon + K2Go-App + Bibliothek + Prozessor + Führt 32-Bit-Apps aus + Ja + Nein + Version + Läuft als + Architektur + %1$d-Bit (%2$s) + %1$d-Bit (Debian %2$s) + Nicht installiert + Unbekannt + Details kopieren + Details kopiert + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-el/strings.xml b/controller/app/src/main/res/values-el/strings.xml index 625287b98..dac68d42f 100644 --- a/controller/app/src/main/res/values-el/strings.xml +++ b/controller/app/src/main/res/values-el/strings.xml @@ -1590,4 +1590,22 @@ Αργότερα Αποθηκεύτηκε. Η αλλαγή εφαρμόζεται την επόμενη φορά που θα ανοίξει η εφαρμογή. Γίνεται επανεκκίνηση του %1$s. Επιστρέφει σε περίπου 30 δευτερόλεπτα. + + Αυτό το τηλέφωνο + Εφαρμογή K2Go + Βιβλιοθήκη + Επεξεργαστής + Εκτελεί εφαρμογές 32 bit + Ναι + Όχι + Έκδοση + Εκτελείται ως + Αρχιτεκτονική + %1$d bit (%2$s) + %1$d bit (Debian %2$s) + Δεν έχει εγκατασταθεί + Άγνωστο + Αντιγραφή λεπτομερειών + Οι λεπτομέρειες αντιγράφηκαν + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-es/strings.xml b/controller/app/src/main/res/values-es/strings.xml index 783207510..acff22517 100644 --- a/controller/app/src/main/res/values-es/strings.xml +++ b/controller/app/src/main/res/values-es/strings.xml @@ -1659,4 +1659,22 @@ Más tarde Guardado. El cambio se aplica la próxima vez que se abra la app. Reiniciando %1$s. Vuelve en unos 30 segundos. + + Este teléfono + App K2Go + Biblioteca + Procesador + Ejecuta apps de 32 bits + Sí + No + Versión + Se ejecuta como + Arquitectura + %1$d bits (%2$s) + %1$d bits (Debian %2$s) + No instalada + Desconocida + Copiar detalles + Detalles copiados + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-fa/strings.xml b/controller/app/src/main/res/values-fa/strings.xml index 20ed3a323..5d0d19ccf 100644 --- a/controller/app/src/main/res/values-fa/strings.xml +++ b/controller/app/src/main/res/values-fa/strings.xml @@ -1583,4 +1583,22 @@ بعداً ذخیره شد. تغییر دفعه بعد که برنامه باز شود اعمال می‌شود. %1$s در حال راه‌اندازی دوباره است. حدود 30 ثانیه دیگر برمی‌گردد. + + این تلفن + برنامه K2Go + کتابخانه + پردازنده + برنامه‌های ۳۲ بیتی را اجرا می‌کند + بله + خیر + نسخه + اجرا به‌صورت + معماری + %1$d بیتی (%2$s) + %1$d بیتی (Debian %2$s) + نصب نشده + نامشخص + کپی جزئیات + جزئیات کپی شد + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-fr/strings.xml b/controller/app/src/main/res/values-fr/strings.xml index 3a026cc82..6877959b4 100644 --- a/controller/app/src/main/res/values-fr/strings.xml +++ b/controller/app/src/main/res/values-fr/strings.xml @@ -1670,4 +1670,22 @@ Plus tard Enregistré. La modification s\'applique à la prochaine ouverture de l\'application. Redémarrage de %1$s. Retour dans environ 30 secondes. + + Ce téléphone + Application K2Go + Bibliothèque + Processeur + Exécute les apps 32 bits + Oui + Non + Version + S\'exécute en + Architecture + %1$d bits (%2$s) + %1$d bits (Debian %2$s) + Non installée + Inconnue + Copier les détails + Détails copiés + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-gu/strings.xml b/controller/app/src/main/res/values-gu/strings.xml index 0c8544318..a136a9be3 100644 --- a/controller/app/src/main/res/values-gu/strings.xml +++ b/controller/app/src/main/res/values-gu/strings.xml @@ -1596,4 +1596,22 @@ પછી સાચવ્યું. આગલી વાર ઍપ ખુલે ત્યારે ફેરફાર લાગુ થશે. %1$s ફરી શરૂ થઈ રહ્યું છે. લગભગ 30 સેકન્ડમાં પાછું આવશે. + + આ ફોન + K2Go ઍપ + લાઇબ્રેરી + પ્રોસેસર + 32-બિટ ઍપ ચલાવે છે + હા + ના + સંસ્કરણ + આ રીતે ચાલે છે + આર્કિટેક્ચર + %1$d-બિટ (%2$s) + %1$d-બિટ (Debian %2$s) + ઇન્સ્ટોલ કરેલ નથી + અજ્ઞાત + વિગતો કૉપિ કરો + વિગતો કૉપિ થઈ + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-hi/strings.xml b/controller/app/src/main/res/values-hi/strings.xml index e9070fb2d..fc32ab931 100644 --- a/controller/app/src/main/res/values-hi/strings.xml +++ b/controller/app/src/main/res/values-hi/strings.xml @@ -1660,4 +1660,22 @@ बाद में सहेजा गया। अगली बार ऐप खुलने पर बदलाव लागू होगा। %1$s फिर से शुरू हो रहा है। लगभग 30 सेकंड में वापस आएगा। + + यह फ़ोन + K2Go ऐप + लाइब्रेरी + प्रोसेसर + 32-बिट ऐप चलाता है + हाँ + नहीं + संस्करण + इस रूप में चलता है + आर्किटेक्चर + %1$d-बिट (%2$s) + %1$d-बिट (Debian %2$s) + इंस्टॉल नहीं है + अज्ञात + विवरण कॉपी करें + विवरण कॉपी हो गया + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-hu/strings.xml b/controller/app/src/main/res/values-hu/strings.xml index c731b397c..df08eddef 100644 --- a/controller/app/src/main/res/values-hu/strings.xml +++ b/controller/app/src/main/res/values-hu/strings.xml @@ -1583,4 +1583,22 @@ Később Mentve. A módosítás az alkalmazás következő megnyitásakor lép életbe. A(z) %1$s újraindul. Körülbelül 30 másodperc múlva újra elérhető. + + Ez a telefon + K2Go alkalmazás + Könyvtár + Processzor + Futtat 32 bites alkalmazásokat + Igen + Nem + Verzió + Futás módja + Architektúra + %1$d bites (%2$s) + %1$d bites (Debian %2$s) + Nincs telepítve + Ismeretlen + Részletek másolása + Részletek másolva + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-in/strings.xml b/controller/app/src/main/res/values-in/strings.xml index bbb6c0851..b1709c76c 100644 --- a/controller/app/src/main/res/values-in/strings.xml +++ b/controller/app/src/main/res/values-in/strings.xml @@ -1590,4 +1590,22 @@ Nanti Tersimpan. Perubahan berlaku saat aplikasi dibuka berikutnya. Memulai ulang %1$s. Kembali dalam sekitar 30 detik. + + Ponsel ini + Aplikasi K2Go + Perpustakaan + Prosesor + Menjalankan aplikasi 32-bit + Ya + Tidak + Versi + Berjalan sebagai + Arsitektur + %1$d-bit (%2$s) + %1$d-bit (Debian %2$s) + Belum dipasang + Tidak diketahui + Salin detail + Detail disalin + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-it/strings.xml b/controller/app/src/main/res/values-it/strings.xml index 324364231..568c98f7d 100644 --- a/controller/app/src/main/res/values-it/strings.xml +++ b/controller/app/src/main/res/values-it/strings.xml @@ -1583,4 +1583,22 @@ Più tardi Salvato. La modifica si applica alla prossima apertura dell\'app. Riavvio di %1$s in corso. Torna disponibile in circa 30 secondi. + + Questo telefono + App K2Go + Libreria + Processore + Esegue app a 32 bit + Sì + No + Versione + In esecuzione come + Architettura + %1$d bit (%2$s) + %1$d bit (Debian %2$s) + Non installata + Sconosciuta + Copia dettagli + Dettagli copiati + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-ja/strings.xml b/controller/app/src/main/res/values-ja/strings.xml index 3c46d9d72..104dd0559 100644 --- a/controller/app/src/main/res/values-ja/strings.xml +++ b/controller/app/src/main/res/values-ja/strings.xml @@ -1584,4 +1584,22 @@ 後で 保存しました。変更は次にアプリを開いたときに適用されます。 %1$s を再起動しています。約 30 秒で戻ります。 + + このスマートフォン + K2Go アプリ + ライブラリ + プロセッサ + 32 ビットアプリを実行可能 + はい + いいえ + バージョン + 実行モード + アーキテクチャ + %1$d ビット (%2$s) + %1$d ビット (Debian %2$s) + 未インストール + 不明 + 詳細をコピー + 詳細をコピーしました + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-ko/strings.xml b/controller/app/src/main/res/values-ko/strings.xml index 9cba65ba1..311abda2a 100644 --- a/controller/app/src/main/res/values-ko/strings.xml +++ b/controller/app/src/main/res/values-ko/strings.xml @@ -1584,4 +1584,22 @@ 나중에 저장했습니다. 다음에 앱을 열 때 변경 사항이 적용됩니다. %1$s을(를) 다시 시작하는 중입니다. 약 30초 후에 돌아옵니다. + + 이 휴대전화 + K2Go 앱 + 라이브러리 + 프로세서 + 32비트 앱 실행 + 예 + 아니요 + 버전 + 실행 방식 + 아키텍처 + %1$d비트(%2$s) + %1$d비트(Debian %2$s) + 설치되지 않음 + 알 수 없음 + 세부정보 복사 + 세부정보를 복사했습니다 + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-lt/strings.xml b/controller/app/src/main/res/values-lt/strings.xml index f84764d5c..a1b0156f4 100644 --- a/controller/app/src/main/res/values-lt/strings.xml +++ b/controller/app/src/main/res/values-lt/strings.xml @@ -1600,4 +1600,22 @@ Vėliau Išsaugota. Pakeitimas bus pritaikytas kitą kartą atidarius programą. %1$s paleidžiama iš naujo. Grįš maždaug po 30 sekundžių. + + Šis telefonas + K2Go programėlė + Biblioteka + Procesorius + Paleidžia 32 bitų programėles + Taip + Ne + Versija + Veikia kaip + Architektūra + %1$d bitų (%2$s) + %1$d bitų (Debian %2$s) + Neįdiegta + Nežinoma + Kopijuoti išsamią informaciją + Informacija nukopijuota + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-nl/strings.xml b/controller/app/src/main/res/values-nl/strings.xml index a826d8ee8..d82f798af 100644 --- a/controller/app/src/main/res/values-nl/strings.xml +++ b/controller/app/src/main/res/values-nl/strings.xml @@ -1583,4 +1583,22 @@ Later Opgeslagen. De wijziging geldt de volgende keer dat de app opent. %1$s wordt opnieuw gestart. Over ongeveer 30 seconden terug. + + Deze telefoon + K2Go-app + Bibliotheek + Processor + Draait 32-bits apps + Ja + Nee + Versie + Draait als + Architectuur + %1$d-bits (%2$s) + %1$d-bits (Debian %2$s) + Niet geïnstalleerd + Onbekend + Details kopiëren + Details gekopieerd + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-no/strings.xml b/controller/app/src/main/res/values-no/strings.xml index 17f993192..caa9dff64 100644 --- a/controller/app/src/main/res/values-no/strings.xml +++ b/controller/app/src/main/res/values-no/strings.xml @@ -1593,4 +1593,22 @@ Senere Lagret. Endringen gjelder neste gang appen åpnes. Starter %1$s på nytt. Tilbake om omtrent 30 sekunder. + + Denne telefonen + K2Go-appen + Bibliotek + Prosessor + Kjører 32-biters apper + Ja + Nei + Versjon + Kjører som + Arkitektur + %1$d-bit (%2$s) + %1$d-bit (Debian %2$s) + Ikke installert + Ukjent + Kopier detaljer + Detaljer kopiert + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-pl/strings.xml b/controller/app/src/main/res/values-pl/strings.xml index d20854e71..9b1c7a29c 100644 --- a/controller/app/src/main/res/values-pl/strings.xml +++ b/controller/app/src/main/res/values-pl/strings.xml @@ -1593,4 +1593,22 @@ Później Zapisano. Zmiana zostanie zastosowana przy następnym otwarciu aplikacji. Ponowne uruchamianie %1$s. Wróci za około 30 sekund. + + Ten telefon + Aplikacja K2Go + Biblioteka + Procesor + Uruchamia aplikacje 32-bitowe + Tak + Nie + Wersja + Działa jako + Architektura + %1$d-bitowa (%2$s) + %1$d-bitowa (Debian %2$s) + Nie zainstalowano + Nieznana + Kopiuj szczegóły + Skopiowano szczegóły + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-pt/strings.xml b/controller/app/src/main/res/values-pt/strings.xml index 6d9304063..4bf9e4f99 100644 --- a/controller/app/src/main/res/values-pt/strings.xml +++ b/controller/app/src/main/res/values-pt/strings.xml @@ -1662,4 +1662,22 @@ Mais tarde Guardado. A alteração aplica-se na próxima vez que a app abrir. A reiniciar %1$s. Volta em cerca de 30 segundos. + + Este telefone + App K2Go + Biblioteca + Processador + Executa apps de 32 bits + Sim + Não + Versão + Executa como + Arquitetura + %1$d bits (%2$s) + %1$d bits (Debian %2$s) + Não instalada + Desconhecida + Copiar detalhes + Detalhes copiados + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-ro/strings.xml b/controller/app/src/main/res/values-ro/strings.xml index bd9a8260d..f704df1dd 100644 --- a/controller/app/src/main/res/values-ro/strings.xml +++ b/controller/app/src/main/res/values-ro/strings.xml @@ -1583,4 +1583,22 @@ Mai târziu Salvat. Modificarea se aplică la următoarea deschidere a aplicației. Se repornește %1$s. Revine în aproximativ 30 de secunde. + + Acest telefon + Aplicația K2Go + Bibliotecă + Procesor + Rulează aplicații pe 32 de biți + Da + Nu + Versiune + Rulează ca + Arhitectură + %1$d biți (%2$s) + %1$d biți (Debian %2$s) + Neinstalată + Necunoscută + Copiază detaliile + Detalii copiate + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-ru-rRU/strings.xml b/controller/app/src/main/res/values-ru-rRU/strings.xml index 98cb4916b..54597714e 100644 --- a/controller/app/src/main/res/values-ru-rRU/strings.xml +++ b/controller/app/src/main/res/values-ru-rRU/strings.xml @@ -1659,4 +1659,22 @@ Позже Сохранено. Изменение применится при следующем открытии приложения. Перезапуск %1$s. Вернётся примерно через 30 секунд. + + Этот телефон + Приложение K2Go + Библиотека + Процессор + Запускает 32-битные приложения + Да + Нет + Версия + Работает как + Архитектура + %1$d-бит (%2$s) + %1$d-бит (Debian %2$s) + Не установлена + Неизвестно + Копировать сведения + Сведения скопированы + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-sk/strings.xml b/controller/app/src/main/res/values-sk/strings.xml index 9db2d5b6f..5423eccf4 100644 --- a/controller/app/src/main/res/values-sk/strings.xml +++ b/controller/app/src/main/res/values-sk/strings.xml @@ -1590,4 +1590,22 @@ Neskôr Uložené. Zmena sa použije pri ďalšom otvorení aplikácie. %1$s sa reštartuje. Bude späť asi o 30 sekúnd. + + Tento telefón + Aplikácia K2Go + Knižnica + Procesor + Spúšťa 32-bitové aplikácie + Áno + Nie + Verzia + Beží ako + Architektúra + %1$d bitov (%2$s) + %1$d bitov (Debian %2$s) + Nenainštalované + Neznáme + Kopírovať podrobnosti + Podrobnosti skopírované + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-sr/strings.xml b/controller/app/src/main/res/values-sr/strings.xml index 6d8cb7b37..6175c7975 100644 --- a/controller/app/src/main/res/values-sr/strings.xml +++ b/controller/app/src/main/res/values-sr/strings.xml @@ -1596,4 +1596,22 @@ Касније Сачувано. Измена се примењује при следећем отварању апликације. %1$s се поново покреће. Враћа се за око 30 секунди. + + Овај телефон + Апликација K2Go + Библиотека + Процесор + Покреће 32-битне апликације + Да + Не + Верзија + Ради као + Архитектура + %1$d-битна (%2$s) + %1$d-битна (Debian %2$s) + Није инсталирана + Непознато + Копирај детаље + Детаљи су копирани + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-sw/strings.xml b/controller/app/src/main/res/values-sw/strings.xml index 1ec5c1e49..4a9e7db63 100644 --- a/controller/app/src/main/res/values-sw/strings.xml +++ b/controller/app/src/main/res/values-sw/strings.xml @@ -1603,4 +1603,22 @@ Baadaye Imehifadhiwa. Mabadiliko yatatumika programu itakapofunguliwa tena. Inaanzisha upya %1$s. Itarudi baada ya takriban sekunde 30. + + Simu hii + Programu ya K2Go + Maktaba + Kichakataji + Huendesha programu za biti 32 + Ndiyo + Hapana + Toleo + Inaendeshwa kama + Muundo + Biti %1$d (%2$s) + Biti %1$d (Debian %2$s) + Haijasakinishwa + Haijulikani + Nakili maelezo + Maelezo yamenakiliwa + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-ta/strings.xml b/controller/app/src/main/res/values-ta/strings.xml index fcc119ba2..d472bedb4 100644 --- a/controller/app/src/main/res/values-ta/strings.xml +++ b/controller/app/src/main/res/values-ta/strings.xml @@ -1603,4 +1603,22 @@ பிறகு சேமிக்கப்பட்டது. அடுத்த முறை ஆப் திறக்கும்போது மாற்றம் பயன்படுத்தப்படும். %1$s மீண்டும் தொடங்குகிறது. சுமார் 30 வினாடிகளில் திரும்பும். + + இந்த ஃபோன் + K2Go ஆப் + நூலகம் + செயலி + 32-பிட் ஆப்களை இயக்கும் + ஆம் + இல்லை + பதிப்பு + இயங்கும் விதம் + கட்டமைப்பு + %1$d-பிட் (%2$s) + %1$d-பிட் (Debian %2$s) + நிறுவப்படவில்லை + தெரியவில்லை + விவரங்களை நகலெடு + விவரங்கள் நகலெடுக்கப்பட்டன + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-tr/strings.xml b/controller/app/src/main/res/values-tr/strings.xml index 778da4735..38111a2c0 100644 --- a/controller/app/src/main/res/values-tr/strings.xml +++ b/controller/app/src/main/res/values-tr/strings.xml @@ -1583,4 +1583,22 @@ Daha sonra Kaydedildi. Değişiklik, uygulama bir sonraki açılışta uygulanır. %1$s yeniden başlatılıyor. Yaklaşık 30 saniye içinde geri gelir. + + Bu telefon + K2Go uygulaması + Kitaplık + İşlemci + 32 bit uygulamaları çalıştırır + Evet + Hayır + Sürüm + Çalışma biçimi + Mimari + %1$d bit (%2$s) + %1$d bit (Debian %2$s) + Yüklü değil + Bilinmiyor + Ayrıntıları kopyala + Ayrıntılar kopyalandı + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-uk/strings.xml b/controller/app/src/main/res/values-uk/strings.xml index eaca7fe3b..3d81f3250 100644 --- a/controller/app/src/main/res/values-uk/strings.xml +++ b/controller/app/src/main/res/values-uk/strings.xml @@ -1583,4 +1583,22 @@ Пізніше Збережено. Зміна застосується під час наступного відкриття застосунку. Перезапуск %1$s. Повернеться приблизно за 30 секунд. + + Цей телефон + Застосунок K2Go + Бібліотека + Процесор + Запускає 32-бітні застосунки + Так + Ні + Версія + Працює як + Архітектура + %1$d-біт (%2$s) + %1$d-біт (Debian %2$s) + Не встановлено + Невідомо + Копіювати відомості + Відомості скопійовано + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-vi/strings.xml b/controller/app/src/main/res/values-vi/strings.xml index 4db299cad..4494b3be8 100644 --- a/controller/app/src/main/res/values-vi/strings.xml +++ b/controller/app/src/main/res/values-vi/strings.xml @@ -1583,4 +1583,22 @@ Để sau Đã lưu. Thay đổi sẽ áp dụng vào lần mở ứng dụng tiếp theo. Đang khởi động lại %1$s. Sẽ trở lại sau khoảng 30 giây. + + Điện thoại này + Ứng dụng K2Go + Thư viện + Bộ xử lý + Chạy ứng dụng 32 bit + Có + Không + Phiên bản + Chạy dưới dạng + Kiến trúc + %1$d bit (%2$s) + %1$d bit (Debian %2$s) + Chưa cài đặt + Không xác định + Sao chép chi tiết + Đã sao chép chi tiết + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-yo/strings.xml b/controller/app/src/main/res/values-yo/strings.xml index e1b47f9e9..5357183bc 100644 --- a/controller/app/src/main/res/values-yo/strings.xml +++ b/controller/app/src/main/res/values-yo/strings.xml @@ -1603,4 +1603,22 @@ Nígbà míràn A ti fi pamọ́. Àyípadà náà yóò ṣiṣẹ́ nígbà tí a bá ṣí áàpù náà nígbà míràn. Ń tún %1$s bẹ̀rẹ̀. Yóò padà ní nǹkan bí ìṣẹ́jú-àáyá 30. + + Fóònù yìí + Áàpù K2Go + Ìkàwé + Ẹ̀rọ ìṣiṣẹ́ + Ń ṣiṣẹ́ àwọn áàpù 32-bit + Bẹ́ẹ̀ni + Rárá + Ẹ̀yà + Ń ṣiṣẹ́ bí + Ìgbékalẹ̀ + %1$d-bit (%2$s) + %1$d-bit (Debian %2$s) + Kò tíì fi sórí + Àìmọ̀ + Da àlàyé kọ + A ti da àlàyé kọ + %1$s (API %2$d) diff --git a/controller/app/src/main/res/values-zh-rCN/strings.xml b/controller/app/src/main/res/values-zh-rCN/strings.xml index ec6ad6707..b8d7e6720 100644 --- a/controller/app/src/main/res/values-zh-rCN/strings.xml +++ b/controller/app/src/main/res/values-zh-rCN/strings.xml @@ -1584,4 +1584,22 @@ 稍后 已保存。更改将在下次打开应用时生效。 正在重新启动 %1$s。约 30 秒后恢复。 + + 此手机 + K2Go 应用 + 资料库 + 处理器 + 可运行 32 位应用 + 是 + 否 + 版本 + 运行模式 + 架构 + %1$d 位(%2$s) + %1$d 位(Debian %2$s) + 未安装 + 未知 + 复制详细信息 + 已复制详细信息 + %1$s(API %2$d) diff --git a/controller/app/src/main/res/values/strings.xml b/controller/app/src/main/res/values/strings.xml index 3aaafdd7b..ae46bda49 100644 --- a/controller/app/src/main/res/values/strings.xml +++ b/controller/app/src/main/res/values/strings.xml @@ -1779,4 +1779,23 @@ Later Saved. The change applies the next time the app opens. Restarting %1$s. It is back in about 30 seconds. + + Android + This phone + K2Go app + Library + Processor + Runs 32-bit apps + Yes + No + Version + Runs as + Architecture + %1$d-bit (%2$s) + %1$d-bit (Debian %2$s) + Not installed + Unknown + Copy details + Details copied + %1$s (API %2$d) diff --git a/controller/app/src/test/java/org/appdevforall/k2go/deviceinfo/domain/PlatformInfoTest.java b/controller/app/src/test/java/org/appdevforall/k2go/deviceinfo/domain/PlatformInfoTest.java new file mode 100644 index 000000000..14577a9bb --- /dev/null +++ b/controller/app/src/test/java/org/appdevforall/k2go/deviceinfo/domain/PlatformInfoTest.java @@ -0,0 +1,32 @@ +package org.appdevforall.k2go.deviceinfo.domain; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import org.junit.Test; + +public class PlatformInfoTest { + + private static PlatformInfo lib(boolean tree, String abi) { + return new PlatformInfo("16", 36, "arm64-v8a", true, "arm64-v8a", tree, abi); + } + + @Test + public void noTreeIsNotInstalledEvenWithAnAbi() { + PlatformInfo p = lib(false, "armeabi-v7a"); + assertEquals(PlatformInfo.LibraryState.NOT_INSTALLED, p.libraryState); + assertNull(p.libraryAbi); + } + + @Test + public void treeWithAbiIsKnown() { + PlatformInfo p = lib(true, "armeabi-v7a"); + assertEquals(PlatformInfo.LibraryState.KNOWN, p.libraryState); + assertEquals("armeabi-v7a", p.libraryAbi); + } + + @Test + public void treeWithoutAbiIsUnknown() { + assertEquals(PlatformInfo.LibraryState.UNKNOWN, lib(true, null).libraryState); + } +}