From 7318aa562ebd53c1f1dd907ad0025b2a8a1c8497 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Sat, 23 Jul 2016 12:40:05 -0300
Subject: [PATCH] Allow different package IDs (for preference intents)
Closes #515
---
briar-android/build.gradle | 4 ++++
briar-android/res/xml/settings.xml | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 75931e0331..90cf59649b 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -77,6 +77,10 @@ android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
+ defaultConfig {
+ resValue "string", "app_package", "org.briarproject"
+ }
+
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
diff --git a/briar-android/res/xml/settings.xml b/briar-android/res/xml/settings.xml
index 80c75046aa..9814fabee1 100644
--- a/briar-android/res/xml/settings.xml
+++ b/briar-android/res/xml/settings.xml
@@ -34,7 +34,7 @@
<intent
android:targetClass="org.briarproject.android.ChangePasswordActivity"
- android:targetPackage="org.briarproject"/>
+ android:targetPackage="@string/app_package"/>
</Preference>
</PreferenceCategory>
@@ -48,7 +48,7 @@
<intent
android:targetClass="org.briarproject.android.panic.PanicPreferencesActivity"
- android:targetPackage="org.briarproject"/>
+ android:targetPackage="@string/app_package"/>
</Preference>
--
GitLab