From dbfa55f6b963ff8c5a975c45a2805838eb1781f7 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 1 Jun 2015 00:05:55 +0200
Subject: introduce CachingDataDecryptorFactory towards cached session keys

this commit introduces the CachingDataDecryptorFactory, which wraps
a DataDecryptorFactory but supports caching of decrypted session keys.

this change also gets rid of runtimeexception based control flow in
PgpDecryptVerify.
---
 .../keychain/service/input/CryptoInputParcel.java                  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/CryptoInputParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/CryptoInputParcel.java
index 3d1ccaca1..ee7caf2d8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/CryptoInputParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/CryptoInputParcel.java
@@ -97,8 +97,12 @@ public class CryptoInputParcel implements Parcelable {
         mCryptoData.put(ByteBuffer.wrap(hash), signedHash);
     }
 
+    public void addCryptoData(Map<ByteBuffer, byte[]> cachedSessionKeys) {
+        mCryptoData.putAll(cachedSessionKeys);
+    }
+
     public Map<ByteBuffer, byte[]> getCryptoData() {
-        return Collections.unmodifiableMap(mCryptoData);
+        return mCryptoData;
     }
 
     public Date getSignatureTime() {
@@ -138,4 +142,5 @@ public class CryptoInputParcel implements Parcelable {
         b.append("}");
         return b.toString();
     }
+
 }
-- 
cgit v1.2.3