ADFA-4900: bank wizard maps selection, apply post-install (no live runrole pre-install)

In the initial-setup wizard there is no rootfs yet, so running runrole maps fails
(can't sanitize binding installed-rootfs). Mirror the Books/ZIM pattern: in the wizard
Maps banks the per-layer selection (MapsWishlist) and returns to the Get More hub with
an 'Add to your setup' action instead of installing live; MapsProvisioner applies it
post-install by handing the selection to the module-queue engine (runrole maps). Drain
maps at the same post-install points as Books/ZIM (SetupProgressActivity, LibraryHome).
Post-install Get More keeps installing directly (mapsWizard=false).

Author: luisguzman-adfa

controller/app/src/main/java/org/iiab/controller/redesign/LibraryHomeFragment.java

@@ -255,7 +255,8 @@ private void refreshStatuses() {
         // fail with no content installed. So gate the drain on the REST API actually answering;
         // the wishlist is untouched until then, and this poll (~3s) retries until it's ready.
         if (alive && !provisionProbing
-                && (BooksProvisioner.hasPending(requireContext()) || ZimProvisioner.hasPending(requireContext()))) {
+                && (BooksProvisioner.hasPending(requireContext()) || ZimProvisioner.hasPending(requireContext())
+                    || MapsProvisioner.hasPending(requireContext()))) {   // ADFA-4900
             provisionProbing = true;
             AppExecutors.get().io().execute(() -> {
                 final boolean ready = RestReadiness.apiReady();
@@ -269,6 +270,7 @@ private void refreshStatuses() {
                     android.util.Log.i("K2Go-Provision", "REST API ready -> draining wishlists (home fallback)");
                     if (BooksProvisioner.hasPending(requireContext())) BooksProvisioner.drain(requireContext());
                     if (ZimProvisioner.hasPending(requireContext())) ZimProvisioner.drain(requireContext());
+                    if (MapsProvisioner.hasPending(requireContext())) MapsProvisioner.drain(requireContext()); // ADFA-4900
                 });
             });
         }

controller/app/src/main/java/org/iiab/controller/redesign/MapsConfirmFragment.java

@@ -75,11 +75,17 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
         final String[] levels = a != null ? a.getStringArray(ARG_LEVELS) : null;
 
+        // ADFA-4900: in the wizard (pre-install) Maps banks the selection; post-install it installs.
+        final boolean wizard = getActivity() instanceof SetupLibraryActivity
+                && ((SetupLibraryActivity) getActivity()).isMapsWizard();
+
         Button start = root.findViewById(R.id.k2go_start_btn);
-        start.setText(getString(R.string.k2go_maps_start_building, fmt(total)));
+        start.setText(getString(wizard ? R.string.k2go_maps_add_setup_fmt : R.string.k2go_maps_start_building, fmt(total)));
         start.setOnClickListener(v -> {
             if (getActivity() instanceof SetupLibraryActivity) {
-                ((SetupLibraryActivity) getActivity()).openMapsPreparing(levels);
+                SetupLibraryActivity act = (SetupLibraryActivity) getActivity();
+                if (act.isMapsWizard()) act.mapsWizardConfirm(levels);
+                else act.openMapsPreparing(levels);
             }
         });
 

controller/app/src/main/java/org/iiab/controller/redesign/MapsProvisioner.java

@@ -0,0 +1,53 @@
+/*
+ * ============================================================================
+ * Name        : MapsProvisioner.java
+ * Author      : AppDevForAll
+ * Copyright   : Copyright (c) 2026 AppDevForAll
+ * Description : ADFA-4900. Post-install drain of the maps wishlist. Mirrors Books/ZimProvisioner:
+ *               once the system is installed, it hands the banked per-layer selection to the
+ *               module-queue engine (InstallService ACTION_START_MODULES {"maps"} + the selection),
+ *               which writes the maps_* local_vars and runs runrole maps with the shared verdict /
+ *               revert / progress. Unlike ZIM this does not need the server up, only the rootfs, so
+ *               it can run at the same post-install drain point. Idempotent: cleared once handed off.
+ * ============================================================================
+ */
+package org.iiab.controller.redesign;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.util.Log;
+
+import org.iiab.controller.install.presentation.InstallService;
+import org.iiab.controller.install.presentation.ModuleQueueRepository;
+
+public final class MapsProvisioner {
+    private MapsProvisioner() {}
+
+    private static final String TAG = "K2Go-Provision";
+
+    /** True when there is a banked maps selection waiting to be applied. */
+    public static boolean hasPending(Context ctx) {
+        return MapsWishlist.has(ctx);
+    }
+
+    /** Hand the banked maps selection to the module-queue engine. No-op if empty or a queue is
+     *  already running. Requires the rootfs (runs runrole maps in the proot). */
+    public static void drain(Context ctx) {
+        if (!MapsWishlist.has(ctx)) return;
+        if (ModuleQueueRepository.get().isRunning()) return;
+        final Context app = ctx.getApplicationContext();
+        Intent i = new Intent(app, InstallService.class);
+        i.setAction(InstallService.ACTION_START_MODULES);
+        i.putExtra(InstallService.EXTRA_MODULES, new String[]{"maps"});
+        i.putExtra(InstallService.EXTRA_MAPS_VECTOR, MapsWishlist.base(app));
+        i.putExtra(InstallService.EXTRA_MAPS_SAT, MapsWishlist.sat(app));
+        i.putExtra(InstallService.EXTRA_MAPS_TERRAIN, MapsWishlist.terrain(app));
+        i.putExtra(InstallService.EXTRA_MAPS_SEARCH, MapsWishlist.search(app));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) app.startForegroundService(i);
+        else app.startService(i);
+        Log.i(TAG, "maps drain: handed the banked selection to InstallService (runrole maps)");
+        // Handed off; the module-queue owns the run from here.
+        MapsWishlist.clear(app);
+    }
+}

