diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-16 23:29:59 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 01:04:25 +0200 |
| commit | f6643962afdf980fe50740eb3c667bf280c15c56 (patch) | |
| tree | a76dbd5e4b24c48406b60b477f8a0784c71d938f /OpenKeychain/src/main/java | |
| parent | d06ae7f691e3bf1984cb79f94aa5a455c88f36f8 (diff) | |
| download | open-keychain-f6643962afdf980fe50740eb3c667bf280c15c56.tar.gz open-keychain-f6643962afdf980fe50740eb3c667bf280c15c56.tar.bz2 open-keychain-f6643962afdf980fe50740eb3c667bf280c15c56.zip | |
allow state loss when yubikey fragment is loaded
Diffstat (limited to 'OpenKeychain/src/main/java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 8c1d23d68..320ccee5d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -596,7 +596,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements manager.beginTransaction() .addToBackStack("yubikey") .replace(R.id.view_key_fragment, frag) - .commit(); + // if this is called while the activity wasn't resumed, just forget it happened + .commitAllowingStateLoss(); } private void encrypt(Uri dataUri, boolean text) { |