mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed encrypted signature / original message

This commit is contained in:
M66B 2019-09-17 17:10:23 +02:00
parent 48c2dd9b20
commit 4749dace7f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -1411,6 +1411,9 @@ public class FragmentCompose extends FragmentBase {
EntityMessage message = db.message().getMessage(id);
if (message == null)
throw new MessageRemovedException();
EntityIdentity identity = db.identity().getIdentity(message.identity);
if (identity == null)
throw new IllegalArgumentException(getString(R.string.title_from_missing));
List<EntityAttachment> attachments = db.attachment().getAttachments(id);
for (EntityAttachment attachment : new ArrayList<>(attachments))
@ -1424,7 +1427,7 @@ public class FragmentCompose extends FragmentBase {
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
MimeMessage imessage = new MimeMessage(isession);
MessageHelper.build(context, message, attachments, null, imessage);
MessageHelper.build(context, message, attachments, identity, imessage);
// Serialize message
ByteArrayOutputStream os = new ByteArrayOutputStream();
@ -1449,10 +1452,6 @@ public class FragmentCompose extends FragmentBase {
Log.logExtras(result);
}
// Identity to store sign key ID into
EntityIdentity identity =
(message.identity == null ? null : db.identity().getIdentity(message.identity));
int resultCode = result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);
switch (resultCode) {
case OpenPgpApi.RESULT_CODE_SUCCESS: