Stop ImapFolderPusher on CertificateValidationException

This is a permanent error, but apparently not treated as one. I got a certificate error notification every two seconds just now (because LocalKeyStore is broken, see thunderbird#3772). This PR simply stops the pusher on a certificate error.
ippschi · Dec 1, 2018 · 268ccfc · 268ccfc
1 parent bb6427c
commit 268ccfc
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolderPusher.java b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolderPusher.java
@@ -12,6 +12,7 @@
 import java.util.Set;
 
 import com.fsck.k9.mail.AuthenticationFailedException;
+import com.fsck.k9.mail.CertificateValidationException;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.K9MailLib;
 import com.fsck.k9.mail.Message;
@@ -194,6 +195,12 @@ public void run() {
 
                     pushReceiver.authenticationFailed();
                     stop = true;
+                } catch (CertificateValidationException e) {
+                    reacquireWakeLockAndCleanUp();
+
+                    Timber.e(e, "Certificate check failed. Stopping ImapFolderPusher.");
+                    stop = true;
+                    pushReceiver.pushError("Push error for " + getServerId(), e);
                 } catch (Exception e) {
                     reacquireWakeLockAndCleanUp();