Update to latest Android SDK

pionere · Aug 30, 2024 · 2dd25e4 · 2dd25e4
1 parent 3d75c66
commit 2dd25e4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
@@ -9,7 +9,7 @@ if (buildAsApplication) {
 android {
 	// ndkVersion '26.1.10909125' - asio is not ready for this
 	ndkVersion '25.2.9519653'
-	compileSdk 34
+	compileSdk 35
 	aaptOptions { // probably does not matter...
 		noCompress 'mpq'
 	}
@@ -21,7 +21,7 @@ android {
 			applicationId "org.diasurgical.devilx"
 		}
 		minSdkVersion 21
-		targetSdkVersion 34
+		targetSdkVersion 35
 		versionCode 666
 		versionName "1.0.0"
 		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
@@ -8,6 +8,7 @@
 import android.content.IntentFilter;
 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;
@@ -66,6 +67,16 @@ protected void onDestroy() {
 
 		request.setDestinationInExternalFilesDir(this, null, fileName);
 
+		if (mReceiver == null) {
+			mReceiver = new DownloadReceiver();
+			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);
 		downloadManager.enqueue(request);
 

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