aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-03-21 21:16:36 +0100
committerChristian Schneppe <christian@pix-art.de>2018-03-21 21:16:36 +0100
commitd1632b84b312c53b15b56a9e02559be3e8e3c169 (patch)
tree4dcacbfbbd8bdd99a209d0e7d4895528e8824f7a /src
parent84d4869572f69014793b463e6613230dc39b5370 (diff)
fixed crash in settings
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/ui/SettingsFragment.java4
-rw-r--r--src/main/res/values/defaults.xml1
-rw-r--r--src/main/res/xml/preferences.xml4
3 files changed, 6 insertions, 3 deletions
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" />