From b0821a3ddd56ebcd16b5e1b0de098cb90cab4c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 10 Aug 2014 20:44:02 +0200
Subject: Introduction of metadata api, starting to fix decryption progress

---
 .../keychain/pgp/PgpDecryptVerifyResult.java       | 23 +++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java
index ad240e834..d16c6ecc0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java
@@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.pgp;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import org.openintents.openpgp.OpenPgpDecryptMetadata;
 import org.openintents.openpgp.OpenPgpSignatureResult;
 
 public class PgpDecryptVerifyResult implements Parcelable {
@@ -31,21 +32,22 @@ public class PgpDecryptVerifyResult implements Parcelable {
     long mKeyIdPassphraseNeeded;
 
     OpenPgpSignatureResult mSignatureResult;
+    OpenPgpDecryptMetadata mDecryptMetadata;
 
     public int getStatus() {
         return mStatus;
     }
 
-    public void setStatus(int mStatus) {
-        this.mStatus = mStatus;
+    public void setStatus(int status) {
+        mStatus = status;
     }
 
     public long getKeyIdPassphraseNeeded() {
         return mKeyIdPassphraseNeeded;
     }
 
-    public void setKeyIdPassphraseNeeded(long mKeyIdPassphraseNeeded) {
-        this.mKeyIdPassphraseNeeded = mKeyIdPassphraseNeeded;
+    public void setKeyIdPassphraseNeeded(long keyIdPassphraseNeeded) {
+        mKeyIdPassphraseNeeded = keyIdPassphraseNeeded;
     }
 
     public OpenPgpSignatureResult getSignatureResult() {
@@ -53,7 +55,15 @@ public class PgpDecryptVerifyResult implements Parcelable {
     }
 
     public void setSignatureResult(OpenPgpSignatureResult signatureResult) {
-        this.mSignatureResult = signatureResult;
+        mSignatureResult = signatureResult;
+    }
+
+    public OpenPgpDecryptMetadata getDecryptMetadata() {
+        return mDecryptMetadata;
+    }
+
+    public void setDecryptMetadata(OpenPgpDecryptMetadata decryptMetadata) {
+        mDecryptMetadata = decryptMetadata;
     }
 
     public PgpDecryptVerifyResult() {
@@ -64,6 +74,7 @@ public class PgpDecryptVerifyResult implements Parcelable {
         this.mStatus = b.mStatus;
         this.mKeyIdPassphraseNeeded = b.mKeyIdPassphraseNeeded;
         this.mSignatureResult = b.mSignatureResult;
+        this.mDecryptMetadata = b.mDecryptMetadata;
     }
 
 
@@ -75,6 +86,7 @@ public class PgpDecryptVerifyResult implements Parcelable {
         dest.writeInt(mStatus);
         dest.writeLong(mKeyIdPassphraseNeeded);
         dest.writeParcelable(mSignatureResult, 0);
+        dest.writeParcelable(mDecryptMetadata, 0);
     }
 
     public static final Creator<PgpDecryptVerifyResult> CREATOR = new Creator<PgpDecryptVerifyResult>() {
@@ -83,6 +95,7 @@ public class PgpDecryptVerifyResult implements Parcelable {
             vr.mStatus = source.readInt();
             vr.mKeyIdPassphraseNeeded = source.readLong();
             vr.mSignatureResult = source.readParcelable(OpenPgpSignatureResult.class.getClassLoader());
+            vr.mDecryptMetadata = source.readParcelable(OpenPgpDecryptMetadata.class.getClassLoader());
             return vr;
         }
 
-- 
cgit v1.2.3