@capgo/capacitor-updater 8.49.0 → 8.49.2

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

@@ -6,13 +6,22 @@
 
 package ee.forgr.capacitor_updater;
 
+import android.view.ActionMode;
+import android.view.KeyEvent;
+import android.view.KeyboardShortcutGroup;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.MotionEvent;
+import android.view.SearchEvent;
 import android.view.View;
-import com.getcapacitor.Bridge;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.accessibility.AccessibilityEvent;
 import com.getcapacitor.BridgeActivity;
-import java.lang.reflect.Field;
+import java.lang.ref.WeakReference;
+import java.util.List;
 
-public class ThreeFingerPinchDetector implements View.OnTouchListener {
+public class ThreeFingerPinchDetector {
 
     public interface Listener {
         void onThreeFingerPinchDetected();
@@ -24,9 +33,10 @@ public class ThreeFingerPinchDetector implements View.OnTouchListener {
 
     private final Listener listener;
     private final Logger logger;
-    private View targetView;
-    private View.OnTouchListener previousOnTouchListener;
-    private boolean touchListenerInstalled = false;
+    private Window targetWindow;
+    private Window.Callback previousWindowCallback;
+    private Window.Callback windowCallback;
+    private WeakReference<ThreeFingerPinchDetector> detectorReference;
     private float initialSpan = 0;
     private boolean tracking = false;
     private boolean triggered = false;
@@ -38,74 +48,68 @@ public class ThreeFingerPinchDetector implements View.OnTouchListener {
     }
 
     public void start(BridgeActivity activity) {
-        if (targetView != null) {
+        if (targetWindow != null) {
             stop();
         }
 
-        View view = null;
-        Bridge bridge = activity.getBridge();
-        if (bridge != null && bridge.getWebView() != null) {
-            view = bridge.getWebView();
-        }
-        if (view == null && activity.getWindow() != null) {
-            view = activity.getWindow().getDecorView().getRootView();
-        }
-        if (view == null) {
-            logger.warn("Three finger pinch detector could not find a target view");
+        Window window = activity.getWindow();
+        if (window == null) {
+            logger.warn("Three finger pinch detector could not find a target window");
             return;
         }
 
-        this.targetView = view;
-        this.previousOnTouchListener = getCurrentOnTouchListener(view);
-        if (this.previousOnTouchListener != this) {
-            this.targetView.setOnTouchListener(this);
-            this.touchListenerInstalled = true;
-        }
+        this.targetWindow = window;
+        this.previousWindowCallback = window.getCallback();
+        this.detectorReference = new WeakReference<>(this);
+        this.windowCallback = new PinchWindowCallback(this.previousWindowCallback, this.detectorReference);
+        window.setCallback(this.windowCallback);
+        logger.info("Three finger pinch detector installed on activity window");
     }
 
     public void stop() {
-        if (targetView != null) {
-            View.OnTouchListener currentOnTouchListener = getCurrentOnTouchListener(targetView);
-            if (touchListenerInstalled && (currentOnTouchListener == this || currentOnTouchListener == null)) {
-                targetView.setOnTouchListener(previousOnTouchListener);
+        if (targetWindow != null) {
+            if (windowCallback instanceof PinchWindowCallback) {
+                ((PinchWindowCallback) windowCallback).disable();
             }
-            targetView = null;
-            previousOnTouchListener = null;
-            touchListenerInstalled = false;
+            if (detectorReference != null) {
+                detectorReference.clear();
+            }
+            if (targetWindow.getCallback() == windowCallback) {
+                targetWindow.setCallback(previousWindowCallback);
+            }
+            targetWindow = null;
+            previousWindowCallback = null;
+            windowCallback = null;
+            detectorReference = null;
         }
         reset();
     }
 
-    @Override
-    public boolean onTouch(View view, MotionEvent event) {
-        boolean consumedByPreviousListener = false;
-        if (previousOnTouchListener != null && previousOnTouchListener != this) {
-            consumedByPreviousListener = previousOnTouchListener.onTouch(view, event);
-        }
-
+    private void handleTouch(MotionEvent event) {
         int action = event.getActionMasked();
         if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP) {
             reset();
-            return consumedByPreviousListener;
+            return;
         }
 
         if (event.getPointerCount() != REQUIRED_POINTER_COUNT) {
             if (action == MotionEvent.ACTION_POINTER_DOWN) {
                 reset();
             }
-            return consumedByPreviousListener;
+            return;
         }
 
         float span = calculateSpan(event);
         if (span <= 0) {
-            return consumedByPreviousListener;
+            return;
         }
 
         if (!tracking || action == MotionEvent.ACTION_POINTER_DOWN) {
             initialSpan = span;
             tracking = true;
             triggered = false;
-            return consumedByPreviousListener;
+            logger.info("Three finger pinch tracking started");
+            return;
         }
 
         if (!triggered && Math.abs(span - initialSpan) / initialSpan >= MIN_SCALE_DELTA) {
@@ -113,13 +117,12 @@ public class ThreeFingerPinchDetector implements View.OnTouchListener {
             if (currentTime - lastPinchTime > PINCH_TIMEOUT) {
                 triggered = true;
                 lastPinchTime = currentTime;
+                logger.info("Three finger pinch threshold reached");
                 if (listener != null) {
                     listener.onThreeFingerPinchDetected();
                 }
             }
         }
-
-        return consumedByPreviousListener;
     }
 
     private float calculateSpan(MotionEvent event) {
@@ -141,29 +144,180 @@ public class ThreeFingerPinchDetector implements View.OnTouchListener {
         return totalDistance / REQUIRED_POINTER_COUNT;
     }
 
-    private View.OnTouchListener getCurrentOnTouchListener(View view) {
-        try {
-            Field listenerInfoField = View.class.getDeclaredField("mListenerInfo");
-            listenerInfoField.setAccessible(true);
-            Object listenerInfo = listenerInfoField.get(view);
-            if (listenerInfo == null) {
-                return null;
-            }
-            Field onTouchListenerField = listenerInfo.getClass().getDeclaredField("mOnTouchListener");
-            onTouchListenerField.setAccessible(true);
-            Object listener = onTouchListenerField.get(listenerInfo);
-            if (listener instanceof View.OnTouchListener) {
-                return (View.OnTouchListener) listener;
-            }
-        } catch (ReflectiveOperationException | RuntimeException exception) {
-            logger.warn("Three finger pinch detector could not inspect the current touch listener: " + exception.getMessage());
-        }
-        return null;
-    }
-
     private void reset() {
         initialSpan = 0;
         tracking = false;
         triggered = false;
     }
+
+    private static class PinchWindowCallback implements Window.Callback {
+
+        private final Window.Callback delegate;
+        private final WeakReference<ThreeFingerPinchDetector> detectorReference;
+        private boolean enabled = true;
+
+        PinchWindowCallback(Window.Callback delegate, WeakReference<ThreeFingerPinchDetector> detectorReference) {
+            this.delegate = delegate;
+            this.detectorReference = detectorReference;
+        }
+
+        void disable() {
+            enabled = false;
+            if (detectorReference != null) {
+                detectorReference.clear();
+            }
+        }
+
+        @Override
+        public boolean dispatchKeyEvent(KeyEvent event) {
+            return delegate != null && delegate.dispatchKeyEvent(event);
+        }
+
+        @Override
+        public boolean dispatchKeyShortcutEvent(KeyEvent event) {
+            return delegate != null && delegate.dispatchKeyShortcutEvent(event);
+        }
+
+        @Override
+        public boolean dispatchTouchEvent(MotionEvent event) {
+            boolean handled = delegate != null && delegate.dispatchTouchEvent(event);
+            if (enabled) {
+                ThreeFingerPinchDetector detector = detectorReference == null ? null : detectorReference.get();
+                if (detector != null) {
+                    detector.handleTouch(event);
+                }
+            }
+            return handled;
+        }
+
+        @Override
+        public boolean dispatchTrackballEvent(MotionEvent event) {
+            return delegate != null && delegate.dispatchTrackballEvent(event);
+        }
+
+        @Override
+        public boolean dispatchGenericMotionEvent(MotionEvent event) {
+            return delegate != null && delegate.dispatchGenericMotionEvent(event);
+        }
+
+        @Override
+        public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
+            return delegate != null && delegate.dispatchPopulateAccessibilityEvent(event);
+        }
+
+        @Override
+        public View onCreatePanelView(int featureId) {
+            return delegate == null ? null : delegate.onCreatePanelView(featureId);
+        }
+
+        @Override
+        public boolean onCreatePanelMenu(int featureId, Menu menu) {
+            return delegate != null && delegate.onCreatePanelMenu(featureId, menu);
+        }
+
+        @Override
+        public boolean onPreparePanel(int featureId, View view, Menu menu) {
+            return delegate != null && delegate.onPreparePanel(featureId, view, menu);
+        }
+
+        @Override
+        public boolean onMenuOpened(int featureId, Menu menu) {
+            return delegate != null && delegate.onMenuOpened(featureId, menu);
+        }
+
+        @Override
+        public boolean onMenuItemSelected(int featureId, MenuItem item) {
+            return delegate != null && delegate.onMenuItemSelected(featureId, item);
+        }
+
+        @Override
+        public void onWindowAttributesChanged(WindowManager.LayoutParams attrs) {
+            if (delegate != null) {
+                delegate.onWindowAttributesChanged(attrs);
+            }
+        }
+
+        @Override
+        public void onContentChanged() {
+            if (delegate != null) {
+                delegate.onContentChanged();
+            }
+        }
+
+        @Override
+        public void onWindowFocusChanged(boolean hasFocus) {
+            if (delegate != null) {
+                delegate.onWindowFocusChanged(hasFocus);
+            }
+        }
+
+        @Override
+        public void onAttachedToWindow() {
+            if (delegate != null) {
+                delegate.onAttachedToWindow();
+            }
+        }
+
+        @Override
+        public void onDetachedFromWindow() {
+            if (delegate != null) {
+                delegate.onDetachedFromWindow();
+            }
+        }
+
+        @Override
+        public void onPanelClosed(int featureId, Menu menu) {
+            if (delegate != null) {
+                delegate.onPanelClosed(featureId, menu);
+            }
+        }
+
+        @Override
+        public boolean onSearchRequested() {
+            return delegate != null && delegate.onSearchRequested();
+        }
+
+        @Override
+        public boolean onSearchRequested(SearchEvent searchEvent) {
+            return delegate != null && delegate.onSearchRequested(searchEvent);
+        }
+
+        @Override
+        public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) {
+            return delegate == null ? null : delegate.onWindowStartingActionMode(callback);
+        }
+
+        @Override
+        public ActionMode onWindowStartingActionMode(ActionMode.Callback callback, int type) {
+            return delegate == null ? null : delegate.onWindowStartingActionMode(callback, type);
+        }
+
+        @Override
+        public void onActionModeStarted(ActionMode mode) {
+            if (delegate != null) {
+                delegate.onActionModeStarted(mode);
+            }
+        }
+
+        @Override
+        public void onActionModeFinished(ActionMode mode) {
+            if (delegate != null) {
+                delegate.onActionModeFinished(mode);
+            }
+        }
+
+        @Override
+        public void onProvideKeyboardShortcuts(List<KeyboardShortcutGroup> data, Menu menu, int deviceId) {
+            if (delegate != null) {
+                delegate.onProvideKeyboardShortcuts(data, menu, deviceId);
+            }
+        }
+
+        @Override
+        public void onPointerCaptureChanged(boolean hasCapture) {
+            if (delegate != null) {
+                delegate.onPointerCaptureChanged(hasCapture);
+            }
+        }
+    }
 }

package/dist/docs.json

@@ -846,7 +846,7 @@
             "text": "4.7.0"
           }
         ],
-        "docs": "Assign this device to a specific update channel at runtime.\n\nChannels allow you to distribute different bundle versions to different groups of users\n(e.g., \"production\", \"beta\", \"staging\"). This method switches the device to a new channel.\n\n**Requirements:**\n- The target channel must allow self-assignment (configured in your Capgo dashboard or backend)\n- The backend may accept or reject the request based on channel settings\n\n**When to use:**\n- After the app is ready and the user has interacted (e.g., opted into beta program)\n- To implement in-app channel switching (beta toggle, tester access, etc.)\n- For user-driven channel changes\n\n**When NOT to use:**\n- At app boot/initialization - use {@link PluginsConfig.CapacitorUpdater.defaultChannel} config instead\n- Before user interaction\n\n**Important: Listen for the `channelPrivate` event**\n\nWhen a user attempts to set a channel that doesn't allow device self-assignment, the method will\nthrow an error AND fire a {@link addListener}('channelPrivate') event. You should listen to this event\nto provide appropriate feedback to users:\n\n```typescript\nCapacitorUpdater.addListener('channelPrivate', (data) => {\n  console.warn(`Cannot access channel \"${data.channel}\": ${data.message}`);\n  // Show user-friendly message\n});\n```\n\nThis sends a request to the Capgo backend linking your device ID to the specified channel.",
+        "docs": "Assign this device to a specific update channel at runtime.\n\nChannels allow you to distribute different bundle versions to different groups of users\n(e.g., \"production\", \"beta\", \"staging\"). This method switches the device to a new channel.\n\n**Device Override UI:** `setChannel()` validates the channel with the backend, then stores the\nselected channel locally on the device. It does not create or update a backend Device Override,\nso the device will not appear as overridden in the Capgo dashboard. Only assignments created\nfrom the dashboard or the Public API are shown in the Device Override UI.\n\n**Requirements:**\n- The target channel must allow self-assignment (configured in your Capgo dashboard or backend)\n- The backend may accept or reject the request based on channel settings\n\n**When to use:**\n- After the app is ready and the user has interacted (e.g., opted into beta program)\n- To implement in-app channel switching (beta toggle, tester access, etc.)\n- For user-driven channel changes\n\n**When NOT to use:**\n- At app boot/initialization - use {@link PluginsConfig.CapacitorUpdater.defaultChannel} config instead\n- Before user interaction\n\n**Important: Listen for the `channelPrivate` event**\n\nWhen a user attempts to set a channel that doesn't allow device self-assignment, the method will\nthrow an error AND fire a {@link addListener}('channelPrivate') event. You should listen to this event\nto provide appropriate feedback to users:\n\n```typescript\nCapacitorUpdater.addListener('channelPrivate', (data) => {\n  console.warn(`Cannot access channel \"${data.channel}\": ${data.message}`);\n  // Show user-friendly message\n});\n```\n\nThis sends a request to the Capgo backend to validate the specified channel, then stores the\nchannel locally on the device.",
         "complexTypes": [
           "ChannelRes",
           "SetChannelOptions"
@@ -886,7 +886,7 @@
             "text": "4.7.0"
           }
         ],
-        "docs": "Remove the device's channel assignment and return to the default channel.\n\nThis unlinks the device from any specifically assigned channel, causing it to fall back to:\n- The {@link PluginsConfig.CapacitorUpdater.defaultChannel} if configured, or\n- Your backend's default channel for this app\n\nUse this when:\n- Users opt out of beta/testing programs\n- You want to reset a device to standard update distribution\n- Testing channel switching behavior",
+        "docs": "Remove the plugin-managed local channel assignment and return to the default channel.\n\nThis clears only the channel stored locally by {@link setChannel}; it does not delete Dashboard or Public API Device Override records. After the local assignment is cleared, normal channel precedence applies:\n- An existing Dashboard or Public API Device Override, if one exists\n- The {@link PluginsConfig.CapacitorUpdater.defaultChannel} if configured, or\n- Your backend default channel for this app\n\nUse this when:\n- Users opt out of beta/testing programs\n- You want to reset a device to standard update distribution\n- Testing channel switching behavior",
         "complexTypes": [
           "UnsetChannelOptions"
         ],
@@ -1013,7 +1013,7 @@
             "text": "{Error} If the operation fails."
           }
         ],
-        "docs": "Get the unique, privacy-friendly identifier for this device.\n\nThis ID is used to identify the device when communicating with update servers.\nIt's automatically generated and stored securely by the plugin.\n\n**Privacy & Security characteristics:**\n- Generated as a UUID (not based on hardware identifiers)\n- Stored securely in platform-specific secure storage\n- Android: Android Keystore (persists across app reinstalls on API 23+)\n- iOS: Keychain with `kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly`\n- Not synced to cloud (iOS)\n- Follows Apple and Google privacy best practices\n- Users can clear it via system settings (Android) or keychain access (iOS)\n\n**Persistence:**\nThe device ID persists across app reinstalls to maintain consistent device identity\nfor update tracking and analytics.\n\nUse this to:\n- Debug update delivery issues (check what ID the server sees)\n- Implement device-specific features\n- Correlate server logs with specific devices",
+        "docs": "Get the unique, privacy-friendly identifier for this device.\n\nThis ID is used to identify the device when communicating with update servers.\nIt's automatically generated and stored securely by the plugin.\n\n**Privacy & Security characteristics:**\n- Generated as a UUID (not based on hardware identifiers)\n- Stored securely in platform-specific secure storage\n- Android: mirrored into backup-restorable app preferences for reinstall restore\n- iOS: Keychain with `kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly`\n- Not synced to cloud (iOS)\n- Follows Apple and Google privacy best practices\n- Users can clear it via system settings (Android) or keychain access (iOS)\n\n**Persistence:**\nThe device ID persists across app reinstalls to maintain consistent device identity\nfor update tracking and analytics when platform storage is preserved. On Android,\napps with custom backup rules must keep the plugin app preferences eligible for\nbackup/restore; disabling Android backup or clearing app data creates a new ID.\n\nUse this to:\n- Debug update delivery issues (check what ID the server sees)\n- Implement device-specific features\n- Correlate server logs with specific devices",
         "complexTypes": [
           "DeviceId"
         ],

package/dist/esm/definitions.d.ts

@@ -938,6 +938,11 @@ export interface CapacitorUpdaterPlugin {
      * Channels allow you to distribute different bundle versions to different groups of users
      * (e.g., "production", "beta", "staging"). This method switches the device to a new channel.
      *
+     * **Device Override UI:** `setChannel()` validates the channel with the backend, then stores the
+     * selected channel locally on the device. It does not create or update a backend Device Override,
+     * so the device will not appear as overridden in the Capgo dashboard. Only assignments created
+     * from the dashboard or the Public API are shown in the Device Override UI.
+     *
      * **Requirements:**
      * - The target channel must allow self-assignment (configured in your Capgo dashboard or backend)
      * - The backend may accept or reject the request based on channel settings
@@ -964,7 +969,8 @@ export interface CapacitorUpdaterPlugin {
      * });
      * ```
      *
-     * This sends a request to the Capgo backend linking your device ID to the specified channel.
+     * This sends a request to the Capgo backend to validate the specified channel, then stores the
+     * channel locally on the device.
      *
      * @param options The {@link SetChannelOptions} containing the channel name and optional auto-update trigger.
      * @returns {Promise<ChannelRes>} Channel operation result with status and optional error/message.
@@ -973,11 +979,12 @@ export interface CapacitorUpdaterPlugin {
      */
     setChannel(options: SetChannelOptions): Promise<ChannelRes>;
     /**
-     * Remove the device's channel assignment and return to the default channel.
+     * Remove the plugin-managed local channel assignment and return to the default channel.
      *
-     * This unlinks the device from any specifically assigned channel, causing it to fall back to:
+     * This clears only the channel stored locally by {@link setChannel}; it does not delete Dashboard or Public API Device Override records. After the local assignment is cleared, normal channel precedence applies:
+     * - An existing Dashboard or Public API Device Override, if one exists
      * - The {@link PluginsConfig.CapacitorUpdater.defaultChannel} if configured, or
-     * - Your backend's default channel for this app
+     * - Your backend default channel for this app
      *
      * Use this when:
      * - Users opt out of beta/testing programs
@@ -1088,7 +1095,7 @@ export interface CapacitorUpdaterPlugin {
      * **Privacy & Security characteristics:**
      * - Generated as a UUID (not based on hardware identifiers)
      * - Stored securely in platform-specific secure storage
-     * - Android: Android Keystore (persists across app reinstalls on API 23+)
+     * - Android: mirrored into backup-restorable app preferences for reinstall restore
      * - iOS: Keychain with `kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly`
      * - Not synced to cloud (iOS)
      * - Follows Apple and Google privacy best practices
@@ -1096,7 +1103,9 @@ export interface CapacitorUpdaterPlugin {
      *
      * **Persistence:**
      * The device ID persists across app reinstalls to maintain consistent device identity
-     * for update tracking and analytics.
+     * for update tracking and analytics when platform storage is preserved. On Android,
+     * apps with custom backup rules must keep the plugin app preferences eligible for
+     * backup/restore; disabling Android backup or clearing app data creates a new ID.
      *
      * Use this to:
      * - Debug update delivery issues (check what ID the server sees)