Merge pull request #584 from appdevforall/fix/K2GO-415-hide-wikipedia-32bit

K2GO-415 K2GO-416 fix(runtime-abi): hide 64-bit-only content on all surfaces in a 32-bit runtime

Author: luisguzman-adfa

controller/app/src/main/java/org/appdevforall/k2go/redesign/GetMoreHubFragment.java

@@ -135,6 +135,9 @@ private void computeWizardAvailability() {
         if (tier == InstallationPlanner.Tier.FULL || tier == InstallationPlanner.Tier.STANDARD) {
             available.add("courses");
         }
+        // K2GO-415: drop content whose backing module cannot run in this app runtime (a 32-bit app
+        // cannot run a 64-bit module like Kiwix), so the user cannot pick content with nowhere to land.
+        for (Item it : ITEMS) if (!archSupports(it.endpoint)) available.remove(it.key);
     }
 
     @Override
@@ -262,10 +265,20 @@ private void probe(final Item it) {
         });
     }
 
+    /** K2GO-415: a 64-bit-only module (e.g. Kiwix) has nowhere to land when the app runtime is 32-bit
+     *  (its proot cannot run 64-bit binaries), so its content is not offered there. Keyed on the app
+     *  process bitness via Card.runsOnThisRuntime(); generalizes to any future requires64Bit module. */
+    private static boolean archSupports(String endpoint) {
+        ModuleCards.Card c = ModuleCards.byEndpoint(endpoint);
+        return c == null || c.runsOnThisRuntime();
+    }
+
     /** The items to show: those whose module answered, in the declared order. */
     private List<Item> visibleItems() {
         List<Item> out = new ArrayList<>();
-        for (Item it : ITEMS) if (available.contains(it.key)) out.add(it);
+        // K2GO-415: also gate on the app runtime as defense in depth (live path), so a 64-bit-only
+        // module never shows in a 32-bit runtime even if its endpoint somehow answered.
+        for (Item it : ITEMS) if (available.contains(it.key) && archSupports(it.endpoint)) out.add(it);
         return out;
     }
 

controller/app/src/main/java/org/appdevforall/k2go/redesign/LibraryHomeFragment.java

