From f747721559a4cfcfeaed99260fbb8658673f5164 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:55:51 +0100
Subject: [PATCH] Use TinyLog for protocol logging

---
 .../main/java/eu/faircode/email/EmailService.java   | 13 +++++--------
 app/src/main/java/eu/faircode/email/Log.java        |  5 +++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index 6e5d620e96..a685b1b986 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -786,14 +786,11 @@ public class EmailService implements AutoCloseable {
                     try {
                         if (((char) b) == '\n') {
                             String line = bos.toString();
-                            if (!line.endsWith("ignoring socket timeout"))
-                                if (log)
-                                    EntityLog.log(context, EntityLog.Type.Protocol, user + " " + line);
-                                else {
-                                    breadcrumbs.push(line);
-                                    if (BuildConfig.DEBUG)
-                                        Log.i("javamail", user + " " + line);
-                                }
+                            if (log)
+                                if (line.endsWith("ignoring socket timeout"))
+                                    Log.d("javamail", user + " " + line);
+                                else
+                                    Log.w("javamail", user + " " + line);
                             bos.reset();
                         } else
                             bos.write(b);
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 6b513bd3e2..2173fafbeb 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -289,6 +289,11 @@ public class Log {
         return 0;
     }
 
+    public static int w(String tag, String msg) {
+        org.tinylog.Logger.tag(tag).warn(msg);
+        return 0;
+    }
+
     public static int w(Throwable ex) {
         if (BuildConfig.BETA_RELEASE)
             try {