Skip to content

Commit 823836e

Browse files
committed
Adopt registerReceiver
1 parent 9b9babc commit 823836e

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

IOIOLibAndroidAccessory/src/main/java/ioio/lib/android/accessory/AccessoryConnectionBootstrap.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import java.io.OutputStream;
4848
import java.util.Collection;
4949

50+
import android.annotation.SuppressLint;
5051
import android.app.PendingIntent;
5152
import android.content.BroadcastReceiver;
5253
import android.content.Context;
@@ -267,9 +268,16 @@ private boolean tryOpen() {
267268
}
268269
}
269270

271+
@SuppressLint("UnspecifiedRegisterReceiverFlag")
270272
private void registerReceiver() {
271273
IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
272-
activity_.registerReceiver(this, filter);
274+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
275+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
276+
activity_.registerReceiver(this, filter, Context.RECEIVER_NOT_EXPORTED);
277+
} else
278+
activity_.registerReceiver(this, filter);
279+
} else
280+
activity_.registerReceiver(this, filter);
273281
}
274282

275283
private void unregisterReceiver() {

IOIOLibAndroidDevice/src/main/java/ioio/lib/android/device/DeviceConnectionBootstrap.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import java.util.Collection;
4343
import java.util.HashMap;
4444

45+
import android.annotation.SuppressLint;
4546
import android.annotation.TargetApi;
4647
import android.app.PendingIntent;
4748
import android.content.BroadcastReceiver;
@@ -484,11 +485,18 @@ private void checkPermission() {
484485
}
485486
}
486487

488+
@SuppressLint("UnspecifiedRegisterReceiverFlag")
487489
private void registerReceiver() {
488490
IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
489491
filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
490492
filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
491-
activity_.registerReceiver(this, filter);
493+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
494+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
495+
activity_.registerReceiver(this, filter, Context.RECEIVER_NOT_EXPORTED);
496+
} else
497+
activity_.registerReceiver(this, filter);
498+
} else
499+
activity_.registerReceiver(this, filter);
492500
}
493501

494502
private void unregisterReceiver() {

0 commit comments

Comments
 (0)