cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some code cleanup in Preferences

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-11-18 19:27:21 +01:00
parent 7eafe5d1e8
commit f554d0fd2d
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
View File

@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Vector; import java.util.Vector;
import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Parcel; import android.os.Parcel;
@@ -47,6 +48,7 @@ import org.sufficientlysecure.keychain.service.KeyserverSyncAdapterService;
/** /**
* Singleton Implementation of a Preference Helper * Singleton Implementation of a Preference Helper
*/ */
@SuppressLint("CommitPrefEdits")
public class Preferences { public class Preferences {
private static Preferences sPreferences; private static Preferences sPreferences;
private SharedPreferences mSharedPreferences; private SharedPreferences mSharedPreferences;
@@ -135,7 +137,7 @@ public class Preferences {
public String[] getKeyServers() { public String[] getKeyServers() {
String rawData = mSharedPreferences.getString(Constants.Pref.KEY_SERVERS, String rawData = mSharedPreferences.getString(Constants.Pref.KEY_SERVERS,
Constants.Defaults.KEY_SERVERS); Constants.Defaults.KEY_SERVERS);
if (rawData.equals("")) { if ("".equals(rawData)) {
return new String[0]; return new String[0];
} }
Vector<String> servers = new Vector<>(); Vector<String> servers = new Vector<>();
@@ -457,15 +459,19 @@ public class Preferences {
if (server == null) { if (server == null) {
continue; continue;
} }
if (server.equals("pool.sks-keyservers.net")) { switch (server) {
// use HKPS! case "pool.sks-keyservers.net":
it.set("hkps://hkps.pool.sks-keyservers.net"); // use HKPS!
} else if (server.equals("pgp.mit.edu")) { it.set("hkps://hkps.pool.sks-keyservers.net");
// use HKPS! break;
it.set("hkps://pgp.mit.edu"); case "pgp.mit.edu":
} else if (server.equals("subkeys.pgp.net")) { // use HKPS!
// remove, because often down and no HKPS! it.set("hkps://pgp.mit.edu");
it.remove(); break;
case "subkeys.pgp.net":
// remove, because often down and no HKPS!
it.remove();
break;
} }
} }