From 33a0099065834a1413dac99666bdeeb5a6b69337 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 1 Aug 2017 12:57:11 -0300
Subject: [PATCH 1/2] Make debug builds installable alongside official beta
 build

---
 briar-android/build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index c70182409..45dbeafcd 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -87,6 +87,8 @@ android {
 
 	buildTypes {
 		debug {
+			applicationIdSuffix ".debug"
+			resValue "string", "app_package", "org.briarproject.briar.beta.debug"
 			shrinkResources false
 			minifyEnabled true
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'

From 08ce6a7331d9c43184f66cd797078126b4523939 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 1 Aug 2017 13:06:07 -0300
Subject: [PATCH 2/2] Change app name for debug builds

---
 briar-android/build.gradle                    | 2 ++
 briar-android/src/main/res/values/strings.xml | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 45dbeafcd..99216769f 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -82,6 +82,7 @@ android {
 		versionName "0.16.8"
 		applicationId "org.briarproject.briar.beta"
 		resValue "string", "app_package", "org.briarproject.briar.beta"
+		resValue "string", "app_name", "Briar Beta"
 		buildConfigField "String", "GitHash", "\"${getGitHash()}\""
 	}
 
@@ -89,6 +90,7 @@ android {
 		debug {
 			applicationIdSuffix ".debug"
 			resValue "string", "app_package", "org.briarproject.briar.beta.debug"
+			resValue "string", "app_name", "Briar Debug"
 			shrinkResources false
 			minifyEnabled true
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 923f2b40a..4001088b1 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string translatable="false" name="app_name">Briar Beta</string>
 
 	<!-- Setup -->
 	<string name="setup_title">Briar Setup</string>