aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteSecurityTokenOperationActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteSecurityTokenOperationActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteSecurityTokenOperationActivity.java13
1 files changed, 7 insertions, 6 deletions
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);
}
}