aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-09-22 21:55:02 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2013-09-22 21:55:02 +0200
commit47acc45934b19118e99a3c35a2044d3a1c7d0a5f (patch)
treec4c1c07c7e1b81ee924d9dd5b5152ea4dd1ff46c /OpenPGP-Keychain
parentb5c0e4478c06cbc8c676df75ac69760473136293 (diff)
downloadopen-keychain-47acc45934b19118e99a3c35a2044d3a1c7d0a5f.tar.gz
open-keychain-47acc45934b19118e99a3c35a2044d3a1c7d0a5f.tar.bz2
open-keychain-47acc45934b19118e99a3c35a2044d3a1c7d0a5f.zip
Fix file import, part 2
Diffstat (limited to 'OpenPGP-Keychain')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 2c7a3ea45..132e644bc 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -166,6 +166,7 @@ public class ImportKeysActivity extends SherlockFragmentActivity implements OnNa
mListFragment = ImportKeysListFragment.newInstance(bytes, filename);
// Add the fragment to the 'fragment_container' FrameLayout
+ // NOTE: We use commitAllowingStateLoss() to prevent wierd crashes!
getSupportFragmentManager().beginTransaction()
.replace(R.id.import_keys_list_container, mListFragment)
.commitAllowingStateLoss();
@@ -209,11 +210,7 @@ public class ImportKeysActivity extends SherlockFragmentActivity implements OnNa
}
public void loadCallback(byte[] importData, String importFilename) {
- if (mListFragment == null) {
- startListFragment(null, importData, importFilename);
- } else {
- mListFragment.loadNew(importData, importFilename);
- }
+ mListFragment.loadNew(importData, importFilename);
}
@Override