Merge pull request #95 from dpkristensen/master

Supress deprecation warning about getParcelableExtra()
altera2015 · Jan 21, 2024 · 29b1a80 · 29b1a80
2 parents 8514cb0 + 6fc7c1e
commit 29b1a80
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/android/src/main/java/dev/bessems/usbserial/UsbSerialPlugin.java b/android/src/main/java/dev/bessems/usbserial/UsbSerialPlugin.java
@@ -47,6 +47,17 @@ public class UsbSerialPlugin implements FlutterPlugin, MethodCallHandler, EventC
 
     private final BroadcastReceiver usbReceiver = new BroadcastReceiver() {
 
+        private UsbDevice getUsbDeviceFromIntent(Intent intent) {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+                return intent.getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice.class);
+            } else {
+                // Create local variable to keep scope of deprecation suppression smallest
+                @SuppressWarnings("deprecation")
+                UsbDevice ret = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                return ret;
+            }
+        }
+
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
@@ -56,12 +67,7 @@ public void onReceive(Context context, Intent intent) {
             if (action.equals(ACTION_USB_ATTACHED)) {
                 Log.d(TAG, "ACTION_USB_ATTACHED");
                 if (m_EventSink != null) {
-                    UsbDevice device;
-                    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
-                        device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice.class);
-                    } else {
-                        device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
-                    }
+                    UsbDevice device = getUsbDeviceFromIntent(intent);
                     if (device != null) {
                         HashMap<String, Object> msg = serializeDevice(device);
                         msg.put("event", ACTION_USB_ATTACHED);
@@ -73,12 +79,7 @@ public void onReceive(Context context, Intent intent) {
             } else if (action.equals(ACTION_USB_DETACHED)) {
                 Log.d(TAG, "ACTION_USB_DETACHED");
                 if (m_EventSink != null) {
-                    UsbDevice device;
-                    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
-                        device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice.class);
-                    } else {
-                        device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
-                    }
+                    UsbDevice device = getUsbDeviceFromIntent(intent);
                     if (device != null) {
                         HashMap<String, Object> msg = serializeDevice(device);
                         msg.put("event", ACTION_USB_DETACHED);