moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-01-12 14:08:24 -05:00
Code Issues Releases Wiki Activity

Fix decrypt file selection and symmetric decryption failure

Browse Source
This commit is contained in:
Ash Hughes 2013-03-15 23:24:06 +00:00
parent 9985722c6e
commit 4fc4f09e84
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
View File

@ -62,6 +62,7 @@ import android.widget.ViewFlipper;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.BufferedInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.InputStream; import java.io.InputStream;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -642,7 +643,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
} }
try { try {
inStream = new FileInputStream(mInputFilename); inStream = new BufferedInputStream(new FileInputStream(mInputFilename));
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Log.e(Constants.TAG, "File not found!", e); Log.e(Constants.TAG, "File not found!", e);
Toast.makeText(this, getString(R.string.error_fileNotFound, e.getMessage()), Toast.makeText(this, getString(R.string.error_fileNotFound, e.getMessage()),
@ -659,6 +660,9 @@ public class DecryptActivity extends SherlockFragmentActivity {
// get decryption key for this inStream // get decryption key for this inStream
try { try {
try { try {
if (inStream.markSupported()) {
inStream.mark(200); //should probably set this to the max size of two pgpF objects, if it even needs to be anything other than 0.
}
mSecretKeyId = PgpMain.getDecryptionKeyId(this, inStream); mSecretKeyId = PgpMain.getDecryptionKeyId(this, inStream);
if (mSecretKeyId == Id.key.none) { if (mSecretKeyId == Id.key.none) {
throw new PgpMain.PgpGeneralException( throw new PgpMain.PgpGeneralException(
@ -666,6 +670,9 @@ public class DecryptActivity extends SherlockFragmentActivity {
} }
mAssumeSymmetricEncryption = false; mAssumeSymmetricEncryption = false;
} catch (PgpMain.NoAsymmetricEncryptionException e) { } catch (PgpMain.NoAsymmetricEncryptionException e) {
if (inStream.markSupported()) {
inStream.reset();
}
mSecretKeyId = Id.key.symmetric; mSecretKeyId = Id.key.symmetric;
if (!PgpMain.hasSymmetricEncryption(this, inStream)) { if (!PgpMain.hasSymmetricEncryption(this, inStream)) {
throw new PgpMain.PgpGeneralException( throw new PgpMain.PgpGeneralException(
@ -914,7 +921,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
case Id.request.output_filename: { case Id.request.output_filename: {
if (resultCode == RESULT_OK && data != null) { if (resultCode == RESULT_OK && data != null) {
try { try {
String path = data.getData().getPath(); String path = FileHelper.getPath(this, data.getData());
Log.d(Constants.TAG, "path=" + path); Log.d(Constants.TAG, "path=" + path);
mFileDialog.setFilename(path); mFileDialog.setFilename(path);
@ -944,3 +951,4 @@ public class DecryptActivity extends SherlockFragmentActivity {
} }
} }

1
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
View File

@ -192,3 +192,4 @@ public class FileDialogFragment extends DialogFragment {
} }
} }
} }