diff --git a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java index a5bc0b04a..4c1712bc3 100644 --- a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java @@ -19,7 +19,6 @@ import android.app.ActivityManager; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.PackageManager; import android.content.res.Configuration; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -34,8 +33,6 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; import androidx.preference.PreferenceManager; import com.google.android.material.color.MaterialColors; @@ -46,14 +43,11 @@ import com.keylesspalace.tusky.db.AccountEntity; import com.keylesspalace.tusky.db.AccountManager; import com.keylesspalace.tusky.di.Injectable; import com.keylesspalace.tusky.interfaces.AccountSelectionListener; -import com.keylesspalace.tusky.interfaces.PermissionRequester; import com.keylesspalace.tusky.settings.AppTheme; import com.keylesspalace.tusky.settings.PrefKeys; import com.keylesspalace.tusky.util.ActivityExtensions; import com.keylesspalace.tusky.util.ThemeUtils; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import javax.inject.Inject; @@ -71,9 +65,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab @NonNull public AccountManager accountManager; - private static final int REQUESTER_NONE = Integer.MAX_VALUE; - private HashMap requesters; - @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -107,8 +98,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab if(requiresLogin()) { redirectIfNotLoggedIn(); } - - requesters = new HashMap<>(); } private boolean activityTransitionWasRequested() { @@ -273,36 +262,4 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab startActivity(intent); finish(); } - - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - if (requesters.containsKey(requestCode)) { - PermissionRequester requester = requesters.remove(requestCode); - requester.onRequestPermissionsResult(permissions, grantResults); - } - } - - public void requestPermissions(@NonNull String[] permissions, @NonNull PermissionRequester requester) { - ArrayList permissionsToRequest = new ArrayList<>(); - for(String permission: permissions) { - if (ContextCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED) { - permissionsToRequest.add(permission); - } - } - if (permissionsToRequest.isEmpty()) { - int[] permissionsAlreadyGranted = new int[permissions.length]; - requester.onRequestPermissionsResult(permissions, permissionsAlreadyGranted); - return; - } - - int newKey = requester == null ? REQUESTER_NONE : requesters.size(); - if (newKey != REQUESTER_NONE) { - requesters.put(newKey, requester); - } - String[] permissionsCopy = new String[permissionsToRequest.size()]; - permissionsToRequest.toArray(permissionsCopy); - ActivityCompat.requestPermissions(this, permissionsCopy, newKey); - - } } diff --git a/app/src/main/java/com/keylesspalace/tusky/interfaces/PermissionRequester.kt b/app/src/main/java/com/keylesspalace/tusky/interfaces/PermissionRequester.kt deleted file mode 100644 index d31bd1feb..000000000 --- a/app/src/main/java/com/keylesspalace/tusky/interfaces/PermissionRequester.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.keylesspalace.tusky.interfaces - -fun interface PermissionRequester { - fun onRequestPermissionsResult(permissions: Array, grantResults: IntArray) -}