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

PGP simplification

This commit is contained in:
M66B 2019-10-27 10:21:35 +01:00
parent 7d17b9a534
commit 236e805d4c
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1550,16 +1550,16 @@ public class FragmentCompose extends FragmentBase {
attachments.remove(attachment);
}
// Create temporary files
File plain = File.createTempFile("plain", "." + id, context.getCacheDir());
File encrypted = File.createTempFile("encrypted", "." + id, context.getCacheDir());
// Build message
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
MimeMessage imessage = new MimeMessage(isession);
MessageHelper.build(context, message, attachments, identity, imessage);
// Create temporary files
File plain = File.createTempFile("plain", "." + id, context.getCacheDir());
File encrypted = File.createTempFile("encrypted", "." + id, context.getCacheDir());
// Serialize message
try (OutputStream out = new FileOutputStream(plain)) {
imessage.writeTo(out);
@ -1567,16 +1567,15 @@ public class FragmentCompose extends FragmentBase {
// Call OpenPGP
Intent result;
try (InputStream in = new FileInputStream(plain)) {
try (OutputStream out = new FileOutputStream(encrypted)) {
Log.i("Executing " + data.getAction());
OpenPgpApi api = new OpenPgpApi(context, pgpService.getService());
result = api.executeApi(data, in, out);
}
try {
Log.i("Executing " + data.getAction());
Log.logExtras(data);
OpenPgpApi api = new OpenPgpApi(context, pgpService.getService());
result = api.executeApi(data, new FileInputStream(plain), new FileOutputStream(encrypted));
} finally {
plain.delete();
}
plain.delete();
// Process result
try {
int resultCode = result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);

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

@ -3888,14 +3888,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
File plain = File.createTempFile("plain", "." + id, context.getCacheDir());
try {
// Decrypt message
try {
try (OutputStream out = new FileOutputStream(plain)) {
OpenPgpApi api = new OpenPgpApi(context, pgpService.getService());
result = api.executeApi(data, in, out);
}
} finally {
in.close();
}
Log.i("Executing " + data.getAction());
Log.logExtras(data);
OpenPgpApi api = new OpenPgpApi(context, pgpService.getService());
result = api.executeApi(data, in, new FileOutputStream(plain));
Log.i("PGP result=" + result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR));
switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) {