Merge branch 'master' of github.com:open-keychain/open-keychain

2015-07-02 17:39:58 +02:00
parent 9dac8ddbac 8b2ae99412
commit 0454c57431
13 changed files with 56 additions and 19 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
@@ -138,6 +138,9 @@ public class Preferences {
    public String[] getKeyServers() {
        String rawData = mSharedPreferences.getString(Constants.Pref.KEY_SERVERS,
                Constants.Defaults.KEY_SERVERS);
+        if (rawData.equals("")) {
+            return new String[0];
+        }
        Vector<String> servers = new Vector<>();
        String chunks[] = rawData.split(",");
        for (String c : chunks) {
@@ -150,7 +153,8 @@ public class Preferences {
    }

    public String getPreferredKeyserver() {
-        return getKeyServers()[0];
+        String[] keyservers = getKeyServers();
+        return keyservers.length == 0 ? null : keyservers[0];
    }

    public void setKeyServers(String[] value) {