From be6f48a5dea999a7108439ab33f217f7d84cd88d Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 6 Feb 2021 16:14:00 +0100 Subject: [PATCH] Yandex search workaround --- app/src/main/java/com/sun/mail/imap/IMAPFolder.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/java/com/sun/mail/imap/IMAPFolder.java b/app/src/main/java/com/sun/mail/imap/IMAPFolder.java index 67492c55ae..bb21fbb559 100644 --- a/app/src/main/java/com/sun/mail/imap/IMAPFolder.java +++ b/app/src/main/java/com/sun/mail/imap/IMAPFolder.java @@ -2378,6 +2378,13 @@ public class IMAPFolder extends Folder implements UIDFolder, ResponseHandler { } catch (CommandFailedException cfx) { // unsupported charset or search criterion + eu.faircode.email.Log.e(cfx); + Response r = cfx.getResponse(); + if (r != null && r.isNO()) { + String rest = r.getRest(); + if (rest != null && rest.contains("[UNAVAILABLE]")) // Yandex + throw new MessagingException(cfx.getMessage(), cfx); + } return super.search(term); } catch (SearchException sex) { // too complex for IMAP