1 files changed, 35 insertions, 22 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index 2d70f3681..e17310b65 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -35,6 +35,7 @@ import android.app.Service;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 import android.os.Parcelable;
@@ -103,20 +104,20 @@ public class OpenPgpService extends Service {
     }
 
     private static class KeyIdResult {
-        final Intent mRequiredUserInteraction;
+        final Intent mResultIntent;
         final HashSet<Long> mKeyIds;
 
-        KeyIdResult(Intent requiredUserInteraction) {
-            mRequiredUserInteraction = requiredUserInteraction;
+        KeyIdResult(Intent resultIntent) {
+            mResultIntent = resultIntent;
             mKeyIds = null;
         }
         KeyIdResult(HashSet<Long> keyIds) {
-            mRequiredUserInteraction = null;
+            mResultIntent = null;
             mKeyIds = keyIds;
         }
     }
 
-    private KeyIdResult returnKeyIdsFromEmails(Intent data, String[] encryptionUserIds) {
+    private KeyIdResult returnKeyIdsFromEmails(Intent data, String[] encryptionUserIds, boolean isOpportunistic) {
         boolean noUserIdsCheck = (encryptionUserIds == null || encryptionUserIds.length == 0);
         boolean missingUserIdsCheck = false;
         boolean duplicateUserIdsCheck = false;
@@ -159,9 +160,15 @@ public class OpenPgpService extends Service {
             }
         }
 
-        if (noUserIdsCheck || missingUserIdsCheck || duplicateUserIdsCheck) {
-            // allow the user to verify pub key selection
+        if (isOpportunistic && (noUserIdsCheck || missingUserIdsCheck)) {
+            Intent result = new Intent();
+            result.putExtra(OpenPgpApi.RESULT_ERROR,
+                    new OpenPgpError(OpenPgpError.OPPORTUNISTIC_MISSING_KEYS, "missing keys in opportunistic mode"));
+            result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);
+            return new KeyIdResult(result);
+        }
 
+        if (noUserIdsCheck || missingUserIdsCheck || duplicateUserIdsCheck) {
             // convert ArrayList<Long> to long[]
             long[] keyIdsArray = getUnboxedLongArray(keyIds);
             ApiPendingIntentFactory piFactory = new ApiPendingIntentFactory(getBaseContext());
@@ -173,15 +180,14 @@ public class OpenPgpService extends Service {
             result.putExtra(OpenPgpApi.RESULT_INTENT, pi);
             result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED);
             return new KeyIdResult(result);
-        } else {
-            // everything was easy, we have exactly one key for every email
-
-            if (keyIds.isEmpty()) {
-                Log.e(Constants.TAG, "keyIdsArray.length == 0, should never happen!");
-            }
+        }
 
-            return new KeyIdResult(keyIds);
+        // everything was easy, we have exactly one key for every email
+        if (keyIds.isEmpty()) {
+            Log.e(Constants.TAG, "keyIdsArray.length == 0, should never happen!");
         }
+
+        return new KeyIdResult(keyIds);
     }
 
     private Intent signImpl(Intent data, InputStream inputStream,
@@ -302,12 +308,12 @@ public class OpenPgpService extends Service {
                 // get key ids based on given user ids
                 if (data.hasExtra(OpenPgpApi.EXTRA_USER_IDS)) {
                     String[] userIds = data.getStringArrayExtra(OpenPgpApi.EXTRA_USER_IDS);
-                    data.removeExtra(OpenPgpApi.EXTRA_USER_IDS);
+                    boolean isOpportunistic = data.getBooleanExtra(OpenPgpApi.EXTRA_OPPORTUNISTIC_ENCRYPTION, false);
                     // give params through to activity...
-                    KeyIdResult result = returnKeyIdsFromEmails(data, userIds);
+                    KeyIdResult result = returnKeyIdsFromEmails(data, userIds, isOpportunistic);
 
-                    if (result.mRequiredUserInteraction != null) {
-                        return result.mRequiredUserInteraction;
+                    if (result.mResultIntent != null) {
+                        return result.mResultIntent;
                     }
                     encryptKeyIds.addAll(result.mKeyIds);
                 }
@@ -448,6 +454,14 @@ public class OpenPgpService extends Service {
                 cryptoInput.mPassphrase =
                         new Passphrase(data.getCharArrayExtra(OpenPgpApi.EXTRA_PASSPHRASE));
             }
+            if (data.hasExtra(OpenPgpApi.EXTRA_DECRYPTION_RESULT_WRAPPER)) {
+                Bundle wrapperBundle = data.getBundleExtra(OpenPgpApi.EXTRA_DECRYPTION_RESULT_WRAPPER);
+                wrapperBundle.setClassLoader(getClassLoader());
+                OpenPgpDecryptionResult decryptionResult = wrapperBundle.getParcelable(OpenPgpApi.EXTRA_DECRYPTION_RESULT);
+                if (decryptionResult != null && decryptionResult.hasDecryptedSessionKey()) {
+                    cryptoInput.addCryptoData(decryptionResult.sessionKey, decryptionResult.decryptedSessionKey);
+                }
+            }
 
             byte[] detachedSignature = data.getByteArrayExtra(OpenPgpApi.EXTRA_DETACHED_SIGNATURE);
 
@@ -695,10 +709,9 @@ public class OpenPgpService extends Service {
         } else {
             // get key ids based on given user ids
             String[] userIds = data.getStringArrayExtra(OpenPgpApi.EXTRA_USER_IDS);
-            data.removeExtra(OpenPgpApi.EXTRA_USER_IDS);
-            KeyIdResult keyResult = returnKeyIdsFromEmails(data, userIds);
-            if (keyResult.mRequiredUserInteraction != null) {
-                return keyResult.mRequiredUserInteraction;
+            KeyIdResult keyResult = returnKeyIdsFromEmails(data, userIds, false);
+            if (keyResult.mResultIntent != null) {
+                return keyResult.mResultIntent;
             }
 
             if (keyResult.mKeyIds == null) {