mirror of https://github.com/M66B/FairEmail.git
PGP simplification
This commit is contained in:
parent
7d17b9a534
commit
236e805d4c
|
@ -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,15 +1567,14 @@ public class FragmentCompose extends FragmentBase {
|
|||
|
||||
// Call OpenPGP
|
||||
Intent result;
|
||||
try (InputStream in = new FileInputStream(plain)) {
|
||||
try (OutputStream out = new FileOutputStream(encrypted)) {
|
||||
try {
|
||||
Log.i("Executing " + data.getAction());
|
||||
Log.logExtras(data);
|
||||
OpenPgpApi api = new OpenPgpApi(context, pgpService.getService());
|
||||
result = api.executeApi(data, in, out);
|
||||
}
|
||||
}
|
||||
|
||||
result = api.executeApi(data, new FileInputStream(plain), new FileOutputStream(encrypted));
|
||||
} finally {
|
||||
plain.delete();
|
||||
}
|
||||
|
||||
// Process result
|
||||
try {
|
||||
|
|
|
@ -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)) {
|
||||
Log.i("Executing " + data.getAction());
|
||||
Log.logExtras(data);
|
||||
OpenPgpApi api = new OpenPgpApi(context, pgpService.getService());
|
||||
result = api.executeApi(data, in, out);
|
||||
}
|
||||
} finally {
|
||||
in.close();
|
||||
}
|
||||
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)) {
|
||||
|
|
Loading…
Reference in New Issue