mirror of
https://github.com/M66B/FairEmail.git
synced 2026-01-01 02:21:37 +01:00
Removed POP3 support
There are too many disadvantages likely resulting in too many support questions
This commit is contained in:
@@ -23,8 +23,6 @@ import android.content.Context;
|
||||
import android.text.TextUtils;
|
||||
import android.webkit.MimeTypeMap;
|
||||
|
||||
import com.sun.mail.imap.IMAPMessage;
|
||||
|
||||
import java.io.BufferedOutputStream;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
@@ -36,13 +34,10 @@ import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.nio.charset.Charset;
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.Enumeration;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Properties;
|
||||
|
||||
import javax.activation.DataHandler;
|
||||
@@ -170,25 +165,6 @@ public class MessageHelper {
|
||||
props.put("mail.smtp.writetimeout", Integer.toString(NETWORK_TIMEOUT)); // one thread overhead
|
||||
props.put("mail.smtp.timeout", Integer.toString(NETWORK_TIMEOUT));
|
||||
|
||||
// https://javaee.github.io/javamail/docs/api/com/sun/mail/pop3/package-summary.html
|
||||
props.put("mail.pop3s.ssl.checkserveridentity", checkserveridentity);
|
||||
props.put("mail.pop3s.ssl.trust", "*");
|
||||
props.put("mail.pop3s.starttls.enable", "false");
|
||||
props.put("mail.pop3s.starttls.required", "false");
|
||||
|
||||
props.put("mail.pop3s.connectiontimeout", Integer.toString(NETWORK_TIMEOUT));
|
||||
props.put("mail.pop3s.timeout", Integer.toString(NETWORK_TIMEOUT));
|
||||
props.put("mail.pop3s.writetimeout", Integer.toString(NETWORK_TIMEOUT)); // one thread overhead
|
||||
|
||||
props.put("mail.pop3.ssl.checkserveridentity", checkserveridentity);
|
||||
props.put("mail.pop3.ssl.trust", "*");
|
||||
props.put("mail.pop3.starttls.enable", "true");
|
||||
props.put("mail.pop3.starttls.required", "true");
|
||||
|
||||
props.put("mail.pop3.connectiontimeout", Integer.toString(NETWORK_TIMEOUT));
|
||||
props.put("mail.pop3.timeout", Integer.toString(NETWORK_TIMEOUT));
|
||||
props.put("mail.pop3.writetimeout", Integer.toString(NETWORK_TIMEOUT)); // one thread overhead
|
||||
|
||||
// MIME
|
||||
props.put("mail.mime.allowutf8", "true"); // SMTPTransport, MimeMessage
|
||||
props.put("mail.mime.address.strict", "false");
|
||||
@@ -536,23 +512,7 @@ public class MessageHelper {
|
||||
}
|
||||
|
||||
long getReceived() throws MessagingException {
|
||||
if (imessage instanceof IMAPMessage)
|
||||
return imessage.getReceivedDate().getTime();
|
||||
else {
|
||||
String[] headers = imessage.getHeader("Received");
|
||||
DateFormat df = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z", Locale.ENGLISH);
|
||||
if (headers != null)
|
||||
for (String received : headers) {
|
||||
int i = received.lastIndexOf(';');
|
||||
if (i > 0)
|
||||
try {
|
||||
return df.parse(received.substring(i + 1).trim()).getTime();
|
||||
} catch (java.text.ParseException ex) {
|
||||
// Ignored
|
||||
}
|
||||
}
|
||||
return new Date().getTime();
|
||||
}
|
||||
return imessage.getReceivedDate().getTime();
|
||||
}
|
||||
|
||||
Long getSent() throws MessagingException {
|
||||
|
||||
Reference in New Issue
Block a user