Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Return a value instead of passing a runnable argument.

Browse Source
This commit is contained in:
akwizgran
2021-04-08 17:11:07 +01:00
parent fe1c6acebb
commit 212751c835
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java
View File

@@ -37,9 +37,12 @@ public class AddNearbyContactIntroFragment extends BaseFragment {
private ScrollView scrollView;
private final ActivityResultLauncher<String[]> 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();

4
briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactPermissionManager.java
View File

@@ -164,8 +164,7 @@ class AddNearbyContactPermissionManager {
requestPermissions.accept(permissions);
}
void onRequestPermissionResult(Map<String, Boolean> result,
Runnable onPermissionsGranted) {
void onRequestPermissionResult(Map<String, Boolean> 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,