From 92e7995b83f49deb9e64b7394598cb22894cf34b Mon Sep 17 00:00:00 2001
From: Wiktor Kwapisiewicz <wiktor@metacode.biz>
Date: Tue, 22 May 2018 21:46:31 +0200
Subject: [PATCH] Add preference toggle for switching on/off WKD

---
 .../main/java/org/sufficientlysecure/keychain/Constants.java | 1 +
 .../org/sufficientlysecure/keychain/util/Preferences.java    | 2 +-
 OpenKeychain/src/main/res/values/strings.xml                 | 2 ++
 OpenKeychain/src/main/res/xml/cloud_search_preferences.xml   | 5 +++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index fa3ac244d..9e1e676f0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -126,6 +126,7 @@ public final class Constants {
         public static final String CACHED_CONSOLIDATE = "cachedConsolidate";
         public static final String SEARCH_KEYSERVER = "search_keyserver_pref";
         public static final String SEARCH_KEYBASE = "search_keybase_pref";
+        public static final String SEARCH_WEB_KEY_DIRECTORY = "search_wkd_pref";
         public static final String USE_NUMKEYPAD_FOR_SECURITY_TOKEN_PIN = "useNumKeypadForYubikeyPin";
         public static final String ENCRYPT_FILENAMES = "encryptFilenames";
         public static final String FILE_USE_COMPRESSION = "useFileCompression";
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
index 4da18b909..a44c101fb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
@@ -347,7 +347,7 @@ public class Preferences {
         return CloudSearchPrefs.create(mSharedPreferences.getBoolean(Pref.SEARCH_KEYSERVER, true),
                 mSharedPreferences.getBoolean(Pref.SEARCH_KEYBASE, true),
                 false,
-                true,
+                mSharedPreferences.getBoolean(Pref.SEARCH_WEB_KEY_DIRECTORY, true),
                 getPreferredKeyserver());
     }
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 0ed0fb1c2..1d14bfd09 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -211,6 +211,8 @@
     <string name="pref_keybase_summary">"Search keys on keybase.io"</string>
     <string name="pref_facebook">"Facebook"</string>
     <string name="pref_facebook_summary">"Search keys on Facebook by username"</string>
+    <string name="pref_wkd">"Web Key Directory"</string>
+    <string name="pref_wkd_summary">"Search keys using Web Key Directory"</string>
 
     <string name="label_sync_settings_keyserver_title">"Automatic key updates"</string>
     <string name="label_sync_settings_keyserver_summary_on">"Every three days, keys are updated from the preferred keyserver"</string>
diff --git a/OpenKeychain/src/main/res/xml/cloud_search_preferences.xml b/OpenKeychain/src/main/res/xml/cloud_search_preferences.xml
index e1ab50d63..6c5540098 100644
--- a/OpenKeychain/src/main/res/xml/cloud_search_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/cloud_search_preferences.xml
@@ -14,4 +14,9 @@
         android:key="search_keybase_pref"
         android:summary="@string/pref_keybase_summary"
         android:title="@string/pref_keybase" />
+    <SwitchPreference
+            android:defaultValue="true"
+            android:key="search_wkd_pref"
+            android:summary="@string/pref_wkd_summary"
+            android:title="@string/pref_wkd" />
 </PreferenceScreen>
\ No newline at end of file