Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs

1 files changed, 14 insertions, 2 deletions

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 b726529f8..5e4bd0b70 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
@@ -24,7 +24,19 @@ import java.io.InputStream;
 import java.util.List;
 
 public abstract class Keyserver {
-    public static class QueryFailedException extends Exception {
+
+    public static class CloudSearchFailureException extends Exception {
+        private static final long serialVersionUID = 2703768928624654515L;
+
+        public CloudSearchFailureException(String message) {
+            super(message);
+        }
+        public CloudSearchFailureException() {
+            super();
+        }
+    }
+
+    public static class QueryFailedException extends CloudSearchFailureException {
         private static final long serialVersionUID = 2703768928624654512L;
 
         public QueryFailedException(String message) {
@@ -32,7 +44,7 @@ public abstract class Keyserver {
         }
     }
 
-    public static class QueryNeedsRepairException extends Exception {
+    public static class QueryNeedsRepairException extends CloudSearchFailureException {
         private static final long serialVersionUID = 2693768928624654512L;
     }