@capgo/capacitor-updater 7.45.10 → 7.50.2

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

@@ -26,10 +26,10 @@ import javax.crypto.spec.GCMParameterSpec;
 
 /**
  * Helper class to manage device ID persistence across app installations.
- * Uses Android Keystore to persist the device ID across reinstalls.
+ * Uses Android Keystore-backed storage and backup-restorable SharedPreferences.
  *
- * The device ID is a random UUID stored in the Android Keystore, which persists
- * even after app uninstall/reinstall on Android 6.0+ (API 23+).
+ * The device ID is a random UUID stored in encrypted preferences and mirrored
+ * to appUUID so Android backup/restore can keep it across reinstalls.
  */
 public class DeviceIdHelper {
 
@@ -45,10 +45,10 @@ public class DeviceIdHelper {
      * Gets or creates a device ID that persists across reinstalls.
      *
      * This method:
-     * 1. First checks for an existing ID in Keystore-encrypted storage (persists across reinstalls)
-     * 2. Falls back to legacy SharedPreferences (for migration)
+     * 1. First checks for an existing ID in Keystore-encrypted storage
+     * 2. Falls back to legacy SharedPreferences restored by Android backup
      * 3. Generates a new UUID if neither exists
-     * 4. Stores the ID in Keystore-encrypted storage for future use
+     * 4. Stores the ID synchronously in both stores for future use
      *
      * @param context Application context
      * @param legacyPrefs Legacy SharedPreferences (for migration)
@@ -60,7 +60,9 @@ public class DeviceIdHelper {
             String deviceId = getDeviceIdFromKeystore(context);
 
             if (deviceId != null && !deviceId.isEmpty()) {
-                return deviceId.toLowerCase();
+                deviceId = deviceId.toLowerCase();
+                saveLegacyDeviceId(legacyPrefs, deviceId);
+                return deviceId;
             }
 
             // Migration: Check legacy SharedPreferences for existing device ID
@@ -74,7 +76,8 @@ public class DeviceIdHelper {
             // Ensure lowercase for consistency
             deviceId = deviceId.toLowerCase();
 
-            // Save to Keystore storage
+            // Save to backup-restorable preferences and Keystore storage
+            saveLegacyDeviceId(legacyPrefs, deviceId);
             saveDeviceIdToKeystore(context, deviceId);
 
             return deviceId;
@@ -90,31 +93,35 @@ public class DeviceIdHelper {
      * @param context Application context
      * @return Device ID string or null if not found
      */
-    private static String getDeviceIdFromKeystore(Context context) throws Exception {
-        SharedPreferences prefs = context.getSharedPreferences(DEVICE_ID_PREFS, Context.MODE_PRIVATE);
-        String encryptedDeviceId = prefs.getString(DEVICE_ID_KEY, null);
-        String ivString = prefs.getString(IV_KEY, null);
+    private static String getDeviceIdFromKeystore(Context context) {
+        try {
+            SharedPreferences prefs = context.getSharedPreferences(DEVICE_ID_PREFS, Context.MODE_PRIVATE);
+            String encryptedDeviceId = prefs.getString(DEVICE_ID_KEY, null);
+            String ivString = prefs.getString(IV_KEY, null);
 
-        if (encryptedDeviceId == null || ivString == null) {
-            return null;
-        }
+            if (encryptedDeviceId == null || ivString == null) {
+                return null;
+            }
 
-        // Get the encryption key from Keystore
-        SecretKey key = getOrCreateKey();
-        if (key == null) {
-            return null;
-        }
+            // Get the encryption key from Keystore
+            SecretKey key = getOrCreateKey();
+            if (key == null) {
+                return null;
+            }
 
-        // Decrypt the device ID
-        byte[] encryptedBytes = android.util.Base64.decode(encryptedDeviceId, android.util.Base64.DEFAULT);
-        byte[] iv = android.util.Base64.decode(ivString, android.util.Base64.DEFAULT);
+            // Decrypt the device ID
+            byte[] encryptedBytes = android.util.Base64.decode(encryptedDeviceId, android.util.Base64.DEFAULT);
+            byte[] iv = android.util.Base64.decode(ivString, android.util.Base64.DEFAULT);
 
-        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-        GCMParameterSpec spec = new GCMParameterSpec(GCM_TAG_LENGTH, iv);
-        cipher.init(Cipher.DECRYPT_MODE, key, spec);
+            Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+            GCMParameterSpec spec = new GCMParameterSpec(GCM_TAG_LENGTH, iv);
+            cipher.init(Cipher.DECRYPT_MODE, key, spec);
 
-        byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
-        return new String(decryptedBytes, StandardCharsets.UTF_8);
+            byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
+            return new String(decryptedBytes, StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     /**
@@ -146,7 +153,7 @@ public class DeviceIdHelper {
             .edit()
             .putString(DEVICE_ID_KEY, android.util.Base64.encodeToString(encryptedBytes, android.util.Base64.DEFAULT))
             .putString(IV_KEY, android.util.Base64.encodeToString(iv, android.util.Base64.DEFAULT))
-            .apply();
+            .commit();
     }
 
     /**
@@ -207,9 +214,17 @@ public class DeviceIdHelper {
 
         if (deviceId == null || deviceId.isEmpty()) {
             deviceId = UUID.randomUUID().toString();
-            legacyPrefs.edit().putString(LEGACY_PREFS_KEY, deviceId).apply();
+            saveLegacyDeviceId(legacyPrefs, deviceId);
         }
 
         return deviceId.toLowerCase();
     }
+
+    private static void saveLegacyDeviceId(SharedPreferences legacyPrefs, String deviceId) {
+        if (legacyPrefs == null || deviceId == null || deviceId.isEmpty()) {
+            return;
+        }
+
+        legacyPrefs.edit().putString(LEGACY_PREFS_KEY, deviceId).commit();
+    }
 }

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

@@ -68,6 +68,7 @@ public class DownloadService extends Worker {
     public static final String IS_MANIFEST = "is_manifest";
     public static final String APP_ID = "app_id";
     public static final String pluginVersion = "plugin_version";
+    public static final String INSTALL_SOURCE = "install_source";
     public static final String STATS_URL = "stats_url";
     public static final String DEVICE_ID = "device_id";
     public static final String CUSTOM_ID = "custom_id";
@@ -115,15 +116,13 @@ public class DownloadService extends Worker {
         }
 
         StringBuilder sanitized = new StringBuilder();
-        value
-            .codePoints()
-            .forEach((cp) -> {
-                boolean isVisibleAscii = cp >= 0x20 && cp <= 0x7E;
-                boolean isIso88591 = cp >= 0xA0 && cp <= 0xFF;
-                if (isVisibleAscii || isIso88591) {
-                    sanitized.appendCodePoint(cp);
-                }
-            });
+        value.codePoints().forEach((cp) -> {
+            boolean isVisibleAscii = cp >= 0x20 && cp <= 0x7E;
+            boolean isIso88591 = cp >= 0xA0 && cp <= 0xFF;
+            if (isVisibleAscii || isIso88591) {
+                sanitized.appendCodePoint(cp);
+            }
+        });
 
         String result = sanitized.toString().trim();
         return result.isEmpty() ? "unknown" : result;
@@ -168,6 +167,16 @@ public class DownloadService extends Worker {
         return Result.success(output);
     }
 
+    static File resolveManifestTargetFile(final File destFolder, final String fileName) throws IOException {
+        final boolean isBrotli = fileName.endsWith(".br");
+        final String targetFileName = isBrotli ? fileName.substring(0, fileName.length() - 3) : fileName;
+        return CapgoUpdater.resolvePathInsideDirectory(destFolder, targetFileName);
+    }
+
+    static File resolveManifestBuiltinFile(final File builtinFolder, final String fileName) throws IOException {
+        return CapgoUpdater.resolvePathInsideDirectory(builtinFolder, fileName);
+    }
+
     private String getInputString(String key, String fallback) {
         String value = getInputData().getString(key);
         return value != null ? value : fallback;
@@ -228,6 +237,7 @@ public class DownloadService extends Worker {
             json.put("platform", "android");
             json.put("app_id", getInputString(APP_ID, "unknown"));
             json.put("plugin_version", getInputString(pluginVersion, "unknown"));
+            json.put("install_source", getInputString(INSTALL_SOURCE, ""));
             json.put("version_name", version != null ? version : "");
             json.put("old_version_name", "");
             json.put("action", action);
@@ -245,27 +255,26 @@ public class DownloadService extends Worker {
                 .post(RequestBody.create(json.toString(), MediaType.get("application/json")))
                 .build();
 
-            sharedClient
-                .newCall(request)
-                .enqueue(
-                    new Callback() {
-                        @Override
-                        public void onFailure(@NonNull Call call, @NonNull IOException e) {
-                            if (logger != null) {
-                                logger.error("Failed to send stats: " + e.getMessage());
-                            }
+            sharedClient.newCall(request).enqueue(
+                new Callback() {
+                    @Override
+                    public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                        if (logger != null) {
+                            logger.error("Failed to send stats: " + e.getMessage());
                         }
+                    }
 
-                        @Override
-                        public void onResponse(@NonNull Call call, @NonNull Response response) {
-                            try (ResponseBody body = response.body()) {
-                                // nothing else to do, just closing body
-                            } catch (Exception ignored) {} finally {
-                                response.close();
-                            }
+                    @Override
+                    public void onResponse(@NonNull Call call, @NonNull Response response) {
+                        try (ResponseBody body = response.body()) {
+                            // nothing else to do, just closing body
+                        } catch (Exception ignored) {
+                        } finally {
+                            response.close();
                         }
                     }
-                );
+                }
+            );
         } catch (Exception e) {
             if (logger != null) {
                 logger.error("sendStatsAsync error: " + e.getMessage());
@@ -338,11 +347,20 @@ public class DownloadService extends Worker {
                 boolean isBrotli = fileName.endsWith(".br");
                 String targetFileName = isBrotli ? fileName.substring(0, fileName.length() - 3) : fileName;
 
-                File targetFile = new File(destFolder, targetFileName);
+                File targetFile;
+                File builtinFile;
+                try {
+                    targetFile = resolveManifestTargetFile(destFolder, fileName);
+                    builtinFile = resolveManifestBuiltinFile(builtinFolder, fileName);
+                } catch (IOException e) {
+                    logger.error("Invalid manifest file path: " + fileName);
+                    sendStatsAsync("manifest_path_fail", version + ":" + fileName);
+                    hasError.set(true);
+                    continue;
+                }
                 String cacheBaseName = new File(isBrotli ? targetFileName : fileName).getName();
                 File cacheFile = new File(cacheFolder, finalFileHash + "_" + cacheBaseName);
                 final File legacyCacheFile = isBrotli ? new File(cacheFolder, finalFileHash + "_" + new File(fileName).getName()) : null;
-                File builtinFile = new File(builtinFolder, fileName);
 
                 // Ensure parent directories of the target file exist
                 if (!Objects.requireNonNull(targetFile.getParentFile()).exists() && !targetFile.getParentFile().mkdirs()) {

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

@@ -63,6 +63,7 @@ public class DownloadWorkerManager {
         String appId,
         String pluginVersion,
         boolean isProd,
+        String installSource,
         String statsUrl,
         String deviceId,
         String versionBuild,
@@ -89,6 +90,7 @@ public class DownloadWorkerManager {
             .putString(DownloadService.PUBLIC_KEY, publicKey)
             .putString(DownloadService.APP_ID, appId)
             .putString(DownloadService.pluginVersion, pluginVersion)
+            .putString(DownloadService.INSTALL_SOURCE, installSource)
             .putString(DownloadService.STATS_URL, statsUrl)
             .putString(DownloadService.DEVICE_ID, deviceId)
             .putString(DownloadService.VERSION_BUILD, versionBuild)

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

@@ -17,8 +17,8 @@ public class ShakeDetector implements SensorEventListener {
         void onShakeDetected();
     }
 
-    private static final float SHAKE_THRESHOLD = 12.0f; // Acceleration threshold for shake detection
-    private static final int SHAKE_TIMEOUT = 500; // Minimum time between shake events (ms)
+    private static final float SHAKE_THRESHOLD = 16.0f; // Acceleration threshold for shake detection
+    private static final int SHAKE_TIMEOUT = 1000; // Minimum time between shake events (ms)
 
     private Listener listener;
     private SensorManager sensorManager;
@@ -34,7 +34,7 @@ public class ShakeDetector implements SensorEventListener {
         this.accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 
         if (accelerometer != null) {
-            sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
+            sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_UI);
         }
     }