From d2a6a6ffd3729702d20a5f54f6604def3504a9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= Date: Thu, 23 Apr 2020 12:41:33 +0200 Subject: [PATCH] [expo-permissions] Apply requested changes --- .../host/exp/exponent/experience/ReactNativeActivity.java | 2 +- .../exponent/kernel/services/PermissionsKernelService.java | 2 +- .../exponent/modules/universal/ScopedPermissionsService.kt | 5 +++-- 3 files changed, 5 insertions(+), 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 index 903722bf50850..af347f7ff21da 100644 --- 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/android/expoview/src/main/java/host/exp/exponent/kernel/services/PermissionsKernelService.java b/android/expoview/src/main/java/host/exp/exponent/kernel/services/PermissionsKernelService.java index 531240161ccae..e3eaab385be91 100644 --- a/android/expoview/src/main/java/host/exp/exponent/kernel/services/PermissionsKernelService.java +++ b/android/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/android/expoview/src/main/java/versioned/host/exp/exponent/modules/universal/ScopedPermissionsService.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/universal/ScopedPermissionsService.kt index b9901e38667b3..a60c7259ed38b 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/universal/ScopedPermissionsService.kt +++ b/android/expoview/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 } }