Android: build fixes & compat fixes

[oweals/minetest.git] / build / android / src / main / java / net.minetest.minetest / MainActivity.java

diff --git a/build/android/src/main/java/net.minetest.minetest/MainActivity.java b/build/android/src/main/java/net.minetest.minetest/MainActivity.java
index 1baa7166843161777d30b89b1eeaf8f7e25e80d3..71b0ce14410a5b30f7297cb314efe2141c797f24 100644 (file)
--- a/build/android/src/main/java/net.minetest.minetest/MainActivity.java
+++ b/build/android/src/main/java/net.minetest.minetest/MainActivity.java
@@ -6,17 +6,17 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 public class MainActivity extends Activity {
-
        private final static int PERMISSIONS = 1;
        private static final String[] REQUIRED_SDK_PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE};
 
@@ -30,8 +30,8 @@ public class MainActivity extends Activity {
                }
        }
 
-       protected void checkPermission() {
-               final List<String> missingPermissions = new ArrayList<String>();
+       private void checkPermission() {
+               final List<String> missingPermissions = new ArrayList<>();
                // check required permission
                for (final String permission : REQUIRED_SDK_PERMISSIONS) {
                        final int result = ContextCompat.checkSelfPermission(this, permission);
@@ -42,7 +42,7 @@ public class MainActivity extends Activity {
                if (!missingPermissions.isEmpty()) {
                        // request permission
                        final String[] permissions = missingPermissions
-                                       .toArray(new String[missingPermissions.size()]);
+                                       .toArray(new String[0]);
                        ActivityCompat.requestPermissions(this, permissions, PERMISSIONS);
                } else {
                        final int[] grantResults = new int[REQUIRED_SDK_PERMISSIONS.length];
@@ -53,25 +53,23 @@ public class MainActivity extends Activity {
        }
 
        @Override
-       public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[],
+       public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
                                                                                   @NonNull int[] grantResults) {
-               switch (requestCode) {
-                       case PERMISSIONS:
-                               for (int index = 0; index < permissions.length; index++) {
-                                       if (grantResults[index] != PackageManager.PERMISSION_GRANTED) {
-                                               // permission not granted - toast and exit
-                                               Toast.makeText(this, R.string.not_granted, Toast.LENGTH_LONG).show();
-                                               finish();
-                                               return;
-                                       }
+               if (requestCode == PERMISSIONS) {
+                       for (int index = 0; index < permissions.length; index++) {
+                               if (grantResults[index] != PackageManager.PERMISSION_GRANTED) {
+                                       // permission not granted - toast and exit
+                                       Toast.makeText(this, R.string.not_granted, Toast.LENGTH_LONG).show();
+                                       finish();
+                                       return;
                                }
-                               // permission were granted - run
-                               next();
-                               break;
+                       }
+                       // permission were granted - run
+                       next();
                }
        }
 
-       public void next() {
+       private void next() {
                Intent intent = new Intent(this, MtNativeActivity.class);
                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK);
                startActivity(intent);