diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-18 19:27:21 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-01-06 16:25:51 +0100 |
| commit | f554d0fd2dee0a5aad513603745b745dfe99a90f (patch) | |
| tree | 758042e2635b204ccef1291a15f0d098f4d4f64d /OpenKeychain/src | |
| parent | 7eafe5d1e81fe3f72e66b600736e55f8eb21f038 (diff) | |
| download | open-keychain-f554d0fd2dee0a5aad513603745b745dfe99a90f.tar.gz open-keychain-f554d0fd2dee0a5aad513603745b745dfe99a90f.tar.bz2 open-keychain-f554d0fd2dee0a5aad513603745b745dfe99a90f.zip | |
some code cleanup in Preferences
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | 26 |
1 files changed, 16 insertions, 10 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 cf4e5ad21..6e8c8c651 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java @@ -32,6 +32,7 @@ import java.util.Map; import java.util.Set; import java.util.Vector; +import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; import android.os.Parcel; @@ -47,6 +48,7 @@ import org.sufficientlysecure.keychain.service.KeyserverSyncAdapterService; /** * Singleton Implementation of a Preference Helper */ +@SuppressLint("CommitPrefEdits") public class Preferences { private static Preferences sPreferences; private SharedPreferences mSharedPreferences; @@ -135,7 +137,7 @@ public class Preferences { public String[] getKeyServers() { String rawData = mSharedPreferences.getString(Constants.Pref.KEY_SERVERS, Constants.Defaults.KEY_SERVERS); - if (rawData.equals("")) { + if ("".equals(rawData)) { return new String[0]; } Vector<String> servers = new Vector<>(); @@ -457,15 +459,19 @@ public class Preferences { if (server == null) { continue; } - 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(); + switch (server) { + case "pool.sks-keyservers.net": + // use HKPS! + it.set("hkps://hkps.pool.sks-keyservers.net"); + break; + case "pgp.mit.edu": + // use HKPS! + it.set("hkps://pgp.mit.edu"); + break; + case "subkeys.pgp.net": + // remove, because often down and no HKPS! + it.remove(); + break; } } |