[pull] master from permissions-dispatcher:master

library/src/main/java/permissions/dispatcher/PermissionUtils.java

@@ -2,11 +2,12 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.Build;
 
 import androidx.collection.SimpleArrayMap;
 import androidx.core.app.ActivityCompat;
-import androidx.core.content.PermissionChecker;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
 public final class PermissionUtils {
@@ -46,7 +47,7 @@ public static boolean verifyPermissions(int... grantResults) {
             return false;
         }
         for (int result : grantResults) {
-            if (result != PermissionChecker.PERMISSION_GRANTED) {
+            if (result != PackageManager.PERMISSION_GRANTED) {
                 return false;
             }
         }
@@ -96,7 +97,7 @@ public static boolean hasSelfPermissions(Context context, String... permissions)
      */
     private static boolean hasSelfPermission(Context context, String permission) {
         try {
-            return PermissionChecker.checkSelfPermission(context, permission) == PermissionChecker.PERMISSION_GRANTED;
+            return ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED;
         } catch (RuntimeException t) {
             return false;
         }

test/src/test/java/permissions/dispatcher/test/ActivityOnlyNeedsPermissionPermissionsDispatcherTest.kt

@@ -2,7 +2,7 @@ package permissions.dispatcher.test
 
 import android.content.pm.PackageManager
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -15,7 +15,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class)
 class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {
 
     private lateinit var activity: ActivityOnlyNeedsPermission
@@ -34,7 +34,7 @@ class ActivityOnlyNeedsPermissionPermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityOnlyNeedsPermission::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
     }
 
     @After

test/src/test/java/permissions/dispatcher/test/ActivityWithAllAnnotationsKtPermissionsDispatcherTest.kt

@@ -2,7 +2,7 @@ package permissions.dispatcher.test
 
 import android.content.pm.PackageManager
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -17,7 +17,7 @@ import permissions.dispatcher.PermissionRequest
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class)
 class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {
 
     private lateinit var activity: ActivityWithAllAnnotationsKt
@@ -38,7 +38,7 @@ class ActivityWithAllAnnotationsKtPermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithAllAnnotationsKt::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
     }
 
     @After

test/src/test/java/permissions/dispatcher/test/ActivityWithAllAnnotationsPermissionsDispatcherTest.kt

@@ -2,7 +2,7 @@ package permissions.dispatcher.test
 
 import android.content.pm.PackageManager
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -17,7 +17,7 @@ import permissions.dispatcher.PermissionRequest
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class)
 class ActivityWithAllAnnotationsPermissionsDispatcherTest {
 
     private lateinit var activity: ActivityWithAllAnnotations
@@ -36,7 +36,7 @@ class ActivityWithAllAnnotationsPermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithAllAnnotations::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
     }
 
     @After

test/src/test/java/permissions/dispatcher/test/ActivityWithNoParameterArgumentKtPermissionsDispatcherTest.kt

@@ -2,7 +2,7 @@ package permissions.dispatcher.test
 
 import android.content.pm.PackageManager
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -15,7 +15,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class)
 class ActivityWithNoParameterArgumentKtPermissionsDispatcherTest {
 
     private lateinit var activity: ActivityWithNoParameterArgumentKt
@@ -36,7 +36,7 @@ class ActivityWithNoParameterArgumentKtPermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithNoParameterArgumentKt::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
     }
 
     @After

test/src/test/java/permissions/dispatcher/test/ActivityWithOnNeverAskAgainPermissionsDispatcherTest.kt

@@ -2,7 +2,7 @@ package permissions.dispatcher.test
 
 import android.content.pm.PackageManager
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -15,7 +15,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class)
 class ActivityWithOnNeverAskAgainPermissionsDispatcherTest {
     private lateinit var activity: ActivityWithOnNeverAskAgain
 
@@ -33,7 +33,7 @@ class ActivityWithOnNeverAskAgainPermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithOnNeverAskAgain::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
     }
 
     @After

test/src/test/java/permissions/dispatcher/test/ActivityWithOnPermissionDeniedPermissionsDispatcherTest.kt

@@ -2,7 +2,7 @@ package permissions.dispatcher.test
 
 import android.content.pm.PackageManager
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -15,7 +15,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class)
 class ActivityWithOnPermissionDeniedPermissionsDispatcherTest {
     private lateinit var activity: ActivityWithOnPermissionDenied
 
@@ -33,7 +33,7 @@ class ActivityWithOnPermissionDeniedPermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithOnPermissionDenied::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
     }
 
     @After

test/src/test/java/permissions/dispatcher/test/ActivityWithParametersKtPermissionsDispatcherTest.kt

@@ -1,7 +1,7 @@
 package permissions.dispatcher.test
 
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -13,7 +13,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class)
 class ActivityWithStringParameterKtPermissionsDispatcherTest {
 
     private lateinit var activity: ActivityWithParametersKt
@@ -22,7 +22,7 @@ class ActivityWithStringParameterKtPermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithParametersKt::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
     }
 
     @After

test/src/test/java/permissions/dispatcher/test/ActivityWithShowRationalePermissionsDispatcherTest.kt

