Extract service parts from SecurityTokenOperationActivity

1 files changed, 9 insertions, 18 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
index 772dfe070..7305c2165 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
@@ -35,7 +35,6 @@ import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.remote.CryptoInputParcelCacheService;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
@@ -61,9 +60,6 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
     public static final String EXTRA_REQUIRED_INPUT = "required_input";
     public static final String EXTRA_CRYPTO_INPUT = "crypto_input";
 
-    // passthrough for OpenPgpService
-    public static final String EXTRA_SERVICE_INTENT = "data";
-
     public static final String RESULT_CRYPTO_INPUT = "result_data";
 
     public ViewAnimator vAnimator;
@@ -72,11 +68,10 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
     public NfcGuideView nfcGuideView;
 
     private RequiredInputParcel mRequiredInput;
-    private Intent mServiceIntent;
 
     private static final byte[] BLANK_FINGERPRINT = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-    private CryptoInputParcel mInputParcel;
+    protected CryptoInputParcel mInputParcel;
 
     @Override
     protected void initTheme() {
@@ -136,7 +131,6 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
         Bundle data = intent.getExtras();
 
         mRequiredInput = data.getParcelable(EXTRA_REQUIRED_INPUT);
-        mServiceIntent = data.getParcelable(EXTRA_SERVICE_INTENT);
 
         obtainPassphraseIfRequired();
     }
@@ -274,17 +268,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
 
     @Override
     protected void onNfcPostExecute() {
-        if (mServiceIntent != null) {
-            // if we're triggered by OpenPgpService
-            // save updated cryptoInputParcel in cache
-            CryptoInputParcelCacheService.addCryptoInputParcel(this, mServiceIntent, mInputParcel);
-            setResult(RESULT_OK, mServiceIntent);
-        } else {
-            Intent result = new Intent();
-            // send back the CryptoInputParcel we received
-            result.putExtra(RESULT_CRYPTO_INPUT, mInputParcel);
-            setResult(RESULT_OK, result);
-        }
+        returnResult();
 
         // show finish
         vAnimator.setDisplayedChild(2);
@@ -315,6 +299,13 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
         }.execute();
     }
 
+    protected void returnResult() {
+        Intent result = new Intent();
+        // send back the CryptoInputParcel we received
+        result.putExtra(RESULT_CRYPTO_INPUT, mInputParcel);
+        setResult(RESULT_OK, result);
+    }
+
     @Override
     protected void onNfcError(String error) {
         pauseTagHandling();