From edb8e8f9d0783c3e8963b1e2698e8772d4b2d0ea Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 3 Aug 2018 13:08:18 -0300
Subject: [PATCH] Move res values from build.gradle into strings.xml

This fixes an issue where the build type values were overriding the
flavor values.
---
 briar-android/build.gradle                    | 39 ++++++++-----------
 .../src/debug/res/values/strings.xml          |  5 +++
 briar-android/src/main/res/values/strings.xml |  3 ++
 .../AndroidManifest.xml                       |  0
 .../screenshotDebug/res/values/strings.xml    |  5 +++
 5 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 briar-android/src/debug/res/values/strings.xml
 rename briar-android/src/{screenshot => screenshotDebug}/AndroidManifest.xml (100%)
 create mode 100644 briar-android/src/screenshotDebug/res/values/strings.xml

diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 1fe8855d9..a39240a65 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -264,8 +264,6 @@ android {
 		versionCode 10013
 		versionName "1.0.13"
 		applicationId "org.briarproject.briar.android"
-		resValue "string", "app_package", "org.briarproject.briar.android"
-		resValue "string", "app_name", "Briar"
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
 		def now = (long) (System.currentTimeMillis() / 1000)
@@ -274,29 +272,9 @@ android {
 		testInstrumentationRunner 'org.briarproject.briar.android.test.BriarTestRunner'
 	}
 
-	flavorDimensions "version"
-	productFlavors {
-		screenshot {
-			dimension "version"
-			minSdkVersion 18
-			applicationIdSuffix ".screenshot"
-			resValue "string", "app_package", "org.briarproject.briar.android.screenshot.debug"
-		}
-		main {
-			dimension "version"
-		}
-	}
-	variantFilter { variant ->
-		if (variant.flavors*.name.contains("screenshot") && variant.buildType.name == "release") {
-			setIgnore(true)
-		}
-	}
-
 	buildTypes {
 		debug {
 			applicationIdSuffix ".debug"
-			resValue "string", "app_package", "org.briarproject.briar.android.debug"
-			resValue "string", "app_name", "Briar Debug"
 			shrinkResources false
 			minifyEnabled true
 			crunchPngs false
@@ -311,6 +289,23 @@ android {
 		}
 	}
 
+	flavorDimensions "version"
+	productFlavors {
+		screenshot {
+			dimension "version"
+			minSdkVersion 18
+			applicationIdSuffix ".screenshot" // = org.briarproject.briar.android.screenshot.debug
+		}
+		main {
+			dimension "version"
+		}
+	}
+	variantFilter { variant ->
+		if (variant.flavors*.name.contains("screenshot") && variant.buildType.name == "release") {
+			setIgnore(true)
+		}
+	}
+
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8
diff --git a/briar-android/src/debug/res/values/strings.xml b/briar-android/src/debug/res/values/strings.xml
new file mode 100644
index 000000000..5cbb56beb
--- /dev/null
+++ b/briar-android/src/debug/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app_name" translatable="false">Briar Debug</string>
+	<string name="app_package" translatable="false">org.briarproject.briar.android.debug</string>
+</resources>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 086ff8c3f..8456ceda1 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<string name="app_name" translatable="false">Briar</string>
+	<string name="app_package" translatable="false">org.briarproject.briar.android</string>
+
 	<!-- Setup -->
 	<string name="setup_title">Welcome to Briar</string>
 	<string name="setup_name_explanation">Your nickname will be shown next to any content you post. You can\'t change it after creating your account.</string>
diff --git a/briar-android/src/screenshot/AndroidManifest.xml b/briar-android/src/screenshotDebug/AndroidManifest.xml
similarity index 100%
rename from briar-android/src/screenshot/AndroidManifest.xml
rename to briar-android/src/screenshotDebug/AndroidManifest.xml
diff --git a/briar-android/src/screenshotDebug/res/values/strings.xml b/briar-android/src/screenshotDebug/res/values/strings.xml
new file mode 100644
index 000000000..6a7574e56
--- /dev/null
+++ b/briar-android/src/screenshotDebug/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app_name" translatable="false">Briar</string>
+	<string name="app_package" translatable="false">org.briarproject.briar.android.screenshot.debug</string>
+</resources>