controller/app/src/main/java/org/iiab/controller/redesign/MapsWishlist.java

@@ -0,0 +1,46 @@
+/*
+ * ============================================================================
+ * Name        : MapsWishlist.java
+ * Author      : AppDevForAll
+ * Copyright   : Copyright (c) 2026 AppDevForAll
+ * Description : ADFA-4900. The persisted maps per-layer selection chosen in the wizard, before the
+ *               system exists. Mirrors ZimWishlist/BooksWishlist: the wizard cannot run runrole
+ *               (no rootfs yet), so it banks the selection here and MapsProvisioner applies it
+ *               after the system is installed. Unlike ZIM/Books (a list of items), maps is a single
+ *               selection (base / satellite / terrain / search), so this stores one record.
+ * ============================================================================
+ */
+package org.iiab.controller.redesign;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+public final class MapsWishlist {
+    private MapsWishlist() {}
+
+    private static final String PREFS = "k2go_maps_wishlist";
+
+    private static SharedPreferences prefs(Context ctx) {
+        return ctx.getApplicationContext().getSharedPreferences(PREFS, Context.MODE_PRIVATE);
+    }
+
+    /** Bank the wizard selection. Layer keys use the maps role's values; satellite/terrain "none"
+     *  = off, and {@code search} = the static pop-1k-cities engine on/off. */
+    public static void save(Context ctx, String base, String sat, String terrain, boolean search) {
+        prefs(ctx).edit()
+                .putBoolean("has", true)
+                .putString("base", base == null ? "osm-z11" : base)
+                .putString("sat", sat == null ? "none" : sat)
+                .putString("terrain", terrain == null ? "none" : terrain)
+                .putBoolean("search", search)
+                .apply();
+    }
+
+    public static boolean has(Context ctx) { return prefs(ctx).getBoolean("has", false); }
+    public static String base(Context ctx) { return prefs(ctx).getString("base", "osm-z11"); }
+    public static String sat(Context ctx) { return prefs(ctx).getString("sat", "none"); }
+    public static String terrain(Context ctx) { return prefs(ctx).getString("terrain", "none"); }
+    public static boolean search(Context ctx) { return prefs(ctx).getBoolean("search", false); }
+
+    public static void clear(Context ctx) { prefs(ctx).edit().clear().apply(); }
+}

controller/app/src/main/java/org/iiab/controller/redesign/SetupLibraryActivity.java

