aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-24 01:41:40 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-24 01:41:40 +0200
commit7654cd54fbba9fa6ecaf47f5ffc5fc21669d6e56 (patch)
tree371060df8332f6dd419ad524b02412b9dfeffa60 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
parentd588b13255a7b7391c5f782a464c44bee4a3391b (diff)
downloadopen-keychain-7654cd54fbba9fa6ecaf47f5ffc5fc21669d6e56.tar.gz
open-keychain-7654cd54fbba9fa6ecaf47f5ffc5fc21669d6e56.tar.bz2
open-keychain-7654cd54fbba9fa6ecaf47f5ffc5fc21669d6e56.zip
fix signing in OK with yubikeys
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 836e7e268..cde31abdc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -4,6 +4,8 @@ import android.content.Intent;
import org.sufficientlysecure.keychain.nfc.NfcActivity;
+import java.util.Date;
+
public class EncryptActivity extends DrawerActivity {
public static final int REQUEST_CODE_PASSPHRASE = 0x00008001;
@@ -28,10 +30,10 @@ public class EncryptActivity extends DrawerActivity {
// build PendingIntent for Yubikey NFC operations
Intent intent = new Intent(this, NfcActivity.class);
intent.setAction(NfcActivity.ACTION_SIGN_HASH);
+
// pass params through to activity that it can be returned again later to repeat pgp operation
intent.putExtra(NfcActivity.EXTRA_DATA, data);
intent.putExtra(NfcActivity.EXTRA_PIN, pin);
-
intent.putExtra(NfcActivity.EXTRA_NFC_HASH_TO_SIGN, hashToSign);
intent.putExtra(NfcActivity.EXTRA_NFC_HASH_ALGO, hashAlgo);
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);