@capgo/capacitor-updater 7.4.0 → 7.5.1

package/README.md

@@ -252,6 +252,7 @@ CapacitorUpdater can be configured with these options:
 | **`appId`**                  | <code>string</code>  | Configure the app id for the app in the config.                                                                                                                                                 | <code>undefined</code>                             | 6.0.0   |
 | **`keepUrlPathAfterReload`** | <code>boolean</code> | Configure the plugin to keep the URL path after a reload. WARNING: When a reload is triggered, 'window.history' will be cleared.                                                                | <code>false</code>                                 | 6.8.0   |
 | **`disableJSLogging`**       | <code>boolean</code> | Disable the JavaScript logging of the plugin. if true, the plugin will not log to the JavaScript console. only the native log will be done                                                      | <code>false</code>                                 | 7.3.0   |
+| **`shakeMenu`**              | <code>boolean</code> | Enable shake gesture to show update menu for debugging/testing purposes                                                                                                                         | <code>false</code>                                 | 7.5.0   |
 
 ### Examples
 
@@ -285,7 +286,8 @@ In `capacitor.config.json`:
       "defaultChannel": undefined,
       "appId": undefined,
       "keepUrlPathAfterReload": undefined,
-      "disableJSLogging": undefined
+      "disableJSLogging": undefined,
+      "shakeMenu": undefined
     }
   }
 }
@@ -326,6 +328,7 @@ const config: CapacitorConfig = {
       appId: undefined,
       keepUrlPathAfterReload: undefined,
       disableJSLogging: undefined,
+      shakeMenu: undefined,
     },
   },
 };
