From 94ec22bef8164633babe42a3778eef399102b677 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 1 Feb 2021 11:14:07 -0300
Subject: [PATCH] Move keyagreement package into contact.add.nearby

and fix some small warnings in the process
---
 briar-android/src/main/AndroidManifest.xml                | 2 +-
 .../java/org/briarproject/briar/android/AppModule.java    | 2 +-
 .../briar/android/activity/ActivityComponent.java         | 8 ++++----
 .../briar/android/contact/ContactListFragment.java        | 2 +-
 .../add/nearby}/CameraException.java                      | 2 +-
 .../{keyagreement => contact/add/nearby}/CameraView.java  | 4 ++--
 .../add/nearby}/ContactExchangeActivity.java              | 5 ++---
 .../add/nearby}/ContactExchangeErrorFragment.java         | 2 +-
 .../add/nearby}/ContactExchangeModule.java                | 2 +-
 .../add/nearby}/ContactExchangeViewModel.java             | 2 +-
 .../add/nearby}/IntroFragment.java                        | 2 +-
 .../add/nearby}/KeyAgreementActivity.java                 | 6 +++---
 .../add/nearby}/KeyAgreementFragment.java                 | 4 ++--
 .../add/nearby}/PreviewConsumer.java                      | 3 +--
 .../add/nearby}/QrCodeDecoder.java                        | 2 +-
 .../{keyagreement => contact/add/nearby}/QrCodeUtils.java | 6 +++---
 .../res/layout/activity_fragment_container_toolbar.xml    | 4 ++--
 .../src/main/res/layout/fragment_keyagreement_qr.xml      | 2 +-
 18 files changed, 29 insertions(+), 31 deletions(-)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/CameraException.java (76%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/CameraView.java (99%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/ContactExchangeActivity.java (95%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/ContactExchangeErrorFragment.java (97%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/ContactExchangeModule.java (87%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/ContactExchangeViewModel.java (98%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/IntroFragment.java (96%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/KeyAgreementActivity.java (98%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/KeyAgreementFragment.java (98%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/PreviewConsumer.java (75%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/QrCodeDecoder.java (98%)
 rename briar-android/src/main/java/org/briarproject/briar/android/{keyagreement => contact/add/nearby}/QrCodeUtils.java (89%)

diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index 988ea2b6f..693af657f 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -342,7 +342,7 @@
 		</activity>
 
 		<activity
-			android:name="org.briarproject.briar.android.keyagreement.ContactExchangeActivity"
+			android:name="org.briarproject.briar.android.contact.add.nearby.ContactExchangeActivity"
 			android:label="@string/add_contact_title"
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
 			android:theme="@style/BriarTheme.NoActionBar">
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
index 0729aa0f2..08057a229 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
@@ -31,9 +31,9 @@ import org.briarproject.briar.android.account.DozeHelperModule;
 import org.briarproject.briar.android.account.LockManagerImpl;
 import org.briarproject.briar.android.account.SetupModule;
 import org.briarproject.briar.android.contact.ContactListModule;
+import org.briarproject.briar.android.contact.add.nearby.ContactExchangeModule;
 import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.introduction.IntroductionModule;
-import org.briarproject.briar.android.keyagreement.ContactExchangeModule;
 import org.briarproject.briar.android.logging.LoggingModule;
 import org.briarproject.briar.android.login.LoginModule;
 import org.briarproject.briar.android.navdrawer.NavDrawerModule;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
index 3b1e91ef9..c8bf4b403 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
@@ -36,10 +36,10 @@ import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
 import org.briarproject.briar.android.introduction.ContactChooserFragment;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.introduction.IntroductionMessageFragment;
-import org.briarproject.briar.android.keyagreement.ContactExchangeActivity;
-import org.briarproject.briar.android.keyagreement.ContactExchangeErrorFragment;
-import org.briarproject.briar.android.keyagreement.KeyAgreementActivity;
-import org.briarproject.briar.android.keyagreement.KeyAgreementFragment;
+import org.briarproject.briar.android.contact.add.nearby.ContactExchangeActivity;
+import org.briarproject.briar.android.contact.add.nearby.ContactExchangeErrorFragment;
+import org.briarproject.briar.android.contact.add.nearby.KeyAgreementActivity;
+import org.briarproject.briar.android.contact.add.nearby.KeyAgreementFragment;
 import org.briarproject.briar.android.login.ChangePasswordActivity;
 import org.briarproject.briar.android.login.OpenDatabaseFragment;
 import org.briarproject.briar.android.login.PasswordFragment;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
index 9d32e0cab..48c3935ae 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
@@ -19,7 +19,7 @@ import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity;
 import org.briarproject.briar.android.conversation.ConversationActivity;
 import org.briarproject.briar.android.fragment.BaseFragment;
-import org.briarproject.briar.android.keyagreement.ContactExchangeActivity;
+import org.briarproject.briar.android.contact.add.nearby.ContactExchangeActivity;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
 import org.briarproject.briar.android.view.BriarRecyclerView;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraException.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraException.java
similarity index 76%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraException.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraException.java
index 0bff14ed7..04f7a0612 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraException.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraException.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import java.io.IOException;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraView.java
similarity index 99%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraView.java
index f21f4bfb8..1afa75ec3 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/CameraView.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.content.Context;
 import android.hardware.Camera;
@@ -40,7 +40,6 @@ import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
-@SuppressWarnings("deprecation")
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
@@ -126,6 +125,7 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
 			throw new CameraException(e);
 		}
 		setDisplayOrientation(getScreenRotationDegrees());
+		if (camera == null) throw new CameraException("No camera found");
 		// Use barcode scene mode if it's available
 		Parameters params = camera.getParameters();
 		params = setSceneMode(camera, params);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeActivity.java
similarity index 95%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeActivity.java
index 222fba77b..8b4b910c4 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeActivity.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.os.Bundle;
 import android.widget.Toast;
@@ -15,7 +15,6 @@ import javax.inject.Inject;
 
 import androidx.annotation.UiThread;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 
 import static android.widget.Toast.LENGTH_LONG;
 import static java.util.Objects.requireNonNull;
@@ -39,7 +38,7 @@ public class ContactExchangeActivity extends KeyAgreementActivity {
 		super.onCreate(state);
 		requireNonNull(getSupportActionBar())
 				.setTitle(R.string.add_contact_title);
-		viewModel = ViewModelProviders.of(this, viewModelFactory)
+		viewModel = new ViewModelProvider(this, viewModelFactory)
 				.get(ContactExchangeViewModel.class);
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeErrorFragment.java
similarity index 97%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeErrorFragment.java
index be708d73c..6a73ed8a8 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeErrorFragment.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeModule.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeModule.java
similarity index 87%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeModule.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeModule.java
index 05a539d5c..bdd7fd2ee 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeModule.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import org.briarproject.briar.android.viewmodel.ViewModelKey;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeViewModel.java
similarity index 98%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeViewModel.java
index 054121cac..20fb5977e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/ContactExchangeViewModel.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.app.Application;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/IntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/IntroFragment.java
similarity index 96%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/IntroFragment.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/IntroFragment.java
index 6ee1f45c2..f0ffe62c6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/IntroFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/IntroFragment.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/KeyAgreementActivity.java
similarity index 98%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/KeyAgreementActivity.java
index 19ea51cbf..506d84cd6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/KeyAgreementActivity.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
@@ -24,8 +24,8 @@ import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
-import org.briarproject.briar.android.keyagreement.IntroFragment.IntroScreenSeenListener;
-import org.briarproject.briar.android.keyagreement.KeyAgreementFragment.KeyAgreementEventListener;
+import org.briarproject.briar.android.contact.add.nearby.IntroFragment.IntroScreenSeenListener;
+import org.briarproject.briar.android.contact.add.nearby.KeyAgreementFragment.KeyAgreementEventListener;
 
 import java.util.logging.Logger;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/KeyAgreementFragment.java
similarity index 98%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/KeyAgreementFragment.java
index eb8f1bced..c8eb8e03b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/KeyAgreementFragment.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -344,7 +344,7 @@ public class KeyAgreementFragment extends BaseEventFragment
 
 	@Override
 	protected void finish() {
-		getActivity().getSupportFragmentManager().popBackStack();
+		requireActivity().getSupportFragmentManager().popBackStack();
 	}
 
 	@NotNullByDefault
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/PreviewConsumer.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/PreviewConsumer.java
similarity index 75%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/PreviewConsumer.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/PreviewConsumer.java
index bea7b65b8..f94043255 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/PreviewConsumer.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/PreviewConsumer.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.hardware.Camera;
 
@@ -6,7 +6,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import androidx.annotation.UiThread;
 
-@SuppressWarnings("deprecation")
 @NotNullByDefault
 interface PreviewConsumer {
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeDecoder.java
similarity index 98%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeDecoder.java
index 91f6f9dda..f78f62769 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeDecoder.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.hardware.Camera;
 import android.hardware.Camera.CameraInfo;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeUtils.java
similarity index 89%
rename from briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeUtils.java
rename to briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeUtils.java
index 617f84b99..26f2bf050 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeUtils.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.keyagreement;
+package org.briarproject.briar.android.contact.add.nearby;
 
 import android.graphics.Bitmap;
 import android.util.DisplayMetrics;
@@ -18,13 +18,13 @@ import static android.graphics.Color.BLACK;
 import static android.graphics.Color.WHITE;
 import static com.google.zxing.BarcodeFormat.QR_CODE;
 import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 @NotNullByDefault
 class QrCodeUtils {
 
-	private static final Logger LOG =
-			Logger.getLogger(QrCodeUtils.class.getName());
+	private static final Logger LOG = getLogger(QrCodeUtils.class.getName());
 
 	@Nullable
 	static Bitmap createQrCode(DisplayMetrics dm, String input) {
diff --git a/briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml b/briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml
index 8718e0b18..c9867a627 100644
--- a/briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml
+++ b/briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml
@@ -4,11 +4,11 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
-	tools:context=".android.keyagreement.KeyAgreementActivity">
+	tools:context=".android.contact.add.nearby.KeyAgreementActivity">
 
 	<include layout="@layout/toolbar" />
 
-	<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	<FrameLayout
 		android:id="@+id/fragmentContainer"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent" />
diff --git a/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml b/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
index 33227017d..6eb3d992e 100644
--- a/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
+++ b/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
@@ -5,7 +5,7 @@
 	android:layout_height="match_parent"
 	android:keepScreenOn="true">
 
-	<org.briarproject.briar.android.keyagreement.CameraView
+	<org.briarproject.briar.android.contact.add.nearby.CameraView
 		android:id="@+id/camera_view"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent" />