@capgo/capacitor-updater 3.0.8 → 3.1.0

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

@@ -47,7 +47,7 @@ public class CapacitorUpdater {
     public String statsUrl = "";
     public String appId = "";
     public String deviceID = "";
-    private String pluginVersion = "3.0.8";
+    private String pluginVersion = "3.1.0";
 
 
     private FilenameFilter filter = new FilenameFilter() {
@@ -59,6 +59,7 @@ public class CapacitorUpdater {
     };
     private final CapacitorUpdaterPlugin plugin;
     private String versionBuild = "";
+    private String versionCode = "";
     private String TAG = "Capacitor-updater";
     private Context context;
     private String basePathHot = "versions";
@@ -86,6 +87,7 @@ public class CapacitorUpdater {
         this.deviceID = Secure.getString(context.getContentResolver(), Secure.ANDROID_ID);
         PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
         this.versionBuild = pInfo.versionName;
+        this.versionCode = Integer.toString(pInfo.versionCode);
     }
     public CapacitorUpdater (Context context, CapacitorUpdaterPlugin plugin) throws PackageManager.NameNotFoundException {
         this.context = context;
@@ -95,6 +97,7 @@ public class CapacitorUpdater {
         this.deviceID = Secure.getString(context.getContentResolver(), Secure.ANDROID_ID);
         PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
         this.versionBuild = pInfo.versionName;
+        this.versionCode = Integer.toString(pInfo.versionCode);
     }
 
     private Boolean unzip(String source, String dest) {
@@ -114,7 +117,7 @@ public class CapacitorUpdater {
             int buffLength = 8192;
             byte[] buffer = new byte[buffLength];
             long totalLength = zipFile.length();
-            long readedLength = buffLength;
+            long readLength = buffLength;
             int percent = 0;
             this.plugin.notifyDownload(75);
             while ((ze = zis.getNextEntry()) != null) {
@@ -131,19 +134,19 @@ public class CapacitorUpdater {
                             dir.getAbsolutePath());
                 if (ze.isDirectory())
                     continue;
-                FileOutputStream fout = new FileOutputStream(file);
+                FileOutputStream fileOut = new FileOutputStream(file);
                 try {
                     while ((count = zis.read(buffer)) != -1)
-                        fout.write(buffer, 0, count);
+                        fileOut.write(buffer, 0, count);
                 } finally {
-                    fout.close();
+                    fileOut.close();
                 }
-                int newPercent = (int)((readedLength * 100) / totalLength);
+                int newPercent = (int)((readLength * 100) / totalLength);
                 if (totalLength > 1 && newPercent != percent) {
                     percent = newPercent;
                     this.plugin.notifyDownload(calcTotalPercent((int)percent, 75, 90));
                 }
-                readedLength += ze.getCompressedSize();
+                readLength += ze.getCompressedSize();
             }
         } catch (Exception e) {
             Log.i(TAG, "unzip error", e);
@@ -194,17 +197,17 @@ public class CapacitorUpdater {
             downFile.getParentFile().mkdirs();
             downFile.createNewFile();
             FileOutputStream fos = new FileOutputStream(downFile);
-            int readedLength = buffLength;
+            int readLength = buffLength;
             int percent = 0;
             this.plugin.notifyDownload(10);
             while ((length = dis.read(buffer))>0) {
                 fos.write(buffer, 0, length);
-                int newPercent = (int)((readedLength * 100) / totalLength);
+                int newPercent = (int)((readLength * 100) / totalLength);
                 if (totalLength > 1 && newPercent != percent) {
                     percent = newPercent;
                     this.plugin.notifyDownload(calcTotalPercent(percent, 10, 70));
                 }
-                readedLength += length;
+                readLength += length;
             }
         } catch (Exception e) {
             Log.e(TAG, "downloadFile error", e);
@@ -297,6 +300,7 @@ public class CapacitorUpdater {
         String deviceID = this.deviceID;
         String appId = this.appId;
         String versionBuild = this.versionBuild;
+        String versionCode = this.versionCode;
         String pluginVersion = this.pluginVersion;
         String versionName = getVersionName().equals("") ? "builtin" : getVersionName();
         StringRequest stringRequest = new StringRequest(Request.Method.GET, url,
@@ -323,6 +327,7 @@ public class CapacitorUpdater {
                     params.put("cap_device_id", deviceID);
                     params.put("cap_app_id", appId);
                     params.put("cap_version_build", versionBuild);
+                    params.put("cap_version_code", versionCode);
                     params.put("cap_version_name", versionName);
                     params.put("cap_plugin_version", pluginVersion);
                     return params;
@@ -361,6 +366,7 @@ public class CapacitorUpdater {
             json.put("version_name", version);
             json.put("device_id", this.deviceID);
             json.put("version_build", this.versionBuild);
+            json.put("version_code", this.versionCode);
             json.put("plugin_version", this.pluginVersion);
             json.put("app_id", this.appId);
             jsonString = json.toString();

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

@@ -82,7 +82,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                 editor.putString("LatestVersionNative", currentVersionNative.toString());
                 editor.commit();
             } catch (Exception ex) {
-                Log.e("CapacitorUpdater", "Cannot get the current version" + ex.getMessage());
+                Log.e("CapacitorUpdater", "Cannot get the current version " + ex.getMessage());
             }
         }
         if (!autoUpdate || this.autoUpdateUrl.equals("")) return;
@@ -183,7 +183,10 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         }
         implementation.reset();
         String pathHot = implementation.getLastPathHot();
-        this.bridge.setServerAssetPath(pathHot);
+        if (this.bridge.getLocalServer() != null) {
+            // if the server is not ready yet, hot reload is not needed
+            this.bridge.setServerAssetPath(pathHot);
+        }
         return true;
     }
 

package/ios/Plugin/CapacitorUpdater.swift

@@ -37,8 +37,9 @@ extension Bundle {
     public var appId = ""
     public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
     public var notifyDownload: (Int) -> Void = { _ in }
-    public var pluginVersion = "3.0.8"
+    public var pluginVersion = "3.1.0"
     private var versionBuild = Bundle.main.releaseVersionNumber ?? ""
+    private var versionCode = Bundle.main.buildVersionNumber ?? ""
     private var lastPathHot = ""
     private var lastPathPersist = ""
     private let basePathHot = "versions"
@@ -112,6 +113,7 @@ extension Bundle {
             "cap_device_id": self.deviceID,
             "cap_app_id": self.appId,
             "cap_version_build": self.versionBuild,
+            "cap_version_code": self.versionCode,
             "cap_plugin_version": self.pluginVersion,
             "cap_version_name": UserDefaults.standard.string(forKey: "versionName") ?? "builtin"
         ]
@@ -253,6 +255,7 @@ extension Bundle {
             "device_id": self.deviceID,
             "version_name": version,
             "version_build": self.versionBuild,
+            "version_code": self.versionCode,
             "plugin_version": self.pluginVersion,
             "app_id": self.appId
         ]

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -32,6 +32,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             implementation.appId = config?["appId"] as! String
         }
         implementation.statsUrl = getConfigValue("statsUrl") as? String ?? CapacitorUpdaterPlugin.statsUrlDefault
+        resetWhenUpdate = getConfigValue("resetWhenUpdate") as? Bool ?? true
         if (resetWhenUpdate) {
             var LatestVersionNative: Version = "0.0.0"
             do {
@@ -51,7 +52,6 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             UserDefaults.standard.set( Bundle.main.buildVersionNumber, forKey: "LatestVersionNative")
         }
         if (!autoUpdate || autoUpdateUrl == "") { return }
-        resetWhenUpdate = getConfigValue("resetWhenUpdate") as? Bool ?? true
         let nc = NotificationCenter.default
         nc.addObserver(self, selector: #selector(appMovedToBackground), name: UIApplication.didEnterBackgroundNotification, object: nil)
         nc.addObserver(self, selector: #selector(appMovedToForeground), name: UIApplication.willEnterForegroundNotification, object: nil)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "3.0.8",
+  "version": "3.1.0",
   "license": "AGPL-3.0-only",
   "description": "OTA update for capacitor apps",
   "main": "dist/plugin.cjs.js",