moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

Fix file import, part 2

Browse Source
This commit is contained in:
Dominik Schürmann 2013-09-22 21:55:02 +02:00
parent b5c0e4478c
commit 47acc45934
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
View File

@ -166,6 +166,7 @@ public class ImportKeysActivity extends SherlockFragmentActivity implements OnNa
mListFragment = ImportKeysListFragment.newInstance(bytes, filename); mListFragment = ImportKeysListFragment.newInstance(bytes, filename);
// Add the fragment to the 'fragment_container' FrameLayout // Add the fragment to the 'fragment_container' FrameLayout
// NOTE: We use commitAllowingStateLoss() to prevent wierd crashes!
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.replace(R.id.import_keys_list_container, mListFragment) .replace(R.id.import_keys_list_container, mListFragment)
.commitAllowingStateLoss(); .commitAllowingStateLoss();
@ -209,12 +210,8 @@ public class ImportKeysActivity extends SherlockFragmentActivity implements OnNa
} }
public void loadCallback(byte[] importData, String importFilename) { public void loadCallback(byte[] importData, String importFilename) {
if (mListFragment == null) {
startListFragment(null, importData, importFilename);
} else {
mListFragment.loadNew(importData, importFilename); mListFragment.loadNew(importData, importFilename);
} }
}
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {