From 7b22d3b84d9d836ee6c657924790a08a1c2e832d Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 28 Nov 2018 17:25:27 -0200
Subject: [PATCH] [android] Address review issues for image fullscreen view

---
 .../briar/android/conversation/AttachmentItem.java       | 1 +
 .../briar/android/conversation/ImageActivity.java        | 9 +++++----
 briar-android/src/main/res/layout/activity_image.xml     | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentItem.java
index bd582d68f..7f39bfefc 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentItem.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentItem.java
@@ -75,6 +75,7 @@ public class AttachmentItem implements Parcelable {
 		return hasError;
 	}
 
+	// TODO use counter instead, because in theory one attachment can appear in more than one messages
 	String getTransitionName() {
 		return String.valueOf(messageId.hashCode());
 	}
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 abdf9cd33..adaaebced 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
@@ -108,6 +108,7 @@ public class ImageActivity extends BriarActivity
 			public boolean onLoadFailed(@Nullable GlideException e,
 					Object model, Target<Drawable> target,
 					boolean isFirstResource) {
+				supportStartPostponedEnterTransition();
 				return false;
 			}
 
@@ -176,14 +177,14 @@ public class ImageActivity extends BriarActivity
 	private void toggleSystemUi() {
 		View decorView = getWindow().getDecorView();
 		if (appBarLayout.getVisibility() == VISIBLE) {
-			hideSystemUI(decorView);
+			hideSystemUi(decorView);
 		} else {
-			showSystemUI(decorView);
+			showSystemUi(decorView);
 		}
 	}
 
 	@RequiresApi(api = 16)
-	private void hideSystemUI(View decorView) {
+	private void hideSystemUi(View decorView) {
 		decorView.setSystemUiVisibility(SYSTEM_UI_FLAG_LAYOUT_STABLE
 				| SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
 				| SYSTEM_UI_FLAG_FULLSCREEN
@@ -196,7 +197,7 @@ public class ImageActivity extends BriarActivity
 	}
 
 	@RequiresApi(api = 16)
-	private void showSystemUI(View decorView) {
+	private void showSystemUi(View decorView) {
 		decorView.setSystemUiVisibility(
 				SYSTEM_UI_FLAG_LAYOUT_STABLE
 						| SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
diff --git a/briar-android/src/main/res/layout/activity_image.xml b/briar-android/src/main/res/layout/activity_image.xml
index 03fa7f3ca..df81ce2e2 100644
--- a/briar-android/src/main/res/layout/activity_image.xml
+++ b/briar-android/src/main/res/layout/activity_image.xml
@@ -40,7 +40,6 @@
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:ellipsize="end"
-					android:gravity="center"
 					android:maxLines="1"
 					android:textColor="@color/action_bar_text"
 					tools:text="Contact Name of someone who chose a long name"/>