@capgo/capacitor-updater 5.50.2 → 5.51.15

package/android/src/main/java/ee/forgr/capacitor_updater/DownloadWorkerManager.java

@@ -1,6 +1,7 @@
 package ee.forgr.capacitor_updater;
 
 import android.content.Context;
+import android.os.Build;
 import androidx.work.BackoffPolicy;
 import androidx.work.Configuration;
 import androidx.work.Constraints;
@@ -8,9 +9,18 @@ import androidx.work.Data;
 import androidx.work.ExistingWorkPolicy;
 import androidx.work.NetworkType;
 import androidx.work.OneTimeWorkRequest;
+import androidx.work.OutOfQuotaPolicy;
+import androidx.work.WorkInfo;
 import androidx.work.WorkManager;
 import androidx.work.WorkRequest;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 public class DownloadWorkerManager {
 
@@ -21,6 +31,7 @@ public class DownloadWorkerManager {
     }
 
     private static volatile boolean isInitialized = false;
+    private static final ExecutorService cancelExecutor = Executors.newSingleThreadExecutor();
 
     private static synchronized void initializeIfNeeded(Context context) {
         if (!isInitialized) {
@@ -120,6 +131,11 @@ public class DownloadWorkerManager {
             .addTag(id)
             .addTag(version)
             .addTag("capacitor_updater_download");
+        // Android 12+ expedited jobs skip the WorkManager delay without a
+        // foreground service. Older APIs require getForegroundInfo().
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            workRequestBuilder.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST);
+        }
 
         // More aggressive retry policy for emulators
         if (isEmulator) {
@@ -142,17 +158,101 @@ public class DownloadWorkerManager {
 
     public static void cancelVersionDownload(Context context, String version) {
         initializeIfNeeded(context.getApplicationContext());
-        WorkManager.getInstance(context).cancelAllWorkByTag(version);
+        cancelExecutor.execute(() -> cancelVersionDownloadInternal(context, version, false));
+    }
+
+    public static boolean cancelVersionDownloadAndAwait(Context context, String version) {
+        initializeIfNeeded(context.getApplicationContext());
+        Future<?> future = cancelExecutor.submit(() -> cancelVersionDownloadInternal(context, version, true));
+        try {
+            future.get(10, TimeUnit.SECONDS);
+            return true;
+        } catch (TimeoutException e) {
+            future.cancel(true);
+            logger.error("Timed out awaiting version download cancel");
+            return false;
+        } catch (Exception e) {
+            logger.error("Error awaiting version download cancel: " + e.getMessage());
+            return false;
+        }
+    }
+
+    private static Set<String> collectManifestIdsForVersion(WorkManager workManager, String version) {
+        Set<String> downloadIds = new HashSet<>();
+        try {
+            List<WorkInfo> workInfos = workManager.getWorkInfosByTag(version).get();
+            for (WorkInfo workInfo : workInfos) {
+                for (String tag : workInfo.getTags()) {
+                    if (!"capacitor_updater_download".equals(tag) && !version.equals(tag)) {
+                        downloadIds.add(tag);
+                    }
+                }
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IllegalStateException("Interrupted while collecting manifest ids before version cancel", e);
+        } catch (Exception e) {
+            logger.error("Error collecting manifest ids before version cancel: " + e.getMessage());
+        }
+        return downloadIds;
+    }
+
+    private static void clearManifestIds(Set<String> downloadIds) {
+        for (String downloadId : downloadIds) {
+            DataManager.getInstance().clearManifest(downloadId);
+        }
+    }
+
+    private static void cancelVersionDownloadInternal(Context context, String version, boolean awaitFinished) {
+        if (Thread.currentThread().isInterrupted()) {
+            return;
+        }
+        WorkManager workManager = WorkManager.getInstance(context);
+        Set<String> downloadIds = collectManifestIdsForVersion(workManager, version);
+        workManager.cancelAllWorkByTag(version);
+        clearManifestIds(downloadIds);
+        if (awaitFinished) {
+            awaitVersionWorkFinished(workManager, version);
+        }
+    }
+
+    private static void awaitVersionWorkFinished(WorkManager workManager, String version) {
+        for (int i = 0; i < 100; i++) {
+            if (Thread.currentThread().isInterrupted()) {
+                throw new IllegalStateException("Interrupted while waiting for version download cancel");
+            }
+            try {
+                boolean anyActive = workManager
+                    .getWorkInfosByTag(version)
+                    .get()
+                    .stream()
+                    .anyMatch((workInfo) -> !workInfo.getState().isFinished());
+                if (!anyActive) {
+                    return;
+                }
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new IllegalStateException("Interrupted while waiting for download cancel", e);
+            } catch (Exception e) {
+                throw new IllegalStateException("Error waiting for download cancel: " + e.getMessage(), e);
+            }
+        }
+        throw new IllegalStateException("Timed out waiting for version download cancel: " + version);
     }
 
     public static void cancelBundleDownload(Context context, String id, String version) {
         String uniqueWorkName = "bundle_" + id + "_" + version;
         initializeIfNeeded(context.getApplicationContext());
-        WorkManager.getInstance(context).cancelUniqueWork(uniqueWorkName);
+        WorkManager workManager = WorkManager.getInstance(context);
+        workManager.cancelUniqueWork(uniqueWorkName);
+        DataManager.getInstance().clearManifest(id);
     }
 
     public static void cancelAllDownloads(Context context) {
         initializeIfNeeded(context.getApplicationContext());
-        WorkManager.getInstance(context).cancelAllWorkByTag("capacitor_updater_download");
+        WorkManager workManager = WorkManager.getInstance(context);
+        workManager.cancelAllWorkByTag("capacitor_updater_download");
+        DataManager.getInstance().clearAllManifests();
     }
 }

package/android/src/main/java/ee/forgr/capacitor_updater/InternalUtils.java

@@ -22,7 +22,7 @@ public class InternalUtils {
     public static String getPackageName(PackageManager pm, String packageName) {
         try {
             PackageInfo pInfo = getPackageInfoInternal(pm, packageName);
-            return (pInfo != null) ? pInfo.packageName : null;
+            return pInfo != null ? pInfo.packageName : null;
         } catch (PackageManager.NameNotFoundException e) {
             // Exception is handled internally, and null is returned to indicate the package name could not be retrieved
             return null;

package/android/src/main/java/ee/forgr/capacitor_updater/ShakeMenu.java

@@ -13,6 +13,7 @@ import android.hardware.SensorManager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -117,65 +118,8 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
                     isShowing = false;
                     return;
                 }
-                if (Boolean.TRUE.equals(plugin.shakeChannelSelectorEnabled)) {
-                    showCombinedPreviewMenu();
-                    return;
-                }
-                String appName = activity.getPackageManager().getApplicationLabel(activity.getApplicationInfo()).toString();
-                String title = "Preview " + appName + " Menu";
-                String message = "Reload, switch, or leave the current preview.";
-                List<String> actions = new ArrayList<>();
-                actions.add("Reload preview");
-                if (plugin.previewMenuPreviews().length() > 0) {
-                    actions.add("Switch preview");
-                }
-                actions.add("Leave test app");
-                final boolean[] openingNestedSelector = { false };
-                final boolean[] previewActionRunning = { false };
 
-                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                builder.setTitle(title);
-                builder.setMessage(message);
-                builder.setItems(actions.toArray(new String[0]), (dialogInterface, which) -> {
-                    AlertDialog dialog = (AlertDialog) dialogInterface;
-                    String action = actions.get(which);
-                    if ("Reload preview".equals(action)) {
-                        previewActionRunning[0] = true;
-                        logger.info("Reloading webview");
-                        runPreviewMenuAction(dialog, "Could not reload the test app.", "Error reloading test app: ", () ->
-                            plugin.reloadPreviewSessionFromShakeMenu()
-                        );
-                    } else if ("Switch preview".equals(action)) {
-                        openingNestedSelector[0] = true;
-                        dialog.dismiss();
-                        showPreviewSelector();
-                    } else {
-                        previewActionRunning[0] = true;
-                        runPreviewMenuAction(dialog, "Could not leave the test app.", "Error leaving test app: ", () ->
-                            plugin.leavePreviewSessionFromShakeMenu()
-                        );
-                    }
-                });
-
-                // Cancel button
-                builder.setNegativeButton(
-                    "Close menu",
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int id) {
-                            logger.info("Shake menu cancelled");
-                            dialog.dismiss();
-                            isShowing = false;
-                        }
-                    }
-                );
-
-                AlertDialog dialog = builder.create();
-                dialog.setOnDismissListener((dialogInterface) -> {
-                    if (!openingNestedSelector[0] && !previewActionRunning[0]) {
-                        isShowing = false;
-                    }
-                });
-                dialog.show();
+                showPreviewActionsMenu(Boolean.TRUE.equals(plugin.shakeChannelSelectorEnabled));
             } catch (Exception e) {
                 logger.error("Error showing shake menu: " + e.getMessage());
                 isShowing = false;
@@ -183,65 +127,95 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
         });
     }
 
-    private void showCombinedPreviewMenu() {
-        try {
-            String appName = activity.getPackageManager().getApplicationLabel(activity.getApplicationInfo()).toString();
-            String title = "Preview " + appName + " Menu";
-            String message = "Reload, switch, or leave the current preview.";
-            List<String> actions = new ArrayList<>();
-            actions.add("Reload preview");
-            if (plugin.previewMenuPreviews().length() > 0) {
-                actions.add("Switch preview");
-            }
-            actions.add("Leave test app");
-            actions.add("Switch channel");
-            final boolean[] openingNestedSelector = { false };
-            final boolean[] previewActionRunning = { false };
+    private void showPreviewActionsMenu(boolean includeChannelSelector) {
+        String appName = activity.getPackageManager().getApplicationLabel(activity.getApplicationInfo()).toString();
+        String title = "Preview " + appName + " Menu";
+        String message = "Reload, switch, or leave the current preview.";
+        final boolean[] openingNestedSelector = { false };
+        final boolean[] previewActionRunning = { false };
+        final AlertDialog[] dialogRef = { null };
+        List<Button> buttons = new ArrayList<>();
+
+        LinearLayout layout = new LinearLayout(activity);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        int horizontalPadding = dpToPx(16);
+        int verticalPadding = dpToPx(8);
+        layout.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
+
+        addPreviewMenuButton(layout, buttons, "Reload preview", () -> {
+            AlertDialog dialog = dialogRef[0];
+            previewActionRunning[0] = true;
+            setPreviewMenuButtonsEnabled(buttons, false);
+            logger.info("Reloading webview");
+            runPreviewMenuAction(dialog, "Could not reload the test app.", "Error reloading test app: ", () ->
+                plugin.reloadPreviewSessionFromShakeMenu()
+            );
+        });
 
-            AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-            builder.setTitle(title);
-            builder.setMessage(message);
-            builder.setItems(actions.toArray(new String[0]), (dialogInterface, which) -> {
-                AlertDialog dialog = (AlertDialog) dialogInterface;
-                String action = actions.get(which);
-                if ("Reload preview".equals(action)) {
-                    previewActionRunning[0] = true;
-                    logger.info("Reloading webview");
-                    runPreviewMenuAction(dialog, "Could not reload the test app.", "Error reloading test app: ", () ->
-                        plugin.reloadPreviewSessionFromShakeMenu()
-                    );
-                } else if ("Leave test app".equals(action)) {
-                    previewActionRunning[0] = true;
-                    runPreviewMenuAction(dialog, "Could not leave the test app.", "Error leaving test app: ", () ->
-                        plugin.leavePreviewSessionFromShakeMenu()
-                    );
-                } else if ("Switch preview".equals(action)) {
-                    openingNestedSelector[0] = true;
-                    dialog.dismiss();
-                    showPreviewSelector();
-                } else {
-                    openingNestedSelector[0] = true;
-                    dialog.dismiss();
-                    showChannelSelector();
-                }
-            });
-            builder.setNegativeButton("Close menu", (dialog, id) -> {
-                logger.info("Shake menu cancelled");
+        if (plugin.previewMenuPreviews().length() > 0) {
+            addPreviewMenuButton(layout, buttons, "Switch preview", () -> {
+                AlertDialog dialog = dialogRef[0];
+                openingNestedSelector[0] = true;
                 dialog.dismiss();
-                isShowing = false;
+                showPreviewSelector();
             });
+        }
 
-            AlertDialog dialog = builder.create();
-            dialog.setOnDismissListener((dialogInterface) -> {
-                if (!openingNestedSelector[0] && !previewActionRunning[0]) {
-                    isShowing = false;
-                }
+        if (includeChannelSelector) {
+            addPreviewMenuButton(layout, buttons, "Switch channel", () -> {
+                AlertDialog dialog = dialogRef[0];
+                openingNestedSelector[0] = true;
+                dialog.dismiss();
+                showChannelSelector();
             });
-            dialog.show();
-        } catch (Exception e) {
-            logger.error("Error showing combined shake menu: " + e.getMessage());
-            isShowing = false;
         }
+
+        addPreviewMenuButton(layout, buttons, "Leave test app", () -> {
+            AlertDialog dialog = dialogRef[0];
+            previewActionRunning[0] = true;
+            setPreviewMenuButtonsEnabled(buttons, false);
+            runPreviewMenuAction(dialog, "Could not leave the test app.", "Error leaving test app: ", () ->
+                plugin.leavePreviewSessionFromShakeMenu()
+            );
+        });
+
+        addPreviewMenuButton(layout, buttons, "Close menu", () -> {
+            AlertDialog dialog = dialogRef[0];
+            if (dialog != null) {
+                logger.info("Shake menu cancelled");
+                dialog.dismiss();
+                isShowing = false;
+            }
+        });
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setTitle(title);
+        builder.setMessage(message);
+        builder.setView(layout);
+
+        AlertDialog dialog = builder.create();
+        dialogRef[0] = dialog;
+        dialog.setOnDismissListener((dialogInterface) -> {
+            if (!openingNestedSelector[0] && !previewActionRunning[0]) {
+                isShowing = false;
+            }
+        });
+        dialog.show();
+    }
+
+    private void addPreviewMenuButton(LinearLayout layout, List<Button> buttons, String title, Runnable action) {
+        Button button = new Button(activity);
+        button.setAllCaps(false);
+        button.setText(title);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        );
+        params.setMargins(0, 0, 0, dpToPx(8));
+        button.setLayoutParams(params);
+        button.setOnClickListener((view) -> action.run());
+        buttons.add(button);
+        layout.addView(button);
     }
 
     private void runPreviewMenuAction(AlertDialog dialog, String failureMessage, String errorPrefix, PreviewMenuAction action) {
@@ -259,13 +233,17 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
                     isShowing = false;
                 });
             }
-        }).start();
+        })
+            .start();
     }
 
