Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify

3 files changed, 86 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/GetKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/GetKeyResult.java
new file mode 100644
index 000000000..e76d1bd41
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/GetKeyResult.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.service.results;
+
+import android.os.Parcel;
+
+public class GetKeyResult extends OperationResult {
+
+    public int mNonPgpPartsCount;
+
+    public int getNonPgpPartsCount() {
+        return mNonPgpPartsCount;
+    }
+
+    public void setNonPgpPartsCount(int nonPgpPartsCount) {
+        mNonPgpPartsCount = nonPgpPartsCount;
+    }
+
+    public GetKeyResult(int result, OperationLog log) {
+        super(result, log);
+    }
+
+    public static final int RESULT_ERROR_NO_VALID_KEYS = RESULT_ERROR + 8;
+    public static final int RESULT_ERROR_NO_PGP_PARTS = RESULT_ERROR + 16;
+    public static final int RESULT_ERROR_QUERY_TOO_SHORT = RESULT_ERROR + 32;
+    public static final int RESULT_ERROR_TOO_MANY_RESPONSES = RESULT_ERROR + 64;
+    public static final int RESULT_ERROR_TOO_SHORT_OR_TOO_MANY_RESPONSES = RESULT_ERROR + 128;
+    public static final int RESULT_ERROR_QUERY_FAILED = RESULT_ERROR + 256;
+
+    public GetKeyResult(Parcel source) {
+        super(source);
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+    }
+
+    public static Creator<GetKeyResult> CREATOR = new Creator<GetKeyResult>() {
+        public GetKeyResult createFromParcel(final Parcel source) {
+            return new GetKeyResult(source);
+        }
+
+        public GetKeyResult[] newArray(final int size) {
+            return new GetKeyResult[size];
+        }
+    };
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
index fa0dc6af3..0d71af876 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
@@ -37,6 +37,7 @@ import org.sufficientlysecure.keychain.ui.LogDisplayFragment;
 public class ImportKeyResult extends OperationResult {
 
     public final int mNewKeys, mUpdatedKeys, mBadKeys, mSecret;
+    public final long[] mImportedMasterKeyIds;
 
     // At least one new key
     public static final int RESULT_OK_NEWKEYS = 8;
@@ -69,21 +70,28 @@ public class ImportKeyResult extends OperationResult {
         return (mResult & RESULT_FAIL_NOTHING) == RESULT_FAIL_NOTHING;
     }
 
+    public long[] getImportedMasterKeyIds() {
+        return mImportedMasterKeyIds;
+    }
+
     public ImportKeyResult(Parcel source) {
         super(source);
         mNewKeys = source.readInt();
         mUpdatedKeys = source.readInt();
         mBadKeys = source.readInt();
         mSecret = source.readInt();
+        mImportedMasterKeyIds = source.createLongArray();
     }
 
     public ImportKeyResult(int result, OperationLog log,
-                           int newKeys, int updatedKeys, int badKeys, int secret) {
+                           int newKeys, int updatedKeys, int badKeys, int secret,
+                           long[] importedMasterKeyIds) {
         super(result, log);
         mNewKeys = newKeys;
         mUpdatedKeys = updatedKeys;
         mBadKeys = badKeys;
         mSecret = secret;
+        mImportedMasterKeyIds = importedMasterKeyIds;
     }
 
     @Override
@@ -93,6 +101,7 @@ public class ImportKeyResult extends OperationResult {
         dest.writeInt(mUpdatedKeys);
         dest.writeInt(mBadKeys);
         dest.writeInt(mSecret);
+        dest.writeLongArray(mImportedMasterKeyIds);
     }
 
     public static Creator<ImportKeyResult> CREATOR = new Creator<ImportKeyResult>() {
@@ -162,8 +171,8 @@ public class ImportKeyResult extends OperationResult {
             color = Style.RED;
             if (isFailNothing()) {
                 str = activity.getString((resultType & ImportKeyResult.RESULT_CANCELLED) > 0
-                                ? R.string.import_error_nothing_cancelled
-                                : R.string.import_error_nothing);
+                        ? R.string.import_error_nothing_cancelled
+                        : R.string.import_error_nothing);
             } else {
                 str = activity.getResources().getQuantityString(R.plurals.import_error, mBadKeys);
             }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java
index 234b13ac2..d32e3a4a9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java
@@ -537,8 +537,16 @@ public abstract class OperationResult implements Parcelable {
 
         MSG_ACC_SAVED (LogLevel.INFO, R.string.api_settings_save_msg),
 
-        MSG_NO_VALID_ENC (LogLevel.ERROR, R.string.error_invalid_data)
-
+        MSG_NO_VALID_ENC (LogLevel.ERROR, R.string.error_invalid_data),
+
+        // get key
+        MSG_GET_SUCCESS(LogLevel.OK, R.string.msg_download_success),
+        MSG_GET_NO_VALID_KEYS(LogLevel.ERROR, R.string.msg_download_no_valid_keys),
+        MSG_GET_NO_PGP_PARTS(LogLevel.ERROR, R.string.msg_download_no_pgp_parts),
+        MSG_GET_QUERY_TOO_SHORT(LogLevel.ERROR, R.string.msg_download_query_too_short),
+        MSG_GET_TOO_MANY_RESPONSES(LogLevel.ERROR, R.string.msg_download_too_many_responses),
+        MSG_GET_QUERY_TOO_SHORT_OR_TOO_MANY_RESPONSES(LogLevel.ERROR, R.string.msg_download_query_too_short_or_too_many_responses),
+        MSG_GET_QUERY_FAILED(LogLevel.ERROR, R.string.msg_download_query_failed)
         ;
 
         public final int mMsgId;