diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-02 17:39:58 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-02 17:39:58 +0200 |
| commit | 0454c57431f55003648f9a328a0f5a0fde6e54b6 (patch) | |
| tree | 9f9da21526dd955e3dbf89d02965f292002fe6a7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util | |
| parent | 9dac8ddbac60997e16b7cb1a4fc9bad71cc0ab87 (diff) | |
| parent | 8b2ae99412906041182634771a2792cfadca65cd (diff) | |
| download | open-keychain-0454c57431f55003648f9a328a0f5a0fde6e54b6.tar.gz open-keychain-0454c57431f55003648f9a328a0f5a0fde6e54b6.tar.bz2 open-keychain-0454c57431f55003648f9a328a0f5a0fde6e54b6.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 a5b0088c0..713d5f5ea 100644 --- 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) { |