From 383056d37eaaca8e78226d855af00dea2043bd65 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 18 Apr 2022 15:57:18 +0100
Subject: [PATCH] Fix the lint problems I created for myself.

---
 .../briar/android/conversation/ImageActivity.java  | 14 +++++---------
 .../briar/android/hotspot/FallbackFragment.java    | 14 ++++++++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
index 3a0b289a0..46bbfabf2 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
@@ -32,7 +32,6 @@ import javax.inject.Inject;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog.Builder;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
@@ -64,7 +63,6 @@ public class ImageActivity extends BriarActivity
 	final static String DATE = "date";
 	final static String ITEM_ID = "itemId";
 
-	@RequiresApi(api = 16)
 	private final static int UI_FLAGS_DEFAULT =
 			SYSTEM_UI_FLAG_LAYOUT_STABLE | SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
 
@@ -78,9 +76,11 @@ public class ImageActivity extends BriarActivity
 	private List<AttachmentItem> attachments;
 	private MessageId conversationMessageId;
 
-	private final ActivityResultLauncher<String> launcher =
+	@Nullable
+	private final ActivityResultLauncher<String> launcher = SDK_INT >= 19 ?
 			registerForActivityResult(new CreateDocumentAdvanced(),
-					this::onImageUriSelected);
+					this::onImageUriSelected) :
+			null;
 
 	@Override
 	public void injectActivity(ActivityComponent component) {
@@ -208,14 +208,12 @@ public class ImageActivity extends BriarActivity
 		super.onBackPressed();
 	}
 
-	@RequiresApi(api = 16)
 	private void onImageClicked(@Nullable Boolean clicked) {
 		if (clicked != null && clicked) {
 			toggleSystemUi();
 		}
 	}
 
-	@RequiresApi(api = 16)
 	private void toggleSystemUi() {
 		View decorView = getWindow().getDecorView();
 		if (appBarLayout.getVisibility() == VISIBLE) {
@@ -225,7 +223,6 @@ public class ImageActivity extends BriarActivity
 		}
 	}
 
-	@RequiresApi(api = 16)
 	private void hideSystemUi(View decorView) {
 		decorView.setSystemUiVisibility(
 				SYSTEM_UI_FLAG_FULLSCREEN | UI_FLAGS_DEFAULT);
@@ -236,7 +233,6 @@ public class ImageActivity extends BriarActivity
 				.start();
 	}
 
-	@RequiresApi(api = 16)
 	private void showSystemUi(View decorView) {
 		decorView.setSystemUiVisibility(UI_FLAGS_DEFAULT);
 		appBarLayout.animate()
@@ -263,7 +259,7 @@ public class ImageActivity extends BriarActivity
 			if (SDK_INT >= 19) {
 				String name = viewModel.getFileName() + "." +
 						getVisibleAttachment().getExtension();
-				launcher.launch(name);
+				requireNonNull(launcher).launch(name);
 			} else {
 				viewModel.saveImage(getVisibleAttachment());
 			}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/FallbackFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/FallbackFragment.java
index 56c88f061..3b8d57bc8 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/FallbackFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/FallbackFragment.java
@@ -34,6 +34,7 @@ import static android.os.Build.VERSION.SDK_INT;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static androidx.transition.TransitionManager.beginDelayedTransition;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.briar.android.AppModule.getAndroidComponent;
 import static org.briarproject.briar.android.hotspot.HotspotViewModel.getApkFileName;
 
@@ -47,9 +48,11 @@ public class FallbackFragment extends BaseFragment {
 	ViewModelProvider.Factory viewModelFactory;
 
 	private HotspotViewModel viewModel;
-	private final ActivityResultLauncher<String> launcher =
+	@Nullable
+	private final ActivityResultLauncher<String> launcher = SDK_INT >= 19 ?
 			registerForActivityResult(new CreateDocumentAdvanced(),
-					this::onDocumentCreated);
+					this::onDocumentCreated) :
+			null;
 	private Button fallbackButton;
 	private ProgressBar progressBar;
 
@@ -87,8 +90,11 @@ public class FallbackFragment extends BaseFragment {
 			fallbackButton.setVisibility(INVISIBLE);
 			progressBar.setVisibility(VISIBLE);
 
-			if (SDK_INT >= 19) launcher.launch(getApkFileName());
-			else viewModel.exportApk();
+			if (SDK_INT >= 19) {
+				requireNonNull(launcher).launch(getApkFileName());
+			} else {
+				viewModel.exportApk();
+			}
 		});
 		viewModel.getSavedApkToUri().observeEvent(this, this::shareUri);
 	}