diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-18 23:06:50 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-18 23:06:50 +0200 |
commit | 19072824bada5ae2fcac6e4e991bf300f270b081 (patch) | |
tree | 3e3acc7f9995cbf616caa494b42d0ec82f592e3d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport | |
parent | 9025de2b74c18d45b7e1853964e8caa653db7432 (diff) | |
download | open-keychain-19072824bada5ae2fcac6e4e991bf300f270b081.tar.gz open-keychain-19072824bada5ae2fcac6e4e991bf300f270b081.tar.bz2 open-keychain-19072824bada5ae2fcac6e4e991bf300f270b081.zip |
Rename KeyServer to Keyserver
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyServer.java) | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyServer.java) | 5 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeyServer.java) | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java index 8d1e1f460..1f101f6ef 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyServer.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java @@ -52,7 +52,7 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class HkpKeyServer extends KeyServer { +public class HkpKeyserver extends Keyserver { private static class HttpError extends Exception { private static final long serialVersionUID = 1718783705229428893L; private int mCode; @@ -148,7 +148,7 @@ public class HkpKeyServer extends KeyServer { * connect using {@link #PORT_DEFAULT}. However, port may be specified after colon * ("<code>hostname:port</code>", eg. "<code>p80.pool.sks-keyservers.net:80</code>"). */ - public HkpKeyServer(String hostAndPort) { + public HkpKeyserver(String hostAndPort) { String host = hostAndPort; short port = PORT_DEFAULT; final int colonPosition = hostAndPort.lastIndexOf(':'); @@ -161,7 +161,7 @@ public class HkpKeyServer extends KeyServer { mPort = port; } - public HkpKeyServer(String host, short port) { + public HkpKeyserver(String host, short port) { mHost = host; mPort = port; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java index 5f729a05c..3094b065e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyServer.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java @@ -29,11 +29,8 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; import java.util.ArrayList; -import java.util.GregorianCalendar; -import java.util.TimeZone; -import java.util.WeakHashMap; -public class KeybaseKeyServer extends KeyServer { +public class KeybaseKeyserver extends Keyserver { @Override public ArrayList<ImportKeysListEntry> search(String query) throws QueryException, TooManyResponses, diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java index d6ebca5a6..19591eda8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeyServer.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -public abstract class KeyServer { +public abstract class Keyserver { public static class QueryException extends Exception { private static final long serialVersionUID = 2703768928624654512L; |