@@ -357,6 +360,7 @@ export default config;
 * [`setChannel(...)`](#setchannel)
 * [`unsetChannel(...)`](#unsetchannel)
 * [`getChannel()`](#getchannel)
+* [`listChannels()`](#listchannels)
 * [`setCustomId(...)`](#setcustomid)
 * [`getBuiltinVersion()`](#getbuiltinversion)
 * [`getDeviceId()`](#getdeviceid)
@@ -374,6 +378,8 @@ export default config;
 * [`addListener('appReady', ...)`](#addlistenerappready-)
 * [`isAutoUpdateAvailable()`](#isautoupdateavailable)
 * [`getNextBundle()`](#getnextbundle)
+* [`setShakeMenu(...)`](#setshakemenu)
+* [`isShakeMenuEnabled()`](#isshakemenuenabled)
 * [Interfaces](#interfaces)
 * [Type Aliases](#type-aliases)
 
@@ -678,6 +684,21 @@ Get the channel for this device
 --------------------
 
 
+### listChannels()
+
+```typescript
+listChannels() => Promise<ListChannelsResult>
+```
+
+List all channels available for this device that allow self-assignment
+
+**Returns:** <code>Promise&lt;<a href="#listchannelsresult">ListChannelsResult</a>&gt;</code>
+
+**Since:** 7.5.0
+
+--------------------
+
+
 ### setCustomId(...)
 
 ```typescript
@@ -972,6 +993,38 @@ Returns null if no next bundle is set.
 --------------------
 
 
+### setShakeMenu(...)
+
+```typescript
+setShakeMenu(options: SetShakeMenuOptions) => Promise<void>
+```
+
+Enable or disable the shake menu for debugging/testing purposes
+
+| Param         | Type                                                                | Description                                              |
+| ------------- | ------------------------------------------------------------------- | -------------------------------------------------------- |
+| **`options`** | <code><a href="#setshakemenuoptions">SetShakeMenuOptions</a></code> | Contains enabled boolean to enable or disable shake menu |
+
+**Since:** 7.5.0
+
+--------------------
+
+
+### isShakeMenuEnabled()
+
+```typescript
+isShakeMenuEnabled() => Promise<ShakeMenuEnabled>
+```
+
+Get the current state of the shake menu
+
+**Returns:** <code>Promise&lt;<a href="#shakemenuenabled">ShakeMenuEnabled</a>&gt;</code>
+
+**Since:** 7.5.0
+
+--------------------
+
+
 ### Interfaces
 
 
@@ -1145,6 +1198,23 @@ If you don't use backend, you need to provide the URL and version of the bundle.
 | **`allowSet`** | <code>boolean</code> |                               |       |
 
 
+#### ListChannelsResult
+
+| Prop           | Type                       | Description                | Since |
+| -------------- | -------------------------- | -------------------------- | ----- |
+| **`channels`** | <code>ChannelInfo[]</code> | List of available channels | 7.5.0 |
+
+
+#### ChannelInfo
+
+| Prop                 | Type                 | Description                                     | Since |
+| -------------------- | -------------------- | ----------------------------------------------- | ----- |
+| **`id`**             | <code>string</code>  | The channel ID                                  | 7.5.0 |
+| **`name`**           | <code>string</code>  | The channel name                                | 7.5.0 |
+| **`public`**         | <code>boolean</code> | Whether this is a public channel                | 7.5.0 |
+| **`allow_self_set`** | <code>boolean</code> | Whether devices can self-assign to this channel | 7.5.0 |
+
+
 #### SetCustomIdOptions
 
 | Prop           | Type                |
@@ -1252,6 +1322,20 @@ If you don't use backend, you need to provide the URL and version of the bundle.
 | **`available`** | <code>boolean</code> |
 
 
+#### SetShakeMenuOptions
+
+| Prop          | Type                 |
+| ------------- | -------------------- |
+| **`enabled`** | <code>boolean</code> |
+
+
+#### ShakeMenuEnabled
+
+| Prop          | Type                 |
+| ------------- | -------------------- |
+| **`enabled`** | <code>boolean</code> |
+
+
 ### Type Aliases
 
 

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

@@ -60,7 +60,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String statsUrlDefault = "https://plugin.capgo.app/stats";
     private static final String channelUrlDefault = "https://plugin.capgo.app/channel_self";
 
-    private final String PLUGIN_VERSION = "7.4.0";
+    private final String PLUGIN_VERSION = "7.5.1";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -78,6 +78,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private Thread backgroundTask;
     private Boolean taskRunning = false;
     private Boolean keepUrlPathAfterReload = false;
+    Boolean shakeMenuEnabled = false;
 
     private Boolean isPreviousMainActivity = true;
 
@@ -91,6 +92,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
     private DelayUpdateUtils delayUpdateUtils;
 
+    private ShakeMenu shakeMenu;
+
     private JSObject mapToJSObject(Map<String, Object> map) {
         JSObject jsObject = new JSObject();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
@@ -224,6 +227,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.appReadyTimeout = this.getConfig().getInt("appReadyTimeout", 10000);
         this.keepUrlPathAfterReload = this.getConfig().getBoolean("keepUrlPathAfterReload", false);
         this.implementation.timeout = this.getConfig().getInt("responseTimeout", 20) * 1000;
+        this.shakeMenuEnabled = this.getConfig().getBoolean("shakeMenu", false);
         boolean resetWhenUpdate = this.getConfig().getBoolean("resetWhenUpdate", true);
 
         this.implementation.autoReset();
@@ -438,7 +442,14 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 CapacitorUpdaterPlugin.this.implementation.unsetChannel(res -> {
                         JSObject jsRes = mapToJSObject(res);
                         if (jsRes.has("error")) {
-                            call.reject(jsRes.getString("error"));
+                            String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
+                            String errorCode = jsRes.getString("error");
+
+                            JSObject errorObj = new JSObject();
+                            errorObj.put("message", errorMessage);
+                            errorObj.put("error", errorCode);
+
+                            call.reject(errorMessage, "UNSETCHANNEL_FAILED", null, errorObj);
                         } else {
                             if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
                                 logger.info("Calling autoupdater after channel change!");
@@ -461,7 +472,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
         if (channel == null) {
             logger.error("setChannel called without channel");
-            call.reject("setChannel called without channel");
+            JSObject errorObj = new JSObject();
+            errorObj.put("message", "setChannel called without channel");
+            errorObj.put("error", "missing_parameter");
+            call.reject("setChannel called without channel", "SETCHANNEL_INVALID_PARAMS", null, errorObj);
             return;
         }
         try {
@@ -470,7 +484,14 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 CapacitorUpdaterPlugin.this.implementation.setChannel(channel, res -> {
                         JSObject jsRes = mapToJSObject(res);
                         if (jsRes.has("error")) {
-                            call.reject(jsRes.getString("error"));
+                            String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
+                            String errorCode = jsRes.getString("error");
+
+                            JSObject errorObj = new JSObject();
+                            errorObj.put("message", errorMessage);
+                            errorObj.put("error", errorCode);
+
+                            call.reject(errorMessage, "SETCHANNEL_FAILED", null, errorObj);
                         } else {
                             if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
                                 logger.info("Calling autoupdater after channel change!");
@@ -494,7 +515,14 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 CapacitorUpdaterPlugin.this.implementation.getChannel(res -> {
                         JSObject jsRes = mapToJSObject(res);
                         if (jsRes.has("error")) {
-                            call.reject(jsRes.getString("error"));
+                            String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
+                            String errorCode = jsRes.getString("error");
+
+                            JSObject errorObj = new JSObject();
+                            errorObj.put("message", errorMessage);
+                            errorObj.put("error", errorCode);
+
+                            call.reject(errorMessage, "GETCHANNEL_FAILED", null, errorObj);
                         } else {
                             call.resolve(jsRes);
                         }
@@ -506,6 +534,33 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
     }
 
+    @PluginMethod
+    public void listChannels(final PluginCall call) {
+        try {
+            logger.info("listChannels");
+            startNewThread(() ->
+                CapacitorUpdaterPlugin.this.implementation.listChannels(res -> {
+                        JSObject jsRes = mapToJSObject(res);
+                        if (jsRes.has("error")) {
+                            String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
+                            String errorCode = jsRes.getString("error");
+
+                            JSObject errorObj = new JSObject();
+                            errorObj.put("message", errorMessage);
+                            errorObj.put("error", errorCode);
+
+                            call.reject(errorMessage, "LISTCHANNELS_FAILED", null, errorObj);
+                        } else {
+                            call.resolve(jsRes);
+                        }
+                    })
+            );
+        } catch (final Exception e) {
+            logger.error("Failed to listChannels: " + e.getMessage());
+            call.reject("Failed to listChannels", e);
+        }
+    }
+
     @PluginMethod
     public void download(final PluginCall call) {
         final String url = call.getString("url");
@@ -1328,6 +1383,16 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
         logger.info("onActivityStarted " + getActivity().getClass().getName());
         isPreviousMainActivity = true;
+
+        // Initialize shake menu if enabled and activity is BridgeActivity
+        if (shakeMenuEnabled && getActivity() instanceof com.getcapacitor.BridgeActivity && shakeMenu == null) {
+            try {
+                shakeMenu = new ShakeMenu(this, (com.getcapacitor.BridgeActivity) getActivity(), logger);
+                logger.info("Shake menu initialized");
+            } catch (Exception e) {
+                logger.error("Failed to initialize shake menu: " + e.getMessage());
+            }
+        }
     }
 
     @Override
@@ -1359,5 +1424,61 @@ public class CapacitorUpdaterPlugin extends Plugin {
         if (counterActivityCreate == 0) {
             this.appKilled();
         }
+
+        // Clean up shake menu
+        if (shakeMenu != null) {
+            try {
+                shakeMenu.stop();
+                shakeMenu = null;
+                logger.info("Shake menu cleaned up");
+            } catch (Exception e) {
+                logger.error("Failed to clean up shake menu: " + e.getMessage());
+            }
+        }
+    }
+
+    @PluginMethod
+    public void setShakeMenu(final PluginCall call) {
+        final Boolean enabled = call.getBoolean("enabled");
+        if (enabled == null) {
+            logger.error("setShakeMenu called without enabled parameter");
+            call.reject("setShakeMenu called without enabled parameter");
+            return;
+        }
+
+        this.shakeMenuEnabled = enabled;
+        logger.info("Shake menu " + (enabled ? "enabled" : "disabled"));
+
+        // Manage shake menu instance based on enabled state
+        if (enabled && getActivity() instanceof com.getcapacitor.BridgeActivity && shakeMenu == null) {
+            try {
+                shakeMenu = new ShakeMenu(this, (com.getcapacitor.BridgeActivity) getActivity(), logger);
+                logger.info("Shake menu initialized");
+            } catch (Exception e) {
+                logger.error("Failed to initialize shake menu: " + e.getMessage());
+            }
+        } else if (!enabled && shakeMenu != null) {
+            try {
+                shakeMenu.stop();
+                shakeMenu = null;
+                logger.info("Shake menu stopped");
+            } catch (Exception e) {
+                logger.error("Failed to stop shake menu: " + e.getMessage());
+            }
+        }
+
+        call.resolve();
+    }
+
+    @PluginMethod
+    public void isShakeMenuEnabled(final PluginCall call) {
+        try {
+            final JSObject ret = new JSObject();
+            ret.put("enabled", this.shakeMenuEnabled);
+            call.resolve(ret);
+        } catch (final Exception e) {
+            logger.error("Could not get shake menu status " + e.getMessage());
+            call.reject("Could not get shake menu status", e);
+        }
     }
 }

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

@@ -35,6 +35,7 @@ import java.util.Objects;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import okhttp3.*;
+import okhttp3.HttpUrl;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -699,6 +700,16 @@ public class CapgoUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
+
+                            // Check for server-side errors first
+                            if (jsonResponse.has("error")) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", jsonResponse.getString("error"));
+                                retError.put("error", "server_error");
+                                callback.callback(retError);
+                                return;
+                            }
+
                             Map<String, Object> ret = new HashMap<>();
 
                             Iterator<String> keys = jsonResponse.keys();
@@ -798,6 +809,16 @@ public class CapgoUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
+
+                            // Check for server-side errors first
+                            if (jsonResponse.has("error")) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", jsonResponse.getString("error"));
+                                retError.put("error", "server_error");
+                                callback.callback(retError);
+                                return;
+                            }
+
                             Map<String, Object> ret = new HashMap<>();
 
                             Iterator<String> keys = jsonResponse.keys();
@@ -912,6 +933,16 @@ public class CapgoUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
+
+                            // Check for server-side errors first
+                            if (jsonResponse.has("error")) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", jsonResponse.getString("error"));
+                                retError.put("error", "server_error");
+                                callback.callback(retError);
+                                return;
+                            }
+
                             Map<String, Object> ret = new HashMap<>();
 
                             Iterator<String> keys = jsonResponse.keys();
@@ -934,6 +965,109 @@ public class CapgoUpdater {
             );
     }
 
+    public void listChannels(final Callback callback) {
+        String channelUrl = this.channelUrl;
+        if (channelUrl == null || channelUrl.isEmpty()) {
+            logger.error("Channel URL is not set");
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "Channel URL is not set");
+            retError.put("error", "missing_config");
+            callback.callback(retError);
+            return;
+        }
+
+        // Auto-detect values
+        String appId = this.appId;
+        String platform = "android";
+        boolean isEmulator = this.isEmulator();
+        boolean isProd = this.isProd();
+
+        // Build URL with query parameters
+        HttpUrl.Builder urlBuilder = HttpUrl.parse(channelUrl).newBuilder();
+        urlBuilder.addQueryParameter("app_id", appId);
+        urlBuilder.addQueryParameter("platform", platform);
+        urlBuilder.addQueryParameter("is_emulator", String.valueOf(isEmulator));
+        urlBuilder.addQueryParameter("is_prod", String.valueOf(isProd));
+
+        Request request = new Request.Builder().url(urlBuilder.build()).get().build();
+
+        client
+            .newCall(request)
+            .enqueue(
+                new okhttp3.Callback() {
+                    @Override
+                    public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                        Map<String, Object> retError = new HashMap<>();
+                        retError.put("message", "Request failed: " + e.getMessage());
+                        retError.put("error", "network_error");
+                        callback.callback(retError);
+                    }
+
+                    @Override
+                    public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
+                        try (ResponseBody responseBody = response.body()) {
+                            if (!response.isSuccessful()) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", "Server error: " + response.code());
+                                retError.put("error", "response_error");
+                                callback.callback(retError);
+                                return;
+                            }
+
+                            assert responseBody != null;
+                            String data = responseBody.string();
+
+                            try {
+                                Map<String, Object> ret = new HashMap<>();
+
+                                try {
+                                    // Try to parse as direct array first
+                                    JSONArray channelsJson = new JSONArray(data);
+                                    List<Map<String, Object>> channelsList = new ArrayList<>();
+
+                                    for (int i = 0; i < channelsJson.length(); i++) {
+                                        JSONObject channelJson = channelsJson.getJSONObject(i);
+                                        Map<String, Object> channel = new HashMap<>();
+                                        channel.put("id", channelJson.optString("id", ""));
+                                        channel.put("name", channelJson.optString("name", ""));
+                                        channel.put("public", channelJson.optBoolean("public", false));
+                                        channel.put("allow_self_set", channelJson.optBoolean("allow_self_set", false));
+                                        channelsList.add(channel);
+                                    }
+
+                                    // Wrap in channels object for JS API
+                                    ret.put("channels", channelsList);
+
+                                    logger.info("Channels listed successfully");
+                                    callback.callback(ret);
+                                } catch (JSONException arrayException) {
+                                    // If not an array, try to parse as error object
+                                    try {
+                                        JSONObject json = new JSONObject(data);
+                                        if (json.has("error")) {
+                                            Map<String, Object> retError = new HashMap<>();
+                                            retError.put("message", json.getString("error"));
+                                            retError.put("error", "server_error");
+                                            callback.callback(retError);
+                                            return;
+                                        }
+                                    } catch (JSONException objException) {
+                                        // If neither array nor object, throw parse error
+                                        throw arrayException;
+                                    }
+                                }
+                            } catch (JSONException e) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", "JSON parse error: " + e.getMessage());
+                                retError.put("error", "parse_error");
+                                callback.callback(retError);
+                            }
+                        }
+                    }
+                }
+            );
+    }
+
     public void sendStats(final String action) {
         this.sendStats(action, this.getCurrentBundle().getVersionName());
     }

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

@@ -0,0 +1,72 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package ee.forgr.capacitor_updater;
+
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+
+public class ShakeDetector implements SensorEventListener {
+
+    public interface Listener {
+        void onShakeDetected();
+    }
+
+    private static final float SHAKE_THRESHOLD = 12.0f; // Acceleration threshold for shake detection
+    private static final int SHAKE_TIMEOUT = 500; // Minimum time between shake events (ms)
+
+    private Listener listener;
+    private SensorManager sensorManager;
+    private Sensor accelerometer;
+    private long lastShakeTime = 0;
+
+    public ShakeDetector(Listener listener) {
+        this.listener = listener;
+    }
+
+    public void start(SensorManager sensorManager) {
+        this.sensorManager = sensorManager;
+        this.accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+
+        if (accelerometer != null) {
+            sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
+        }
+    }
+
+    public void stop() {
+        if (sensorManager != null) {
+            sensorManager.unregisterListener(this);
+        }
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+            float x = event.values[0];
+            float y = event.values[1];
+            float z = event.values[2];
+
+            // Calculate the acceleration magnitude (excluding gravity)
+            float acceleration = (float) Math.sqrt(x * x + y * y + z * z) - SensorManager.GRAVITY_EARTH;
+
+            // Check if acceleration exceeds threshold and enough time has passed
+            long currentTime = System.currentTimeMillis();
+            if (Math.abs(acceleration) > SHAKE_THRESHOLD && currentTime - lastShakeTime > SHAKE_TIMEOUT) {
+                lastShakeTime = currentTime;
+                if (listener != null) {
+                    listener.onShakeDetected();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // Not needed for shake detection
+    }
+}