diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-31 00:28:24 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-31 00:28:24 +0200 |
commit | 8bd8267a47bbc86fc534858be68de43e9ecb8eec (patch) | |
tree | 02435c6e7142b33d927912b57b47eb229be2c694 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | |
parent | 6cc7b6141a42870840a290455e16d7e599fa3469 (diff) | |
download | open-keychain-8bd8267a47bbc86fc534858be68de43e9ecb8eec.tar.gz open-keychain-8bd8267a47bbc86fc534858be68de43e9ecb8eec.tar.bz2 open-keychain-8bd8267a47bbc86fc534858be68de43e9ecb8eec.zip |
work on passphrase data flow
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java index 0b22ecdaf..9b10ccdb1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java @@ -4,6 +4,7 @@ package org.sufficientlysecure.keychain.ui.base; import java.io.IOException; import java.nio.ByteBuffer; +import android.app.Activity; import android.app.PendingIntent; import android.content.Intent; import android.content.IntentFilter; @@ -130,6 +131,11 @@ public abstract class BaseNfcActivity extends BaseActivity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode) { case REQUEST_CODE_PASSPHRASE: + if (resultCode != Activity.RESULT_OK) { + setResult(resultCode); + finish(); + return; + } CryptoInputParcel input = data.getParcelableExtra(PassphraseDialogActivity.RESULT_CRYPTO_INPUT); mPin = input.getPassphrase(); break; |