mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-22 07:42:52 +00:00
Code Issues Releases Wiki Activity

Attempt to fix Samsung badge count

Browse source
This commit is contained in:
M66B 2024-11-08 22:10:34 +01:00
parent 9c10b9658a
commit 0c5cfa52af
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/NotificationHelper.java
View file

@ -679,6 +679,8 @@ class NotificationHelper {
boolean pro = ActivityBilling.isPro(context); boolean pro = ActivityBilling.isPro(context);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean badge = prefs.getBoolean("badge", true);
boolean unseen_ignored = prefs.getBoolean("unseen_ignored", false);
boolean notify_grouping = prefs.getBoolean("notify_grouping", true); boolean notify_grouping = prefs.getBoolean("notify_grouping", true);
boolean notify_private = prefs.getBoolean("notify_private", true); boolean notify_private = prefs.getBoolean("notify_private", true);
boolean notify_newest_first = prefs.getBoolean("notify_newest_first", false); boolean notify_newest_first = prefs.getBoolean("notify_newest_first", false);
@ -780,7 +782,6 @@ class NotificationHelper {
: R.drawable.baseline_mail_white_24) : R.drawable.baseline_mail_white_24)
.setContentTitle(title) .setContentTitle(title)
.setContentIntent(piContent) .setContentIntent(piContent)
.setNumber(total_messages)
.setDeleteIntent(piClear) .setDeleteIntent(piClear)
.setPriority(NotificationCompat.PRIORITY_DEFAULT) .setPriority(NotificationCompat.PRIORITY_DEFAULT)
.setCategory(notify_summary .setCategory(notify_summary
@ -788,6 +789,14 @@ class NotificationHelper {
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setAllowSystemGeneratedContextualActions(false); .setAllowSystemGeneratedContextualActions(false);
// https://github.com/leolin310148/ShortcutBadger/issues/266
if (badge && !unseen_ignored /* Unseen */ &&
Helper.isSamsung() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
EntityLog.log(context, "Notify no number" +
" badge=" + badge + " unseen_ignored=" + unseen_ignored);
else
builder.setNumber(total_messages);
if (latest != null) if (latest != null)
builder.setWhen(latest).setShowWhen(true); builder.setWhen(latest).setShowWhen(true);