From 045fcfc5fa44e5fa2f3cd9d258a21f486d907876 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 4 Jan 2019 17:25:39 +0000
Subject: [PATCH] Remove translucent window effect.

---
 briar-android/src/main/AndroidManifest.xml          |  6 ++++--
 .../android/conversation/ConversationActivity.java  | 13 +++----------
 .../briar/android/conversation/ImageActivity.java   |  2 --
 briar-android/src/main/res/values/themes.xml        |  4 +---
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index 7e3f9f712..5708cbd00 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
 	package="org.briarproject.briar"
+	xmlns:tools="http://schemas.android.com/tools"
 	xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
@@ -29,7 +30,8 @@
 		android:label="@string/app_name"
 		android:logo="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
-		android:theme="@style/BriarTheme">
+		android:theme="@style/BriarTheme"
+		tools:ignore="GoogleAppIndexingWarning">
 
 		<receiver
 			android:name="org.briarproject.briar.android.login.SignInReminderReceiver"
@@ -117,7 +119,7 @@
 		<activity
 			android:name=".android.conversation.ImageActivity"
 			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity"
-			android:theme="@style/BriarTheme.Transparent.NoActionBar">
+			android:theme="@style/BriarTheme.ActionBarOverlay">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.conversation.ConversationActivity"/>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
index d0fde5de8..f74aaa583 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -295,6 +295,8 @@ public class ConversationActivity extends BriarActivity
 	public void onStart() {
 		super.onStart();
 		eventBus.addListener(this);
+		notificationManager.blockContactNotification(contactId);
+		notificationManager.clearContactNotification(contactId);
 		displayContactOnlineStatus();
 		viewModel.getContactDisplayName().observe(this, contactNameObserver);
 		list.startPeriodicUpdate();
@@ -303,9 +305,6 @@ public class ConversationActivity extends BriarActivity
 	@Override
 	public void onResume() {
 		super.onResume();
-		// TODO move back to onStart() when we have unread msg indicators
-		notificationManager.blockContactNotification(contactId);
-		notificationManager.clearContactNotification(contactId);
 		// Trigger loading of contact data, noop if data was loaded already.
 		//
 		// We can only start loading data *after* we are sure
@@ -313,17 +312,11 @@ public class ConversationActivity extends BriarActivity
 		if (signedIn()) viewModel.setContactId(contactId);
 	}
 
-	@Override
-	protected void onPause() {
-		super.onPause();
-		// TODO move back to onStop() when we have unread msg indicators
-		notificationManager.unblockContactNotification(contactId);
-	}
-
 	@Override
 	public void onStop() {
 		super.onStop();
 		eventBus.removeListener(this);
+		notificationManager.unblockContactNotification(contactId);
 		viewModel.getContactDisplayName().removeObserver(contactNameObserver);
 		list.stopPeriodicUpdate();
 	}
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 9658a9ece..6c165134d 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
@@ -101,7 +101,6 @@ public class ImageActivity extends BriarActivity
 		// inflate layout
 		setContentView(R.layout.activity_image);
 		layout = findViewById(R.id.layout);
-		layout.getBackground().setAlpha(255);
 		layout.setCallback(this);
 		layout.getViewTreeObserver().addOnGlobalLayoutListener(this);
 
@@ -196,7 +195,6 @@ public class ImageActivity extends BriarActivity
 
 	@Override
 	public void onPull(float progress) {
-		layout.getBackground().setAlpha(Math.round((1 - progress) * 255));
 	}
 
 	@Override
diff --git a/briar-android/src/main/res/values/themes.xml b/briar-android/src/main/res/values/themes.xml
index 8f54152ce..1ede39934 100644
--- a/briar-android/src/main/res/values/themes.xml
+++ b/briar-android/src/main/res/values/themes.xml
@@ -18,9 +18,7 @@
 		<item name="toolbarStyle">@style/BriarToolbar</item>
 	</style>
 
-	<style name="BriarTheme.Transparent.NoActionBar" parent="BriarTheme.NoActionBar">
-		<item name="android:windowBackground">@android:color/transparent</item>
-		<item name="android:windowIsTranslucent">true</item>
+	<style name="BriarTheme.ActionBarOverlay" parent="BriarTheme.NoActionBar">
 		<item name="android:windowActionBarOverlay">true</item>
 	</style>