moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

get back to a working state

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-06-03 02:04:43 +02:00
parent 5917303c1d
commit 5496b42fe6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesListFragment.java
View File

@ -138,13 +138,15 @@ public class DecryptFilesListFragment extends CryptoOperationFragment {
private void displayInputUris(ArrayList<Uri> uris) { private void displayInputUris(ArrayList<Uri> uris) {
mInputUris = uris; mInputUris = uris;
mOutputUris = new ArrayList<>(uris.size()); // mOutputUris = new ArrayList<>(uris.size());
for (Uri uri : uris) { for (Uri uri : uris) {
mAdapter.add(uri); mAdapter.add(uri);
/*
String targetName = (mEncryptFilenames ? String.valueOf(filenameCounter) : FileHelper.getFilename(getActivity(), model.inputUri)) String targetName = (mEncryptFilenames ? String.valueOf(filenameCounter) : FileHelper.getFilename(getActivity(), model.inputUri))
+ (mUseArmor ? Constants.FILE_EXTENSION_ASC : Constants.FILE_EXTENSION_PGP_MAIN); + (mUseArmor ? Constants.FILE_EXTENSION_ASC : Constants.FILE_EXTENSION_PGP_MAIN);
mOutputUris.add(TemporaryStorageProvider.createFile(getActivity(), targetName)); mOutputUris.add(TemporaryStorageProvider.createFile(getActivity(), targetName));
filenameCounter++; filenameCounter++;
*/
} }
mPendingInputUris = uris; mPendingInputUris = uris;
@ -230,8 +232,8 @@ public class DecryptFilesListFragment extends CryptoOperationFragment {
Log.d(Constants.TAG, "mInputUri=" + mCurrentInputUri + ", mOutputUri=" + mCurrentOutputUri); Log.d(Constants.TAG, "mInputUri=" + mCurrentInputUri + ", mOutputUri=" + mCurrentOutputUri);
PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel(mCurrentInputUri, mCurrentOutputUri) PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel(mCurrentInputUri, mCurrentOutputUri)
.setAllowSymmetricDecryption(true) // .setDecryptMetadataOnly(true)
.setDecryptMetadataOnly(true); .setAllowSymmetricDecryption(true);
data.putParcelable(KeychainIntentService.DECRYPT_VERIFY_PARCEL, input); data.putParcelable(KeychainIntentService.DECRYPT_VERIFY_PARCEL, input);
data.putParcelable(KeychainIntentService.EXTRA_CRYPTO_INPUT, cryptoInput); data.putParcelable(KeychainIntentService.EXTRA_CRYPTO_INPUT, cryptoInput);