aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-09-17 20:19:20 +0200
committerChristian Schneppe <christian@pix-art.de>2017-09-17 20:26:50 +0200
commit9522577e5ba97fa52277a5d7ba9163687743ba24 (patch)
treed5deda0fd87a8f3048c08ffa75839a5be6de3c15 /src/main/res
parent58a4b628a6d21195ffc5a2b1e924dc1d3d90a225 (diff)
Foregroundservice can be deactivated in expert options (default = foregroundservice active)
Fixes #138
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values-de/strings.xml4
-rw-r--r--src/main/res/values/defaults.xml1
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/xml/preferences.xml5
4 files changed, 11 insertions, 1 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index f615049f0..7e593dd12 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -732,11 +732,13 @@
<string name="yesterday">Gestern</string>
<string name="pref_validate_hostname">Überprüfe den Hostnamen mit DNSSEC</string>
<string name="pref_validate_hostname_summary">Serverzertifikate, die den überprüften Hostnamen enthalten, werden als verifiziert betrachtet</string>
- <string name="pref_treat_vibrate_as_silent">Vibration als \\\"Lautlos\\\" behandeln</string>
+ <string name="pref_treat_vibrate_as_silent">Vibration als \"Lautlos\" behandeln</string>
<string name="certificate_does_not_contain_jid">Zertifikat enthält keine Jabber-ID</string>
<string name="error_no_keys_to_trust_presence">Für diesen Kontakt sind keine benutzbaren Schlüssel verfügbar.\\nStelle sicher, dass du den gegenseitigen Online-Status aktiviert hast.</string>
<string name="mark_as_read">Als gelesen markieren</string>
<string name="network_is_unreachable">Netzwerk nicht verfügbar</string>
<string name="server_info_partial">teilweise</string>
+ <string name="pref_show_foreground_service">Nutze Vordergrunddienst</string>
+ <string name="pref_show_foreground_service_summary">Einige Android Geräte schließen manche Apps nach einer gewissen Zeitspanne automatisch und du wirst keine neuen Nachrichten mehr empfangen können. Falls du solche Probleme hast, versuche den Vordergrunddienst zu aktivieren. Bitte beachte, dass dadurch ein permanente Eintrag in der Benachrichtigungsleiste erscheint.</string>
</resources>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 5a7a1c057..6059f1002 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -47,4 +47,5 @@
<bool name="send_crashreport">true</bool>
<bool name="plain_text_logs">false</bool>
<bool name="validate_hostname">false</bool>
+ <bool name="show_foreground_service">true</bool>
</resources> \ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 481337cb9..3fb0c39e2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -786,4 +786,6 @@
<string name="error_no_keys_to_trust_presence">There are no usable keys available for this contact.\\nMake sure you have mutual presence subscription.</string>
<string name="mark_as_read">Mark as read</string>
<string name="server_info_partial">partial</string>
+ <string name="pref_show_foreground_service_summary">Some Android devices will close some apps after a period of time and you wont be able to receive new messages. If you have such problems, try to activate the foreground service. But keep in mind, that you will have a permanent notification with this option checked.</string>
+ <string name="pref_show_foreground_service">Use foreground service</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index a3cfc15ed..c1ccd31c4 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -245,6 +245,11 @@
android:key="resource"
android:summary="@string/pref_xmpp_resource_summary"
android:title="@string/pref_xmpp_resource" />
+ <CheckBoxPreference
+ android:defaultValue="@bool/show_foreground_service"
+ android:key="show_foreground_service"
+ android:summary="@string/pref_show_foreground_service_summary"
+ android:title="@string/pref_show_foreground_service"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_ui_options">
<CheckBoxPreference