diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java
index 57ea13edb..b0947f1da 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java
@@ -48,10 +48,8 @@ public class HotspotHelpFragment extends Fragment {
 
 	private HotspotViewModel viewModel;
 	private final ActivityResultLauncher<String> launcher =
-			registerForActivityResult(new CreateDocument(), uri -> {
-				showButton();
-				if (uri != null) viewModel.exportApk(uri);
-			});
+			registerForActivityResult(new CreateDocument(),
+					this::onDocumentCreated);
 	private Button button;
 	private ProgressBar progressBar;
 
@@ -88,6 +86,11 @@ public class HotspotHelpFragment extends Fragment {
 		viewModel.getSavedApkToUri().observeEvent(this, this::shareUri);
 	}
 
+	private void onDocumentCreated(@Nullable Uri uri) {
+		showButton();
+		if (uri != null) viewModel.exportApk(uri);
+	}
+
 	private void shareUri(Uri uri) {
 		Intent i = new Intent(ACTION_SEND);
 		i.putExtra(EXTRA_STREAM, uri);