-    private void setPreviewMenuButtonsEnabled(AlertDialog dialog, boolean enabled) {
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled);
-        dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setEnabled(enabled);
-        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(enabled);
+    private void setPreviewMenuButtonsEnabled(List<Button> buttons, boolean enabled) {
+        for (Button button : buttons) {
+            if (!enabled && "Close menu".equals(button.getText().toString())) {
+                continue;
+            }
+            button.setEnabled(enabled);
+        }
     }
 
     private void showPreviewSelector() {
@@ -299,7 +277,7 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
         String name = preview.optString("name", "");
         JSObject bundle = preview.getJSObject("bundle");
         String version = bundle == null ? "" : bundle.optString("version", "");
-        String label = !name.isEmpty() ? name : (!version.isEmpty() ? version : preview.optString("id", "Preview"));
+        String label = !name.isEmpty() ? name : !version.isEmpty() ? version : preview.optString("id", "Preview");
         if (preview.optBoolean("isActive", false)) {
             label += " (current)";
         }
@@ -405,7 +383,8 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
             } finally {
                 isShowing = false;
             }
-        }).start();
+        })
+            .start();
     }
 
     private void showConfiguredDefaultMenu() {
@@ -592,7 +571,8 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
                             presentChannelPicker(channels);
                         });
                     });
