@capgo/capacitor-updater 5.7.7 → 5.7.9

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

@@ -0,0 +1,7 @@
+package ee.forgr.capacitor_updater;
+
+import com.getcapacitor.JSObject;
+
+public interface Callback {
+  void callback(JSObject jsoObject);
+}

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

@@ -23,7 +23,6 @@ import com.android.volley.DefaultRetryPolicy;
 import com.android.volley.NetworkResponse;
 import com.android.volley.Request;
 import com.android.volley.RequestQueue;
-import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.HttpHeaderParser;
 import com.android.volley.toolbox.JsonObjectRequest;
@@ -56,10 +55,6 @@ import javax.crypto.SecretKey;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-interface Callback {
-  void callback(JSObject jsoObject);
-}
-
 public class CapacitorUpdater {
 
   private static final String AB =
@@ -95,16 +90,13 @@ public class CapacitorUpdater {
   public String deviceID = "";
   public int timeout = 20000;
 
-  private final FilenameFilter filter = new FilenameFilter() {
-    @Override
-    public boolean accept(final File f, final String name) {
-      // ignore directories generated by mac os x
-      return (
-        !name.startsWith("__MACOSX") &&
-        !name.startsWith(".") &&
-        !name.startsWith(".DS_Store")
-      );
-    }
+  private final FilenameFilter filter = (f, name) -> {
+    // ignore directories generated by mac os x
+    return (
+      !name.startsWith("__MACOSX") &&
+      !name.startsWith(".") &&
+      !name.startsWith(".DS_Store")
+    );
   };
 
   private boolean isProd() {
@@ -143,23 +135,15 @@ public class CapacitorUpdater {
     return (percent * (max - min)) / 100 + min;
   }
 
-  void notifyDownload(final String id, final int percent) {
-    return;
-  }
+  void notifyDownload(final String id, final int percent) {}
 
-  void directUpdateFinish(final BundleInfo latest) {
-    return;
-  }
+  void directUpdateFinish(final BundleInfo latest) {}
 
-  void notifyListeners(final String id, final JSObject res) {
-    return;
-  }
+  void notifyListeners(final String id, final JSObject res) {}
 
-  private String randomString(final int len) {
-    final StringBuilder sb = new StringBuilder(len);
-    for (int i = 0; i < len; i++) sb.append(
-      AB.charAt(rnd.nextInt(AB.length()))
-    );
+  private String randomString() {
+    final StringBuilder sb = new StringBuilder(10);
+    for (int i = 0; i < 10; i++) sb.append(AB.charAt(rnd.nextInt(AB.length())));
     return sb.toString();
   }
 
@@ -205,8 +189,8 @@ public class CapacitorUpdater {
           );
         }
 
+        assert dir != null;
         if (!dir.isDirectory() && !dir.mkdirs()) {
-          final JSObject ret = new JSObject();
           this.sendStats("directory_path_fail");
           throw new FileNotFoundException(
             "Failed to ensure directory: " + dir.getAbsolutePath()
@@ -248,7 +232,7 @@ public class CapacitorUpdater {
       );
     }
     final File destinationFile = new File(this.documentsDir, dest);
-    destinationFile.getParentFile().mkdirs();
+    Objects.requireNonNull(destinationFile.getParentFile()).mkdirs();
     final String[] entries = sourceFile.list(this.filter);
     if (entries == null || entries.length == 0) {
       throw new IOException(
@@ -283,7 +267,7 @@ public class CapacitorUpdater {
     this.activity.unregisterReceiver(receiver);
   }
 
-  private BroadcastReceiver receiver = new BroadcastReceiver() {
+  private final BroadcastReceiver receiver = new BroadcastReceiver() {
     @Override
     public void onReceive(Context context, Intent intent) {
       String action = intent.getAction();
@@ -358,7 +342,7 @@ public class CapacitorUpdater {
       final String checksum;
       checksum = this.getChecksum(downloaded);
       this.notifyDownload(id, 71);
-      final File unzipped = this.unzip(id, downloaded, this.randomString(10));
+      final File unzipped = this.unzip(id, downloaded, this.randomString());
       downloaded.delete();
       this.notifyDownload(id, 91);
       final String idName = bundleDirectory + "/" + id;
@@ -439,7 +423,7 @@ public class CapacitorUpdater {
     this.activity.startService(intent);
   }
 
-  private File downloadFile(
+  private void downloadFile(
     final String id,
     final String url,
     final String dest
@@ -478,7 +462,6 @@ public class CapacitorUpdater {
       this.sendStats("low_mem_fail");
       throw new IOException("OutOfMemoryError while downloading file");
     }
-    return target;
   }
 
   private void deleteDirectory(final File file) throws IOException {
@@ -575,7 +558,7 @@ public class CapacitorUpdater {
     final String sessionKey,
     final String checksum
   ) {
-    final String id = this.randomString(10);
+    final String id = this.randomString();
     this.saveBundleInfo(
         id,
         new BundleInfo(
@@ -594,7 +577,7 @@ public class CapacitorUpdater {
         version,
         sessionKey,
         checksum,
-        this.randomString(10)
+        this.randomString()
       );
   }
 
@@ -604,7 +587,7 @@ public class CapacitorUpdater {
     final String sessionKey,
     final String checksum
   ) throws IOException {
-    final String id = this.randomString(10);
+    final String id = this.randomString();
     this.saveBundleInfo(
         id,
         new BundleInfo(
@@ -616,10 +599,9 @@ public class CapacitorUpdater {
         )
       );
     this.notifyDownload(id, 0);
-    final String idName = bundleDirectory + "/" + id;
     this.notifyDownload(id, 5);
-    final String dest = this.randomString(10);
-    final File downloaded = this.downloadFile(id, url, dest);
+    final String dest = this.randomString();
+    this.downloadFile(id, url, dest);
     final Boolean finished =
       this.finishDownload(id, dest, version, sessionKey, checksum, false);
     final BundleStatus status = finished
@@ -684,15 +666,12 @@ public class CapacitorUpdater {
   private boolean bundleExists(final String id) {
     final File bundle = this.getBundleDirectory(id);
     final BundleInfo bundleInfo = this.getBundleInfo(id);
-    if (
+    return (
       bundle.isDirectory() &&
       bundle.exists() &&
       new File(bundle.getPath(), "/index.html").exists() &&
       !bundleInfo.isDeleted()
-    ) {
-      return true;
-    }
-    return false;
+    );
   }
 
   public Boolean set(final BundleInfo bundle) {
@@ -804,10 +783,10 @@ public class CapacitorUpdater {
         );
         retError.put("message", message + ": " + json);
       } catch (UnsupportedEncodingException e) {
-        retError.put("message", message + ": " + e.toString());
+        retError.put("message", message + ": " + e);
       }
     } else {
-      retError.put("message", message + ": " + error.toString());
+      retError.put("message", message + ": " + error);
     }
     Log.e(TAG, message + ": " + retError);
     return retError;
@@ -821,7 +800,7 @@ public class CapacitorUpdater {
       Log.e(TAG, "Error getLatest JSONException", e);
       e.printStackTrace();
       final JSObject retError = new JSObject();
-      retError.put("message", "Cannot get info: " + e.toString());
+      retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
       callback.callback(retError);
       return;
@@ -833,40 +812,33 @@ public class CapacitorUpdater {
       Request.Method.POST,
       updateUrl,
       json,
-      new Response.Listener<JSONObject>() {
-        @Override
-        public void onResponse(JSONObject res) {
-          final JSObject ret = new JSObject();
-          Iterator<String> keys = res.keys();
-          while (keys.hasNext()) {
-            String key = keys.next();
-            if (res.has(key)) {
-              try {
-                if ("session_key".equals(key)) {
-                  ret.put("sessionKey", res.get(key));
-                } else {
-                  ret.put(key, res.get(key));
-                }
-              } catch (JSONException e) {
-                e.printStackTrace();
-                final JSObject retError = new JSObject();
-                retError.put("message", "Cannot set info: " + e.toString());
-                retError.put("error", "response_error");
-                callback.callback(retError);
+      res -> {
+        final JSObject ret = new JSObject();
+        Iterator<String> keys = res.keys();
+        while (keys.hasNext()) {
+          String key = keys.next();
+          if (res.has(key)) {
+            try {
+              if ("session_key".equals(key)) {
+                ret.put("sessionKey", res.get(key));
+              } else {
+                ret.put(key, res.get(key));
               }
+            } catch (JSONException e) {
+              e.printStackTrace();
+              final JSObject retError = new JSObject();
+              retError.put("message", "Cannot set info: " + e);
+              retError.put("error", "response_error");
+              callback.callback(retError);
             }
           }
-          callback.callback(ret);
         }
+        callback.callback(ret);
       },
-      new Response.ErrorListener() {
-        @Override
-        public void onErrorResponse(VolleyError error) {
-          callback.callback(
-            CapacitorUpdater.this.createError("Error get latest", error)
-          );
-        }
-      }
+      error ->
+        callback.callback(
+          CapacitorUpdater.this.createError("Error get latest", error)
+        )
     );
     this.requestQueue.add(setRetryPolicy(request));
   }
@@ -881,14 +853,14 @@ public class CapacitorUpdater {
       callback.callback(retError);
       return;
     }
-    JSONObject json = null;
+    JSONObject json;
     try {
       json = this.createInfoObject();
     } catch (JSONException e) {
       Log.e(TAG, "Error unsetChannel JSONException", e);
       e.printStackTrace();
       final JSObject retError = new JSObject();
-      retError.put("message", "Cannot get info: " + e.toString());
+      retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
       callback.callback(retError);
       return;
@@ -898,40 +870,30 @@ public class CapacitorUpdater {
       Request.Method.DELETE,
       channelUrl,
       json,
-      new Response.Listener<JSONObject>() {
-        @Override
-        public void onResponse(JSONObject res) {
-          final JSObject ret = new JSObject();
-          Iterator<String> keys = res.keys();
-          while (keys.hasNext()) {
-            String key = keys.next();
-            if (res.has(key)) {
-              try {
-                ret.put(key, res.get(key));
-              } catch (JSONException e) {
-                e.printStackTrace();
-                final JSObject retError = new JSObject();
-                retError.put(
-                  "message",
-                  "Cannot unset channel: " + e.toString()
-                );
-                retError.put("error", "response_error");
-                callback.callback(ret);
-              }
+      res -> {
+        final JSObject ret = new JSObject();
+        Iterator<String> keys = res.keys();
+        while (keys.hasNext()) {
+          String key = keys.next();
+          if (res.has(key)) {
+            try {
+              ret.put(key, res.get(key));
+            } catch (JSONException e) {
+              e.printStackTrace();
+              final JSObject retError = new JSObject();
+              retError.put("message", "Cannot unset channel: " + e);
+              retError.put("error", "response_error");
+              callback.callback(ret);
             }
           }
-          Log.i(TAG, "Channel unset");
-          callback.callback(ret);
         }
+        Log.i(TAG, "Channel unset");
+        callback.callback(ret);
       },
-      new Response.ErrorListener() {
-        @Override
-        public void onErrorResponse(VolleyError error) {
-          callback.callback(
-            CapacitorUpdater.this.createError("Error unset channel", error)
-          );
-        }
-      }
+      error ->
+        callback.callback(
+          CapacitorUpdater.this.createError("Error unset channel", error)
+        )
     );
     this.requestQueue.add(setRetryPolicy(request));
   }
@@ -946,7 +908,7 @@ public class CapacitorUpdater {
       callback.callback(retError);
       return;
     }
-    JSONObject json = null;
+    JSONObject json;
     try {
       json = this.createInfoObject();
       json.put("channel", channel);
@@ -954,7 +916,7 @@ public class CapacitorUpdater {
       Log.e(TAG, "Error setChannel JSONException", e);
       e.printStackTrace();
       final JSObject retError = new JSObject();
-      retError.put("message", "Cannot get info: " + e.toString());
+      retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
       callback.callback(retError);
       return;
@@ -964,37 +926,30 @@ public class CapacitorUpdater {
       Request.Method.POST,
       channelUrl,
       json,
-      new Response.Listener<JSONObject>() {
-        @Override
-        public void onResponse(JSONObject res) {
-          final JSObject ret = new JSObject();
-          Iterator<String> keys = res.keys();
-          while (keys.hasNext()) {
-            String key = keys.next();
-            if (res.has(key)) {
-              try {
-                ret.put(key, res.get(key));
-              } catch (JSONException e) {
-                e.printStackTrace();
-                final JSObject retError = new JSObject();
-                retError.put("message", "Cannot set channel: " + e.toString());
-                retError.put("error", "response_error");
-                callback.callback(ret);
-              }
+      res -> {
+        final JSObject ret = new JSObject();
+        Iterator<String> keys = res.keys();
+        while (keys.hasNext()) {
+          String key = keys.next();
+          if (res.has(key)) {
+            try {
+              ret.put(key, res.get(key));
+            } catch (JSONException e) {
+              e.printStackTrace();
+              final JSObject retError = new JSObject();
+              retError.put("message", "Cannot set channel: " + e);
+              retError.put("error", "response_error");
+              callback.callback(ret);
             }
           }
-          Log.i(TAG, "Channel set to \"" + channel);
-          callback.callback(ret);
         }
+        Log.i(TAG, "Channel set to \"" + channel);
+        callback.callback(ret);
       },
-      new Response.ErrorListener() {
-        @Override
-        public void onErrorResponse(VolleyError error) {
-          callback.callback(
-            CapacitorUpdater.this.createError("Error set channel", error)
-          );
-        }
-      }
+      error ->
+        callback.callback(
+          CapacitorUpdater.this.createError("Error set channel", error)
+        )
     );
     this.requestQueue.add(setRetryPolicy(request));
   }
@@ -1009,14 +964,14 @@ public class CapacitorUpdater {
       callback.callback(retError);
       return;
     }
-    JSONObject json = null;
+    JSONObject json;
     try {
       json = this.createInfoObject();
     } catch (JSONException e) {
       Log.e(TAG, "Error getChannel JSONException", e);
       e.printStackTrace();
       final JSObject retError = new JSObject();
-      retError.put("message", "Cannot get info: " + e.toString());
+      retError.put("message", "Cannot get info: " + e);
       retError.put("error", "json_error");
       callback.callback(retError);
       return;
@@ -1026,33 +981,26 @@ public class CapacitorUpdater {
       Request.Method.PUT,
       channelUrl,
       json,
-      new Response.Listener<JSONObject>() {
-        @Override
-        public void onResponse(JSONObject res) {
-          final JSObject ret = new JSObject();
-          Iterator<String> keys = res.keys();
-          while (keys.hasNext()) {
-            String key = keys.next();
-            if (res.has(key)) {
-              try {
-                ret.put(key, res.get(key));
-              } catch (JSONException e) {
-                e.printStackTrace();
-              }
+      res -> {
+        final JSObject ret = new JSObject();
+        Iterator<String> keys = res.keys();
+        while (keys.hasNext()) {
+          String key = keys.next();
+          if (res.has(key)) {
+            try {
+              ret.put(key, res.get(key));
+            } catch (JSONException e) {
+              e.printStackTrace();
             }
           }
-          Log.i(TAG, "Channel get to \"" + ret);
-          callback.callback(ret);
         }
+        Log.i(TAG, "Channel get to \"" + ret);
+        callback.callback(ret);
       },
-      new Response.ErrorListener() {
-        @Override
-        public void onErrorResponse(VolleyError error) {
-          callback.callback(
-            CapacitorUpdater.this.createError("Error get channel", error)
-          );
-        }
-      }
+      error ->
+        callback.callback(
+          CapacitorUpdater.this.createError("Error get channel", error)
+        )
     );
     this.requestQueue.add(setRetryPolicy(request));
   }
@@ -1066,7 +1014,7 @@ public class CapacitorUpdater {
     if (statsUrl == null || statsUrl.isEmpty()) {
       return;
     }
-    JSONObject json = null;
+    JSONObject json;
     try {
       json = this.createInfoObject();
       json.put("action", action);
@@ -1080,21 +1028,9 @@ public class CapacitorUpdater {
       Request.Method.POST,
       statsUrl,
       json,
-      new Response.Listener<JSONObject>() {
-        @Override
-        public void onResponse(JSONObject response) {
-          Log.i(
-            TAG,
-            "Stats send for \"" + action + "\", version " + versionName
-          );
-        }
-      },
-      new Response.ErrorListener() {
-        @Override
-        public void onErrorResponse(VolleyError error) {
-          CapacitorUpdater.this.createError("Error send stats", error);
-        }
-      }
+      response ->
+        Log.i(TAG, "Stats send for \"" + action + "\", version " + versionName),
+      error -> CapacitorUpdater.this.createError("Error send stats", error)
     );
     this.requestQueue.add(setRetryPolicy(request));
   }
@@ -1156,14 +1092,6 @@ public class CapacitorUpdater {
     this.editor.commit();
   }
 
-  public void setVersionName(final String id, final String name) {
-    if (id != null) {
-      Log.d(TAG, "Setting name for bundle [" + id + "] to " + name);
-      BundleInfo info = this.getBundleInfo(id);
-      this.saveBundleInfo(id, info.setVersionName(name));
-    }
-  }
-
   private void setBundleStatus(final String id, final BundleStatus status) {
     if (id != null && status != null) {
       BundleInfo info = this.getBundleInfo(id);

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

@@ -55,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.7.7";
+  private final String PLUGIN_VERSION = "5.7.9";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;

package/ios/Plugin/CapacitorUpdater.swift

@@ -950,12 +950,6 @@ extension CustomError: LocalizedError {
         UserDefaults.standard.synchronize()
     }
 
-    public func setVersionName(id: String, version: String) {
-        print("\(self.TAG) Setting version for folder [\(id)] to \(version)")
-        let info = self.getBundleInfo(id: id)
-        self.saveBundleInfo(id: id, bundle: info.setVersionName(version: version))
-    }
-
     private func setBundleStatus(id: String, status: BundleStatus) {
         print("\(self.TAG) Setting status for bundle [\(id)] to \(status)")
         let info = self.getBundleInfo(id: id)

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.7.7"
+    private let PLUGIN_VERSION: String = "5.7.9"
     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"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.7.7",
+  "version": "5.7.9",
   "packageManager": "pnpm@8.15.4",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",