aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-01 14:19:06 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-01 14:19:06 +0200
commitcec483b70d6bd480ee6b3fa1be2fd2432a8d2ae6 (patch)
tree0b636cb00c900572131e81c8cc5a0d563f7503ce /src/main/res/values
parenta70f8423f0389916b3c2d7b1b708feebce1aa59b (diff)
removed 'preemptive grant' setting
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/defaults.xml1
-rw-r--r--src/main/res/values/strings.xml2
2 files changed, 0 insertions, 3 deletions
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 71f1d5937..67545e6a9 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -70,7 +70,6 @@
<string name="picture_compression">auto</string>
<string name="image_compression">mid</string>
<string name="video_compression">mid</string>
- <bool name="grant_new_contacts">true</bool>
<integer name="automatic_message_deletion">0</integer>
<bool name="confirm_messages">true</bool>
<bool name="allow_message_correction">true</bool>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6e65e6803..5e7ac836e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -121,8 +121,6 @@
<string name="openpgp_error">OpenKeychain reported an error</string>
<string name="accept">Accept</string>
<string name="error">An error has occurred</string>
- <string name="pref_grant_presence_updates">Grant presence updates</string>
- <string name="pref_grant_presence_updates_summary">Preemptively grant and request presence subscriptions for contacts you have created</string>
<string name="your_account">Your account</string>
<string name="send_presence_updates">Send presence updates</string>
<string name="receive_presence_updates">Receive presence updates</string>