Fix for Opaque USB support on Android 14.

iiordanov · Dec 29, 2023 · 3681e2d · 3681e2d
1 parent c3044da
commit 3681e2d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/remoteClientLib/src/main/java/com/undatech/opaque/SpiceCommunicator.java b/remoteClientLib/src/main/java/com/undatech/opaque/SpiceCommunicator.java
@@ -29,6 +29,7 @@
 import android.graphics.Bitmap;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -146,12 +147,7 @@ public SpiceCommunicator(Context context, Handler handler, Viewable canvas, bool
  }
 
  usbDeviceManager = new UsbDeviceManager(context, usbEnabled);
- if (usbEnabled) {
- context.registerReceiver(usbPermissionRequestedReceiver, new IntentFilter(ACTION_USB_PERMISSION));
- IntentFilter filter = new IntentFilter();
- filter.addAction("android.hardware.usb.action.USB_STATE");
- context.registerReceiver(usbStateChangedReceiver, filter);
- }
+ registerReceiversForUsbDevices(context);
  modifierMap.put(RemoteKeyboard.CTRL_MASK, LCONTROL);
  modifierMap.put(RemoteKeyboard.RCTRL_MASK, RCONTROL);
  modifierMap.put(RemoteKeyboard.ALT_MASK, LALT);
@@ -163,6 +159,23 @@ public SpiceCommunicator(Context context, Handler handler, Viewable canvas, bool
 
  }
 
+ private void registerReceiversForUsbDevices(Context context) {
+ if (usbEnabled) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ context.registerReceiver(usbPermissionRequestedReceiver, new IntentFilter(ACTION_USB_PERMISSION), Context.RECEIVER_NOT_EXPORTED);
+ } else {
+ context.registerReceiver(usbPermissionRequestedReceiver, new IntentFilter(ACTION_USB_PERMISSION));
+ }
+ IntentFilter filter = new IntentFilter();
+ filter.addAction("android.hardware.usb.action.USB_STATE");
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ context.registerReceiver(usbStateChangedReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
+ } else {
+ context.registerReceiver(usbStateChangedReceiver, filter);
+ }
+ }
+ }
+
  public static void sendMessage(int message) {
  android.util.Log.d(TAG, "sendMessage called with message: " + message);
  myself.handler.sendEmptyMessage(message);

diff --git a/remoteClientLib/src/main/java/com/undatech/opaque/util/UsbDeviceManager.kt b/remoteClientLib/src/main/java/com/undatech/opaque/util/UsbDeviceManager.kt
@@ -71,7 +71,7 @@ class UsbDeviceManager(val context: Context, val usbEnabled: Boolean) {
  val d = this.getUnrequested()
  if (d != null) {
  val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
- PendingIntent.FLAG_MUTABLE
+ PendingIntent.FLAG_IMMUTABLE
  } else {
  0
  };