From 4aec28c2377faf7f25ff3598eccbb1b74a45b792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 20 Jun 2014 15:14:34 +0200 Subject: Fix update from keyserver flow --- .../sufficientlysecure/keychain/ui/ImportKeysActivity.java | 1 + .../keychain/ui/ImportKeysListFragment.java | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index e829df7a0..07587b599 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -212,6 +212,7 @@ public class ImportKeysActivity extends ActionBarActivity { serverBundle = new Bundle(); serverBundle.putString(ImportKeysServerFragment.ARG_QUERY, query); serverBundle.putBoolean(ImportKeysServerFragment.ARG_DISABLE_QUERY_EDIT, true); + // display server tab only serverOnly = true; mSwitchToTab = NAV_SERVER; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java index cba6dd78f..45c44803c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java @@ -149,12 +149,13 @@ public class ImportKeysListFragment extends ListFragment implements mAdapter = new ImportKeysAdapter(mActivity); setListAdapter(mAdapter); - if (getArguments().containsKey(ARG_DATA_URI) || getArguments().containsKey(ARG_BYTES)) { - Uri dataUri = getArguments().getParcelable(ARG_DATA_URI); - byte[] bytes = getArguments().getByteArray(ARG_BYTES); + Uri dataUri = getArguments().getParcelable(ARG_DATA_URI); + byte[] bytes = getArguments().getByteArray(ARG_BYTES); + String query = getArguments().getString(ARG_SERVER_QUERY); + + if (dataUri != null || bytes != null) { mLoaderState = new BytesLoaderState(bytes, dataUri); - } else if (getArguments().containsKey(ARG_SERVER_QUERY)) { - String query = getArguments().getString(ARG_SERVER_QUERY); + } else if (query != null) { // TODO: this is used when scanning QR Code or updating a key. // Currently it simply uses keyserver nr 0 String keyserver = Preferences.getPreferences(getActivity()) -- cgit v1.2.3