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

use keys.openpgp.org by default

This commit is contained in:
Vincent Breitmoser 2019-06-15 19:11:07 +02:00
parent 0a001e4cf6
commit cb054156a7
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
View File

@ -197,7 +197,7 @@ public final class Constants {
public static final class Defaults {
public static final String KEY_SERVERS = "hkps://keyserver.ubuntu.com,hkps://hkps.pool.sks-keyservers.net;hkp://jirk5u4osbsr34t5.onion,hkps://pgp.mit.edu";
public static final int PREF_CURRENT_VERSION = 9;
public static final int PREF_CURRENT_VERSION = 10;
}
public static final class key {

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

@ -471,8 +471,9 @@ public class Preferences {
case 7: {
addOnionToSks();
}
case 8: {
replaceDefaultKeyserverWithUbuntu();
case 8:
case 9: {
replaceDefaultKeyserverWithKeysOpenPgpOrg();
}
}
@ -531,19 +532,22 @@ public class Preferences {
setKeyServers(servers);
}
private void replaceDefaultKeyserverWithUbuntu() {
private void replaceDefaultKeyserverWithKeysOpenPgpOrg() {
ArrayList<HkpKeyserverAddress> servers = getKeyServers();
if (servers.isEmpty()) {
return;
}
boolean oldDefaults = "hkps://hkps.pool.sks-keyservers.net".equalsIgnoreCase(servers.get(0).getUrl()) ||
"hkps://pgp.mit.edu".equalsIgnoreCase(servers.get(0).getUrl());
String currentKeyserverUri = servers.get(0).getUrl();
boolean oldDefaults = "hkps://keyserver.ubuntu.com".equalsIgnoreCase(currentKeyserverUri) ||
"hkps://hkps.pool.sks-keyservers.net".equalsIgnoreCase(currentKeyserverUri) ||
"hkps://pgp.mit.edu".equalsIgnoreCase(currentKeyserverUri);
HkpKeyserverAddress ubuntuKeyserver = HkpKeyserverAddress.createFromUri("hkps://keyserver.ubuntu.com");
HkpKeyserverAddress keysOpenPgpOrgKeyserver = HkpKeyserverAddress.createWithOnionProxy(
"hkps://keys.openpgp.org", "zkaan2xfbuxia2wpf7ofnkbz6r5zdbbvxbunvp5g2iebopbfc4iqmbad.onion");
if (oldDefaults) {
servers.add(0, ubuntuKeyserver);
} else if (!servers.contains(ubuntuKeyserver)) {
servers.add(ubuntuKeyserver);
servers.add(0, keysOpenPgpOrgKeyserver);
} else if (!servers.contains(keysOpenPgpOrgKeyserver)) {
servers.add(keysOpenPgpOrgKeyserver);
}
setKeyServers(servers);
}