-                }).start();
+                })
+                    .start();
             } catch (Exception e) {
                 logger.error("Error showing channel selector: " + e.getMessage());
                 isShowing = false;
@@ -785,14 +765,13 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
                                 String latestKind = getString(latestRes, "kind");
                                 String latestMessage = getString(latestRes, "message");
 
-                                String detail =
-                                    latestMessage != null && !latestMessage.isEmpty()
-                                        ? latestMessage
-                                        : latestError != null && !latestError.isEmpty()
-                                            ? latestError
-                                            : latestKind != null && !latestKind.isEmpty()
-                                                ? latestKind
-                                                : "server did not provide a message";
+                                String detail = latestMessage != null && !latestMessage.isEmpty()
+                                    ? latestMessage
+                                    : latestError != null && !latestError.isEmpty()
+                                        ? latestError
+                                        : latestKind != null && !latestKind.isEmpty()
+                                            ? latestKind
+                                            : "server did not provide a message";
 
                                 // Handle update errors first (before "no new version" check)
                                 if (
@@ -819,8 +798,20 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
 
                                 String latestUrl = getString(latestRes, "url");
 
-                                // Check if there's an actual update available
-                                if ("up_to_date".equals(latestKind) || latestUrl == null || latestUrl.isEmpty()) {
+                                Object manifestObj = latestRes.get("manifest");
+                                JSONArray manifestArray = null;
+                                if (manifestObj instanceof JSONArray) {
+                                    manifestArray = (JSONArray) manifestObj;
+                                } else if (manifestObj instanceof List) {
+                                    manifestArray = new JSONArray((List<?>) manifestObj);
+                                }
+                                final boolean hasManifest = manifestArray != null && manifestArray.length() > 0;
+
+                                // Check if there's an actual update available. A manifest-only
+                                // response legitimately has no URL (the files come from the
+                                // manifest, not a zip), so only report "already on latest" when
+                                // the URL is empty AND there is no manifest to download from.
+                                if ("up_to_date".equals(latestKind) || ((latestUrl == null || latestUrl.isEmpty()) && !hasManifest)) {
                                     activity.runOnUiThread(() -> {
                                         progressDialog.dismiss();
                                         showSuccess("Channel set to " + channelName + ". Already on latest version.");
@@ -843,25 +834,19 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
 
                                 String sessionKey = getString(latestRes, "sessionKey");
                                 String checksum = getString(latestRes, "checksum");
-                                Object manifestObj = latestRes.get("manifest");
+
+                                // A manifest-only response has no zip URL; downloadManifest
+                                // tolerates the placeholder URL the plugin already uses.
+                                final String downloadUrl = latestUrl == null || latestUrl.isEmpty()
+                                    ? "https://404.capgo.app/no.zip"
+                                    : latestUrl;
 
                                 // Download the update
                                 try {
                                     BundleInfo bundle;
-                                    if (manifestObj != null) {
-                                        JSONArray manifestArray = null;
-                                        if (manifestObj instanceof JSONArray) {
-                                            manifestArray = (JSONArray) manifestObj;
-                                        } else if (manifestObj instanceof List) {
-                                            manifestArray = new JSONArray((List<?>) manifestObj);
-                                        }
-
-                                        if (manifestArray == null) {
-                                            throw new IllegalArgumentException("Invalid manifest format");
-                                        }
-
+                                    if (hasManifest) {
                                         bundle = updater.downloadManifest(
-                                            latestUrl,
+                                            downloadUrl,
                                             versionForUi,
                                             sessionKey != null ? sessionKey : "",
                                             checksum != null ? checksum : "",
@@ -869,7 +854,7 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
                                         );
                                     } else {
                                         bundle = updater.download(
-                                            latestUrl,
+                                            downloadUrl,
                                             versionForUi,
                                             sessionKey != null ? sessionKey : "",
                                             checksum != null ? checksum : ""
@@ -911,7 +896,8 @@ public class ShakeMenu implements ShakeDetector.Listener, ThreeFingerPinchDetect
                             });
                         }
                     );
-                }).start();
+                })
+                    .start();
             } catch (Exception e) {
                 logger.error("Error selecting channel: " + e.getMessage());
                 isShowing = false;