Update to latest Android SDK

diasurgical · Aug 29, 2024 · a77120f · a77120f
1 parent 46e729e
commit a77120f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
@@ -8,13 +8,13 @@ if (buildAsApplication) {
 
 android {
 	ndkVersion '26.1.10909125'
-	compileSdk 33
+	compileSdk 35
 	defaultConfig {
 		if (buildAsApplication) {
 			applicationId "org.diasurgical.devilutionx"
 		}
 		minSdkVersion 21
-		targetSdkVersion 33
+		targetSdkVersion 35
 		versionCode 29
 		versionName project.file('../../VERSION').text.trim()
 		externalNativeBuild {

diff --git a/android-project/app/src/main/java/org/diasurgical/devilutionx/DataActivity.java b/android-project/app/src/main/java/org/diasurgical/devilutionx/DataActivity.java
@@ -9,6 +9,7 @@
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.text.method.LinkMovementMethod;
@@ -158,7 +159,12 @@ public void sendDownloadRequest(String url, String fileName, String description)
 
 		if (mReceiver == null) {
 			mReceiver = new DownloadReceiver();
-			registerReceiver(mReceiver, new IntentFilter("android.intent.action.DOWNLOAD_COMPLETE"));
+			IntentFilter filter = new IntentFilter("android.intent.action.DOWNLOAD_COMPLETE");
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED);
+			} else {
+				registerReceiver(mReceiver, filter);
+			}
 		}
 
 		DownloadManager downloadManager = (DownloadManager)this.getSystemService(Context.DOWNLOAD_SERVICE);

diff --git a/android-project/build.gradle b/android-project/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.5.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files