Update Keyservers to use hkps as needed

3 files changed, 25 insertions, 2 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index 639b70043..110a7f980 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -102,10 +102,12 @@ public final class Constants {
         public static final String LANGUAGE = "language";
         public static final String FORCE_V3_SIGNATURES = "forceV3Signatures";
         public static final String KEY_SERVERS = "keyServers";
+        public static final String KEY_SERVERS_DEFAULT_VERSION = "keyServersDefaultVersion";
     }
 
     public static final class Defaults {
-        public static final String KEY_SERVERS = "pool.sks-keyservers.net, subkeys.pgp.net, pgp.mit.edu";
+        public static final String KEY_SERVERS = "hkps://pool.sks-keyservers.net, subkeys.pgp.net, hkps://pgp.mit.edu";
+        public static final int KEY_SERVERS_VERSION = 2;
     }
 
     public static final class DrawerItems {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 5d6a62f9c..9d355564f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -26,7 +26,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Environment;
 
 import org.spongycastle.jce.provider.BouncyCastleProvider;
-import org.sufficientlysecure.keychain.helper.ContactHelper;
+import org.sufficientlysecure.keychain.helper.Preferences;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.PRNGFixes;
 
@@ -81,6 +81,9 @@ public class KeychainApplication extends Application {
                 getApplicationContext().getResources().getColor(R.color.emphasis));
 
         setupAccountAsNeeded(this);
+
+        // Update keyserver list as needed
+        Preferences.getPreferences(this).updateKeyServers();
     }
 
     public static void setupAccountAsNeeded(Context context) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
index c82c5e115..6f3d38ccd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
@@ -169,4 +169,22 @@ public class Preferences {
         editor.putString(Constants.Pref.KEY_SERVERS, rawData);
         editor.commit();
     }
+
+    public void updateKeyServers() {
+        if (mSharedPreferences.getInt(Constants.Pref.KEY_SERVERS_DEFAULT_VERSION, 0) !=
+                Constants.Defaults.KEY_SERVERS_VERSION) {
+            String[] servers = getKeyServers();
+            for (int i = 0; i < servers.length; i++) {
+                if (servers[i].equals("pool.sks-keyservers.net")) {
+                    servers[i] = "hkps://hkps.pool.sks-keyservers.net";
+                } else if (servers[i].equals("pgp.mit.edu")) {
+                    servers[i] = "hkps://pgp.mit.edu";
+                }
+            }
+            setKeyServers(servers);
+            mSharedPreferences.edit()
+                    .putInt(Constants.Pref.KEY_SERVERS_DEFAULT_VERSION, Constants.Defaults.KEY_SERVERS_VERSION)
+                    .commit();
+        }
+    }
 }