From 1733edce59fb9633b845929af15e3364d4b6c3d6 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 22 Oct 2021 09:27:24 +0200 Subject: [PATCH] Revert "Experiment: debug wait after EOF" This reverts commit a6f9f34480edfdd9fc3ac7cf6c53e61a6203f01c. --- .../java/com/sun/mail/iap/ResponseInputStream.java | 10 ++-------- .../java/eu/faircode/email/TrafficStatsHelper.java | 7 ------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/sun/mail/iap/ResponseInputStream.java b/app/src/main/java/com/sun/mail/iap/ResponseInputStream.java index 45370d2277..dc6f65078b 100644 --- a/app/src/main/java/com/sun/mail/iap/ResponseInputStream.java +++ b/app/src/main/java/com/sun/mail/iap/ResponseInputStream.java @@ -20,8 +20,6 @@ import java.io.*; import com.sun.mail.iap.ByteArray; import com.sun.mail.util.ASCIIUtility; -import eu.faircode.email.TrafficStatsHelper; - /** * * Inputstream that is used to read a Response. @@ -92,10 +90,8 @@ public class ResponseInputStream { } catch (InterruptedException ex) { eu.faircode.email.Log.w(ex); } - } else if (wait > 1) { - TrafficStatsHelper.debug("Data after=" + wait); + } else wait = 1; - } if (b == '\n') { if ((idx > 0) && buffer[idx-1] == '\r') gotCRLF = true; @@ -162,10 +158,8 @@ public class ResponseInputStream { } catch (InterruptedException ex) { eu.faircode.email.Log.w(ex); } - } else if (wait > 1) { - TrafficStatsHelper.debug("Data after=" + wait); + } else wait = 1; - } count -= actual; idx += actual; } diff --git a/app/src/main/java/eu/faircode/email/TrafficStatsHelper.java b/app/src/main/java/eu/faircode/email/TrafficStatsHelper.java index e0bbd052ae..dcfb935536 100644 --- a/app/src/main/java/eu/faircode/email/TrafficStatsHelper.java +++ b/app/src/main/java/eu/faircode/email/TrafficStatsHelper.java @@ -43,11 +43,4 @@ public class TrafficStatsHelper { else EntityLog.log(ctx, EntityLog.Type.Statistics, msg); } - - public static void debug(String msg) { - if (ctx == null) - Log.e(msg); - else - EntityLog.log(ctx, EntityLog.Type.General, msg); - } }