ImportKeys: Set "Basic" mode as default for import from file
- For import from keyserver only "Advanced" mode is available because it makes no sense to import all the keys from a search result
This commit is contained in:
@@ -12,4 +12,9 @@ public class BytesLoaderState implements LoaderState {
|
|||||||
mDataUri = dataUri;
|
mDataUri = dataUri;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isBasicModeSupported() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,4 +12,9 @@ public class CloudLoaderState implements LoaderState {
|
|||||||
mCloudPrefs = cloudPrefs;
|
mCloudPrefs = cloudPrefs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isBasicModeSupported() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
package org.sufficientlysecure.keychain.keyimport.processing;
|
package org.sufficientlysecure.keychain.keyimport.processing;
|
||||||
|
|
||||||
public interface LoaderState {
|
public interface LoaderState {
|
||||||
|
|
||||||
|
boolean isBasicModeSupported();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -212,15 +212,14 @@ public class ImportKeysListFragment extends Fragment implements
|
|||||||
mRecyclerView.setAdapter(mAdapter);
|
mRecyclerView.setAdapter(mAdapter);
|
||||||
|
|
||||||
if (dataUri != null || bytes != null) {
|
if (dataUri != null || bytes != null) {
|
||||||
mLoaderState = new BytesLoaderState(bytes, dataUri);
|
loadState(new BytesLoaderState(bytes, dataUri));
|
||||||
} else if (query != null) {
|
} else if (query != null) {
|
||||||
CloudSearchPrefs cloudSearchPrefs
|
CloudSearchPrefs cloudSearchPrefs
|
||||||
= args.getParcelable(ARG_CLOUD_SEARCH_PREFS);
|
= args.getParcelable(ARG_CLOUD_SEARCH_PREFS);
|
||||||
if (cloudSearchPrefs == null) {
|
if (cloudSearchPrefs == null) {
|
||||||
cloudSearchPrefs = Preferences.getPreferences(mActivity).getCloudSearchPrefs();
|
cloudSearchPrefs = Preferences.getPreferences(mActivity).getCloudSearchPrefs();
|
||||||
}
|
}
|
||||||
|
loadState(new CloudLoaderState(query, cloudSearchPrefs));
|
||||||
mLoaderState = new CloudLoaderState(query, cloudSearchPrefs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dataUri == null || PermissionsUtil.checkAndRequestReadPermission(mActivity, dataUri)) {
|
if (dataUri == null || PermissionsUtil.checkAndRequestReadPermission(mActivity, dataUri)) {
|
||||||
@@ -254,10 +253,14 @@ public class ImportKeysListFragment extends Fragment implements
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
||||||
inflater.inflate(R.menu.import_keys_list_fragment, menu);
|
if (mLoaderState != null) {
|
||||||
|
inflater.inflate(R.menu.import_keys_list_fragment, menu);
|
||||||
|
|
||||||
menu.findItem(R.id.basic).setVisible(mAdvanced);
|
MenuItem basicMenuItem = menu.findItem(R.id.basic);
|
||||||
menu.findItem(R.id.advanced).setVisible(!mAdvanced);
|
basicMenuItem.setVisible(mAdvanced && mLoaderState.isBasicModeSupported());
|
||||||
|
MenuItem advancedMenuItem = menu.findItem(R.id.advanced);
|
||||||
|
advancedMenuItem.setVisible(!mAdvanced);
|
||||||
|
}
|
||||||
|
|
||||||
super.onCreateOptionsMenu(menu, inflater);
|
super.onCreateOptionsMenu(menu, inflater);
|
||||||
}
|
}
|
||||||
@@ -315,6 +318,11 @@ public class ImportKeysListFragment extends Fragment implements
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!mLoaderState.isBasicModeSupported()) {
|
||||||
|
mAdvanced = true;
|
||||||
|
}
|
||||||
|
setAdvanced(mAdvanced);
|
||||||
|
|
||||||
restartLoaders();
|
restartLoaders();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user