From c59ef29cdb56925420b43a7912fbdfd8bf2579d3 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 23 Nov 2018 12:28:11 +0000
Subject: [PATCH] Minor code cleanups.

---
 .../briar/android/activity/BriarActivity.java        | 12 ++++++------
 .../conversation/ConversationMessageViewHolder.java  |  4 ++--
 .../briar/android/conversation/ImageFragment.java    |  1 +
 .../briar/android/settings/SettingsFragment.java     |  3 ++-
 .../briar/android/view/EmojiTextInputView.java       |  2 ++
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java
index 2ee632979..f2af043f8 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java
@@ -121,6 +121,7 @@ public abstract class BriarActivity extends BaseActivity {
 
 	/**
 	 * Sets the transition animations.
+	 *
 	 * @param enterTransition used to move views into initial positions
 	 * @param exitTransition used to move views out when starting a <b>new</b> activity.
 	 * @param returnTransition used when window is closing, because the activity is finishing.
@@ -169,12 +170,11 @@ public abstract class BriarActivity extends BaseActivity {
 				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		b.setMessage(message);
 		b.setView(R.layout.checkbox);
-		b.setPositiveButton(R.string.fix,
-				(dialog, which) -> {
-					Intent i = getDozeWhitelistingIntent(BriarActivity.this);
-					startActivityForResult(i, REQUEST_DOZE_WHITELISTING);
-					dialog.dismiss();
-				});
+		b.setPositiveButton(R.string.fix, (dialog, which) -> {
+			Intent i = getDozeWhitelistingIntent(BriarActivity.this);
+			startActivityForResult(i, REQUEST_DOZE_WHITELISTING);
+			dialog.dismiss();
+		});
 		b.setNegativeButton(R.string.cancel,
 				(dialog, which) -> dialog.dismiss());
 		b.setOnDismissListener(dialog -> {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java
index 94c80639a..6575fdd78 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java
@@ -42,8 +42,8 @@ class ConversationMessageViewHolder extends ConversationItemViewHolder {
 		timeColorBubble = getColor(v.getContext(), R.color.briar_white);
 
 		// clone constraint sets from layout files
-		textConstraints
-				.clone(v.getContext(), R.layout.list_item_conversation_msg_in);
+		textConstraints.clone(v.getContext(),
+				R.layout.list_item_conversation_msg_in);
 		imageConstraints.clone(v.getContext(),
 				R.layout.list_item_conversation_msg_image);
 		imageTextConstraints.clone(v.getContext(),
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java
index 446d61749..ddca2ae53 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java
@@ -86,6 +86,7 @@ public class ImageFragment extends Fragment {
 
 		// Request Listener
 		RequestListener<Drawable> listener = new RequestListener<Drawable>() {
+
 			@Override
 			public boolean onLoadFailed(@Nullable GlideException e,
 					Object model, Target<Drawable> target,
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
index 417e8c640..e1a9aa981 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
@@ -328,7 +328,8 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		boolean blocked =
 				circumventionProvider.isTorProbablyBlocked(country);
 		boolean useBridges = circumventionProvider.doBridgesWork(country);
-		String setting = getString(R.string.tor_network_setting_without_bridges);
+		String setting =
+				getString(R.string.tor_network_setting_without_bridges);
 		if (blocked && useBridges) {
 			setting = getString(R.string.tor_network_setting_with_bridges);
 		} else if (blocked) {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java
index 18701f682..5652a7893 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java
@@ -232,7 +232,9 @@ public class EmojiTextInputView extends KeyboardAwareLinearLayout implements
 	}
 
 	interface TextInputListener {
+
 		void onTextIsEmptyChanged(boolean isEmpty);
+
 		void onSendEvent();
 	}