diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-16 23:29:59 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-16 23:30:32 +0200 |
| commit | 4b2c8a13094cc53a834ff30b88eaf5e3229c2878 (patch) | |
| tree | 2e30d2d81d979cd0e8978ab175fe747a70369d00 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |
| parent | a81474b7a5b179d29776f2c652609d13dec74536 (diff) | |
| download | open-keychain-4b2c8a13094cc53a834ff30b88eaf5e3229c2878.tar.gz open-keychain-4b2c8a13094cc53a834ff30b88eaf5e3229c2878.tar.bz2 open-keychain-4b2c8a13094cc53a834ff30b88eaf5e3229c2878.zip | |
allow state loss when yubikey fragment is loaded
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.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) { |