Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-16 22:13:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
M66B
2019-07-29 16:42:17 +02:00
parent f6f43ef575
commit 48a7a714ad
7 changed files with 79 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/ActivityEml.java
View File

@@ -97,7 +97,7 @@ public class ActivityEml extends ActivityBase {
AssetFileDescriptor descriptor = resolver.openTypedAssetFileDescriptor(uri, "*/*", null);
try (InputStream is = descriptor.createInputStream()) {
Properties props = MessageHelper.getSessionProperties(null, false);
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
MimeMessage mmessage = new MimeMessage(isession, is);

4
app/src/main/java/eu/faircode/email/Core.java
View File

@@ -484,7 +484,7 @@ class Core {
db.message().setMessageMsgId(message.id, message.msgid);
}
Properties props = MessageHelper.getSessionProperties(null, false);
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
// Get raw message
@@ -608,7 +608,7 @@ class Core {
imessage.writeTo(os);
}
Properties props = MessageHelper.getSessionProperties(null, false);
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
Message icopy;

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

@@ -1346,7 +1346,7 @@ public class FragmentCompose extends FragmentBase {
}
// Build message
Properties props = MessageHelper.getSessionProperties(null, false);
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
MimeMessage imessage = new MimeMessage(isession);
MessageHelper.build(context, message, attachments, null, imessage);

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

@@ -3798,7 +3798,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
} else {
// Decode message
Properties props = MessageHelper.getSessionProperties(null, false);
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
ByteArrayInputStream is = new ByteArrayInputStream(decrypted.toByteArray());
MimeMessage imessage = new MimeMessage(isession, is);

75
app/src/main/java/eu/faircode/email/MailService.java
View File

@@ -36,14 +36,83 @@ public class MailService implements AutoCloseable {
private Session isession;
private Service iservice;
private final static int CONNECT_TIMEOUT = 20 * 1000; // milliseconds
private final static int WRITE_TIMEOUT = 60 * 1000; // milliseconds
private final static int READ_TIMEOUT = 60 * 1000; // milliseconds
private final static int FETCH_SIZE = 256 * 1024; // bytes, default 16K
private final static int POOL_TIMEOUT = 45 * 1000; // milliseconds, default 45 sec
private static final int APPEND_BUFFER_SIZE = 4 * 1024 * 1024; // bytes
private MailService() {
}
MailService(Context context, String protocol, String realm, boolean insecure, boolean debug) {
this.context = context;
MailService(Context context, String protocol, String realm, boolean insecure, boolean debug) throws NoSuchProviderException {
this.context = context.getApplicationContext();
this.protocol = protocol;
this.debug = debug;
this.properties = MessageHelper.getSessionProperties(realm, insecure);
this.properties = MessageHelper.getSessionProperties();
this.properties.put("mail.event.scope", "folder");
String checkserveridentity = Boolean.toString(!insecure).toLowerCase();
if ("imap".equals(protocol) || "imaps".equals(protocol)) {
// https://javaee.github.io/javamail/docs/api/com/sun/mail/imap/package-summary.html#properties
this.properties.put("mail." + this.protocol + ".ssl.checkserveridentity", checkserveridentity);
this.properties.put("mail." + this.protocol + ".ssl.trust", "*");
this.properties.put("mail.imaps.starttls.enable", "false");
this.properties.put("mail.imap.starttls.enable", "true");
this.properties.put("mail.imap.starttls.required", "true");
if (realm != null)
this.properties.put("mail." + this.protocol + ".auth.ntlm.domain", realm);
// TODO: make timeouts configurable?
this.properties.put("mail." + this.protocol + ".connectiontimeout", Integer.toString(CONNECT_TIMEOUT));
this.properties.put("mail." + this.protocol + ".writetimeout", Integer.toString(WRITE_TIMEOUT)); // one thread overhead
this.properties.put("mail." + this.protocol + ".timeout", Integer.toString(READ_TIMEOUT));
this.properties.put("mail." + this.protocol + ".connectionpool.debug", "true");
this.properties.put("mail." + this.protocol + ".connectionpoolsize", "2");
this.properties.put("mail." + this.protocol + ".connectionpooltimeout", Integer.toString(POOL_TIMEOUT));
this.properties.put("mail." + this.protocol + ".finalizecleanclose", "false");
// https://tools.ietf.org/html/rfc4978
// https://docs.oracle.com/javase/8/docs/api/java/util/zip/Deflater.html
this.properties.put("mail." + this.protocol + ".compress.enable", "true");
//this.properties.put("mail.imaps.compress.level", "-1");
//this.properties.put("mail.imaps.compress.strategy", "0");
this.properties.put("mail." + this.protocol + ".throwsearchexception", "true");
this.properties.put("mail." + this.protocol + ".fetchsize", Integer.toString(FETCH_SIZE));
this.properties.put("mail." + this.protocol + ".peek", "true");
this.properties.put("mail." + this.protocol + ".appendbuffersize", Integer.toString(APPEND_BUFFER_SIZE));
} else if ("smtp".equals(protocol) || "smtps".equals(protocol)) {
// https://javaee.github.io/javamail/docs/api/com/sun/mail/smtp/package-summary.html#properties
this.properties.put("mail." + this.protocol + ".ssl.checkserveridentity", checkserveridentity);
this.properties.put("mail." + this.protocol + ".ssl.trust", "*");
this.properties.put("mail.smtps.starttls.enable", "false");
this.properties.put("mail.smtp.starttls.enable", "true");
this.properties.put("mail.smtp.starttls.required", "true");
this.properties.put("mail." + this.protocol + ".auth", "true");
if (realm != null)
this.properties.put("mail." + this.protocol + ".auth.ntlm.domain", realm);
this.properties.put("mail." + this.protocol + ".connectiontimeout", Integer.toString(CONNECT_TIMEOUT));
this.properties.put("mail." + this.protocol + ".writetimeout", Integer.toString(WRITE_TIMEOUT)); // one thread overhead
this.properties.put("mail." + this.protocol + ".timeout", Integer.toString(READ_TIMEOUT));
} else
throw new NoSuchProviderException(protocol);
}
void setPartialFetch(boolean enabled) {

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

@@ -74,16 +74,7 @@ import biweekly.ICalendar;
public class MessageHelper {
private MimeMessage imessage;
private final static int CONNECT_TIMEOUT = 20 * 1000; // milliseconds
private final static int WRITE_TIMEOUT = 60 * 1000; // milliseconds
private final static int READ_TIMEOUT = 60 * 1000; // milliseconds
private final static int FETCH_SIZE = 256 * 1024; // bytes, default 16K
private final static int POOL_TIMEOUT = 45 * 1000; // milliseconds, default 45 sec
private static final int APPEND_BUFFER_SIZE = 4 * 1024 * 1024; // bytes
static final int SMALL_MESSAGE_SIZE = 32 * 1024; // bytes
static final int DEFAULT_ATTACHMENT_DOWNLOAD_SIZE = 256 * 1024; // bytes
static void setSystemProperties(Context context) {
@@ -101,95 +92,9 @@ public class MessageHelper {
System.setProperty("mail.mime.multipart.ignoreexistingboundaryparameter", "true");
}
static Properties getSessionProperties(String realm, boolean insecure) {
static Properties getSessionProperties() {
Properties props = new Properties();
props.put("mail.event.scope", "folder");
String checkserveridentity = Boolean.toString(!insecure).toLowerCase();
// https://javaee.github.io/javamail/docs/api/com/sun/mail/imap/package-summary.html#properties
props.put("mail.imaps.ssl.checkserveridentity", checkserveridentity);
props.put("mail.imaps.ssl.trust", "*");
props.put("mail.imaps.starttls.enable", "false");
if (realm != null)
props.put("mail.imaps.auth.ntlm.domain", realm);
// TODO: make timeouts configurable?
props.put("mail.imaps.connectiontimeout", Integer.toString(CONNECT_TIMEOUT));
props.put("mail.imaps.writetimeout", Integer.toString(WRITE_TIMEOUT)); // one thread overhead
props.put("mail.imaps.timeout", Integer.toString(READ_TIMEOUT));
props.put("mail.imaps.connectionpool.debug", "true");
props.put("mail.imaps.connectionpoolsize", "2");
props.put("mail.imaps.connectionpooltimeout", Integer.toString(POOL_TIMEOUT));
props.put("mail.imaps.finalizecleanclose", "false");
// https://tools.ietf.org/html/rfc4978
// https://docs.oracle.com/javase/8/docs/api/java/util/zip/Deflater.html
props.put("mail.imaps.compress.enable", "true");
//props.put("mail.imaps.compress.level", "-1");
//props.put("mail.imaps.compress.strategy", "0");
props.put("mail.imaps.throwsearchexception", "true");
props.put("mail.imaps.fetchsize", Integer.toString(FETCH_SIZE));
props.put("mail.imaps.peek", "true");
props.put("mail.imaps.appendbuffersize", Integer.toString(APPEND_BUFFER_SIZE));
props.put("mail.imap.ssl.checkserveridentity", checkserveridentity);
props.put("mail.imap.ssl.trust", "*");
props.put("mail.imap.starttls.enable", "true");
props.put("mail.imap.starttls.required", "true");
if (realm != null)
props.put("mail.imap.auth.ntlm.domain", realm);
props.put("mail.imap.connectiontimeout", Integer.toString(CONNECT_TIMEOUT));
props.put("mail.imap.writetimeout", Integer.toString(WRITE_TIMEOUT)); // one thread overhead
props.put("mail.imap.timeout", Integer.toString(READ_TIMEOUT));
props.put("mail.imap.connectionpool.debug", "true");
props.put("mail.imap.connectionpoolsize", "2");
props.put("mail.imap.connectionpooltimeout", Integer.toString(POOL_TIMEOUT));
props.put("mail.imap.finalizecleanclose", "false");
props.put("mail.imap.compress.enable", "true");
props.put("mail.imap.throwsearchexception", "true");
props.put("mail.imap.fetchsize", Integer.toString(FETCH_SIZE));
props.put("mail.imap.peek", "true");
props.put("mail.imap.appendbuffersize", Integer.toString(APPEND_BUFFER_SIZE));
// https://javaee.github.io/javamail/docs/api/com/sun/mail/smtp/package-summary.html#properties
props.put("mail.smtps.ssl.checkserveridentity", checkserveridentity);
props.put("mail.smtps.ssl.trust", "*");
props.put("mail.smtps.starttls.enable", "false");
props.put("mail.smtps.starttls.required", "false");
props.put("mail.smtps.auth", "true");
if (realm != null)
props.put("mail.smtps.auth.ntlm.domain", realm);
props.put("mail.smtps.connectiontimeout", Integer.toString(CONNECT_TIMEOUT));
props.put("mail.smtps.writetimeout", Integer.toString(WRITE_TIMEOUT)); // one thread overhead
props.put("mail.smtps.timeout", Integer.toString(READ_TIMEOUT));
props.put("mail.smtp.ssl.checkserveridentity", checkserveridentity);
props.put("mail.smtp.ssl.trust", "*");
props.put("mail.smtp.starttls.enable", "true");
props.put("mail.smtp.starttls.required", "true");
props.put("mail.smtp.auth", "true");
if (realm != null)
props.put("mail.smtp.auth.ntlm.domain", realm);
props.put("mail.smtp.connectiontimeout", Integer.toString(CONNECT_TIMEOUT));
props.put("mail.smtp.writetimeout", Integer.toString(WRITE_TIMEOUT)); // one thread overhead
props.put("mail.smtp.timeout", Integer.toString(READ_TIMEOUT));
// MIME
props.put("mail.mime.allowutf8", "false"); // SMTPTransport, MimeMessage
props.put("mail.mime.address.strict", "false");

2
app/src/main/java/eu/faircode/email/ServiceSend.java
View File

@@ -310,7 +310,7 @@ public class ServiceSend extends ServiceBase {
throw new IllegalArgumentException("Identity not found");
// Create message
Properties props = MessageHelper.getSessionProperties(null, false);
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
MimeMessage imessage = MessageHelper.from(this, message, ident, isession);