@@ -40,6 +40,10 @@ public class SetupLibraryActivity extends AppCompatActivity {
     // then persists the cart to ZimWishlist instead of starting a live download.
     private boolean zimWizard = false;
 
+    // ADFA-4900: true while the Maps flow runs inside the wizard (pre-install). The Confirm step then
+    // banks the per-layer selection to MapsWishlist instead of starting a live runrole.
+    private boolean mapsWizard = false;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -118,6 +122,7 @@ private InstallationPlanner.Tier readInstalledTier() {
      *  the rest are navigable placeholders for now so the hub is reviewable. */
     public void openContentType(String key, String title) {
         zimWizard = false;   // live (post-install) path; the ZIM terminal downloads, not wishlists
+        mapsWizard = false;  // ADFA-4900: live (post-install) path; Maps installs, not wishlists
         androidx.fragment.app.Fragment f;
         if ("maps".equals(key)) f = new MapsLandingFragment();
         else if ("wikipedia".equals(key)) f = new ZimLandingFragment();   // Wikipedia & ZIM content
@@ -190,9 +195,9 @@ public void goToWizardContent() {
     public void openWizardContent(String key, String title) {
         if ("books".equals(key)) { openBooksWizard(); return; }
         if ("wikipedia".equals(key)) { openZimWizard(); return; }
-        // Maps is identical pre/post-install (it stops everything and runs the proot), so it reuses
-        // the existing Maps flow rather than a wizard-specific mode.
-        if ("maps".equals(key)) { openContentType(key, title); return; }
+        // ADFA-4900: in the wizard there is no rootfs yet, so Maps cannot run runrole. It banks the
+        // per-layer selection (MapsWishlist) like Books/ZIM and MapsProvisioner applies it post-install.
+        if ("maps".equals(key)) { openContentType(key, title); mapsWizard = true; return; }
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.k2go_setup_host, PlaceholderFragment.newInstance(title))
                 .addToBackStack("wizard_" + key)
@@ -261,6 +266,21 @@ public void openMapsPreparing(String[] levels) {
                 .commit();
     }
 
+    /** ADFA-4900: true while Maps runs inside the wizard (pre-install) — Confirm banks the selection. */
+    public boolean isMapsWizard() { return mapsWizard; }
+
+    /** ADFA-4900: Maps Confirm terminal in wizard mode — bank the per-layer selection to MapsWishlist
+     *  (MapsProvisioner applies it post-install) and return to the Get More hub. No live runrole. */
+    public void mapsWizardConfirm(String[] levels) {
+        String base = levels != null && levels.length > 0 && levels[0] != null ? levels[0] : "osm-z11";
+        String sat = levels != null && levels.length > 1 && levels[1] != null ? levels[1] : "none";
+        String ter = levels != null && levels.length > 2 && levels[2] != null ? levels[2] : "none";
+        boolean search = levels != null && levels.length > 3 && levels[3] != null;
+        MapsWishlist.save(this, base, sat, ter, search);
+        getSupportFragmentManager().popBackStack("getmore_maps",
+                androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
+    }
+
     /** ADFA-4900: start the maps install through the module-queue engine (a queue of {"maps"} plus
      *  the per-layer selection). InstallService writes the full maps_* local_vars and runs runrole
      *  with the shared success/failure verdict, revert-on-fail and observable progress. {@code levels}

controller/app/src/main/java/org/iiab/controller/redesign/SetupProgressActivity.java

@@ -130,6 +130,7 @@ public void onBackPressed() {
                         if (!drained) {
                             if (BooksProvisioner.hasPending(SetupProgressActivity.this)) BooksProvisioner.drain(SetupProgressActivity.this);
                             if (ZimProvisioner.hasPending(SetupProgressActivity.this)) ZimProvisioner.drain(SetupProgressActivity.this);
+                            if (MapsProvisioner.hasPending(SetupProgressActivity.this)) MapsProvisioner.drain(SetupProgressActivity.this); // ADFA-4900
                             drained = true;
                         }
                         render();

controller/app/src/main/res/values/strings_k2go.xml

@@ -384,6 +384,7 @@
     <string name="k2go_maps_use_wifi" translatable="false">Use Wi-Fi</string>
     <string name="k2go_maps_keep_charged" translatable="false">Keep charged</string>
     <string name="k2go_maps_start_building" translatable="false">Start building \u00b7 %1$s</string>
+    <string name="k2go_maps_add_setup_fmt" translatable="false">Add to your setup \u00b7 %1$s</string>
     <string name="k2go_maps_keep_using" translatable="false">You can keep using the app meanwhile.</string>
     <string name="k2go_maps_preparing_title" translatable="false">Preparing your maps\u2026</string>
     <string name="k2go_maps_preparing_sub" translatable="false">This can take a while. You can leave it running.</string>