From fa8e8ee011e45c588088ab6df8495943d00c801c Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 12 Jan 2022 17:13:25 +0100 Subject: [PATCH] Added statistics to debug info --- app/src/main/java/eu/faircode/email/DaoFolder.java | 3 +++ app/src/main/java/eu/faircode/email/DaoMessage.java | 3 +++ app/src/main/java/eu/faircode/email/DaoRule.java | 3 +++ app/src/main/java/eu/faircode/email/Log.java | 13 ++++++++----- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java index d05e262bd6..d5cbe9353b 100644 --- a/app/src/main/java/eu/faircode/email/DaoFolder.java +++ b/app/src/main/java/eu/faircode/email/DaoFolder.java @@ -231,6 +231,9 @@ public interface DaoFolder { @Query("SELECT download FROM folder WHERE id = :id") boolean getFolderDownload(long id); + @Query("SELECT COUNT(*) FROM folder") + int countTotal(); + @Insert long insertFolder(EntityFolder folder); diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index 789e44d168..96dcb96530 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -464,6 +464,9 @@ public interface DaoMessage { " AND sender = :sender") int countSender(long folder, String sender); + @Query("SELECT COUNT(*) FROM message") + int countTotal(); + @Query("SELECT message.*" + ", account.pop AS accountProtocol, account.name AS accountName, account.category AS accountCategory, identity.color AS accountColor" + ", account.notify AS accountNotify, account.leave_deleted AS accountLeaveDeleted, account.auto_seen AS accountAutoSeen" + diff --git a/app/src/main/java/eu/faircode/email/DaoRule.java b/app/src/main/java/eu/faircode/email/DaoRule.java index 58cc2b759b..6a4381dcb4 100644 --- a/app/src/main/java/eu/faircode/email/DaoRule.java +++ b/app/src/main/java/eu/faircode/email/DaoRule.java @@ -53,6 +53,9 @@ public interface DaoRule { " ORDER BY `order`, name COLLATE NOCASE") LiveData> liveRules(long folder); + @Query("SELECT COUNT(*) FROM rule") + int countTotal(); + @Insert long insertRule(EntityRule rule); diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java index 4019225656..3e0d5e0afe 100644 --- a/app/src/main/java/eu/faircode/email/Log.java +++ b/app/src/main/java/eu/faircode/email/Log.java @@ -2067,14 +2067,17 @@ public class Log { boolean auto_optimize = prefs.getBoolean("auto_optimize", false); boolean schedule = prefs.getBoolean("schedule", false); - size += write(os, "accounts=" + accounts.size() + - " enabled=" + enabled + + size += write(os, "enabled=" + enabled + " interval=" + pollInterval + "\r\n" + - " metered=" + metered + + "metered=" + metered + " VPN=" + ConnectionHelper.vpnActive(context) + " NetGuard=" + Helper.isInstalled(context, "eu.faircode.netguard") + "\r\n" + - " optimizing=" + (ignoring == null ? null : !ignoring) + - " auto_optimize=" + auto_optimize + + "optimizing=" + (ignoring == null ? null : !ignoring) + + " auto_optimize=" + auto_optimize + "\r\n" + + "accounts=" + accounts.size() + + " folders=" + db.folder().countTotal() + + " messages=" + db.message().countTotal() + + " rules=" + db.rule().countTotal() + "\r\n\r\n"); if (schedule) {