ACardEmulator: raise sdktarget to 34

frankmorgner · Mar 5, 2025 · 4b7b423 · 4b7b423
1 parent 2da92a7
commit 4b7b423
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/ACardEmulator/app/build.gradle b/ACardEmulator/app/build.gradle
@@ -6,10 +6,10 @@ android {
         applicationId "com.vsmartcard.acardemulator"
         minSdk 21
         //noinspection ExpiredTargetSdkVersion
-        targetSdk 30
+        targetSdk 34
         versionCode 8
         versionName "3.5"
-        archivesBaseName = "ACardEmulator-$versionName"
+        base.archivesName = "ACardEmulator-$versionName"
     }
     buildTypes {
         release {
@@ -62,4 +62,4 @@ dependencies {
     implementation 'com.google.zxing:core:3.4.1'
     implementation 'org.bouncycastle:bcprov-jdk14:1.46'
     fullImplementation files('libs/sdk-v1.0.0.jar')
-}
+}
diff --git a/ACardEmulator/app/src/main/AndroidManifest.xml b/ACardEmulator/app/src/main/AndroidManifest.xml
@@ -6,9 +6,8 @@
     <uses-permission android:name="android.permission.NFC" />
 
     <uses-feature android:name="android.hardware.nfc.hce" android:required="true" />
-
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="com.samsung.accessory.permission.ACCESSORY_FRAMEWORK" />
     <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
     <uses-permission android:name="com.samsung.WATCH_APP_TYPE.Companion" />

diff --git a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java
@@ -220,10 +220,16 @@ public boolean onPreferenceClick(Preference preference) {
                 gear_nfc.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                     public boolean onPreferenceClick(Preference preference) {
                         String gearPackage = "com.samsung.android.gearoplugin";
+                        Intent intent = new Intent(Intent.ACTION_VIEW);
                         try {
-                            startActivity(new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("market://details?id="+gearPackage)));
+                            intent.setData(Uri.parse(
+                                    "https://play.google.com/store/apps/details?id="+gearPackage));
+                            intent.setPackage("com.android.vending");
+                            startActivity(intent);
                         } catch (android.content.ActivityNotFoundException e) {
-                            startActivity(new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id="+gearPackage)));
+                            intent.setData(Uri.parse(
+                                    "market://details?id="+gearPackage));
+                            intent.setPackage("com.sec.android.app.samsungapps");
                         }
                         return true;
                     }