@capgo/capacitor-updater 5.3.25 → 5.3.29

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

@@ -14,7 +14,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.os.Handler;
 import android.util.Log;
 import com.android.volley.toolbox.Volley;
 import com.getcapacitor.CapConfig;
@@ -56,7 +55,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "5.3.25";
+  private final String PLUGIN_VERSION = "5.3.29";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -157,15 +156,25 @@ public class CapacitorUpdaterPlugin extends Plugin {
       );
       return;
     }
-
     final CapConfig config = CapConfig.loadDefault(this.getActivity());
-    this.implementation.appId = config.getString("appId", "");
+    this.implementation.appId =
+      InternalUtils.getPackageName(
+        getContext().getPackageManager(),
+        getContext().getPackageName()
+      );
+    this.implementation.appId =
+      config.getString("appId", this.implementation.appId);
     this.implementation.appId =
       this.getConfig().getString("appId", this.implementation.appId);
-    if ("".equals(implementation.appId)) {
-      Log.i(CapacitorUpdater.TAG, "appId: " + implementation.appId);
-      throw new RuntimeException("appId is required");
+    if (
+      this.implementation.appId == null || "".equals(this.implementation.appId)
+    ) {
+      // crash the app
+      throw new RuntimeException(
+        "appId is missing in capacitor.config.json or plugin config, and cannot be retrieved from the native app, please add it globally or in the plugin config"
+      );
     }
+    Log.i(CapacitorUpdater.TAG, "appId: " + implementation.appId);
     this.implementation.privateKey =
       this.getConfig().getString("privateKey", defaultPrivateKey);
     this.implementation.statsUrl =

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

@@ -0,0 +1,42 @@
+package ee.forgr.capacitor_updater;
+
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+
+public class InternalUtils {
+
+  public static String getPackageName(PackageManager pm, String packageName) {
+    try {
+      PackageInfo pinfo = getPackageInfoInternal(pm, packageName, 0);
+      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;
+    }
+  }
+
+  private static PackageInfo getPackageInfoInternal(
+    PackageManager pm,
+    String packageName,
+    long flags
+  ) throws PackageManager.NameNotFoundException {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      return pm.getPackageInfo(
+        packageName,
+        PackageManager.PackageInfoFlags.of(flags)
+      );
+    } else {
+      return getPackageInfoLegacy(pm, packageName, (int) flags);
+    }
+  }
+
+  @SuppressWarnings("deprecation")
+  private static PackageInfo getPackageInfoLegacy(
+    PackageManager pm,
+    String packageName,
+    int flags
+  ) throws PackageManager.NameNotFoundException {
+    return pm.getPackageInfo(packageName, flags);
+  }
+}

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "5.3.25"
+    private let PLUGIN_VERSION: String = "5.3.29"
     static let updateUrlDefault = "https://api.capgo.app/updates"
     static let statsUrlDefault = "https://api.capgo.app/stats"
     static let channelUrlDefault = "https://api.capgo.app/channel_self"
@@ -71,15 +71,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         implementation.notifyDownload = notifyDownload
         implementation.PLUGIN_VERSION = self.PLUGIN_VERSION
         let config = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor().legacyConfig
-        if config?["appId"] != nil {
-            implementation.appId = config?["appId"] as! String
-        }
+        implementation.appId = Bundle.main.infoDictionary?["CFBundleIdentifier"] as? String ?? ""
+        implementation.appId = config?["appId"] as? String ?? implementation.appId
         implementation.appId = getConfig().getString("appId", implementation.appId)!
         if implementation.appId == "" {
-            print("\(self.implementation.TAG) appId is empty")
-            // crash the app
-            fatalError("appId is empty")
+            fatalError("appId is missing in capacitor.config.json or plugin config, and cannot be retrieved from the native app, please add it globally or in the plugin config")
         }
+        print("\(self.implementation.TAG) appId \(implementation.appId)")
         implementation.statsUrl = getConfig().getString("statsUrl", CapacitorUpdaterPlugin.statsUrlDefault)!
         implementation.channelUrl = getConfig().getString("channelUrl", CapacitorUpdaterPlugin.channelUrlDefault)!
         if resetWhenUpdate {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.3.25",
-  "packageManager": "pnpm@8.10.0",
+  "version": "5.3.29",
+  "packageManager": "pnpm@8.10.2",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",