Merge pull request #63 from v2bsd/dev

Support Android 14 and fix IOException for Prolific PL2303GT (prodId …

Author: anotherlab

UsbSerialForAndroid/Extensions/UsbManagerExtensions.cs

@@ -27,7 +27,16 @@ public static Task<bool> RequestPermissionAsync(this UsbManager manager, UsbDevi
             var completionSource = new TaskCompletionSource<bool>();
 
             var usbPermissionReceiver = new UsbPermissionReceiver(completionSource);
-            context.RegisterReceiver(usbPermissionReceiver, new IntentFilter(ACTION_USB_PERMISSION));
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.Tiramisu)
+            {
+#pragma warning disable CA1416
+                context.RegisterReceiver(usbPermissionReceiver, new IntentFilter(ACTION_USB_PERMISSION), ReceiverFlags.NotExported);
+#pragma warning restore CA1416
+            }
+            else
+            {
+                context.RegisterReceiver(usbPermissionReceiver, new IntentFilter(ACTION_USB_PERMISSION));
+            }
 
             // Targeting S+ (version 31 and above) requires that one of FLAG_IMMUTABLE or FLAG_MUTABLE be specified when creating a PendingIntent.
 #if NET6_0_OR_GREATER
@@ -36,9 +45,14 @@ public static Task<bool> RequestPermissionAsync(this UsbManager manager, UsbDevi
             PendingIntentFlags pendingIntentFlags = Build.VERSION.SdkInt >= (BuildVersionCodes)31 ? (PendingIntentFlags).33554432 : 0;
 #endif
 
-            var intent = PendingIntent.GetBroadcast(context, 0, new Intent(ACTION_USB_PERMISSION), pendingIntentFlags);
+            var intent = new Intent(ACTION_USB_PERMISSION);
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.UpsideDownCake)
+            {
+                intent.SetPackage(context.PackageName);
+            }
+            var pendingIntent = PendingIntent.GetBroadcast(context, 0, intent, pendingIntentFlags);
 
-            manager.RequestPermission(device, intent);
+            manager.RequestPermission(device, pendingIntent);
 
             return completionSource.Task;
         }

UsbSerialForAndroid/driver/ProlificSerialDriver.cs

@@ -374,23 +374,23 @@ public override void Open(UsbDeviceConnection connection)
                     {
                         mDeviceType = DeviceType.DEVICE_TYPE_01;
                     }
-                    else if (deviceVersion == 0x300 && usbVersion == 0x200)
+                    else if (usbVersion == 0x200)
                     {
-                        mDeviceType = DeviceType.DEVICE_TYPE_T; // TA
-                    }
-                    else if (deviceVersion == 0x500)
-                    {
-                        mDeviceType = DeviceType.DEVICE_TYPE_T; // TB
-                    }
-                    else if (usbVersion == 0x200 && !TestHxStatus())
-                    {
-                        mDeviceType = DeviceType.DEVICE_TYPE_HXN;
+                        if ((deviceVersion == 0x300 || deviceVersion == 0x500) && TestHxStatus())
+                        {
+                            mDeviceType = DeviceType.DEVICE_TYPE_T; // TA & TB
+                        }
+
+                        else
+                        {
+                            mDeviceType = DeviceType.DEVICE_TYPE_HXN;
+                        }
                     }
                     else
                     {
                         mDeviceType = DeviceType.DEVICE_TYPE_HX;
                     }
-                    
+
                     SetControlLines(mControlLinesValue);
                     ResetDevice();