cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temporary fix for nullpointer on orientation change in import activity

Browse Source
This commit is contained in:
Dominik Schürmann
2014-02-04 18:59:40 +01:00
parent 82b0fba47d
commit b78a564de3
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenPGP-Keychain/src/main/AndroidManifest.xml
View File

@@ -254,6 +254,7 @@
android:label="@string/title_certify_key" /> android:label="@string/title_certify_key" />
<activity <activity
android:name=".ui.ImportKeysActivity" android:name=".ui.ImportKeysActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_import_keys" android:label="@string/title_import_keys"
android:launchMode="singleTop" android:launchMode="singleTop"
android:windowSoftInputMode="stateHidden"> android:windowSoftInputMode="stateHidden">

15
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
View File

@@ -136,7 +136,7 @@ public class ImportKeysListFragment extends ListFragment implements
getLoaderManager().initLoader(LOADER_ID_BYTES, null, this); getLoaderManager().initLoader(LOADER_ID_BYTES, null, this);
} }
if (mServerQuery != null) { if (mServerQuery != null && mKeyServer != null) {
// Start out with a progress indicator. // Start out with a progress indicator.
setListShown(false); setListShown(false);
@@ -165,14 +165,19 @@ public class ImportKeysListFragment extends ListFragment implements
mServerQuery = serverQuery; mServerQuery = serverQuery;
mKeyServer = keyServer; mKeyServer = keyServer;
// Start out with a progress indicator. if (mKeyBytes != null || mDataUri != null) {
setListShown(false); // Start out with a progress indicator.
setListShown(false);
if (mKeyBytes != null || mDataUri != null)
getLoaderManager().restartLoader(LOADER_ID_BYTES, null, this); 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); getLoaderManager().restartLoader(LOADER_ID_SERVER_QUERY, null, this);
}
} }
@Override @Override