msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added workaround for Yahoo JP

Browse Source
pull/205/head
M66B 3 years ago
parent 82cc2fc620
commit 7ed38b50fe
3 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File

12
app/src/main/java/com/sun/mail/imap/IMAPMessage.java
Unescape View File

@ -1112,6 +1112,18 @@ public class IMAPMessage extends MimeMessage implements ReadableMime {
try {
IMAPProtocol p = getProtocol();
checkExpunged(); // Insure that this message is not expunged
if (flag.contains(javax.mail.Flags.Flag.DELETED) &&
"imap.mail.yahoo.co.jp".equals(p.getInetAddress().getHostName())) {
// NO [CANNOT] STORE It's not possible to perform specified operation
long uid = ((IMAPFolder) getFolder()).getUID(this);
Response[] r = p.command("UID STORE " + uid +
" " + (set ? '+' : '-') + "FLAGS (\\Deleted)", null);
p.notifyResponseHandlers(r);
p.handleResult(r[r.length - 1]);
flag.remove(javax.mail.Flags.Flag.DELETED);
if (flag.getSystemFlags().length == 0)
return;
}
p.storeFlags(getSequenceNumber(), flag, set);
} catch (ConnectionException cex) {
throw new FolderClosedException(folder, cex.getMessage());

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

@ -368,7 +368,7 @@ class Core {
Log.w(folder.name + " ignored=" + op.name);
}
else {
ensureUid(context, folder, message, op, (IMAPFolder) ifolder);
ensureUid(context, account, folder, message, op, (IMAPFolder) ifolder);
switch (op.name) {
case EntityOperation.SEEN:
@ -445,7 +445,7 @@ class Core {
break;
case EntityOperation.PURGE:
onPurgeFolder(context, jargs, folder, (IMAPFolder) ifolder);
onPurgeFolder(context, jargs, account, folder, (IMAPFolder) ifolder);
break;
case EntityOperation.EXPUNGE:
@ -685,7 +685,7 @@ class Core {
}
}
private static void ensureUid(Context context, EntityFolder folder, EntityMessage message, EntityOperation op, IMAPFolder ifolder) throws MessagingException {
private static void ensureUid(Context context, EntityAccount account, EntityFolder folder, EntityMessage message, EntityOperation op, IMAPFolder ifolder) throws MessagingException, IOException {
if (folder.local)
return;
if (message == null || message.uid != null)
@ -707,7 +707,7 @@ class Core {
DB db = DB.getInstance(context);
Long uid = findUid(context, ifolder, message.msgid, false);
Long uid = findUid(context, account, ifolder, message.msgid, false);
if (uid == null) {
if (EntityOperation.MOVE.equals(op.name) &&
EntityFolder.DRAFTS.equals(folder.type))
@ -729,15 +729,25 @@ class Core {
message.uid = uid;
}
private static Long findUid(Context context, IMAPFolder ifolder, String msgid, boolean purge) throws MessagingException {
private static Long findUid(Context context, EntityAccount account, IMAPFolder ifolder, String msgid, boolean purge) throws MessagingException, IOException {
String name = ifolder.getFullName();
Log.i(name + " searching for msgid=" + msgid);
Long uid = null;
Message[] imessages = ifolder.search(new MessageIDTerm(msgid));
Message[] imessages;
// https://stackoverflow.com/questions/18891509/how-to-get-message-from-messageidterm-for-yahoo-imap-profile
if (account.isYahooJp())
imessages = ifolder.search(new ReceivedDateTerm(ComparisonTerm.GE, new Date()));
else
imessages = ifolder.search(new MessageIDTerm(msgid));
if (imessages != null) {
for (Message iexisting : imessages) {
if (account.isYahooJp()) {
MessageHelper helper = new MessageHelper((MimeMessage) iexisting, context);
if (!msgid.equals(helper.getMessageID()))
continue;
}
long muid = ifolder.getUID(iexisting);
if (muid < 0)
continue;
@ -1137,7 +1147,7 @@ class Core {
// Some providers do not list the new message yet
try {
Long found = findUid(context, ifolder, message.msgid, true);
Long found = findUid(context, account, ifolder, message.msgid, true);
if (found != null)
if (newuid == null)
newuid = found;
@ -1175,7 +1185,7 @@ class Core {
int count = 0;
Long found = newuid;
while (found == null && count++ < FIND_RETRY_COUNT) {
found = findUid(context, ifolder, message.msgid, false);
found = findUid(context, account, ifolder, message.msgid, false);
if (found == null)
try {
Thread.sleep(FIND_RETRY_DELAY);
@ -1263,7 +1273,10 @@ class Core {
}
// Some servers return different capabilities for different sessions
boolean canMove = MessageHelper.hasCapability(ifolder, "MOVE");
// NO [CANNOT] MOVE It's not possible to perform specified operation
// https://stackoverflow.com/questions/56148668/cannot-delete-emails-of-domain-co-jp-type
boolean canMove = !account.isYahooJp() &&
MessageHelper.hasCapability(ifolder, "MOVE");
// Some providers do not support the COPY operation for drafts
boolean draft = (EntityFolder.DRAFTS.equals(folder.type) || EntityFolder.DRAFTS.equals(target.type));
@ -1400,7 +1413,7 @@ class Core {
if (TextUtils.isEmpty(msgid))
throw new IllegalArgumentException("move: msgid missing");
Long uid = findUid(context, itarget, msgid, false);
Long uid = findUid(context, account, itarget, msgid, false);
if (uid == null)
throw new IllegalArgumentException("move: uid not found");
@ -2312,7 +2325,7 @@ class Core {
Log.i(folder.name + " subscribed=" + subscribe);
}
private static void onPurgeFolder(Context context, JSONArray jargs, EntityFolder folder, IMAPFolder ifolder) throws MessagingException {
private static void onPurgeFolder(Context context, JSONArray jargs, EntityAccount account, EntityFolder folder, IMAPFolder ifolder) throws MessagingException {
// Delete all messages from folder
try {
DB db = DB.getInstance(context);
@ -2333,6 +2346,10 @@ class Core {
}
EntityLog.log(context, folder.name + " purging=" + idelete.size() + "/" + imessages.length);
if (account.isYahooJp()) {
for (Message imessage : idelete)
imessage.setFlag(Flags.Flag.DELETED, true);
} else
ifolder.setFlags(idelete.toArray(new Message[0]), new Flags(Flags.Flag.DELETED), true);
Log.i(folder.name + " purge deleted");

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

@ -158,6 +158,10 @@ public class EntityAccount extends EntityOrder implements Serializable {
return "imap.gmail.com".equalsIgnoreCase(host);
}
boolean isYahooJp() {
return "imap.mail.yahoo.co.jp".equalsIgnoreCase(host);
}
boolean isTransient(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean enabled = prefs.getBoolean("enabled", true);

Write Preview
Loading…
Cancel
Save