From d81be67338369dcf0e1fcd2aa2a08fed336f35d8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 2 Sep 2023 11:39:14 +0200
Subject: [PATCH] Debug info: blocked senders

---
 app/src/main/java/eu/faircode/email/DaoContact.java | 5 +++++
 app/src/main/java/eu/faircode/email/Log.java        | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/DaoContact.java b/app/src/main/java/eu/faircode/email/DaoContact.java
index 8dd37bb694..d5135ea837 100644
--- a/app/src/main/java/eu/faircode/email/DaoContact.java
+++ b/app/src/main/java/eu/faircode/email/DaoContact.java
@@ -99,6 +99,11 @@ public interface DaoContact {
             " OR type = " + EntityContact.TYPE_FROM + ")")
     int countContacts();
 
+    @Query("SELECT COUNT(*) FROM contact" +
+            " WHERE account = :account" +
+            " AND type = " + EntityContact.TYPE_JUNK)
+    int countBlocked(long account);
+
     @Insert
     long insertContact(EntityContact contact);
 
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index e2b601d487..8267edf168 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -2419,7 +2419,7 @@ public class Log {
                         " auto_optimize=" + auto_optimize + (auto_optimize ? " !!!" : "") +
                         " notifications=" + (filter == null ? null :
                         Helper.getInterruptionFilter(filter) +
-                                (filter == NotificationManager.INTERRUPTION_FILTER_ALL ? "" : "!!!")) + "\r\n" +
+                                (filter == NotificationManager.INTERRUPTION_FILTER_ALL ? "" : " !!!")) + "\r\n" +
                         "accounts=" + accounts.size() +
                         " folders=" + db.folder().countSync() + "/" + db.folder().countTotal() +
                         " messages=" + db.message().countTotal() +
@@ -2499,6 +2499,8 @@ public class Log {
                             messages += folder.messages;
                         }
 
+                        int blocked = db.contact().countBlocked(account.id);
+
                         boolean unmetered = false;
                         boolean ignore_schedule = false;
                         try {
@@ -2522,6 +2524,7 @@ public class Log {
                                 " poll=" + account.poll_interval +
                                 " ondemand=" + account.ondemand + (account.ondemand ? " !!!" : "") +
                                 " msgs=" + content + "/" + messages + " max=" + account.max_messages +
+                                " blocked=" + blocked + (blocked == 0 ? "" : " !!!") +
                                 " ops=" + db.operation().getOperationCount(account.id) +
                                 " schedule=" + (!ignore_schedule) + (ignore_schedule ? " !!!" : "") +
                                 " unmetered=" + unmetered + (unmetered ? " !!!" : "") +