From cec483b70d6bd480ee6b3fa1be2fd2432a8d2ae6 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 1 Apr 2018 14:19:06 +0200
Subject: removed 'preemptive grant' setting

---
 src/main/res/values/defaults.xml | 1 -
 src/main/res/values/strings.xml  | 2 --
 2 files changed, 3 deletions(-)

(limited to 'src/main/res/values')

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>
-- 
cgit v1.2.3