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

Prevent crash

This commit is contained in:
M66B 2020-02-23 14:22:51 +01:00
parent b1e4d557d5
commit cf97a02442
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1874,8 +1874,11 @@ public class FragmentCompose extends FragmentBase {
} else if (OpenPgpApi.ACTION_DETACHED_SIGN.equals(data.getAction())) {
name = "signature.asc";
encryption = EntityAttachment.PGP_SIGNATURE;
String micalg = result.getStringExtra(OpenPgpApi.RESULT_SIGNATURE_MICALG);
if (TextUtils.isEmpty(micalg))
throw new IllegalArgumentException("micalg missing");
ct = new ContentType("application/pgp-signature");
ct.setParameter("micalg", result.getStringExtra(OpenPgpApi.RESULT_SIGNATURE_MICALG));
ct.setParameter("micalg", micalg);
} else if (OpenPgpApi.ACTION_SIGN_AND_ENCRYPT.equals(data.getAction())) {
name = "encrypted.asc";
encryption = EntityAttachment.PGP_MESSAGE;

12
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -297,8 +297,11 @@ public class MessageHelper {
final ContentType cts = new ContentType(attachment.type);
String micalg = cts.getParameter("micalg");
if (TextUtils.isEmpty(micalg))
Log.e("PGP micalg missing");
ParameterList params = cts.getParameterList();
params.remove("micalg");
if (params != null)
params.remove("micalg");
cts.setParameterList(params);
// Build signature
@ -378,8 +381,13 @@ public class MessageHelper {
final ContentType cts = new ContentType(attachment.type);
String micalg = cts.getParameter("micalg");
if (TextUtils.isEmpty(micalg)) {
Log.e("S/MIME micalg missing");
micalg = "sha-256";
}
ParameterList params = cts.getParameterList();
params.remove("micalg");
if (params != null)
params.remove("micalg");
cts.setParameterList(params);
// Build signature