Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-06 00:53:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sign-only fixes

Browse Source
This commit is contained in:
M66B
2019-11-30 09:22:16 +01:00
parent 8b8c3b539b
commit ec365a4a9b
8 changed files with 89 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -4112,12 +4112,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
return null;
InputStream in = null;
OutputStream out = null;
boolean inline = false;
File plain = File.createTempFile("plain", "." + message.id, context.getCacheDir());
// Find encrypted data
for (EntityAttachment attachment : attachments)
if (EntityAttachment.PGP_MESSAGE.equals(attachment.encryption) ||
EntityAttachment.PGP_CONTENT.equals(attachment.encryption)) {
if (EntityAttachment.PGP_CONTENT.equals(attachment.encryption) ||
EntityAttachment.PGP_MESSAGE.equals(attachment.encryption)) {
if (!attachment.available)
if (auto)
return null;
@@ -4126,14 +4128,17 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
File file = attachment.getFile(context);
in = new FileInputStream(file);
break;
if (EntityAttachment.PGP_MESSAGE.equals(attachment.encryption))
out = new FileOutputStream(plain);
} else if (EntityAttachment.PGP_SIGNATURE.equals(attachment.encryption)) {
File file = attachment.getFile(context);
byte[] signature = new byte[(int) file.length()];
try (FileInputStream fis = new FileInputStream(file)) {
fis.read(signature);
}
data.putExtra(OpenPgpApi.ACTION_DETACHED_SIGN, signature);
data.putExtra(OpenPgpApi.EXTRA_DETACHED_SIGNATURE, signature);
}
if (in == null) {
@@ -4167,74 +4172,74 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
throw new IllegalArgumentException(context.getString(R.string.title_not_encrypted));
Intent result;
File plain = File.createTempFile("plain", "." + message.id, context.getCacheDir());
try {
// Decrypt message
Log.i("Executing " + data.getAction());
Log.logExtras(data);
OpenPgpApi api = new OpenPgpApi(context, pgpService.getService());
result = api.executeApi(data, in, new FileOutputStream(plain));
result = api.executeApi(data, in, out);
int resultCode = result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);
Log.i("Result action=" + data.getAction() + " code=" + resultCode);
Log.logExtras(data);
switch (resultCode) {
case OpenPgpApi.RESULT_CODE_SUCCESS:
if (inline) {
try {
db.beginTransaction();
if (out != null)
if (inline) {
try {
db.beginTransaction();
// Write decrypted body
Helper.copy(plain, message.getFile(context));
db.message().setMessageStored(message.id, new Date().getTime());
// Write decrypted body
Helper.copy(plain, message.getFile(context));
db.message().setMessageStored(message.id, new Date().getTime());
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
} else {
// Decode message
MessageHelper.MessageParts parts;
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
try (InputStream fis = new FileInputStream(plain)) {
MimeMessage imessage = new MimeMessage(isession, fis);
MessageHelper helper = new MessageHelper(imessage);
parts = helper.getMessageParts();
}
try {
db.beginTransaction();
// Write decrypted body
String html = parts.getHtml(context);
Helper.writeText(message.getFile(context), html);
// Remove existing attachments
db.attachment().deleteAttachments(message.id);
// Add decrypted attachments
List<EntityAttachment> remotes = parts.getAttachments();
for (int index = 0; index < remotes.size(); index++) {
EntityAttachment remote = remotes.get(index);
remote.message = message.id;
remote.sequence = index + 1;
remote.id = db.attachment().insertAttachment(remote);
try {
parts.downloadAttachment(context, index, remote);
} catch (Throwable ex) {
Log.e(ex);
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
db.message().setMessageStored(message.id, new Date().getTime());
} else {
// Decode message
MessageHelper.MessageParts parts;
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
try (InputStream fis = new FileInputStream(plain)) {
MimeMessage imessage = new MimeMessage(isession, fis);
MessageHelper helper = new MessageHelper(imessage);
parts = helper.getMessageParts();
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
try {
db.beginTransaction();
// Write decrypted body
String html = parts.getHtml(context);
Helper.writeText(message.getFile(context), html);
// Remove existing attachments
db.attachment().deleteAttachments(message.id);
// Add decrypted attachments
List<EntityAttachment> remotes = parts.getAttachments();
for (int index = 0; index < remotes.size(); index++) {
EntityAttachment remote = remotes.get(index);
remote.message = message.id;
remote.sequence = index + 1;
remote.id = db.attachment().insertAttachment(remote);
try {
parts.downloadAttachment(context, index, remote);
} catch (Throwable ex) {
Log.e(ex);
}
}
db.message().setMessageStored(message.id, new Date().getTime());
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
}
}
// Check signature status
OpenPgpSignatureResult sigResult = result.getParcelableExtra(OpenPgpApi.RESULT_SIGNATURE);