mirror of https://github.com/M66B/FairEmail.git
Fixed encrypted signature / original message
This commit is contained in:
parent
48c2dd9b20
commit
4749dace7f
|
@ -1411,6 +1411,9 @@ public class FragmentCompose extends FragmentBase {
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
if (message == null)
|
if (message == null)
|
||||||
throw new MessageRemovedException();
|
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);
|
List<EntityAttachment> attachments = db.attachment().getAttachments(id);
|
||||||
for (EntityAttachment attachment : new ArrayList<>(attachments))
|
for (EntityAttachment attachment : new ArrayList<>(attachments))
|
||||||
|
@ -1424,7 +1427,7 @@ public class FragmentCompose extends FragmentBase {
|
||||||
Properties props = MessageHelper.getSessionProperties();
|
Properties props = MessageHelper.getSessionProperties();
|
||||||
Session isession = Session.getInstance(props, null);
|
Session isession = Session.getInstance(props, null);
|
||||||
MimeMessage imessage = new MimeMessage(isession);
|
MimeMessage imessage = new MimeMessage(isession);
|
||||||
MessageHelper.build(context, message, attachments, null, imessage);
|
MessageHelper.build(context, message, attachments, identity, imessage);
|
||||||
|
|
||||||
// Serialize message
|
// Serialize message
|
||||||
ByteArrayOutputStream os = new ByteArrayOutputStream();
|
ByteArrayOutputStream os = new ByteArrayOutputStream();
|
||||||
|
@ -1449,10 +1452,6 @@ public class FragmentCompose extends FragmentBase {
|
||||||
Log.logExtras(result);
|
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);
|
int resultCode = result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);
|
||||||
switch (resultCode) {
|
switch (resultCode) {
|
||||||
case OpenPgpApi.RESULT_CODE_SUCCESS:
|
case OpenPgpApi.RESULT_CODE_SUCCESS:
|
||||||
|
|
Loading…
Reference in New Issue