From cf450d24fbcbbd9bc56959e387bd52141004bde1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 15 Aug 2014 10:19:46 +0200
Subject: Remove subkeys.pgp.net keyserver, often down and no hkps

---
 .../org/sufficientlysecure/keychain/Constants.java |  2 +-
 .../keychain/helper/Preferences.java               | 27 ++++++++++++++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index 755d74ac2..7cfc11bc6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -72,7 +72,7 @@ public final class Constants {
 
     public static final class Defaults {
         public static final String KEY_SERVERS = "hkps://hkps.pool.sks-keyservers.net, subkeys.pgp.net, hkps://pgp.mit.edu";
-        public static final int KEY_SERVERS_VERSION = 2;
+        public static final int KEY_SERVERS_VERSION = 3;
     }
 
     public static final class DrawerItems {
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 80b047530..14ae46840 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
@@ -26,6 +26,10 @@ import org.spongycastle.bcpg.HashAlgorithmTags;
 import org.spongycastle.openpgp.PGPEncryptedData;
 import org.sufficientlysecure.keychain.Constants;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.ListIterator;
 import java.util.Vector;
 
 /**
@@ -175,15 +179,24 @@ public class Preferences {
         // migrate keyserver to hkps
         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";
+            String[] serversArray = getKeyServers();
+            ArrayList<String> servers = new ArrayList<String>(Arrays.asList(serversArray));
+            ListIterator<String> it = servers.listIterator();
+            while (it.hasNext()) {
+                String server = it.next();
+                if (server.equals("pool.sks-keyservers.net")) {
+                    // use HKPS!
+                    it.set("hkps://hkps.pool.sks-keyservers.net");
+                } else if (server.equals("pgp.mit.edu")) {
+                    // use HKPS!
+                    it.set("hkps://pgp.mit.edu");
+                } else if (server.equals("subkeys.pgp.net")) {
+                    // remove, because often down and no HKPS!
+                    it.remove();
                 }
+
             }
-            setKeyServers(servers);
+            setKeyServers(servers.toArray(new String[servers.size()]));
             mSharedPreferences.edit()
                     .putInt(Constants.Pref.KEY_SERVERS_DEFAULT_VERSION, Constants.Defaults.KEY_SERVERS_VERSION)
                     .commit();
-- 
cgit v1.2.3