Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 08:33:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Group non unified folder notifications

Browse Source
This commit is contained in:
M66B
2020-06-15 12:34:25 +02:00
parent 097cd0b68b
commit 42f02ba743
5 changed files with 59 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@@ -942,12 +942,19 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getSupportFragmentManager().popBackStack("unified", 0);
long folder = Long.parseLong(action.split(":", 2)[1]);
String[] parts = action.split(":");
long folder = Long.parseLong(parts[1]);
if (folder > 0) {
intent.putExtra("folder", folder);
onViewMessages(intent);
}
if (parts.length > 2) {
Intent clear = new Intent(this, ServiceUI.class)
.setAction("clear:" + parts[2]);
startService(clear);
}
} else if ("why".equals(action)) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getSupportFragmentManager().popBackStack("unified", 0);

53
app/src/main/java/eu/faircode/email/Core.java
View File

@@ -2923,6 +2923,8 @@ class Core {
}
long group = (pro && message.accountNotify ? message.account : 0);
if (!message.folderUnified)
group = -message.folder;
if (!groupNotifying.containsKey(group))
groupNotifying.put(group, new ArrayList<Long>());
if (!groupMessages.containsKey(group))
@@ -3020,7 +3022,7 @@ class Core {
String tag = "unseen." + group + "." + Math.abs(id);
Notification notification = builder.build();
Log.i("Notifying tag=" + tag + " id=" + id +
Log.i("Notifying tag=" + tag + " id=" + id + " group=" + notification.getGroup() +
(Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? "" : " channel=" + notification.getChannelId()));
try {
nm.notify(tag, 1, notification);
@@ -3099,10 +3101,15 @@ class Core {
// Summary notification
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N || notify_summary) {
// Build pending intents
Intent unified = new Intent(context, ActivityView.class)
.setAction("unified" + (notify_remove ? ":" + group : ""));
unified.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
PendingIntent piUnified = PendingIntent.getActivity(context, ActivityView.REQUEST_UNIFIED, unified, PendingIntent.FLAG_UPDATE_CURRENT);
Intent content;
if (group < 0)
content = new Intent(context, ActivityView.class)
.setAction("folder:" + (-group) + (notify_remove ? ":" + group : ""));
else
content = new Intent(context, ActivityView.class)
.setAction("unified" + (notify_remove ? ":" + group : ""));
content.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
PendingIntent piContent = PendingIntent.getActivity(context, ActivityView.REQUEST_UNIFIED, content, PendingIntent.FLAG_UPDATE_CURRENT);
Intent clear = new Intent(context, ServiceUI.class).setAction("clear:" + group);
PendingIntent piClear = PendingIntent.getService(context, ServiceUI.PI_CLEAR, clear, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -3111,14 +3118,18 @@ class Core {
String title = context.getResources().getQuantityString(
R.plurals.title_notification_unseen, messages.size(), messages.size());
long cgroup = (group >= 0
? group
: (pro && messages.size() > 0 && messages.get(0).accountNotify ? messages.get(0).account : 0));
// Build notification
NotificationCompat.Builder builder =
new NotificationCompat.Builder(context, EntityAccount.getNotificationChannelId(group))
new NotificationCompat.Builder(context, EntityAccount.getNotificationChannelId(cgroup))
.setSmallIcon(messages.size() > 1
? R.drawable.baseline_mail_more_white_24
: R.drawable.baseline_mail_white_24)
.setContentTitle(title)
.setContentIntent(piUnified)
.setContentIntent(piContent)
.setNumber(messages.size())
.setShowWhen(false)
.setDeleteIntent(piClear)
@@ -3148,11 +3159,15 @@ class Core {
if (pro && group != 0 && messages.size() > 0) {
TupleMessageEx amessage = messages.get(0);
if (amessage.accountColor != null) {
builder.setColor(amessage.accountColor);
Integer color = getColor(amessage);
if (color != null) {
builder.setColor(color);
builder.setColorized(true);
}
builder.setSubText(amessage.accountName);
if (amessage.folderUnified)
builder.setSubText(amessage.accountName);
else
builder.setSubText(amessage.accountName + " · " + amessage.getFolderName(context));
}
Notification pub = builder.build();
@@ -3263,8 +3278,11 @@ class Core {
Address[] afrom = messageFrom.get(message.id);
String from = MessageHelper.formatAddresses(afrom, name_email, false);
mbuilder.setContentTitle(from)
.setSubText(message.accountName + " · " + message.getFolderName(context));
mbuilder.setContentTitle(from);
if (message.folderUnified)
mbuilder.setSubText(message.accountName + " · " + message.getFolderName(context));
else
mbuilder.setSubText(message.accountName);
DB db = DB.getInstance(context);
@@ -3483,8 +3501,9 @@ class Core {
if (info[0].hasLookupUri())
mbuilder.addPerson(info[0].getLookupUri().toString());
if (pro && message.accountColor != null) {
mbuilder.setColor(message.accountColor);
Integer color = getColor(message);
if (pro && color != null) {
mbuilder.setColor(color);
mbuilder.setColorized(true);
}
@@ -3501,6 +3520,12 @@ class Core {
return notifications;
}
private static Integer getColor(TupleMessageEx message) {
if (!message.folderUnified && message.folderColor != null)
return message.folderColor;
return message.accountColor;
}
private static void setLightAndSound(NotificationCompat.Builder builder, boolean light, String sound) {
int def = 0;

10
app/src/main/java/eu/faircode/email/DaoMessage.java
View File

@@ -48,7 +48,7 @@ public interface DaoMessage {
@Query("SELECT message.*" +
", account.pop AS accountProtocol, account.name AS accountName, COALESCE(identity.color, folder.color, account.color) AS accountColor" +
", account.notify AS accountNotify, account.auto_seen AS accountAutoSeen" +
", folder.name AS folderName, folder.color AS folderColor, folder.display AS folderDisplay, folder.type AS folderType, folder.read_only AS folderReadOnly" +
", folder.name AS folderName, folder.color AS folderColor, folder.display AS folderDisplay, folder.type AS folderType, folder.unified AS folderUnified, folder.read_only AS folderReadOnly" +
", IFNULL(identity.display, identity.name) AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
", '[' || group_concat(message.`from`, ',') || ']' AS senders" +
", '[' || group_concat(message.`to`, ',') || ']' AS recipients" +
@@ -126,7 +126,7 @@ public interface DaoMessage {
@Query("SELECT message.*" +
", account.pop AS accountProtocol, account.name AS accountName, COALESCE(identity.color, folder.color, account.color) AS accountColor" +
", account.notify AS accountNotify, account.auto_seen AS accountAutoSeen" +
", folder.name AS folderName, folder.color AS folderColor, folder.display AS folderDisplay, folder.type AS folderType, folder.read_only AS folderReadOnly" +
", folder.name AS folderName, folder.color AS folderColor, folder.display AS folderDisplay, folder.type AS folderType, folder.unified AS folderUnified, folder.read_only AS folderReadOnly" +
", IFNULL(identity.display, identity.name) AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
", '[' || group_concat(message.`from`, ',') || ']' AS senders" +
", '[' || group_concat(message.`to`, ',') || ']' AS recipients" +
@@ -195,7 +195,7 @@ public interface DaoMessage {
@Query("SELECT message.*" +
", account.pop AS accountProtocol, account.name AS accountName, COALESCE(identity.color, folder.color, account.color) AS accountColor" +
", account.notify AS accountNotify, account.auto_seen AS accountAutoSeen" +
", folder.name AS folderName, folder.color AS folderColor, folder.display AS folderDisplay, folder.type AS folderType, folder.read_only AS folderReadOnly" +
", folder.name AS folderName, folder.color AS folderColor, folder.display AS folderDisplay, folder.type AS folderType, folder.unified AS folderUnified, folder.read_only AS folderReadOnly" +
", IFNULL(identity.display, identity.name) AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
", message.`from` AS senders" +
", message.`to` AS recipients" +
@@ -387,7 +387,7 @@ public interface DaoMessage {
@Query("SELECT message.*" +
", account.pop AS accountProtocol, account.name AS accountName, identity.color AS accountColor" +
", account.notify AS accountNotify, account.auto_seen AS accountAutoSeen" +
", folder.name AS folderName, folder.color AS folderColor, folder.display AS folderDisplay, folder.type AS folderType, folder.read_only AS folderReadOnly" +
", folder.name AS folderName, folder.color AS folderColor, folder.display AS folderDisplay, folder.type AS folderType, folder.unified AS folderUnified, folder.read_only AS folderReadOnly" +
", IFNULL(identity.display, identity.name) AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
", message.`from` AS senders" +
", message.`to` AS recipients" +
@@ -419,7 +419,7 @@ public interface DaoMessage {
@Query("SELECT message.*" +
", account.pop AS accountProtocol, account.name AS accountName, COALESCE(identity.color, folder.color, account.color) AS accountColor" +
", account.notify AS accountNotify, account.auto_seen AS accountAutoSeen" +
", folder.name AS folderName, folder.color AS folderColor, folder.display AS folderDisplay, folder.type AS folderType, folder.read_only AS folderReadOnly" +
", folder.name AS folderName, folder.color AS folderColor, folder.display AS folderDisplay, folder.type AS folderType, folder.unified AS folderUnified, folder.read_only AS folderReadOnly" +
", IFNULL(identity.display, identity.name) AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
", message.`from` AS senders" +
", message.`to` AS recipients" +

6
app/src/main/java/eu/faircode/email/ServiceUI.java
View File

@@ -184,7 +184,11 @@ public class ServiceUI extends IntentService {
private void onClear(long group) {
DB db = DB.getInstance(this);
int cleared = db.message().ignoreAll(group == 0 ? null : group, null);
int cleared;
if (group < 0)
cleared = db.message().ignoreAll(null, -group);
else
cleared = db.message().ignoreAll(group == 0 ? null : group, null);
Log.i("Cleared=" + cleared);
}

2
app/src/main/java/eu/faircode/email/TupleMessageEx.java
View File

@@ -42,6 +42,7 @@ public class TupleMessageEx extends EntityMessage {
public Integer folderColor;
public String folderDisplay;
public String folderType;
public boolean folderUnified;
public boolean folderReadOnly;
public String identityName;
public String identityEmail;
@@ -101,6 +102,7 @@ public class TupleMessageEx extends EntityMessage {
this.folderName.equals(other.folderName) &&
Objects.equals(this.folderDisplay, other.folderDisplay) &&
this.folderType.equals(other.folderType) &&
this.folderUnified == other.folderUnified &&
this.folderReadOnly == other.folderReadOnly &&
Objects.equals(this.identityName, other.identityName) &&
Objects.equals(this.identityEmail, other.identityEmail) &&