Fix permissions

Author: haslinghuis

.gitignore

@@ -47,3 +47,7 @@ capacitor.config.json
 
 # Ignore Gradle build output directory
 build
+
+# Ignore capcitor android build output directory
+capacitor-plugin-betaflight-serial/android/bin/
+

android/app/src/main/AndroidManifest.xml

@@ -41,6 +41,15 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths"></meta-data>
         </provider>
+
+        <!-- Explicit receiver to handle USB permission PendingIntent on Android 14+ -->
+        <receiver
+            android:name="com.betaflight.plugin.serial.UsbPermissionReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.betaflight.USB_PERMISSION" />
+            </intent-filter>
+        </receiver>
     </application>
 
     <!-- Permissions -->

android/capacitor.settings.gradle

@@ -3,4 +3,4 @@ include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-plugin-betaflight-serial'
-project(':capacitor-plugin-betaflight-serial').projectDir = new File('../node_modules/capacitor-plugin-betaflight-serial/android')
+project(':capacitor-plugin-betaflight-serial').projectDir = new File('../capacitor-plugin-betaflight-serial/android')

capacitor-plugin-betaflight-serial/android/src/main/java/com/betaflight/plugin/serial/BetaflightSerialPlugin.java

@@ -49,6 +49,8 @@
     }
 )
 public class BetaflightSerialPlugin extends Plugin implements SerialInputOutputManager.Listener {
+    // Hold a static reference for forwarding permission callbacks from an explicit BroadcastReceiver
+    private static java.lang.ref.WeakReference<BetaflightSerialPlugin> sInstance = new java.lang.ref.WeakReference<>(null);
     private static final String TAG = "BetaflightSerial";
     private static final String ACTION_USB_PERMISSION = "com.betaflight.USB_PERMISSION";
     private static final int WRITE_WAIT_MILLIS = 2000;
@@ -81,6 +83,7 @@ public void onReceive(Context context, Intent intent) {
     @Override
     public void load() {
         super.load();
+        sInstance = new java.lang.ref.WeakReference<>(this);
         usbManager = (UsbManager) getContext().getSystemService(Context.USB_SERVICE);
 
         // Register USB broadcast receivers
@@ -136,13 +139,32 @@ public void requestPermission(PluginCall call) {
                     String deviceKey = getDeviceKey(device);
                     permissionRequestedDevices.put(deviceKey, device);
 
+                    // Create fully explicit broadcast intent with component
+                    Intent permissionAction = new Intent(ACTION_USB_PERMISSION);
+                    permissionAction.setComponent(new android.content.ComponentName(
+                        getContext(),
+                        UsbPermissionReceiver.class
+                    ));
+                    permissionAction.putExtra(UsbManager.EXTRA_DEVICE, device);
+                    
+                    int requestCode = device.getDeviceId();
+                    int flags;
+                    
+                    if (Build.VERSION.SDK_INT >= 34) { // Android 14+ (U / API 34)
+                        // Android 14+ requires IMMUTABLE for explicit intents
+                        flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
+                    } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                        // Android 12-13 requires MUTABLE for UsbManager
+                        flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE;
+                    } else {
+                        flags = PendingIntent.FLAG_UPDATE_CURRENT;
+                    }
+                    
                     PendingIntent permissionIntent = PendingIntent.getBroadcast(
                         getContext(),
-                        0,
-                        new Intent(ACTION_USB_PERMISSION),
-                        Build.VERSION.SDK_INT >= Build.VERSION_CODES.S 
-                            ? PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
-                            : PendingIntent.FLAG_UPDATE_CURRENT
+                        requestCode,
+                        permissionAction,
+                        flags
                     );
 
                     usbManager.requestPermission(device, permissionIntent);
@@ -356,7 +378,7 @@ public void onRunError(Exception e) {
 
     // ===== Private helper methods =====
 
-    private void handlePermissionResult(Intent intent) {
+    public void handlePermissionResult(Intent intent) {
         UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
         if (device == null) return;
 
@@ -374,6 +396,14 @@ private void handlePermissionResult(Intent intent) {
         }
     }
 
+    // Static entry point for the explicit BroadcastReceiver to forward the permission result
+    public static void onUsbPermissionResult(Context context, Intent intent) {
+        BetaflightSerialPlugin instance = sInstance.get();
+        if (instance != null) {
+            instance.handlePermissionResult(intent);
+        }
+    }
+
     private void handleDeviceAttached(Intent intent) {
         UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
         if (device == null) return;

capacitor-plugin-betaflight-serial/android/src/main/java/com/betaflight/plugin/serial/UsbPermissionReceiver.java

@@ -0,0 +1,20 @@
+package com.betaflight.plugin.serial;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+/**
+ * Explicit BroadcastReceiver to receive USB permission results on Android 14+.
+ * Forwards the Intent to the active BetaflightSerialPlugin instance.
+ */
+public class UsbPermissionReceiver extends BroadcastReceiver {
+    private static final String TAG = "BetaflightSerial";
+    
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Log.d(TAG, "UsbPermissionReceiver.onReceive called with action: " + intent.getAction());
+        BetaflightSerialPlugin.onUsbPermissionResult(context, intent);
+    }
+}

package.json

@@ -45,7 +45,7 @@
     "@capacitor/core": "^7.0.1",
     "@fortawesome/fontawesome-free": "^6.5.2",
     "@vitejs/plugin-vue": "^6.0.1",
-    "capacitor-plugin-betaflight-serial": "file:./capacitor-plugin-betaflight-serial",
+    "capacitor-plugin-betaflight-serial": "link:./capacitor-plugin-betaflight-serial",
     "crypto-es": "^2.1.0",
     "d3": "^7.9.0",
     "djv": "^2.1.4",

src/js/protocols/CapacitorSerial.js

@@ -144,6 +144,11 @@ class CapacitorSerial extends EventTarget {
 
             console.log(`${logHead} Permission granted for ${this.ports.length} devices`);
 
+            // Dispatch addedDevice event for each new port to update UI
+            for (const port of this.ports) {
+                this.dispatchEvent(new CustomEvent("addedDevice", { detail: port }));
+            }
+
             // Return the first device if available
             return this.ports.length > 0 ? this.ports[0] : null;
         } catch (error) {
@@ -267,24 +272,7 @@ class CapacitorSerial extends EventTarget {
             return { bytesSent: 0 };
         }
 
-        // Normalize data to Uint8Array (MSP passes Uint8Array or ArrayBuffer)
-        if (data instanceof ArrayBuffer) {
-            data = new Uint8Array(data);
-        } else if (ArrayBuffer.isView(data)) {
-            // Accept DataView or other typed views; re-wrap to Uint8Array slice
-            data = new Uint8Array(data.buffer, data.byteOffset || 0, data.byteLength);
-        } else if (Array.isArray(data)) {
-            data = new Uint8Array(data);
-        }
-
-        // Handle empty or invalid data
-        if (!data || typeof data.length !== "number" || data.length === 0) {
-            console.log(`${logHead} Empty data, skipping send (data:`, data, `length:`, data?.length, `)`);
-            if (callback) {
-                callback({ bytesSent: 0 });
-            }
-            return { bytesSent: 0 };
-        }
+        data = new Uint8Array(data);
 
         try {
             // Convert Uint8Array to hex string

vite.config.js

@@ -115,6 +115,11 @@ export default defineConfig({
         alias: {
             "/src": path.resolve(process.cwd(), "src"),
             vue: path.resolve(__dirname, "node_modules/vue/dist/vue.esm-bundler.js"),
+            // Ensure local Capacitor plugin resolves to its ESM entry without relying on package exports
+            "capacitor-plugin-betaflight-serial": path.resolve(
+                __dirname,
+                "capacitor-plugin-betaflight-serial/dist/esm/index.js",
+            ),
         },
     },
     server: {

yarn.lock

@@ -3203,8 +3203,9 @@ caniuse-lite@^1.0.30001737:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001741.tgz#67fb92953edc536442f3c9da74320774aa523143"
   integrity sha512-QGUGitqsc8ARjLdgAfxETDhRbJ0REsP6O3I96TAth/mVjh2cYzN2u+3AzPP3aVSm2FehEItaJw1xd+IGBXWeSw==
 
-"capacitor-plugin-betaflight-serial@file:./capacitor-plugin-betaflight-serial":
-  version "1.0.0"
+"capacitor-plugin-betaflight-serial@link:./capacitor-plugin-betaflight-serial":
+  version "0.0.0"
+  uid ""
 
 caseless@~0.12.0:
   version "0.12.0"