Merge branch 'master' into development

love/src/main/java/org/love2d/android/GameActivity.java

@@ -55,8 +55,8 @@ public class GameActivity extends SDLActivity {
     private static Vibrator vibrator = null;
     protected final int[] externalStorageRequestDummy = new int[1];
     protected final int[] recordAudioRequestDummy = new int[1];
-    public static final int EXTERNAL_STORAGE_REQUEST_CODE = 1;
-    public static final int RECORD_AUDIO_REQUEST_CODE = 2;
+    public static final int EXTERNAL_STORAGE_REQUEST_CODE = 2;
+    public static final int RECORD_AUDIO_REQUEST_CODE = 3;
     private static boolean immersiveActive = false;
     private static boolean mustCacheArchive = false;
     private boolean storagePermissionUnnecessary = false;
@@ -424,8 +424,6 @@ public class GameActivity extends SDLActivity {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
         if (grantResults.length > 0) {
             Log.d("GameActivity", "Received a request permission result");
 
@@ -461,6 +459,8 @@ public class GameActivity extends SDLActivity {
                     }
                     break;
                 }
+                default:
+                    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
             }
         }
     }

love/src/normal/java/org/love2d/android/DownloadActivity.java

@@ -33,8 +33,6 @@ import android.util.Log;
 import androidx.core.app.ActivityCompat;
 
 public class DownloadActivity extends Activity {
-    public static final int EXTERNAL_STORAGE_REQUEST_CODE = 3;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -45,7 +43,7 @@ public class DownloadActivity extends Activity {
             runDownloader();
             finish();
         } else {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, EXTERNAL_STORAGE_REQUEST_CODE);
+            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, GameActivity.EXTERNAL_STORAGE_REQUEST_CODE);
         }
     }
 
@@ -56,7 +54,7 @@ public class DownloadActivity extends Activity {
         if (grantResults.length > 0) {
             Log.d("DownloadActivity", "Received a request permission result");
 
-            if (requestCode == EXTERNAL_STORAGE_REQUEST_CODE) {
+            if (requestCode == GameActivity.EXTERNAL_STORAGE_REQUEST_CODE) {
                 if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     runDownloader();
                     finish();
@@ -67,6 +65,9 @@ public class DownloadActivity extends Activity {
                     }
                 }
             }
+            else {
+                super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+            }
         }
     }