From 31389e48083e702ae8d2a6de79892bb2e2d5726f Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 3 May 2021 07:42:57 +0200 Subject: [PATCH] Count non favorite answers only --- app/src/main/java/eu/faircode/email/DaoAnswer.java | 5 +++-- app/src/main/java/eu/faircode/email/FragmentMessages.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoAnswer.java b/app/src/main/java/eu/faircode/email/DaoAnswer.java index 8e20df9c50..69195e1a32 100644 --- a/app/src/main/java/eu/faircode/email/DaoAnswer.java +++ b/app/src/main/java/eu/faircode/email/DaoAnswer.java @@ -56,8 +56,9 @@ public interface DaoAnswer { LiveData> liveAnswers(); @Query("SELECT COUNT(*) FROM answer" + - " WHERE NOT hide") - Integer getAnswerCount(); + " WHERE NOT hide" + + " AND (:favorite OR NOT favorite)") + Integer getAnswerCount(boolean favorite); @Insert long insertAnswer(EntityAnswer answer); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 280820e399..6be98e6ea6 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -2445,7 +2445,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (message == null) return result; - args.putInt("answers", db.answer().getAnswerCount()); + args.putInt("answers", db.answer().getAnswerCount(false)); result.identities = db.identity().getComposableIdentities(message.account); result.answers = db.answer().getAnswersByFavorite(true); @@ -2469,7 +2469,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. Address[] recipients = message.getAllRecipients(data.identities, message.account); - int answers = args.getInt("answers"); + int answers = args.getInt("answers"); // Non favorite SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); boolean experiments = prefs.getBoolean("experiments", false);