Skip to content

P
permission_handler
Commit cbaf71f9 by Maurits van Beusekom
Options

Fix merge conflict (cast issue)

parents 8d86c490 9393aa44
Showing with 5 additions and 5 deletions
android/src/main/java/com/baseflow/permissionhandler/MethodCallHandlerImpl.java
...@@ -52,7 +52,7 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler { ...@@ -52,7 +52,7 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
{ {
switch (call.method) { switch (call.method) {
case "checkPermissionStatus": { case "checkPermissionStatus": {
@PermissionConstants.PermissionGroup final int permission = (int) call.arguments; @PermissionConstants.PermissionGroup final int permission = Integer.parseInt(call.arguments.toString());
@PermissionConstants.PermissionStatus final int permissionStatus = @PermissionConstants.PermissionStatus final int permissionStatus =
permissionManager.checkPermissionStatus( permissionManager.checkPermissionStatus(
permission, permission,
...@@ -62,7 +62,7 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler { ...@@ -62,7 +62,7 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
break; break;
} }
case "checkServiceStatus": { case "checkServiceStatus": {
@PermissionConstants.PermissionGroup final int permission = (int) call.arguments; @PermissionConstants.PermissionGroup final int permission = Integer.parseInt(call.arguments.toString());
@PermissionConstants.ServiceStatus final int serviceStatus = @PermissionConstants.ServiceStatus final int serviceStatus =
serviceManager.checkServiceStatus( serviceManager.checkServiceStatus(
permission, permission,
...@@ -79,13 +79,13 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler { ...@@ -79,13 +79,13 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
activityRegistry, activityRegistry,
permissionRegistry, permissionRegistry,
result::success, result::success,
(String errorCode, String errorDiscription) -> { (String errorCode, String errorDescription) -> {
result.error(errorCode, errorDiscription, null); result.error(errorCode, errorDescription, null);
}); });
break; break;
case "shouldShowRequestPermissionRationale": { case "shouldShowRequestPermissionRationale": {
@PermissionConstants.PermissionGroup final int permission = (int) call.arguments; @PermissionConstants.PermissionGroup final int permission = Integer.parseInt(call.arguments.toString());
final boolean showRationale = permissionManager final boolean showRationale = permissionManager
.shouldShowRequestPermissionRationale(permission, activity); .shouldShowRequestPermissionRationale(permission, activity);
result.success(showRationale); result.success(showRationale);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment