[expo-permissions] Apply requested changes

expo · Apr 27, 2020 · 6909239 · 6909239
1 parent 2374f13
commit 6909239
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/android/expoview/src/main/java/host/exp/exponent/experience/ReactNativeActivity.java b/android/expoview/src/main/java/host/exp/exponent/experience/ReactNativeActivity.java
@@ -690,7 +690,7 @@ public void onRequestPermissionsResult(final int requestCode, final String[] per
   @Override
   public int checkPermission(final String permission, final int pid, final int uid) {
     int globalResult = super.checkPermission(permission, pid, uid);
-    return mExpoKernelServiceRegistry.getPermissionsKernelService().getFinalPermissions(globalResult, getPackageManager(), permission, mExperienceId);
+    return mExpoKernelServiceRegistry.getPermissionsKernelService().getPermissions(globalResult, getPackageManager(), permission, mExperienceId);
   }
 
   public RNObject getDevSupportManager() {

diff --git a/...id/expoview/src/main/java/host/exp/exponent/kernel/services/PermissionsKernelService.java b/...id/expoview/src/main/java/host/exp/exponent/kernel/services/PermissionsKernelService.java
@@ -95,7 +95,7 @@ public boolean hasGrantedPermissions(String permission, ExperienceId experienceI
     return false;
   }
 
-  public int getFinalPermissions(int globalPermissionStatus, PackageManager packageManager, String permission, ExperienceId experienceId) {
+  public int getPermissions(int globalPermissionStatus, PackageManager packageManager, String permission, ExperienceId experienceId) {
     // only these permissions, which show a dialog to the user should be scoped.
     boolean isDangerousPermission;
     try {

diff --git a/...w/src/main/java/versioned/host/exp/exponent/modules/universal/ScopedPermissionsService.kt b/...w/src/main/java/versioned/host/exp/exponent/modules/universal/ScopedPermissionsService.kt
@@ -13,7 +13,7 @@ import javax.inject.Inject
 
 class ScopedPermissionsService(context: Context, val experienceId: ExperienceId) : PermissionsService(context) {
 
-  // This variable cannot be lateinit, cause the Location module gets permissions before this module initialized.
+  // This variable cannot be lateinit, cause the Location module gets permissions before this module is initialized.
   @Inject
   var mExpoKernelServiceRegistry: ExpoKernelServiceRegistry? = null
 
@@ -30,7 +30,8 @@ class ScopedPermissionsService(context: Context, val experienceId: ExperienceId)
   // We override this to scoped permissions in the headless mode.
   override fun getManifestPermissionFromContext(permission: String): Int {
     val globalPermissions = ContextCompat.checkSelfPermission(context, permission)
-    return mExpoKernelServiceRegistry?.permissionsKernelService?.getFinalPermissions(globalPermissions, context.packageManager, permission, experienceId) ?: PackageManager.PERMISSION_DENIED
+    return mExpoKernelServiceRegistry?.permissionsKernelService?.getPermissions(globalPermissions, context.packageManager, permission, experienceId)
+      ?: PackageManager.PERMISSION_DENIED
   }
 
 }