mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-03 05:34:51 +00:00
Code Issues Releases Wiki Activity

Prevent hanging LOGOUT

Browse source
This commit is contained in:
M66B 2020-08-27 09:39:11 +02:00
parent fff231b9fa
commit cff6d1a8a2
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
View file

@ -462,6 +462,8 @@ public class IMAPProtocol extends Protocol {
*/ */
public void logout() throws ProtocolException { public void logout() throws ProtocolException {
try { try {
if (!authenticated)
return;
Response[] r = command("LOGOUT", null); Response[] r = command("LOGOUT", null);
authenticated = false; authenticated = false;

14
patches/JavaMail.patch
View file

@ -265,10 +265,18 @@ diff -rupN /home/marcel/JavaMail/mail/src/main/java/com/sun/mail/imap/IMAPStore.
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
// If someone is trying to interrupt us we can't keep going // If someone is trying to interrupt us we can't keep going
// around the loop waiting for IDLE to complete, but we can't // around the loop waiting for IDLE to complete, but we can't
diff -rupN /home/marcel/JavaMail/mail/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java ./app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
--- /home/marcel/JavaMail/mail/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java 2020-08-14 11:44:05.406359065 +0200 --- /home/marcel/JavaMail/mail/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java 2020-08-14 11:44:05.406359065 +0200
+++ ./app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java 2020-08-10 18:05:30.293227224 +0200 +++ ./app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java 2020-08-27 09:28:55.701456371 +0200
@@ -627,6 +627,59 @@ public class IMAPProtocol extends Protoc @@ -462,6 +462,8 @@ public class IMAPProtocol extends Protoc
*/
public void logout() throws ProtocolException {
try {
+ if (!authenticated)
+ return;
Response[] r = command("LOGOUT", null);
authenticated = false;
@@ -627,6 +629,59 @@ public class IMAPProtocol extends Protoc
authenticated = true; authenticated = true;
} }