From 15488c544584f5515c83c9fbcf4d09055ba7af3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 15 Feb 2016 16:29:23 +0100 Subject: Split remote methods from activities for better seperation --- .../remote/ui/RemoteSecurityTokenOperationActivity.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteSecurityTokenOperationActivity.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteSecurityTokenOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteSecurityTokenOperationActivity.java index 1231f890b..a9aa35da1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteSecurityTokenOperationActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteSecurityTokenOperationActivity.java @@ -21,13 +21,14 @@ import android.content.Intent; import android.os.Bundle; import org.sufficientlysecure.keychain.remote.CryptoInputParcelCacheService; +import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.ui.SecurityTokenOperationActivity; public class RemoteSecurityTokenOperationActivity extends SecurityTokenOperationActivity { - public static final String EXTRA_SERVICE_INTENT = "data"; + public static final String EXTRA_DATA = "data"; - private Intent mServiceIntent; + private Intent mPendingIntentData; @Override protected void onCreate(Bundle savedInstanceState) { @@ -35,14 +36,14 @@ public class RemoteSecurityTokenOperationActivity extends SecurityTokenOperation Intent intent = getIntent(); Bundle data = intent.getExtras(); - mServiceIntent = data.getParcelable(EXTRA_SERVICE_INTENT); + mPendingIntentData = data.getParcelable(EXTRA_DATA); } @Override - protected void returnResult() { + protected void handleResult(CryptoInputParcel inputParcel) { // save updated cryptoInputParcel in cache - CryptoInputParcelCacheService.addCryptoInputParcel(this, mServiceIntent, mInputParcel); - setResult(RESULT_OK, mServiceIntent); + CryptoInputParcelCacheService.addCryptoInputParcel(this, mPendingIntentData, inputParcel); + setResult(RESULT_OK, mPendingIntentData); } } -- cgit v1.2.3