@@ -241,10 +241,12 @@ private void refreshStatuses() {
             return;
         }
 
-        // ADFA-4853: system is installed and the server is up — drain any wizard Books order into
-        // the live download engine (one-shot; the wishlist is cleared once handed off).
-        if (alive && BooksProvisioner.hasPending(requireContext())) {
-            BooksProvisioner.drain(requireContext());
+        // ADFA-4853: system is installed and the server is up — drain any wizard content orders
+        // (Books, ZIM) into the live download engines (one-shot; each wishlist is cleared once
+        // handed off, and each service downloads one item at a time with per-item retry).
+        if (alive) {
+            if (BooksProvisioner.hasPending(requireContext())) BooksProvisioner.drain(requireContext());
+            if (ZimProvisioner.hasPending(requireContext())) ZimProvisioner.drain(requireContext());
         }
 
         for (final Card c : cards) {
 
@@ -0,0 +1,76 @@
+/*
+ * ============================================================================
+ * Name        : ZimProvisioner.java
+ * Author      : AppDevForAll
+ * Copyright   : Copyright (c) 2026 AppDevForAll
+ * Description : ADFA-4853. Post-install drain of the ZIM/Wikipedia wishlist. Mirrors
+ *               BooksProvisioner: once the system is installed and the server is up, it resolves
+ *               each banked selector "project|lang|flavour" against the offline catalog
+ *               (kiwix_catalog.csv, via KiwixCatalog) into a real ZIM file + label + size, then
+ *               hands them to the existing ZimDownloadService (the live REST route, foreground,
+ *               per-item retry). ZIM is a LIVE operation (server up), so this must only run when
+ *               the server is alive. Idempotent: the wishlist is cleared once handed off.
+ * ============================================================================
+ */
+package org.iiab.controller.redesign;
+
+import android.content.Context;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class ZimProvisioner {
+    private ZimProvisioner() {}
+
+    /** True when there is a banked ZIM order waiting to be provisioned. */
+    public static boolean hasPending(Context ctx) {
+        return ZimWishlist.size(ctx) > 0;
+    }
+
+    /** Resolve the wishlist against the offline catalog and hand it to ZimDownloadService.
+     *  No-op if empty or a session is already running. Requires the server to be up. */
+    public static void drain(Context ctx) {
+        if (ZimDownloadService.isRunning() || ZimDownloadService.hasSession()) return;
+        if (ZimWishlist.size(ctx) == 0) return;
+        final Context app = ctx.getApplicationContext();
+        KiwixCatalog.getOrFetch(app, new KiwixCatalog.Listener() {
+            @Override public void onReady(JSONObject catalog) { resolveAndStart(app, catalog); }
+            @Override public void onError(String message) { /* leave the wishlist for a later retry */ }
+        });
+    }
+
+    private static void resolveAndStart(Context app, JSONObject catalog) {
+        JSONArray order = ZimWishlist.all(app);
+        List<String> files = new ArrayList<>(), labels = new ArrayList<>();
+        List<Long> bytes = new ArrayList<>();
+        for (int i = 0; i < order.length(); i++) {
+            JSONObject o = order.optJSONObject(i);
+            if (o == null) continue;
+            String[] p = o.optString("key", "").split("\\|", 3);   // project | lang | entryKey
+            if (p.length < 3) continue;
+            JSONObject ld = KiwixCatalog.langData(catalog, p[0], p[1]);
+            JSONObject v = ld != null ? ld.optJSONObject(p[2]) : null;
+            if (v == null) continue;
+            files.add(v.optString("file"));
+            labels.add(label(p[0], v.optString("creator"), v.optString("flavour")));
+            bytes.add(v.optLong("size", o.optLong("bytes", 0)));
+        }
+        if (files.isEmpty()) { ZimWishlist.clear(app); return; }
+        long[] b = new long[bytes.size()];
+        for (int i = 0; i < b.length; i++) b[i] = bytes.get(i);
+        ZimDownloadService.start(app, files.toArray(new String[0]), labels.toArray(new String[0]), b);
+        ZimWishlist.clear(app);   // handed off; the service owns retry from here
+    }
+
+    private static String label(String project, String creator, String flavour) {
+        KiwixCategories.Category c = KiwixCategories.byKey(project);
+        String cat = c != null ? c.title : project;
+        if (flavour == null || flavour.isEmpty() || "all".equalsIgnoreCase(flavour)) {
+            return (creator == null || creator.isEmpty()) ? cat : cat + " · " + creator;
+        }
+        return cat + " · " + flavour.replace('_', ' ').replace('-', ' ');
+    }
+}