From cdae8b35f5c47e826cdd75646d311b84c5e1fabf Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 9 Apr 2021 11:09:54 +0100
Subject: [PATCH] Another small refactoring to make control flow easier to
 understand.

---
 .../add/nearby/AddNearbyContactIntroFragment.java        | 9 ++++++---
 .../contact/add/nearby/AddNearbyContactViewModel.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 eb5f3aede..4e3e0c1d7 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
@@ -72,9 +72,12 @@ public class AddNearbyContactIntroFragment extends BaseFragment {
 				false);
 		scrollView = v.findViewById(R.id.scrollView);
 		View button = v.findViewById(R.id.continueButton);
-		button.setOnClickListener(view -> viewModel.onContinueClicked(() ->
-				permissionManager.checkPermissions()
-		));
+		button.setOnClickListener(view -> {
+			viewModel.onContinueClicked();
+			if (permissionManager.checkPermissions()) {
+				viewModel.showQrCodeFragmentIfAllowed();
+			}
+		});
 		return v;
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactViewModel.java
index 7d69bd954..d79ef6b1b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactViewModel.java
@@ -65,7 +65,6 @@ import javax.inject.Provider;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
-import androidx.core.util.Supplier;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
@@ -211,12 +210,11 @@ class AddNearbyContactViewModel extends AndroidViewModel
 	}
 
 	@UiThread
-	void onContinueClicked(Supplier<Boolean> checkPermissions) {
+	void onContinueClicked() {
 		if (bluetoothDecision == REFUSED) {
 			bluetoothDecision = UNKNOWN; // Ask again
 		}
 		wasContinueClicked = true;
-		if (checkPermissions.get()) showQrCodeFragmentIfAllowed();
 	}
 
 	@UiThread