From e9015a55416ce22500cf994c6a048db47530dc57 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 26 Apr 2021 10:52:05 +0900 Subject: [PATCH] use targetapi annotations throughout base activity --- .../activities/base/AbsBaseActivity.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java index 279ef6bd..bb3fc975 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java @@ -1,5 +1,6 @@ package com.dkanada.gramophone.activities.base; +import android.annotation.TargetApi; import android.app.AlertDialog; import android.content.pm.PackageManager; import android.os.Build; @@ -7,11 +8,13 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import androidx.core.app.ActivityCompat; import com.dkanada.gramophone.util.NavigationUtil; import com.dkanada.gramophone.R; +import java.util.ArrayList; import java.util.List; public abstract class AbsBaseActivity extends AbsThemeActivity { @@ -21,6 +24,7 @@ public abstract class AbsBaseActivity extends AbsThemeActivity { private boolean allowed; @Override + @TargetApi(Build.VERSION_CODES.M) protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -29,6 +33,7 @@ public abstract class AbsBaseActivity extends AbsThemeActivity { } @Override + @TargetApi(Build.VERSION_CODES.M) protected void onPostCreate(@Nullable Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); @@ -38,6 +43,7 @@ public abstract class AbsBaseActivity extends AbsThemeActivity { } @Override + @TargetApi(Build.VERSION_CODES.M) protected void onResume() { super.onResume(); if (hasPermissions() != allowed) { @@ -46,25 +52,23 @@ public abstract class AbsBaseActivity extends AbsThemeActivity { } protected List getPermissionsToRequest() { - return null; + return new ArrayList<>(); } protected String getPermissionDeniedMessage() { return getString(R.string.permissions_denied); } + @RequiresApi(api = Build.VERSION_CODES.M) protected void requestPermissions() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && permissions != null) { - requestPermissions(permissions.toArray(new String[0]), PERMISSION_REQUEST); - } + requestPermissions(permissions.toArray(new String[0]), PERMISSION_REQUEST); } + @RequiresApi(api = Build.VERSION_CODES.M) protected boolean hasPermissions() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && permissions != null) { - for (String permission : permissions) { - if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) { - return false; - } + for (String permission : permissions) { + if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) { + return false; } } @@ -72,6 +76,7 @@ public abstract class AbsBaseActivity extends AbsThemeActivity { } @Override + @TargetApi(Build.VERSION_CODES.M) public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] results) { super.onRequestPermissionsResult(requestCode, permissions, results);