mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-25 00:18:51 -05:00
Format KeyListFragment
This commit is contained in:
parent
555b0bf757
commit
f2d3abd4c9
@ -681,17 +681,16 @@ public class KeyListFragment extends LoaderFragment
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void showMultiExportDialog(long[] masterKeyIds) {
|
private void showMultiExportDialog(long[] masterKeyIds) {
|
||||||
mIdsForRepeatAskPassphrase = new ArrayList<Long>();
|
mIdsForRepeatAskPassphrase = new ArrayList<>();
|
||||||
for (long id : masterKeyIds) {
|
for (long id : masterKeyIds) {
|
||||||
try {
|
try {
|
||||||
if (PassphraseCacheService.getCachedPassphrase(
|
if (PassphraseCacheService.getCachedPassphrase(
|
||||||
getActivity(), id, id) == null) {
|
getActivity(), id, id) == null) {
|
||||||
mIdsForRepeatAskPassphrase.add(Long.valueOf(id));
|
mIdsForRepeatAskPassphrase.add(id);
|
||||||
}
|
}
|
||||||
} catch (PassphraseCacheService.KeyNotFoundException e) {
|
} catch (PassphraseCacheService.KeyNotFoundException e) {
|
||||||
// This happens when the master key is stripped
|
// This happens when the master key is stripped
|
||||||
// and ignore this key.
|
// and ignore this key.
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mIndex = 0;
|
mIndex = 0;
|
||||||
@ -701,7 +700,7 @@ public class KeyListFragment extends LoaderFragment
|
|||||||
}
|
}
|
||||||
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);
|
||||||
}
|
}
|
||||||
mExportHelper.showExportKeysDialog(idsForMultiExport,
|
mExportHelper.showExportKeysDialog(idsForMultiExport,
|
||||||
Constants.Path.APP_DIR_FILE,
|
Constants.Path.APP_DIR_FILE,
|
||||||
@ -710,7 +709,7 @@ public class KeyListFragment extends LoaderFragment
|
|||||||
|
|
||||||
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++);
|
||||||
intent.putExtra(PassphraseDialogActivity.EXTRA_SUBKEY_ID, masterKeyId);
|
intent.putExtra(PassphraseDialogActivity.EXTRA_SUBKEY_ID, masterKeyId);
|
||||||
startActivityForResult(intent, REQUEST_REPEAT_PASSPHRASE);
|
startActivityForResult(intent, REQUEST_REPEAT_PASSPHRASE);
|
||||||
}
|
}
|
||||||
@ -727,7 +726,7 @@ public class KeyListFragment extends LoaderFragment
|
|||||||
}
|
}
|
||||||
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);
|
||||||
}
|
}
|
||||||
mExportHelper.showExportKeysDialog(idsForMultiExport,
|
mExportHelper.showExportKeysDialog(idsForMultiExport,
|
||||||
Constants.Path.APP_DIR_FILE,
|
Constants.Path.APP_DIR_FILE,
|
||||||
|
Loading…
Reference in New Issue
Block a user