aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2019-11-03 19:42:01 +0100
committerChristian Schneppe <christian.schneppe@pix-art.de>2019-11-03 19:42:01 +0100
commit7d7835e03538f5176fc1f39445589e6afd5ee012 (patch)
tree83bd56498e364c23a102d6dc6bbd30444571da46
parentad75ab3f683391c26c2a99242210747c0bf881c2 (diff)
add grace period
-rw-r--r--src/main/res/values/arrays.xml13
-rw-r--r--src/main/res/values/strings.xml6
-rw-r--r--src/main/res/xml/preferences.xml7
3 files changed, 26 insertions, 0 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index b0ba7423f..8cb8025d2 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -134,4 +134,17 @@
<item>JABBER_NETWORK</item>
<item>LOCAL_SERVER</item>
</string-array>
+
+ <string-array name="grace_periods">
+ <item>@string/gp_disable</item>
+ <item>@string/gp_short</item>
+ <item>@string/gp_medium</item>
+ <item>@string/gp_long</item>
+ </string-array>
+ <string-array name="grace_periods_values">
+ <item>0</item>
+ <item>144</item>
+ <item>610</item>
+ <item>2584</item>
+ </string-array>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 175f1c58b..634f4beef 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -982,4 +982,10 @@
<string name="local_server">Local server</string>
<string name="pref_channel_discovery_summary">Most users should choose ‘jabber.network’ for better suggestions from the entirety of the public XMPP ecosystem.</string>
<string name="pref_channel_discovery">Channel discovery method</string>
+ <string name="gp_disable">Disable</string>
+ <string name="gp_short">Short</string>
+ <string name="gp_medium">Medium</string>
+ <string name="gp_long">Long</string>
+ <string name="pref_notification_grace_period">Grace Period</string>
+ <string name="pref_notification_grace_period_summary">The length of time notifications are silenced after detecting activity on one of your other devices.</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index e7149e60c..d3404a2e1 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -178,6 +178,13 @@
android:value="messages" />
</intent>
</PreferenceScreen>
+ <ListPreference
+ android:defaultValue="@integer/grace_period"
+ android:entries="@array/grace_periods"
+ android:entryValues="@array/grace_periods_values"
+ android:key="grace_period_length"
+ android:summary="@string/pref_notification_grace_period_summary"
+ android:title="@string/pref_notification_grace_period" />
</PreferenceScreen>
<!--Attachments-->
<PreferenceScreen