@capawesome/capacitor-live-update 7.3.0 → 8.0.0

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdateHttpClient.java

@@ -4,9 +4,13 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.getcapacitor.Logger;
 import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.DownloadProgressCallback;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.EmptyCallback;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.NonEmptyCallback;
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
+import okhttp3.Call;
+import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -21,6 +25,9 @@ public class LiveUpdateHttpClient {
     @NonNull
     private final LiveUpdateConfig config;
 
+    @NonNull
+    private final OkHttpClient okHttpClient;
+
     @Nullable
     public static String getChecksumFromResponse(Response response) {
         String checksum = response.header("X-Checksum");
@@ -41,17 +48,38 @@ public class LiveUpdateHttpClient {
 
     public LiveUpdateHttpClient(@NonNull LiveUpdateConfig config) {
         this.config = config;
-    }
-
-    public Response execute(String url) throws IOException {
         int httpTimeout = config.getHttpTimeout();
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+
+        // Increase max requests per host to allow multiple parallel downloads from the same host
+        okhttp3.Dispatcher dispatcher = new okhttp3.Dispatcher();
+        dispatcher.setMaxRequestsPerHost(30);
+
+        this.okHttpClient = new OkHttpClient.Builder()
+            .dispatcher(dispatcher)
             .connectTimeout(httpTimeout, TimeUnit.MILLISECONDS)
             .readTimeout(httpTimeout, TimeUnit.MILLISECONDS)
             .writeTimeout(httpTimeout, TimeUnit.MILLISECONDS)
             .build();
+    }
+
+    public Call enqueue(String url, NonEmptyCallback<Response> callback) {
         Request request = new Request.Builder().url(url).build();
-        return okHttpClient.newCall(request).execute();
+
+        Call call = okHttpClient.newCall(request);
+        call.enqueue(
+            new Callback() {
+                @Override
+                public void onResponse(@NonNull Call call, @NonNull Response response) {
+                    callback.success(response);
+                }
+
+                @Override
+                public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                    callback.error(new Exception(e));
+                }
+            }
+        );
+        return call;
     }
 
     public static void writeResponseBodyToFile(ResponseBody body, File file, @Nullable DownloadProgressCallback callback)

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdatePlugin.java

@@ -16,11 +16,17 @@ import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.DeleteBundle
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.DownloadBundleOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.FetchLatestBundleOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.SetChannelOptions;
+import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.SetConfigOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.SetCustomIdOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.SetNextBundleOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.SyncOptions;
+import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.FetchLatestBundleResult;
+import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetBlockedBundlesResult;
+import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetConfigResult;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetCurrentBundleResult;
+import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetDownloadedBundlesResult;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetNextBundleResult;
+import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.IsSyncingResult;
 import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.EmptyCallback;
 import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.NonEmptyCallback;
 import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
@@ -29,7 +35,7 @@ import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
 public class LiveUpdatePlugin extends Plugin {
 
     public static final String TAG = "LiveUpdate";
-    public static final String VERSION = "7.3.0";
+    public static final String VERSION = "7.4.0";
     public static final String SHARED_PREFERENCES_NAME = "CapawesomeLiveUpdate"; // DO NOT CHANGE
     public static final String ERROR_APP_ID_MISSING = "appId must be configured.";
     public static final String ERROR_BUNDLE_EXISTS = "bundle already exists.";
@@ -49,6 +55,7 @@ public class LiveUpdatePlugin extends Plugin {
     public static final String ERROR_UNKNOWN_ERROR = "An unknown error has occurred.";
     public static final String EVENT_DOWNLOAD_BUNDLE_PROGRESS = "downloadBundleProgress";
     public static final String EVENT_NEXT_BUNDLE_SET = "nextBundleSet";
+    public static final String EVENT_RELOADED = "reloaded";
 
     @Nullable
     private LiveUpdateConfig config;
@@ -97,6 +104,16 @@ public class LiveUpdatePlugin extends Plugin {
         }
     }
 
+    @PluginMethod
+    public void clearBlockedBundles(PluginCall call) {
+        try {
+            implementation.clearBlockedBundles();
+            resolveCall(call);
+        } catch (Exception exception) {
+            rejectCall(call, exception);
+        }
+    }
+
     @PluginMethod
     public void deleteBundle(PluginCall call) {
         try {
@@ -171,9 +188,9 @@ public class LiveUpdatePlugin extends Plugin {
             }
 
             FetchLatestBundleOptions options = new FetchLatestBundleOptions(call);
-            NonEmptyCallback<Result> callback = new NonEmptyCallback<>() {
+            NonEmptyCallback<FetchLatestBundleResult> callback = new NonEmptyCallback<>() {
                 @Override
-                public void success(Result result) {
+                public void success(FetchLatestBundleResult result) {
                     resolveCall(call, result.toJSObject());
                 }
 
@@ -189,6 +206,28 @@ public class LiveUpdatePlugin extends Plugin {
         }
     }
 
+    @PluginMethod
+    public void getBlockedBundles(PluginCall call) {
+        try {
+            NonEmptyCallback<GetBlockedBundlesResult> callback = new NonEmptyCallback<>() {
+                @Override
+                public void success(GetBlockedBundlesResult result) {
+                    resolveCall(call, result.toJSObject());
+                }
+
+                @Override
+                public void error(Exception exception) {
+                    rejectCall(call, exception);
+                }
+            };
+
+            assert implementation != null;
+            implementation.getBlockedBundles(callback);
+        } catch (Exception exception) {
+            rejectCall(call, exception);
+        }
+    }
+
     @PluginMethod
     public void getBundles(PluginCall call) {
         try {
@@ -210,6 +249,28 @@ public class LiveUpdatePlugin extends Plugin {
         }
     }
 
+    @PluginMethod
+    public void getDownloadedBundles(PluginCall call) {
+        try {
+            NonEmptyCallback<GetDownloadedBundlesResult> callback = new NonEmptyCallback<>() {
+                @Override
+                public void success(GetDownloadedBundlesResult result) {
+                    resolveCall(call, result.toJSObject());
+                }
+
+                @Override
+                public void error(Exception exception) {
+                    rejectCall(call, exception);
+                }
+            };
+
+            assert implementation != null;
+            implementation.getDownloadedBundles(callback);
+        } catch (Exception exception) {
+            rejectCall(call, exception);
+        }
+    }
+
     @PluginMethod
     public void getChannel(PluginCall call) {
         try {
@@ -231,6 +292,28 @@ public class LiveUpdatePlugin extends Plugin {
         }
     }
 
+    @PluginMethod
+    public void getConfig(PluginCall call) {
+        try {
+            NonEmptyCallback<GetConfigResult> callback = new NonEmptyCallback<>() {
+                @Override
+                public void success(GetConfigResult result) {
+                    resolveCall(call, result.toJSObject());
+                }
+
+                @Override
+                public void error(Exception exception) {
+                    rejectCall(call, exception);
+                }
+            };
+
+            assert implementation != null;
+            implementation.getConfig(callback);
+        } catch (Exception exception) {
+            rejectCall(call, exception);
+        }
+    }
+
     @PluginMethod
     public void getCurrentBundle(PluginCall call) {
         try {
@@ -359,6 +442,28 @@ public class LiveUpdatePlugin extends Plugin {
         }
     }
 
+    @PluginMethod
+    public void isSyncing(PluginCall call) {
+        try {
+            NonEmptyCallback<IsSyncingResult> callback = new NonEmptyCallback<>() {
+                @Override
+                public void success(IsSyncingResult result) {
+                    resolveCall(call, result.toJSObject());
+                }
+
+                @Override
+                public void error(Exception exception) {
+                    rejectCall(call, exception);
+                }
+            };
+
+            assert implementation != null;
+            implementation.isSyncing(callback);
+        } catch (Exception exception) {
+            rejectCall(call, exception);
+        }
+    }
+
     @PluginMethod
     public void ready(PluginCall call) {
         try {
@@ -400,6 +505,16 @@ public class LiveUpdatePlugin extends Plugin {
         }
     }
 
+    @PluginMethod
+    public void resetConfig(PluginCall call) {
+        try {
+            implementation.resetConfig();
+            resolveCall(call);
+        } catch (Exception exception) {
+            rejectCall(call, exception);
+        }
+    }
+
     @PluginMethod
     public void setChannel(PluginCall call) {
         try {
@@ -424,6 +539,17 @@ public class LiveUpdatePlugin extends Plugin {
         }
     }
 
+    @PluginMethod
+    public void setConfig(PluginCall call) {
+        try {
+            SetConfigOptions options = new SetConfigOptions(call);
+            implementation.setConfig(options);
+            resolveCall(call);
+        } catch (Exception exception) {
+            rejectCall(call, exception);
+        }
+    }
+
     @PluginMethod
     public void setCustomId(PluginCall call) {
         try {
@@ -510,6 +636,11 @@ public class LiveUpdatePlugin extends Plugin {
         notifyListeners(EVENT_NEXT_BUNDLE_SET, event.toJSObject(), false);
     }
 
+    public void notifyReloadedListeners() {
+        JSObject event = new JSObject();
+        notifyListeners(EVENT_RELOADED, event, true);
+    }
+
     private LiveUpdateConfig getLiveUpdateConfig() {
         LiveUpdateConfig config = new LiveUpdateConfig();
 

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdatePreferences.java

@@ -15,10 +15,12 @@ public class LiveUpdatePreferences {
     @NonNull
     private final SharedPreferences.Editor settingsEditor;
 
+    private final String appIdKey = "appId"; // DO NOT CHANGE
     private final String blockedBundleIdsKey = "blockedBundleIds"; // DO NOT CHANGE
     private final String channelKey = "channel"; // DO NOT CHANGE
     private final String deviceIdKey = "deviceId"; // DO NOT CHANGE
     private final String customIdKey = "customId"; // DO NOT CHANGE
+    private final String lastVersionCodeKey = "lastVersionCode"; // DO NOT CHANGE
     private final String previousBundleIdKey = "previousBundleId"; // DO NOT CHANGE
 
     public LiveUpdatePreferences(@NonNull Context context) {
@@ -26,6 +28,11 @@ public class LiveUpdatePreferences {
         this.settingsEditor = context.getSharedPreferences(LiveUpdatePlugin.SHARED_PREFERENCES_NAME, Activity.MODE_PRIVATE).edit();
     }
 
+    @Nullable
+    public String getAppId() {
+        return context.getSharedPreferences(LiveUpdatePlugin.SHARED_PREFERENCES_NAME, Activity.MODE_PRIVATE).getString(appIdKey, null);
+    }
+
     @Nullable
     public String getChannel() {
         return context.getSharedPreferences(LiveUpdatePlugin.SHARED_PREFERENCES_NAME, Activity.MODE_PRIVATE).getString(channelKey, null);
@@ -49,6 +56,10 @@ public class LiveUpdatePreferences {
         }
     }
 
+    public int getLastVersionCode() {
+        return context.getSharedPreferences(LiveUpdatePlugin.SHARED_PREFERENCES_NAME, Activity.MODE_PRIVATE).getInt(lastVersionCodeKey, -1);
+    }
+
     @Nullable
     public String getPreviousBundleId() {
         return context
@@ -63,6 +74,15 @@ public class LiveUpdatePreferences {
             .getString(blockedBundleIdsKey, null);
     }
 
+    public void setAppId(@Nullable String appId) {
+        if (appId == null) {
+            settingsEditor.remove(appIdKey);
+        } else {
+            settingsEditor.putString(appIdKey, appId);
+        }
+        settingsEditor.apply();
+    }
+
     public void setBlockedBundleIds(@Nullable String blockedBundleIds) {
         if (blockedBundleIds == null) {
             settingsEditor.remove(blockedBundleIdsKey);
@@ -99,6 +119,11 @@ public class LiveUpdatePreferences {
         settingsEditor.apply();
     }
 
+    public void setLastVersionCode(int versionCode) {
+        settingsEditor.putInt(lastVersionCodeKey, versionCode);
+        settingsEditor.apply();
+    }
+
     public void setPreviousBundleId(@Nullable String bundleId) {
         if (bundleId == null) {
             settingsEditor.remove(previousBundleIdKey);

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/api/GetLatestBundleResponse.java

@@ -36,9 +36,9 @@ public class GetLatestBundleResponse {
             this.artifactType = ArtifactType.ZIP;
         }
         this.bundleId = responseJson.optString("bundleId");
-        this.checksum = responseJson.optString("checksum");
+        this.checksum = responseJson.isNull("checksum") ? null : responseJson.optString("checksum");
         this.customProperties = responseJson.optJSONObject("customProperties");
-        this.signature = responseJson.optString("signature");
+        this.signature = responseJson.isNull("signature") ? null : responseJson.optString("signature");
         this.url = responseJson.optString("url");
     }
 

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/options/SetConfigOptions.java

@@ -0,0 +1,19 @@
+package io.capawesome.capacitorjs.plugins.liveupdate.classes.options;
+
+import androidx.annotation.Nullable;
+import com.getcapacitor.PluginCall;
+
+public class SetConfigOptions {
+
+    @Nullable
+    private final String appId;
+
+    public SetConfigOptions(PluginCall call) {
+        this.appId = call.getString("appId");
+    }
+
+    @Nullable
+    public String getAppId() {
+        return appId;
+    }
+}

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/results/GetBlockedBundlesResult.java

@@ -0,0 +1,27 @@
+package io.capawesome.capacitorjs.plugins.liveupdate.classes.results;
+
+import androidx.annotation.NonNull;
+import com.getcapacitor.JSArray;
+import com.getcapacitor.JSObject;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
+
+public class GetBlockedBundlesResult implements Result {
+
+    @NonNull
+    private String[] bundleIds;
+
+    public GetBlockedBundlesResult(@NonNull String[] bundleIds) {
+        this.bundleIds = bundleIds;
+    }
+
+    public JSObject toJSObject() {
+        JSArray bundleIdsResult = new JSArray();
+        for (String bundleId : bundleIds) {
+            bundleIdsResult.put(bundleId);
+        }
+
+        JSObject result = new JSObject();
+        result.put("bundleIds", bundleIdsResult);
+        return result;
+    }
+}

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/results/GetConfigResult.java

@@ -0,0 +1,40 @@
+package io.capawesome.capacitorjs.plugins.liveupdate.classes.results;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.getcapacitor.JSObject;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
+import org.json.JSONObject;
+
+public class GetConfigResult implements Result {
+
+    @Nullable
+    private final String appId;
+
+    @NonNull
+    private final String autoUpdateStrategy;
+
+    public GetConfigResult(@Nullable String appId, @NonNull String autoUpdateStrategy) {
+        this.appId = appId;
+        this.autoUpdateStrategy = autoUpdateStrategy;
+    }
+
+    @Nullable
+    public String getAppId() {
+        return appId;
+    }
+
+    @NonNull
+    public String getAutoUpdateStrategy() {
+        return autoUpdateStrategy;
+    }
+
+    @Override
+    @NonNull
+    public JSObject toJSObject() {
+        JSObject result = new JSObject();
+        result.put("appId", appId == null ? JSONObject.NULL : appId);
+        result.put("autoUpdateStrategy", autoUpdateStrategy);
+        return result;
+    }
+}

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/results/GetDownloadedBundlesResult.java

@@ -0,0 +1,27 @@
+package io.capawesome.capacitorjs.plugins.liveupdate.classes.results;
+
+import androidx.annotation.NonNull;
+import com.getcapacitor.JSArray;
+import com.getcapacitor.JSObject;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
+
+public class GetDownloadedBundlesResult implements Result {
+
+    @NonNull
+    private String[] bundleIds;
+
+    public GetDownloadedBundlesResult(@NonNull String[] bundleIds) {
+        this.bundleIds = bundleIds;
+    }
+
+    public JSObject toJSObject() {
+        JSArray bundleIdsResult = new JSArray();
+        for (String bundleId : bundleIds) {
+            bundleIdsResult.put(bundleId);
+        }
+
+        JSObject result = new JSObject();
+        result.put("bundleIds", bundleIdsResult);
+        return result;
+    }
+}

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/classes/results/IsSyncingResult.java

@@ -0,0 +1,26 @@
+package io.capawesome.capacitorjs.plugins.liveupdate.classes.results;
+
+import androidx.annotation.NonNull;
+import com.getcapacitor.JSObject;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
+
+public class IsSyncingResult implements Result {
+
+    private final boolean syncing;
+
+    public IsSyncingResult(boolean syncing) {
+        this.syncing = syncing;
+    }
+
+    public boolean getSyncing() {
+        return syncing;
+    }
+
+    @Override
+    @NonNull
+    public JSObject toJSObject() {
+        JSObject result = new JSObject();
+        result.put("syncing", syncing);
+        return result;
+    }
+}