@@ -2,7 +2,7 @@ package permissions.dispatcher.test
 
 import android.content.pm.PackageManager
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -17,7 +17,7 @@ import permissions.dispatcher.PermissionRequest
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class)
 class ActivityWithShowRationalePermissionsDispatcherTest {
 
     private lateinit var activity: ActivityWithShowRationale
@@ -36,7 +36,7 @@ class ActivityWithShowRationalePermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithShowRationale::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
     }
 
     @After

test/src/test/java/permissions/dispatcher/test/ActivityWithSystemAlertWindowAllAnnotationsPermissionsDispatcherTest.kt

@@ -6,7 +6,7 @@ import android.os.Build
 import android.provider.Settings
 import androidx.core.app.ActivityCompat
 import androidx.core.app.AppOpsManagerCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -23,7 +23,7 @@ import permissions.dispatcher.test.ActivityWithSystemAlertWindowAllAnnotationsPe
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class,
+@PrepareForTest(ActivityCompat::class, ContextCompat::class,
         AppOpsManagerCompat::class, Settings::class, Build.VERSION::class, Uri::class)
 class ActivityWithSystemAlertWindowAllAnnotationsPermissionsDispatcherTest {
     private lateinit var activity: ActivityWithSystemAlertWindowAllAnnotations
@@ -42,7 +42,7 @@ class ActivityWithSystemAlertWindowAllAnnotationsPermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithSystemAlertWindowAllAnnotations::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
         PowerMockito.mockStatic(Settings::class.java)
         PowerMockito.mockStatic(Uri::class.java)
 

test/src/test/java/permissions/dispatcher/test/ActivityWithSystemAlertWindowKtAllAnnotationsTest.kt

@@ -5,7 +5,7 @@ import android.net.Uri
 import android.os.Build
 import android.provider.Settings
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -20,7 +20,7 @@ import permissions.dispatcher.PermissionRequest
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class, Settings::class, Build.VERSION::class, Uri::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class, Settings::class, Build.VERSION::class, Uri::class)
 class ActivityWithSystemAlertWindowKtAllAnnotationsTest {
 
     private lateinit var activity: ActivityWithSystemAlertWindowKtAllAnnotations
@@ -39,7 +39,7 @@ class ActivityWithSystemAlertWindowKtAllAnnotationsTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithSystemAlertWindowKtAllAnnotations::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
         PowerMockito.mockStatic(Settings::class.java)
         PowerMockito.mockStatic(Uri::class.java)
 

test/src/test/java/permissions/dispatcher/test/ActivityWithSystemAlertWindowKtTest.kt

@@ -5,7 +5,7 @@ import android.net.Uri
 import android.os.Build
 import android.provider.Settings
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -19,7 +19,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class, Settings::class, Build.VERSION::class, Uri::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class, Settings::class, Build.VERSION::class, Uri::class)
 class ActivityWithSystemAlertWindowKtTest {
     private lateinit var activity: ActivityWithSystemAlertWindowKt
 
@@ -37,7 +37,7 @@ class ActivityWithSystemAlertWindowKtTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithSystemAlertWindowKt::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
         PowerMockito.mockStatic(Settings::class.java)
         PowerMockito.mockStatic(Uri::class.java)
 

test/src/test/java/permissions/dispatcher/test/ActivityWithSystemAlertWindowPermissionsDispatcherTest.kt

@@ -5,7 +5,7 @@ import android.net.Uri
 import android.os.Build
 import android.provider.Settings
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -19,7 +19,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class, Settings::class, Build.VERSION::class, Uri::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class, Settings::class, Build.VERSION::class, Uri::class)
 class ActivityWithSystemAlertWindowPermissionsDispatcherTest {
     private lateinit var activity: ActivityWithSystemAlertWindow
 
@@ -37,7 +37,7 @@ class ActivityWithSystemAlertWindowPermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithSystemAlertWindow::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
         PowerMockito.mockStatic(Settings::class.java)
         PowerMockito.mockStatic(Uri::class.java)
 

test/src/test/java/permissions/dispatcher/test/ActivityWithWriteSettingAllAnnotationsPermissionsDispatcherTest.kt

@@ -5,7 +5,7 @@ import android.net.Uri
 import android.os.Build
 import android.provider.Settings
 import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
+import androidx.core.content.ContextCompat
 import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
@@ -21,7 +21,7 @@ import permissions.dispatcher.test.ActivityWithWriteSettingAllAnnotationsPermiss
 
 @Suppress("IllegalIdentifier")
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ActivityCompat::class, PermissionChecker::class, Settings::class, Build.VERSION::class, Uri::class)
+@PrepareForTest(ActivityCompat::class, ContextCompat::class, Settings::class, Build.VERSION::class, Uri::class)
 class ActivityWithWriteSettingAllAnnotationsPermissionsDispatcherTest {
     private lateinit var activity: ActivityWithWriteSettingAllAnnotations
 
@@ -39,7 +39,7 @@ class ActivityWithWriteSettingAllAnnotationsPermissionsDispatcherTest {
     fun setUp() {
         activity = Mockito.mock(ActivityWithWriteSettingAllAnnotations::class.java)
         PowerMockito.mockStatic(ActivityCompat::class.java)
-        PowerMockito.mockStatic(PermissionChecker::class.java)
+        PowerMockito.mockStatic(ContextCompat::class.java)
         PowerMockito.mockStatic(Settings.System::class.java)
         PowerMockito.mockStatic(Uri::class.java)