aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-06-03 02:04:43 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-06-03 02:04:43 +0200
commit5496b42fe6c0250859d6d1341d8b6333197a3a80 (patch)
treefae75d516697151731d5ad37c164497b03617db8 /OpenKeychain/src/main/java
parent5917303c1d8acede5dee7e9d367dc629d49113ef (diff)
downloadopen-keychain-5496b42fe6c0250859d6d1341d8b6333197a3a80.tar.gz
open-keychain-5496b42fe6c0250859d6d1341d8b6333197a3a80.tar.bz2
open-keychain-5496b42fe6c0250859d6d1341d8b6333197a3a80.zip
get back to a working state
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesListFragment.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesListFragment.java
index bf21421a1..72f6d9d03 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesListFragment.java
@@ -138,13 +138,15 @@ public class DecryptFilesListFragment extends CryptoOperationFragment {
private void displayInputUris(ArrayList<Uri> uris) {
mInputUris = uris;
- mOutputUris = new ArrayList<>(uris.size());
+ // mOutputUris = new ArrayList<>(uris.size());
for (Uri uri : uris) {
mAdapter.add(uri);
+ /*
String targetName = (mEncryptFilenames ? String.valueOf(filenameCounter) : FileHelper.getFilename(getActivity(), model.inputUri))
+ (mUseArmor ? Constants.FILE_EXTENSION_ASC : Constants.FILE_EXTENSION_PGP_MAIN);
mOutputUris.add(TemporaryStorageProvider.createFile(getActivity(), targetName));
filenameCounter++;
+ */
}
mPendingInputUris = uris;
@@ -230,8 +232,8 @@ public class DecryptFilesListFragment extends CryptoOperationFragment {
Log.d(Constants.TAG, "mInputUri=" + mCurrentInputUri + ", mOutputUri=" + 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.EXTRA_CRYPTO_INPUT, cryptoInput);