From d1632b84b312c53b15b56a9e02559be3e8e3c169 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 21 Mar 2018 21:16:36 +0100
Subject: fixed crash in settings

---
 build.gradle                                               | 6 ++++--
 src/main/java/de/pixart/messenger/ui/SettingsFragment.java | 4 ++++
 src/main/res/values/defaults.xml                           | 1 -
 src/main/res/xml/preferences.xml                           | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 228008271..d36a6a1bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,7 +92,8 @@ android {
         applicationId "de.pixart.messenger"
         multiDexEnabled true
         buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/"')
-
+        resValue "string", "applicationId", applicationId
+        resValue "string", "app_name", "Pix-Art Messenger"
         dimension "distribution"
     }
 
@@ -120,7 +121,8 @@ android {
         open {
             buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/open/"')
             applicationId "de.pixart.openmessenger"
-
+            resValue "string", "applicationId", applicationId
+            resValue "string", "app_name", "Pix-Art Messenger"
             dimension "distribution"
         }
     }
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsFragment.java b/src/main/java/de/pixart/messenger/ui/SettingsFragment.java
index 939ef6145..b40875f7c 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsFragment.java
@@ -37,10 +37,14 @@ public class SettingsFragment extends PreferenceFragment {
     }
 
     public void setActivityIntent(final Intent intent) {
+        boolean wasEmpty = TextUtils.isEmpty(page);
         if (intent != null) {
             if (Intent.ACTION_VIEW.equals(intent.getAction())) {
                 if (intent.getExtras() != null) {
                     this.page = intent.getExtras().getString("page");
+                    if (wasEmpty) {
+                        openPreferenceScreen(page);
+                    }
                 }
             }
         }
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index f82b5f21e..869072f84 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">Pix-Art Messenger</string>
     <string name="welcome_header" translatable="false">Pix-Art Messenger</string>
     <string name="type_pc" translatable="false">Computer</string>
     <string name="type_phone" translatable="false">Mobile phone</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index bfcffe012..70fbf4484 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -68,7 +68,7 @@
             <intent
                 android:action="android.intent.action.VIEW"
                 android:targetClass="de.pixart.messenger.ui.SettingsActivity"
-                android:targetPackage="de.pixart.messenger">
+                android:targetPackage="@string/applicationId">
                 <extra
                     android:name="page"
                     android:value="quiet_hours" />
@@ -258,7 +258,7 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:targetClass="de.pixart.messenger.ui.SettingsActivity"
-            android:targetPackage="de.pixart.messenger">
+            android:targetPackage="@string/applicationId">
             <extra
                 android:name="page"
                 android:value="expert" />
-- 
cgit v1.2.3