moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Add brackets for if-else constructs and externalize the procedure as showMultiExportDialog.

Browse Source
This commit is contained in:
iseki 2015-03-26 11:59:18 +09:00
parent e83532cb19
commit 59a446d7f4
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@ -241,30 +241,7 @@ public class KeyListFragment extends LoaderFragment
} }
case R.id.menu_key_list_multi_export: { case R.id.menu_key_list_multi_export: {
ids = mAdapter.getCurrentSelectedMasterKeyIds(); ids = mAdapter.getCurrentSelectedMasterKeyIds();
mIdsForRepeatAskPassphrase = new ArrayList<Long>(); showMultiExportDialog(ids);
for(long id: ids) {
try {
if (PassphraseCacheService.getCachedPassphrase(
getActivity(), id, id) == null) {
mIdsForRepeatAskPassphrase.add(Long.valueOf(id));
}
} catch (PassphraseCacheService.KeyNotFoundException e) {
// This happens when the master key is stripped
// and ignore this key.
continue;
}
}
mIndex = 0;
if (mIdsForRepeatAskPassphrase.size() != 0) {
startPassphraseActivity();
break;
}
long[] idsForMultiExport = new long[mIdsForRepeatAskPassphrase.size()];
for(int i=0; i<mIdsForRepeatAskPassphrase.size(); ++i)
idsForMultiExport[i] = mIdsForRepeatAskPassphrase.get(i).longValue();
mExportHelper.showExportKeysDialog(idsForMultiExport,
Constants.Path.APP_DIR_FILE,
mAdapter.isAnySecretSelected());
break; break;
} }
case R.id.menu_key_list_multi_select_all: { case R.id.menu_key_list_multi_select_all: {
@ -728,6 +705,34 @@ public class KeyListFragment extends LoaderFragment
getActivity().startService(intent); getActivity().startService(intent);
} }
private void showMultiExportDialog(long[] masterKeyIds) {
mIdsForRepeatAskPassphrase = new ArrayList<Long>();
for(long id: masterKeyIds) {
try {
if (PassphraseCacheService.getCachedPassphrase(
getActivity(), id, id) == null) {
mIdsForRepeatAskPassphrase.add(Long.valueOf(id));
}
} catch (PassphraseCacheService.KeyNotFoundException e) {
// This happens when the master key is stripped
// and ignore this key.
continue;
}
}
mIndex = 0;
if (mIdsForRepeatAskPassphrase.size() != 0) {
startPassphraseActivity();
break;
}
long[] idsForMultiExport = new long[mIdsForRepeatAskPassphrase.size()];
for(int i=0; i<mIdsForRepeatAskPassphrase.size(); ++i) {
idsForMultiExport[i] = mIdsForRepeatAskPassphrase.get(i).longValue();
}
mExportHelper.showExportKeysDialog(idsForMultiExport,
Constants.Path.APP_DIR_FILE,
mAdapter.isAnySecretSelected());
}
private void startPassphraseActivity() { private void startPassphraseActivity() {
Intent intent = new Intent(getActivity(), PassphraseDialogActivity.class); Intent intent = new Intent(getActivity(), PassphraseDialogActivity.class);
long masterKeyId = mIdsForRepeatAskPassphrase.get(mIndex++).longValue(); long masterKeyId = mIdsForRepeatAskPassphrase.get(mIndex++).longValue();
@ -738,15 +743,17 @@ public class KeyListFragment extends LoaderFragment
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_REPEAT_PASSPHRASE) { if (requestCode == REQUEST_REPEAT_PASSPHRASE) {
if(resultCode != Activity.RESULT_OK) if(resultCode != Activity.RESULT_OK) {
return; return;
}
if (mIndex < mIdsForRepeatAskPassphrase.size()) { if (mIndex < mIdsForRepeatAskPassphrase.size()) {
startPassphraseActivity(); startPassphraseActivity();
return; return;
} }
long[] idsForMultiExport = new long[mIdsForRepeatAskPassphrase.size()]; long[] idsForMultiExport = new long[mIdsForRepeatAskPassphrase.size()];
for(int i=0; i<mIdsForRepeatAskPassphrase.size(); ++i) for(int i=0; i<mIdsForRepeatAskPassphrase.size(); ++i) {
idsForMultiExport[i] = mIdsForRepeatAskPassphrase.get(i).longValue(); idsForMultiExport[i] = mIdsForRepeatAskPassphrase.get(i).longValue();
}
mExportHelper.showExportKeysDialog(idsForMultiExport, mExportHelper.showExportKeysDialog(idsForMultiExport,
Constants.Path.APP_DIR_FILE, Constants.Path.APP_DIR_FILE,
mAdapter.isAnySecretSelected()); mAdapter.isAnySecretSelected());