From 532edff6423cd5987034ec156c0102f06c55c0b0 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 4 Jan 2019 16:55:29 +0000
Subject: [PATCH] Minor code cleanups.

---
 .../briar/android/view/ImagePreview.java      |  2 ++
 .../android/view/ImagePreviewAdapter.java     |  9 ++++----
 .../view/TextAttachmentController.java        | 21 +++++++++++--------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java
index 820fdc0e5..8921b668c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java
@@ -78,7 +78,9 @@ public class ImagePreview extends ConstraintLayout {
 	}
 
 	interface ImagePreviewListener {
+
 		void onUriError(Uri uri);
+
 		void onCancel();
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java
index 8f9238487..20bf9d4c3 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java
@@ -25,8 +25,7 @@ class ImagePreviewAdapter extends Adapter<ImagePreviewViewHolder> {
 	@LayoutRes
 	private final int layout;
 
-	public ImagePreviewAdapter(Collection<Uri> items,
-			ImagePreviewListener listener) {
+	ImagePreviewAdapter(Collection<Uri> items, ImagePreviewListener listener) {
 		this.items = new ArrayList<>(items);
 		this.listener = listener;
 		this.layout = items.size() == 1 ?
@@ -35,14 +34,16 @@ class ImagePreviewAdapter extends Adapter<ImagePreviewViewHolder> {
 	}
 
 	@Override
-	public ImagePreviewViewHolder onCreateViewHolder(ViewGroup viewGroup, int type) {
+	public ImagePreviewViewHolder onCreateViewHolder(ViewGroup viewGroup,
+			int type) {
 		View v = LayoutInflater.from(viewGroup.getContext())
 				.inflate(layout, viewGroup, false);
 		return new ImagePreviewViewHolder(v, requireNonNull(listener));
 	}
 
 	@Override
-	public void onBindViewHolder(ImagePreviewViewHolder viewHolder, int position) {
+	public void onBindViewHolder(ImagePreviewViewHolder viewHolder,
+			int position) {
 		viewHolder.bind(items.get(position));
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
index 4ebae76db..f7d60de2c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
@@ -188,6 +188,7 @@ public class TextAttachmentController extends TextSendController
 	}
 
 	private static class SavedState extends AbsSavedState {
+
 		@Nullable
 		private List<Uri> imageUris;
 
@@ -207,16 +208,18 @@ public class TextAttachmentController extends TextSendController
 			out.writeList(imageUris);
 		}
 
-		public static final Parcelable.Creator<SavedState> CREATOR
-				= new Parcelable.Creator<SavedState>() {
-			public SavedState createFromParcel(Parcel in) {
-				return new SavedState(in);
-			}
+		public static final Creator<SavedState> CREATOR =
+				new Creator<SavedState>() {
+					@Override
+					public SavedState createFromParcel(Parcel in) {
+						return new SavedState(in);
+					}
 
-			public SavedState[] newArray(int size) {
-				return new SavedState[size];
-			}
-		};
+					@Override
+					public SavedState[] newArray(int size) {
+						return new SavedState[size];
+					}
+				};
 	}
 
 	public interface AttachImageListener {