Move PendingIntent creation into factory

3 files changed, 201 insertions, 140 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java
new file mode 100644
index 000000000..2cd463934
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2016 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * 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.remote;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+
+import org.sufficientlysecure.keychain.provider.KeychainContract;
+import org.sufficientlysecure.keychain.remote.ui.RemoteCreateAccountActivity;
+import org.sufficientlysecure.keychain.remote.ui.RemoteErrorActivity;
+import org.sufficientlysecure.keychain.remote.ui.RemoteImportKeysActivity;
+import org.sufficientlysecure.keychain.remote.ui.RemotePassphraseDialogActivity;
+import org.sufficientlysecure.keychain.remote.ui.RemoteRegisterActivity;
+import org.sufficientlysecure.keychain.remote.ui.RemoteSecurityTokenOperationActivity;
+import org.sufficientlysecure.keychain.remote.ui.RemoteSelectPubKeyActivity;
+import org.sufficientlysecure.keychain.remote.ui.SelectAllowedKeysActivity;
+import org.sufficientlysecure.keychain.remote.ui.SelectSignKeyIdActivity;
+import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
+import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
+import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
+
+import java.util.ArrayList;
+
+public class ApiPendingIntentFactory {
+
+    Context mContext;
+    private Intent mPendingIntentData;
+
+    public ApiPendingIntentFactory(Context context, Intent data) {
+        mContext = context;
+        mPendingIntentData = data;
+    }
+
+    PendingIntent requiredInputPi(RequiredInputParcel requiredInput,
+                                  CryptoInputParcel cryptoInput) {
+
+        switch (requiredInput.mType) {
+            case NFC_MOVE_KEY_TO_CARD:
+            case NFC_DECRYPT:
+            case NFC_SIGN: {
+                return nfc(requiredInput, cryptoInput);
+            }
+
+            case PASSPHRASE: {
+                return passphrase(requiredInput, cryptoInput);
+            }
+
+            default:
+                throw new AssertionError("Unhandled required input type!");
+        }
+    }
+
+    private PendingIntent nfc(RequiredInputParcel requiredInput, CryptoInputParcel cryptoInput) {
+        Intent intent = new Intent(mContext, RemoteSecurityTokenOperationActivity.class);
+        // pass params through to activity that it can be returned again later to repeat pgp operation
+        intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput);
+        intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, cryptoInput);
+
+        return build(intent);
+    }
+
+    private PendingIntent passphrase(RequiredInputParcel requiredInput, CryptoInputParcel cryptoInput) {
+        Intent intent = new Intent(mContext, RemotePassphraseDialogActivity.class);
+        // pass params through to activity that it can be returned again later to repeat pgp operation
+        intent.putExtra(RemotePassphraseDialogActivity.EXTRA_REQUIRED_INPUT, requiredInput);
+        intent.putExtra(RemotePassphraseDialogActivity.EXTRA_CRYPTO_INPUT, cryptoInput);
+
+        return build(intent);
+    }
+
+    PendingIntent selectPublicKey(long[] keyIdsArray, ArrayList<String> missingEmails,
+                                  ArrayList<String> duplicateEmails, boolean noUserIdsCheck) {
+        Intent intent = new Intent(mContext, RemoteSelectPubKeyActivity.class);
+        intent.putExtra(RemoteSelectPubKeyActivity.EXTRA_SELECTED_MASTER_KEY_IDS, keyIdsArray);
+        intent.putExtra(RemoteSelectPubKeyActivity.EXTRA_NO_USER_IDS_CHECK, noUserIdsCheck);
+        intent.putExtra(RemoteSelectPubKeyActivity.EXTRA_MISSING_EMAILS, missingEmails);
+        intent.putExtra(RemoteSelectPubKeyActivity.EXTRA_DUPLICATE_EMAILS, duplicateEmails);
+
+        return build(intent);
+    }
+
+    PendingIntent importFromKeyserver(long masterKeyId) {
+        Intent intent = new Intent(mContext, RemoteImportKeysActivity.class);
+        intent.setAction(RemoteImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_RESULT);
+        intent.putExtra(RemoteImportKeysActivity.EXTRA_KEY_ID, masterKeyId);
+
+        return build(intent);
+    }
+
+    PendingIntent selectAllowedKeys(String packageName) {
+        Intent intent = new Intent(mContext, SelectAllowedKeysActivity.class);
+        intent.setData(KeychainContract.ApiApps.buildByPackageNameUri(packageName));
+
+        return build(intent);
+    }
+
+    PendingIntent showKey(long masterKeyId) {
+        Intent intent = new Intent(mContext, ViewKeyActivity.class);
+        intent.setData(KeychainContract.KeyRings.buildGenericKeyRingUri(masterKeyId));
+
+        return build(intent);
+    }
+
+    PendingIntent selectSignKeyId(String packageName, String preferredUserId) {
+        Intent intent = new Intent(mContext, SelectSignKeyIdActivity.class);
+        intent.setData(KeychainContract.ApiApps.buildByPackageNameUri(packageName));
+        intent.putExtra(SelectSignKeyIdActivity.EXTRA_USER_ID, preferredUserId);
+
+        return build(intent);
+    }
+
+    /**
+     * @deprecated
+     */
+    PendingIntent createAccount(String packageName, String accountName) {
+        Intent intent = new Intent(mContext, RemoteCreateAccountActivity.class);
+        intent.putExtra(RemoteCreateAccountActivity.EXTRA_PACKAGE_NAME, packageName);
+        intent.putExtra(RemoteCreateAccountActivity.EXTRA_ACC_NAME, accountName);
+
+        return build(intent);
+    }
+
+    PendingIntent error(String errorMessage) {
+        Intent intent = new Intent(mContext, RemoteErrorActivity.class);
+        intent.putExtra(RemoteErrorActivity.EXTRA_ERROR_MESSAGE, errorMessage);
+
+        return build(intent);
+    }
+
+    private PendingIntent build(Intent intent) {
+        // re-attach "data" for pass through. It will be used later to repeat pgp operation
+        intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_DATA, mPendingIntentData);
+
+        return PendingIntent.getActivity(mContext, 0,
+                intent,
+                PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+
+    PendingIntent register(String packageName, byte[] packageCertificate) {
+        Intent intent = new Intent(mContext, RemoteRegisterActivity.class);
+        intent.putExtra(RemoteRegisterActivity.EXTRA_PACKAGE_NAME, packageName);
+        intent.putExtra(RemoteRegisterActivity.EXTRA_PACKAGE_SIGNATURE, packageCertificate);
+        intent.putExtra(RemoteRegisterActivity.EXTRA_DATA, mPendingIntentData);
+
+        return PendingIntent.getActivity(mContext, 0,
+                intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPermissionHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPermissionHelper.java
index e2011e059..34dab6ec1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPermissionHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPermissionHelper.java
@@ -18,11 +18,6 @@
 package org.sufficientlysecure.keychain.remote;
 
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -40,11 +35,13 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.remote.ui.RemoteCreateAccountActivity;
-import org.sufficientlysecure.keychain.remote.ui.RemoteErrorActivity;
-import org.sufficientlysecure.keychain.remote.ui.RemoteRegisterActivity;
 import org.sufficientlysecure.keychain.util.Log;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+
 
 /**
  * Abstract service class for remote APIs that handle app registration and user input.
@@ -75,6 +72,8 @@ public class ApiPermissionHelper {
      * @return null if caller is allowed, or a Bundle with a PendingIntent
      */
     protected Intent isAllowed(Intent data) {
+        ApiPendingIntentFactory piFactory = new ApiPendingIntentFactory(mContext, data);
+
         try {
             if (isCallerAllowed()) {
                 return null;
@@ -96,14 +95,7 @@ public class ApiPermissionHelper {
                 }
                 Log.e(Constants.TAG, "Not allowed to use service! return PendingIntent for registration!");
 
-                Intent intent = new Intent(mContext, RemoteRegisterActivity.class);
-                intent.putExtra(RemoteRegisterActivity.EXTRA_PACKAGE_NAME, packageName);
-                intent.putExtra(RemoteRegisterActivity.EXTRA_PACKAGE_SIGNATURE, packageCertificate);
-                intent.putExtra(RemoteRegisterActivity.EXTRA_DATA, data);
-
-                PendingIntent pi = PendingIntent.getActivity(mContext, 0,
-                        intent,
-                        PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
+                PendingIntent pi = piFactory.register(packageName, packageCertificate);
 
                 // return PendingIntent to be executed by client
                 Intent result = new Intent();
@@ -115,14 +107,7 @@ public class ApiPermissionHelper {
         } catch (WrongPackageCertificateException e) {
             Log.e(Constants.TAG, "wrong signature!", e);
 
-            Intent intent = new Intent(mContext, RemoteErrorActivity.class);
-            intent.putExtra(RemoteErrorActivity.EXTRA_ERROR_MESSAGE,
-                    mContext.getString(R.string.api_error_wrong_signature));
-            intent.putExtra(RemoteErrorActivity.EXTRA_DATA, data);
-
-            PendingIntent pi = PendingIntent.getActivity(mContext, 0,
-                    intent,
-                    PendingIntent.FLAG_CANCEL_CURRENT);
+            PendingIntent pi = piFactory.error(mContext.getString(R.string.api_error_wrong_signature));
 
             // return PendingIntent to be executed by client
             Intent result = new Intent();
@@ -187,20 +172,15 @@ public class ApiPermissionHelper {
     }
 
     /**
-     * Deprecated API
+     * @deprecated
      */
     protected Intent getCreateAccountIntent(Intent data, String accountName) {
         String packageName = getCurrentCallingPackage();
         Log.d(Constants.TAG, "getCreateAccountIntent accountName: " + accountName);
 
-        Intent intent = new Intent(mContext, RemoteCreateAccountActivity.class);
-        intent.putExtra(RemoteCreateAccountActivity.EXTRA_PACKAGE_NAME, packageName);
-        intent.putExtra(RemoteCreateAccountActivity.EXTRA_ACC_NAME, accountName);
-        intent.putExtra(RemoteCreateAccountActivity.EXTRA_DATA, data);
+        ApiPendingIntentFactory piFactory = new ApiPendingIntentFactory(mContext, data);
 
-        PendingIntent pi = PendingIntent.getActivity(mContext, 0,
-                intent,
-                PendingIntent.FLAG_CANCEL_CURRENT);
+        PendingIntent pi = piFactory.createAccount(packageName, accountName);
 
         // return PendingIntent to be executed by client
         Intent result = new Intent();
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 62354bd6b..7c5351d6a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -19,7 +19,6 @@ package org.sufficientlysecure.keychain.remote;
 
 import android.app.PendingIntent;
 import android.app.Service;
-import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -53,15 +52,8 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.ApiAccounts;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.remote.ui.RemoteImportKeysActivity;
-import org.sufficientlysecure.keychain.remote.ui.RemotePassphraseDialogActivity;
-import org.sufficientlysecure.keychain.remote.ui.RemoteSecurityTokenOperationActivity;
-import org.sufficientlysecure.keychain.remote.ui.RemoteSelectPubKeyActivity;
-import org.sufficientlysecure.keychain.remote.ui.SelectAllowedKeysActivity;
-import org.sufficientlysecure.keychain.remote.ui.SelectSignKeyIdActivity;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
-import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
 import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.Passphrase;
@@ -151,16 +143,9 @@ public class OpenPgpService extends Service {
         if (noUserIdsCheck || missingUserIdsCheck || duplicateUserIdsCheck) {
             // allow the user to verify pub key selection
 
-            Intent intent = new Intent(getBaseContext(), RemoteSelectPubKeyActivity.class);
-            intent.putExtra(RemoteSelectPubKeyActivity.EXTRA_SELECTED_MASTER_KEY_IDS, keyIdsArray);
-            intent.putExtra(RemoteSelectPubKeyActivity.EXTRA_NO_USER_IDS_CHECK, noUserIdsCheck);
-            intent.putExtra(RemoteSelectPubKeyActivity.EXTRA_MISSING_EMAILS, missingEmails);
-            intent.putExtra(RemoteSelectPubKeyActivity.EXTRA_DUPLICATE_EMAILS, duplicateEmails);
-            intent.putExtra(RemoteSelectPubKeyActivity.EXTRA_DATA, data);
-
-            PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
-                    intent,
-                    PendingIntent.FLAG_CANCEL_CURRENT);
+            ApiPendingIntentFactory piFactory = new ApiPendingIntentFactory(getBaseContext(), data);
+            PendingIntent pi = piFactory.selectPublicKey(keyIdsArray, missingEmails,
+                    duplicateEmails, noUserIdsCheck);
 
             // return PendingIntent to be executed by client
             Intent result = new Intent();
@@ -181,76 +166,6 @@ public class OpenPgpService extends Service {
         }
     }
 
-    private static PendingIntent getRequiredInputPendingIntent(Context context,
-                                                               Intent data,
-                                                               RequiredInputParcel requiredInput,
-                                                               CryptoInputParcel cryptoInput) {
-
-        switch (requiredInput.mType) {
-            case NFC_MOVE_KEY_TO_CARD:
-            case NFC_DECRYPT:
-            case NFC_SIGN: {
-                // build PendingIntent for Security Token NFC operations
-                Intent intent = new Intent(context, RemoteSecurityTokenOperationActivity.class);
-                // pass params through to activity that it can be returned again later to repeat pgp operation
-                intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_DATA, data);
-                intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput);
-                intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, cryptoInput);
-                return PendingIntent.getActivity(context, 0, intent,
-                        PendingIntent.FLAG_CANCEL_CURRENT);
-            }
-
-            case PASSPHRASE: {
-                // build PendingIntent for Passphrase request
-                Intent intent = new Intent(context, RemotePassphraseDialogActivity.class);
-                // pass params through to activity that it can be returned again later to repeat pgp operation
-                intent.putExtra(RemotePassphraseDialogActivity.EXTRA_DATA, data);
-                intent.putExtra(RemotePassphraseDialogActivity.EXTRA_REQUIRED_INPUT, requiredInput);
-                intent.putExtra(RemotePassphraseDialogActivity.EXTRA_CRYPTO_INPUT, cryptoInput);
-                return PendingIntent.getActivity(context, 0, intent,
-                        PendingIntent.FLAG_CANCEL_CURRENT);
-            }
-
-            default:
-                throw new AssertionError("Unhandled required input type!");
-        }
-
-    }
-
-    private PendingIntent getKeyserverPendingIntent(Intent data, long masterKeyId) {
-        // If signature is unknown we return an _additional_ PendingIntent
-        // to retrieve the missing key
-        Intent intent = new Intent(getBaseContext(), RemoteImportKeysActivity.class);
-        intent.setAction(RemoteImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_RESULT);
-        intent.putExtra(RemoteImportKeysActivity.EXTRA_KEY_ID, masterKeyId);
-        intent.putExtra(RemoteImportKeysActivity.EXTRA_DATA, data);
-
-        return PendingIntent.getActivity(getBaseContext(), 0,
-                intent,
-                PendingIntent.FLAG_CANCEL_CURRENT);
-    }
-
-    private PendingIntent getSelectAllowedKeysIntent(Intent data) {
-        // If signature is unknown we return an _additional_ PendingIntent
-        // to retrieve the missing key
-        Intent intent = new Intent(getBaseContext(), SelectAllowedKeysActivity.class);
-        intent.putExtra(SelectAllowedKeysActivity.EXTRA_SERVICE_INTENT, data);
-        intent.setData(KeychainContract.ApiApps.buildByPackageNameUri(mApiPermissionHelper.getCurrentCallingPackage()));
-
-        return PendingIntent.getActivity(getBaseContext(), 0,
-                intent,
-                PendingIntent.FLAG_CANCEL_CURRENT);
-    }
-
-    private PendingIntent getShowKeyPendingIntent(long masterKeyId) {
-        Intent intent = new Intent(getBaseContext(), ViewKeyActivity.class);
-        intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId));
-
-        return PendingIntent.getActivity(getBaseContext(), 0,
-                intent,
-                PendingIntent.FLAG_CANCEL_CURRENT);
-    }
-
     private Intent signImpl(Intent data, InputStream inputStream,
                             OutputStream outputStream, boolean cleartextSign) {
         try {
@@ -311,10 +226,10 @@ public class OpenPgpService extends Service {
             PgpSignEncryptResult pgpResult = pse.execute(pseInput, inputParcel, inputData, outputStream);
 
             if (pgpResult.isPending()) {
+                ApiPendingIntentFactory piFactory = new ApiPendingIntentFactory(getBaseContext(), data);
 
                 RequiredInputParcel requiredInput = pgpResult.getRequiredInputParcel();
-                PendingIntent pIntent = getRequiredInputPendingIntent(getBaseContext(), data,
-                        requiredInput, pgpResult.mCryptoInputParcel);
+                PendingIntent pIntent = piFactory.requiredInputPi(requiredInput, pgpResult.mCryptoInputParcel);
 
                 // return PendingIntent to be executed by client
                 Intent result = new Intent();
@@ -448,9 +363,10 @@ public class OpenPgpService extends Service {
             PgpSignEncryptResult pgpResult = op.execute(pseInput, inputParcel, inputData, outputStream);
 
             if (pgpResult.isPending()) {
+                ApiPendingIntentFactory piFactory = new ApiPendingIntentFactory(getBaseContext(), data);
+
                 RequiredInputParcel requiredInput = pgpResult.getRequiredInputParcel();
-                PendingIntent pIntent = getRequiredInputPendingIntent(getBaseContext(), data,
-                        requiredInput, pgpResult.mCryptoInputParcel);
+                PendingIntent pIntent = piFactory.requiredInputPi(requiredInput, pgpResult.mCryptoInputParcel);
 
                 // return PendingIntent to be executed by client
                 Intent result = new Intent();
@@ -520,11 +436,12 @@ public class OpenPgpService extends Service {
 
             DecryptVerifyResult pgpResult = op.execute(input, cryptoInput, inputData, outputStream);
 
+            ApiPendingIntentFactory piFactory = new ApiPendingIntentFactory(getBaseContext(), data);
+
             if (pgpResult.isPending()) {
                 // prepare and return PendingIntent to be executed by client
                 RequiredInputParcel requiredInput = pgpResult.getRequiredInputParcel();
-                PendingIntent pIntent = getRequiredInputPendingIntent(getBaseContext(), data,
-                        requiredInput, pgpResult.mCryptoInputParcel);
+                PendingIntent pIntent = piFactory.requiredInputPi(requiredInput, pgpResult.mCryptoInputParcel);
 
                 Intent result = new Intent();
                 result.putExtra(OpenPgpApi.RESULT_INTENT, pIntent);
@@ -541,7 +458,8 @@ public class OpenPgpService extends Service {
                 switch (signatureResult.getResult()) {
                     case OpenPgpSignatureResult.RESULT_KEY_MISSING: {
                         // If signature key is missing we return a PendingIntent to retrieve the key
-                        result.putExtra(OpenPgpApi.RESULT_INTENT, getKeyserverPendingIntent(data, signatureResult.getKeyId()));
+                        result.putExtra(OpenPgpApi.RESULT_INTENT,
+                                piFactory.importFromKeyserver(signatureResult.getKeyId()));
                         break;
                     }
                     case OpenPgpSignatureResult.RESULT_VALID_CONFIRMED:
@@ -550,7 +468,7 @@ public class OpenPgpService extends Service {
                     case OpenPgpSignatureResult.RESULT_INVALID_KEY_EXPIRED:
                     case OpenPgpSignatureResult.RESULT_INVALID_INSECURE: {
                         // If signature key is known, return PendingIntent to show key
-                        result.putExtra(OpenPgpApi.RESULT_INTENT, getShowKeyPendingIntent(signatureResult.getKeyId()));
+                        result.putExtra(OpenPgpApi.RESULT_INTENT, piFactory.showKey(signatureResult.getKeyId()));
                         break;
                     }
                     default:
@@ -623,7 +541,8 @@ public class OpenPgpService extends Service {
                 if (pgpResult.isKeysDisallowed()) {
                     // allow user to select allowed keys
                     Intent result = new Intent();
-                    result.putExtra(OpenPgpApi.RESULT_INTENT, getSelectAllowedKeysIntent(data));
+                    String packageName = mApiPermissionHelper.getCurrentCallingPackage();
+                    result.putExtra(OpenPgpApi.RESULT_INTENT, piFactory.selectAllowedKeys(packageName));
                     result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED);
                     return result;
                 }
@@ -647,6 +566,8 @@ public class OpenPgpService extends Service {
 
     private Intent getKeyImpl(Intent data, OutputStream outputStream) {
         try {
+            ApiPendingIntentFactory piFactory = new ApiPendingIntentFactory(getBaseContext(), data);
+
             long masterKeyId = data.getLongExtra(OpenPgpApi.EXTRA_KEY_ID, 0);
 
             try {
@@ -676,14 +597,14 @@ public class OpenPgpService extends Service {
                 }
 
                 // also return PendingIntent that opens the key view activity
-                result.putExtra(OpenPgpApi.RESULT_INTENT, getShowKeyPendingIntent(masterKeyId));
+                result.putExtra(OpenPgpApi.RESULT_INTENT, piFactory.showKey(masterKeyId));
 
                 return result;
             } catch (ProviderHelper.NotFoundException e) {
                 // If keys are not in db we return an additional PendingIntent
                 // to retrieve the missing key
                 Intent result = new Intent();
-                result.putExtra(OpenPgpApi.RESULT_INTENT, getKeyserverPendingIntent(data, masterKeyId));
+                result.putExtra(OpenPgpApi.RESULT_INTENT, piFactory.importFromKeyserver(masterKeyId));
                 result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED);
                 return result;
             }
@@ -709,17 +630,11 @@ public class OpenPgpService extends Service {
             result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS);
             return result;
         } else {
-            String preferredUserId = data.getStringExtra(OpenPgpApi.EXTRA_USER_ID);
-
-            Intent intent = new Intent(getBaseContext(), SelectSignKeyIdActivity.class);
             String currentPkg = mApiPermissionHelper.getCurrentCallingPackage();
-            intent.setData(KeychainContract.ApiApps.buildByPackageNameUri(currentPkg));
-            intent.putExtra(SelectSignKeyIdActivity.EXTRA_USER_ID, preferredUserId);
-            intent.putExtra(SelectSignKeyIdActivity.EXTRA_DATA, data);
+            String preferredUserId = data.getStringExtra(OpenPgpApi.EXTRA_USER_ID);
 
-            PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
-                    intent,
-                    PendingIntent.FLAG_CANCEL_CURRENT);
+            ApiPendingIntentFactory piFactory = new ApiPendingIntentFactory(getBaseContext(), data);
+            PendingIntent pi = piFactory.selectSignKeyId(currentPkg, preferredUserId);
 
             // return PendingIntent to be executed by client
             Intent result = new Intent();