From 212751c83541ab62076e40d28e46919abd8925f9 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 8 Apr 2021 17:11:07 +0100 Subject: [PATCH] Return a value instead of passing a runnable argument. --- .../add/nearby/AddNearbyContactIntroFragment.java | 9 ++++++--- .../add/nearby/AddNearbyContactPermissionManager.java | 4 +--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java index 5a9aa3864..08b61094a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java @@ -37,9 +37,12 @@ public class AddNearbyContactIntroFragment extends BaseFragment { private ScrollView scrollView; private final ActivityResultLauncher permissionLauncher = - registerForActivityResult(new RequestMultiplePermissions(), r -> - permissionManager.onRequestPermissionResult(r, - viewModel::showQrCodeFragmentIfAllowed)); + registerForActivityResult(new RequestMultiplePermissions(), r -> { + permissionManager.onRequestPermissionResult(r); + if (permissionManager.checkPermissions()) { + viewModel.showQrCodeFragmentIfAllowed(); + } + }); public static AddNearbyContactIntroFragment newInstance() { Bundle args = new Bundle(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactPermissionManager.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactPermissionManager.java index f04102c1e..b0bc75fbe 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactPermissionManager.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactPermissionManager.java @@ -164,8 +164,7 @@ class AddNearbyContactPermissionManager { requestPermissions.accept(permissions); } - void onRequestPermissionResult(Map result, - Runnable onPermissionsGranted) { + void onRequestPermissionResult(Map result) { if (gotPermission(CAMERA, result)) { cameraPermission = Permission.GRANTED; } else if (shouldShowRationale(CAMERA)) { @@ -182,7 +181,6 @@ class AddNearbyContactPermissionManager { locationPermission = Permission.PERMANENTLY_DENIED; } } - if (checkPermissions()) onPermissionsGranted.run(); } private boolean gotPermission(String permission,