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

Temporary fix for multi export

Browse Source
This commit is contained in:
Dominik Schürmann
2015-07-08 03:12:20 +02:00
parent 954825a42a
commit 15cee8e7e9
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,6 +118,7 @@ public class KeyListFragment extends LoaderFragment
// This ids for multiple key export.
private ArrayList<Long> mIdsForRepeatAskPassphrase;
private ArrayList<Long> mIdsForExport;
// This index for remembering the number of master key.
private int mIndex;
@@ -642,6 +643,7 @@ public class KeyListFragment extends LoaderFragment
private void showMultiExportDialog(long[] masterKeyIds) {
mIdsForRepeatAskPassphrase = new ArrayList<>();
mIdsForExport = new ArrayList<>();
for (long id : masterKeyIds) {
try {
if (PassphraseCacheService.getCachedPassphrase(
@@ -651,6 +653,7 @@ public class KeyListFragment extends LoaderFragment
} catch (PassphraseCacheService.KeyNotFoundException e) {
// This happens when the master key is stripped
// and ignore this key.
mIdsForExport.add(id);
}
}
mIndex = 0;
@@ -658,13 +661,9 @@ public class KeyListFragment extends LoaderFragment
startPassphraseActivity();
return;
}
long[] idsForMultiExport = new long[mIdsForRepeatAskPassphrase.size()];
for (int i = 0; i < mIdsForRepeatAskPassphrase.size(); ++i) {
idsForMultiExport[i] = mIdsForRepeatAskPassphrase.get(i);
}
mExportHelper.showExportKeysDialog(idsForMultiExport,
Constants.Path.APP_DIR_FILE,
mAdapter.isAnySecretSelected());
mIdsForExport.addAll(mIdsForRepeatAskPassphrase);
finishExport();
}
private void startPassphraseActivity() {
@@ -674,6 +673,16 @@ public class KeyListFragment extends LoaderFragment
startActivityForResult(intent, REQUEST_REPEAT_PASSPHRASE);
}
private void finishExport() {
long[] idsForMultiExport = new long[mIdsForExport.size()];
for (int i = 0; i < mIdsForExport.size(); i++) {
idsForMultiExport[i] = mIdsForExport.get(i);
}
mExportHelper.showExportKeysDialog(idsForMultiExport,
Constants.Path.APP_DIR_FILE,
mAdapter.isAnySecretSelected());
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (mImportOpHelper != null) {
@@ -692,13 +701,9 @@ public class KeyListFragment extends LoaderFragment
startPassphraseActivity();
return;
}
long[] idsForMultiExport = new long[mIdsForRepeatAskPassphrase.size()];
for (int i = 0; i < mIdsForRepeatAskPassphrase.size(); ++i) {
idsForMultiExport[i] = mIdsForRepeatAskPassphrase.get(i);
}
mExportHelper.showExportKeysDialog(idsForMultiExport,
Constants.Path.APP_DIR_FILE,
mAdapter.isAnySecretSelected());
mIdsForExport.addAll(mIdsForRepeatAskPassphrase);
finishExport();
}
if (requestCode == REQUEST_ACTION) {