From 449285a585f6ed586ad072a48eda4c0f298c3ebe Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Thu, 29 Aug 2024 16:18:51 +0200
Subject: [PATCH] Update to latest Android SDK

---
 android-project/app/build.gradle                          | 6 +++---
 .../java/org/diasurgical/devilutionx/DataActivity.java    | 8 +++++++-
 android-project/build.gradle                              | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
index 2a6508c62..180927e92 100644
--- a/android-project/app/build.gradle
+++ b/android-project/app/build.gradle
@@ -8,14 +8,14 @@ if (buildAsApplication) {
 
 android {
 	ndkVersion '26.1.10909125'
-	compileSdk 33
+	compileSdk 35
 	defaultConfig {
 		if (buildAsApplication) {
 			applicationId "org.diasurgical.devilutionx"
 		}
 		minSdkVersion 21
-		targetSdkVersion 33
-		versionCode 28
+		targetSdkVersion 35
+		versionCode 29
 		versionName project.file('../../VERSION').text.trim()
 		externalNativeBuild {
 			cmake {
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
index d07045441..03ed9a830 100644
--- 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.IntentFilter;
 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 class DataActivity extends Activity {
 
 		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
index face7ef7e..fd7d26f22 100644
--- 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