From 357f8aabaa0b447a80ee44f83dca2d178bc318dd Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 12 Dec 2023 16:47:34 +0100 Subject: [PATCH] Import Receiver Flags Signed-off-by: Andy Scherzinger Signed-off-by: tobiasKaminsky Signed-off-by: alperozturk --- build.gradle | 2 +- .../transport/usb/UsbConnectionDispatcher.java | 10 +++++++++- .../main/java/de/cotech/hw/util/NfcStatusObserver.java | 6 +++++- hwsecurity/fido/build.gradle | 2 +- jitpack.yml | 2 ++ 5 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 jitpack.yml diff --git a/build.gradle b/build.gradle index bcaa38b..2dc4b68 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,6 @@ allprojects { } ext { - compileSdkVersion = 29 + compileSdkVersion = 33 hwSdkVersionName = '4.4.0' } diff --git a/hwsecurity/core/src/main/java/de/cotech/hw/internal/transport/usb/UsbConnectionDispatcher.java b/hwsecurity/core/src/main/java/de/cotech/hw/internal/transport/usb/UsbConnectionDispatcher.java index 5e3db86..be095f7 100644 --- a/hwsecurity/core/src/main/java/de/cotech/hw/internal/transport/usb/UsbConnectionDispatcher.java +++ b/hwsecurity/core/src/main/java/de/cotech/hw/internal/transport/usb/UsbConnectionDispatcher.java @@ -25,6 +25,7 @@ package de.cotech.hw.internal.transport.usb; +import android.annotation.SuppressLint; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; @@ -33,11 +34,13 @@ import android.content.pm.PackageManager; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbManager; +import android.os.Build; import androidx.annotation.AnyThread; import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; import androidx.annotation.UiThread; + import de.cotech.hw.util.HwTimber; @@ -121,9 +124,14 @@ private boolean handleConnectedUsbDevice(UsbDevice usbDevice, boolean requestPer return false; } + @SuppressLint("UnspecifiedRegisterReceiverFlag") @UiThread public void onActive() { - context.registerReceiver(usbBroadcastReceiver, intentFilter); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + context.registerReceiver(usbBroadcastReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED); + } else { + context.registerReceiver(usbBroadcastReceiver, intentFilter); + } } @UiThread diff --git a/hwsecurity/core/src/main/java/de/cotech/hw/util/NfcStatusObserver.java b/hwsecurity/core/src/main/java/de/cotech/hw/util/NfcStatusObserver.java index 9f14084..04527d8 100644 --- a/hwsecurity/core/src/main/java/de/cotech/hw/util/NfcStatusObserver.java +++ b/hwsecurity/core/src/main/java/de/cotech/hw/util/NfcStatusObserver.java @@ -159,7 +159,11 @@ public void onReceive(Context context, Intent intent) { }; } IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED); - context.registerReceiver(nfcStateBroadcastReceiver, filter); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + context.registerReceiver(nfcStateBroadcastReceiver, filter, Context.RECEIVER_NOT_EXPORTED); + } else { + context.registerReceiver(nfcStateBroadcastReceiver, filter); + } } @TargetApi(VERSION_CODES.JELLY_BEAN_MR2) diff --git a/hwsecurity/fido/build.gradle b/hwsecurity/fido/build.gradle index 8f4cba6..d652c80 100644 --- a/hwsecurity/fido/build.gradle +++ b/hwsecurity/fido/build.gradle @@ -23,7 +23,7 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - minSdkVersion 14 + minSdkVersion 24 versionName rootProject.ext.hwSdkVersionName vectorDrawables.useSupportLibrary = true } diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..efde7bf --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk17