@capgo/capacitor-updater 3.0.9 → 3.2.0

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.util.Log;
 
 import com.android.volley.AuthFailureError;
@@ -47,7 +48,7 @@ public class CapacitorUpdater {
     public String statsUrl = "";
     public String appId = "";
     public String deviceID = "";
-    private String pluginVersion = "3.0.9";
+    private String pluginVersion = "3.2.0";
 
 
     private FilenameFilter filter = new FilenameFilter() {
@@ -59,6 +60,8 @@ public class CapacitorUpdater {
     };
     private final CapacitorUpdaterPlugin plugin;
     private String versionBuild = "";
+    private String versionCode = "";
+    private String versionOs = "";
     private String TAG = "Capacitor-updater";
     private Context context;
     private String basePathHot = "versions";
@@ -83,18 +86,22 @@ public class CapacitorUpdater {
         this.plugin = new CapacitorUpdaterPlugin();
         this.prefs = context.getSharedPreferences("CapWebViewSettings", Activity.MODE_PRIVATE);
         this.editor = prefs.edit();
+        this.versionOs = Build.VERSION.RELEASE;
         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;
         this.plugin = plugin;
         this.prefs = context.getSharedPreferences("CapWebViewSettings", Activity.MODE_PRIVATE);
         this.editor = prefs.edit();
+        this.versionOs = Build.VERSION.RELEASE;
         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 +121,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 +138,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 +201,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,35 +304,39 @@ public class CapacitorUpdater {
         String deviceID = this.deviceID;
         String appId = this.appId;
         String versionBuild = this.versionBuild;
+        String versionCode = this.versionCode;
+        String versionOs = this.versionOs;
         String pluginVersion = this.pluginVersion;
         String versionName = getVersionName().equals("") ? "builtin" : getVersionName();
         StringRequest stringRequest = new StringRequest(Request.Method.GET, url,
-        new Response.Listener<String>() {
-            @Override
-            public void onResponse(String response) {
-                try {
-                    JSONObject jsonObject = new JSONObject(response);
-                    callback.callback(jsonObject);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-            }
-        }, new Response.ErrorListener() {
+                new Response.Listener<String>() {
+                    @Override
+                    public void onResponse(String response) {
+                        try {
+                            JSONObject jsonObject = new JSONObject(response);
+                            callback.callback(jsonObject);
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
                 Log.e(TAG, "Error getting Latest" +  error);
             }
-        }) {     
+        }) {
             @Override
             public Map<String, String> getHeaders() throws AuthFailureError {
-                    Map<String, String>  params = new HashMap<String, String>();
-                    params.put("cap_platform", "android");
-                    params.put("cap_device_id", deviceID);
-                    params.put("cap_app_id", appId);
-                    params.put("cap_version_build", versionBuild);
-                    params.put("cap_version_name", versionName);
-                    params.put("cap_plugin_version", pluginVersion);
-                    return params;
+                Map<String, String>  params = new HashMap<String, String>();
+                params.put("cap_platform", "android");
+                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_os", versionOs);
+                params.put("cap_version_name", versionName);
+                params.put("cap_plugin_version", pluginVersion);
+                return params;
             }
         };
         RequestQueue requestQueue = Volley.newRequestQueue(this.context);
@@ -340,7 +351,7 @@ public class CapacitorUpdater {
         return prefs.getString("versionName", "");
     }
 
-    public void reset() {        
+    public void reset() {
         String version = prefs.getString("versionName", "");
         this.sendStats("reset", version);
         editor.putString("lastPathHot", "public");
@@ -361,6 +372,8 @@ 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("version_os", this.versionOs);
             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

@@ -22,6 +22,11 @@ public class AppVersion: NSObject {
     var message: String?
     var major: Bool?
 }
+extension OperatingSystemVersion {
+    func getFullVersion(separator: String = ".") -> String {
+        return "\(majorVersion)\(separator)\(minorVersion)\(separator)\(patchVersion)"
+    }
+}
 extension Bundle {
     var releaseVersionNumber: String? {
         return infoDictionary?["CFBundleShortVersionString"] as? String
@@ -37,8 +42,10 @@ extension Bundle {
     public var appId = ""
     public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
     public var notifyDownload: (Int) -> Void = { _ in }
-    public var pluginVersion = "3.0.9"
+    public var pluginVersion = "3.2.0"
     private var versionBuild = Bundle.main.releaseVersionNumber ?? ""
+    private var versionCode = Bundle.main.buildVersionNumber ?? ""
+    private var versionOs = ProcessInfo().operatingSystemVersion.getFullVersion()
     private var lastPathHot = ""
     private var lastPathPersist = ""
     private let basePathHot = "versions"
@@ -112,6 +119,8 @@ extension Bundle {
             "cap_device_id": self.deviceID,
             "cap_app_id": self.appId,
             "cap_version_build": self.versionBuild,
+            "cap_version_code": self.versionCode,
+            "cap_version_os": self.versionOs,
             "cap_plugin_version": self.pluginVersion,
             "cap_version_name": UserDefaults.standard.string(forKey: "versionName") ?? "builtin"
         ]
@@ -253,6 +262,8 @@ extension Bundle {
             "device_id": self.deviceID,
             "version_name": version,
             "version_build": self.versionBuild,
+            "version_code": self.versionCode,
+            "version_os": self.versionOs,
             "plugin_version": self.pluginVersion,
             "app_id": self.appId
         ]

package/package.json

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