From c9922b1d94d2a875e405c8e21493482f6fa53bd7 Mon Sep 17 00:00:00 2001
From: Simon <6168240+DrBeef@users.noreply.github.com>
Date: Mon, 6 May 2024 19:49:08 +0100
Subject: [PATCH] Proper External SDCARD access

No need to use scoped storage
---
 Projects/Android/AndroidManifest.xml          |  6 +-
 Projects/Android/build.gradle                 |  4 +-
 Projects/Android/jni/darkplaces/menu.c        |  2 +-
 .../drbeef/quakequest/GLES3JNIActivity.java   | 91 +++++--------------
 4 files changed, 32 insertions(+), 71 deletions(-)

diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index da5e543..995a99a 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.quakequest"
-		android:versionCode="25"
-		android:versionName="1.5.6"
+		android:versionCode="26"
+		android:versionName="1.5.7"
 		android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
@@ -14,7 +14,7 @@
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
 	
 	<application
 		android:allowBackup="false"
diff --git a/Projects/Android/build.gradle b/Projects/Android/build.gradle
index 07a5f94..66dc9be 100644
--- a/Projects/Android/build.gradle
+++ b/Projects/Android/build.gradle
@@ -33,7 +33,9 @@ android {
                 abiFilters 'arm64-v8a'
         }
         ndkBuild {
-                abiFilters 'arm64-v8a'
+            def numProcs = Runtime.runtime.availableProcessors()
+            arguments "V=0", "-j$numProcs", "-C$project.buildDir.parent", "APP_PLATFORM=android-29", "NDK_TOOLCHAIN_VERSION=clang", "APP_STL=c++_static"
+            abiFilters 'arm64-v8a'
         }
     }
 
diff --git a/Projects/Android/jni/darkplaces/menu.c b/Projects/Android/jni/darkplaces/menu.c
index 08d444a..2ba11a6 100644
--- a/Projects/Android/jni/darkplaces/menu.c
+++ b/Projects/Android/jni/darkplaces/menu.c
@@ -3597,7 +3597,7 @@ static void M_Credits_Draw (void)
 			"   QQQQQQQQ           QQQQQQQQ      ",
 			"     QQQ                QQQ         ",
    			"      Q                  Q          ",
-	  		"      Q                  Q   v1.5.6");
+	  		"      Q                  Q   v1.5.7");
 
 	int i, l, linelength, firstline, lastline, lines;
 	for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_credits_message[i];i++)
diff --git a/java/com/drbeef/quakequest/GLES3JNIActivity.java b/java/com/drbeef/quakequest/GLES3JNIActivity.java
index cf98383..4140e4a 100644
--- a/java/com/drbeef/quakequest/GLES3JNIActivity.java
+++ b/java/com/drbeef/quakequest/GLES3JNIActivity.java
@@ -16,11 +16,15 @@ import java.util.Locale;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
+import android.provider.Settings;
 import android.system.ErrnoException;
 import android.util.Log;
 import android.view.SurfaceHolder;
@@ -57,31 +61,25 @@ import android.support.v4.content.ContextCompat;
 
 	private static final String TAG = "QuakeQuest";
 
-	private int permissionCount = 0;
-	private static final int READ_EXTERNAL_STORAGE_PERMISSION_ID = 1;
-	private static final int WRITE_EXTERNAL_STORAGE_PERMISSION_ID = 2;
-
 	String commandLineParams;
 
-	private SurfaceView mView;
-	private SurfaceHolder mSurfaceHolder;
+    private SurfaceHolder mSurfaceHolder;
 	private long mNativeHandle;
 
 	String dir;
 
-	private final boolean m_asynchronousTracking = false;
-	
 	@Override protected void onCreate( Bundle icicle )
 	{
 		Log.v( TAG, "----------------------------------------------------------------" );
 		Log.v( TAG, "GLES3JNIActivity::onCreate()" );
 		super.onCreate( icicle );
 
-		mView = new SurfaceView( this );
-		setContentView( mView );
+        SurfaceView mView = new SurfaceView(this);
+		setContentView(mView);
 		mView.getHolder().addCallback( this );
 
-		dir = getBaseContext().getExternalFilesDir(null).getAbsolutePath();
+		dir = "/sdcard/QuakeQuest";
+		//dir = getBaseContext().getExternalFilesDir(null).getAbsolutePath();
 
 		// Force the screen to stay on, rather than letting it dim and shut off
 		// while the user is watching a movie.
@@ -97,76 +95,37 @@ import android.support.v4.content.ContextCompat;
 
 	/** Initializes the Activity only if the permission has been granted. */
 	private void checkPermissionsAndInitialize() {
-		// Boilerplate for checking runtime permissions in Android.
-		if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-				!= PackageManager.PERMISSION_GRANTED){
-			ActivityCompat.requestPermissions(
-					GLES3JNIActivity.this,
-					new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE},
-					WRITE_EXTERNAL_STORAGE_PERMISSION_ID);
+		if (!Environment.isExternalStorageManager()) {
+			//request for the permission
+			Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+			Uri uri = Uri.fromParts("package", getPackageName(), null);
+			intent.setData(uri);
+			startActivityForResult(intent, 1);
 		}
 		else
 		{
-			permissionCount++;
-		}
-
-		if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
-				!= PackageManager.PERMISSION_GRANTED)
-		{
-			ActivityCompat.requestPermissions(
-					GLES3JNIActivity.this,
-					new String[] {Manifest.permission.READ_EXTERNAL_STORAGE},
-					READ_EXTERNAL_STORAGE_PERMISSION_ID);
-		}
-		else
-		{
-			permissionCount++;
-		}
-
-		if (permissionCount == 2) {
 			// Permissions have already been granted.
-			try {
-				create();
-			} catch (Exception ignored)
-			{
-
-			}
+			create();
 		}
 	}
 
-	/** Handles the user accepting the permission. */
 	@Override
-	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] results) {
-		if (requestCode == READ_EXTERNAL_STORAGE_PERMISSION_ID) {
-			if (results.length > 0 && results[0] == PackageManager.PERMISSION_GRANTED) {
-				permissionCount++;
-			}
-			else
-			{
-				System.exit(0);
-			}
-		}
-
-		if (requestCode == WRITE_EXTERNAL_STORAGE_PERMISSION_ID) {
-			if (results.length > 0 && results[0] == PackageManager.PERMISSION_GRANTED) {
-				permissionCount++;
-			}
-			else
-			{
-				System.exit(0);
-			}
-		}
-
-		checkPermissionsAndInitialize();
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		create();
 	}
 
-	public void create() throws ErrnoException {
+	public void create() {
 		//This will copy the shareware version of quake if user doesn't have anything installed
 		copy_asset(dir + "/id1", "pak0.pak");
 		copy_asset(dir + "/id1", "config.cfg");
 		copy_asset(dir, "commandline.txt");
 
-		setenv("QUAKEQUEST_DIR", dir, true);
+		try {
+			setenv("QUAKEQUEST_DIR", dir, true);
+		} catch (Exception ignored)
+		{
+			System.exit(-9);;
+		}
 
 		//Read these from a file and pass through
 		commandLineParams = new String("quake");