From be076f0bcbf2a3acd602ffa15aaad10f5b2735be Mon Sep 17 00:00:00 2001
From: Subsurface CI <ci@subsurface-divelog.org>
Date: Thu, 5 Dec 2024 08:06:04 -0800
Subject: [PATCH] Android: bump target SDK Version to 35

The treadmill never stops.
Apparently when switching to a newer SDK, we also need to add a new pointless
value to the activity section.

Android: add pointless receive exported flag

Because why make backwards compatible changes to the SDK when you can instead
break existing applications for absolutely no reason...

And of course the new required parameter doesn't exist in the older SDK we used
to use, so the forced change also forces us to abandon older Android versions.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Signed-off-by: Subsurface CI <ci@subsurface-divelog.org>
---
 android-mobile/AndroidManifest.xml                           | 5 +++--
 android-mobile/build.gradle                                  | 4 ++--
 .../subsurfacedivelog/mobile/SubsurfaceMobileActivity.java   | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/android-mobile/AndroidManifest.xml b/android-mobile/AndroidManifest.xml
index 36baecfca..f41229441 100644
--- a/android-mobile/AndroidManifest.xml
+++ b/android-mobile/AndroidManifest.xml
@@ -18,6 +18,7 @@
             android:label="@string/app_name"
             android:theme="@style/AppTheme"
             android:launchMode="singleTop"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="unspecified" >
             <intent-filter>
@@ -88,8 +89,8 @@
         </provider>
     </application>
 
-    <uses-sdk android:minSdkVersion="21"
-	      android:targetSdkVersion="30" />
+    <uses-sdk android:minSdkVersion="26"
+	      android:targetSdkVersion="34" />
 
     <supports-screens
         android:anyDensity="true"
diff --git a/android-mobile/build.gradle b/android-mobile/build.gradle
index 3434020b4..e03576b4f 100644
--- a/android-mobile/build.gradle
+++ b/android-mobile/build.gradle
@@ -1,5 +1,5 @@
 /*******************************************************
- * SPDX-License-Identifier: GPL-2.0 
+ * SPDX-License-Identifier: GPL-2.0
  * Subsurface-Mobile own Gradle build spec. Derived from
  * the one supplied by Qt.
  *******************************************************/
@@ -29,7 +29,7 @@ apply plugin: 'com.android.application'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.github.mik3y:usb-serial-for-android:3.8.1'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.core:core:1.15.0'
 }
 
 android {
diff --git a/android-mobile/src/org/subsurfacedivelog/mobile/SubsurfaceMobileActivity.java b/android-mobile/src/org/subsurfacedivelog/mobile/SubsurfaceMobileActivity.java
index 48d1efee8..dba8b135c 100644
--- a/android-mobile/src/org/subsurfacedivelog/mobile/SubsurfaceMobileActivity.java
+++ b/android-mobile/src/org/subsurfacedivelog/mobile/SubsurfaceMobileActivity.java
@@ -30,6 +30,7 @@ import android.content.pm.ResolveInfo;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import androidx.core.content.ContextCompat;
 
 // this is the main class that will be run at start
 public class SubsurfaceMobileActivity extends QtActivity
@@ -129,7 +130,7 @@ public class SubsurfaceMobileActivity extends QtActivity
 
 		// Register the usb permission intent filter.
 		IntentFilter filter = new IntentFilter("org.subsurfacedivelog.mobile.USB_PERMISSION");
-		registerReceiver(usbReceiver, filter);
+		ContextCompat.registerReceiver(usbReceiver, filter, ContextCompat.RECEIVER_EXPORTED);
 
 	} // onCreate