diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-04 18:59:40 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-04 18:59:40 +0100 |
| commit | b78a564de3d8c3771d2e8ae445e0a43b026531ab (patch) | |
| tree | 665ac6fb5c31edd174ca332176185f5dc010e570 | |
| parent | 82b0fba47dee42128335d172b2c3fb28927661d1 (diff) | |
| download | open-keychain-b78a564de3d8c3771d2e8ae445e0a43b026531ab.tar.gz open-keychain-b78a564de3d8c3771d2e8ae445e0a43b026531ab.tar.bz2 open-keychain-b78a564de3d8c3771d2e8ae445e0a43b026531ab.zip | |
temporary fix for nullpointer on orientation change in import activity
| -rw-r--r-- | OpenPGP-Keychain/src/main/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java | 15 |
2 files changed, 11 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml index 4102a882e..d970770f5 100644 --- a/OpenPGP-Keychain/src/main/AndroidManifest.xml +++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml @@ -254,6 +254,7 @@ android:label="@string/title_certify_key" /> <activity android:name=".ui.ImportKeysActivity" + android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_import_keys" android:launchMode="singleTop" android:windowSoftInputMode="stateHidden"> diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java index 68d318491..cfcb202b9 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java @@ -136,7 +136,7 @@ public class ImportKeysListFragment extends ListFragment implements getLoaderManager().initLoader(LOADER_ID_BYTES, null, this); } - if (mServerQuery != null) { + if (mServerQuery != null && mKeyServer != null) { // Start out with a progress indicator. setListShown(false); @@ -165,14 +165,19 @@ public class ImportKeysListFragment extends ListFragment implements mServerQuery = serverQuery; mKeyServer = keyServer; - // Start out with a progress indicator. - setListShown(false); + if (mKeyBytes != null || mDataUri != null) { + // Start out with a progress indicator. + setListShown(false); - if (mKeyBytes != null || mDataUri != null) getLoaderManager().restartLoader(LOADER_ID_BYTES, null, this); + } + + if (mServerQuery != null && mKeyServer != null) { + // Start out with a progress indicator. + setListShown(false); - if (mServerQuery != null && mKeyServer != null) getLoaderManager().restartLoader(LOADER_ID_SERVER_QUERY, null, this); + } } @Override |