@@ -187,6 +187,10 @@ private void populateCards() {
         cards.add(new Card("maps",    getString(R.string.k2go_card_maps),     false, R.drawable.ic_card_maps));
         for (java.util.Iterator<Card> it = cards.iterator(); it.hasNext(); ) {
             Card card = it.next();
+            // K2GO-415/416: hide a module the app runtime cannot run (a 64-bit-only module like Kiwix
+            // on a 32-bit app), like Module management and Get more do, instead of showing a permanent
+            // "Not supported" card on Home.
+            if (unsupported(card)) { it.remove(); continue; }
             ModuleCards.Card m = ModuleCards.byEndpoint(card.endpoint);
             if (m != null && HiddenModules.contains(requireContext(), m.key())) it.remove();
         }
@@ -414,8 +418,12 @@ private boolean isScheduled(Card c) {
     @Override public void onResume() { super.onResume(); main.post(poll); }
     @Override public void onPause() { super.onPause(); main.removeCallbacks(poll); }
 
+    // K2GO-416: gate on the APP process bitness (Process.is64Bit()), not the device ABI list, so a
+    // 64-bit-only module is unsupported whenever the app runtime is 32-bit (its proot cannot run it).
+    // Home uses its own Card type (field requires64), so it reads the platform API directly rather than
+    // ModuleCards.Card.runsOnThisRuntime() (which needs a ModuleCards.Card): same single runtime signal.
     private boolean unsupported(Card c) {
-        return c.requires64 && android.os.Build.SUPPORTED_64_BIT_ABIS.length == 0;
+        return c.requires64 && !android.os.Process.is64Bit();
     }
 
     // ADFA-4853: guards a single in-flight readiness probe before the post-install drain.
@@ -488,7 +496,6 @@ private void refreshStatuses() {
                 // answers — and every sheet offered to install a platform that was there. The
                 // fact is asked for where it is needed (applyState, openSheet) instead.
                 applyState(c, GRAY);
-                if (unsupported(c) && c.status != null) c.status.setText(getString(R.string.k2go_not_supported));
             }
             updateHeaderFromCards();
             return;
@@ -540,15 +547,6 @@ private void refreshStatuses() {
         }
 
         for (final Card c : cards) {
-            if (unsupported(c)) {
-                // ADFA-5061: grey, but not "absent". A 64-bit module on a 32-bit device is not
-                // missing — it is never going to be there, which is why the sheet must not offer
-                // to install it. Nothing is recorded, so "nothing established" withholds the
-                // offer where ABSENT would have made it.
-                applyState(c, GRAY);
-                if (c.status != null) c.status.setText(getString(R.string.k2go_not_supported));
-                continue;
-            }
             // ADFA-4828: system is installed. Before the first probe resolves (or while the server
             // is still coming up) show "Connecting", never "Not installed" — the latter only appears
             // once a probe actually reports the content is absent (404 -> GRAY).
@@ -638,7 +636,7 @@ private void updateHeaderFromCards() {
         }
         boolean anyChecking = false, anyReady = false;
         for (Card c : cards) {
-            if (unsupported(c) || c.state == GRAY) continue;   // GRAY = content absent → doesn't gate
+            if (c.state == GRAY) continue;   // GRAY = content absent, does not gate
             if (c.state == AMBER) anyChecking = true;
             else if (c.state == GREEN) anyReady = true;
         }

controller/app/src/main/java/org/appdevforall/k2go/redesign/ModuleCards.java

@@ -46,6 +46,15 @@ public static final class Card {
         public String key() { return module.yamlBaseKey; }
         public String endpoint() { return module.endpoint; }
         public boolean requires64Bit() { return module.requires64Bit; }
+
+        /** K2GO-415: true when this module can run in the current app runtime. A 64-bit-only module
+         *  (e.g. Kiwix) runs inside the app's proot, so what matters is the APP process bitness
+         *  (Process.is64Bit()), NOT the device ABI list: a 32-bit app cannot run a 64-bit module even
+         *  on 64-bit hardware. Same signal RootfsManifest uses to pick the rootfs arch. One home for
+         *  this check so callers do not re-derive it. */
+        public boolean runsOnThisRuntime() {
+            return !requires64Bit() || android.os.Process.is64Bit();
+        }
     }
 
     // The modules we present as cards, in display order. maps is added when its selector flow lands

controller/app/src/main/java/org/appdevforall/k2go/redesign/ModuleHubFragment.java

@@ -16,7 +16,6 @@
 package org.appdevforall.k2go.redesign;
 
 import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -102,10 +101,6 @@ public class ModuleHubFragment extends Fragment {
 
     private int px(int dp) { return Math.round(dp * getResources().getDisplayMetrics().density); }
 
-    private static boolean is64Bit() {
-        return Build.SUPPORTED_64_BIT_ABIS != null && Build.SUPPORTED_64_BIT_ABIS.length > 0;
-    }
-
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle s) {
@@ -202,7 +197,8 @@ private void probeAll() {
     private void confirmByProbe(final int gen) {
         final Set<String> answered = new HashSet<>();
         for (final ModuleCards.Card c : ModuleCards.all()) {
-            if (c.requires64Bit() && !is64Bit()) continue;   // hidden on this device
+            // K2GO-416: delegate the runtime-ABI rule to its owner (Card), do not re-derive it here.
+            if (!c.runsOnThisRuntime()) continue;   // 64-bit-only module cannot run in this app runtime
             if (installed.contains(c.key())) continue;       // disk already says yes
             // K2GO-393: a completion-gated module (maps, a proot install) is answered by its
             // iiab_state marker, which the disk floor above already read. It always writes that
@@ -298,7 +294,7 @@ private void buildCards() {
         // anything; it is the only place the answer exists.
         List<ModuleCards.Card> items = new ArrayList<>();
         for (ModuleCards.Card c : ModuleCards.all()) {
-            if (c.requires64Bit() && !is64Bit()) continue;   // never going to run here
+            if (!c.runsOnThisRuntime()) continue;   // never going to run in this app runtime
             items.add(c);
         }
         boolean anyInstallable = false;