From 5e7d1f7bcce250ad431e6665d32f3fd6d26b4d88 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 21 Feb 2018 10:30:38 +0100
Subject: [PATCH] stop settings from crashing when building with different
 package id

---
 build.gradle                     | 1 +
 src/main/res/xml/preferences.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index aa593378f..4c9c8a32d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,6 +72,7 @@ android {
         versionName "1.23.8"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
+        resValue "string", "applicationId", applicationId
     }
 
     dataBinding {
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 2bff29bc1..39969edec 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -89,7 +89,7 @@
             android:title="@string/title_pref_quiet_hours">
             <intent
                 android:action="android.intent.action.VIEW"
-                android:targetPackage="eu.siacs.conversations"
+                android:targetPackage="@string/applicationId"
                 android:targetClass="eu.siacs.conversations.ui.SettingsActivity" >
                 <extra android:name="page" android:value="quiet_hours" />
             </intent>
@@ -193,7 +193,7 @@
             android:title="@string/pref_expert_options">
             <intent
                 android:action="android.intent.action.VIEW"
-                android:targetPackage="eu.siacs.conversations"
+                android:targetPackage="@string/applicationId"
                 android:targetClass="eu.siacs.conversations.ui.SettingsActivity" >
                 <extra android:name="page" android:value="expert" />
             </intent>