Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In the process of trying to make them stack I just couldnt. So I guess this is the new release then

This commit is contained in:
LucasGGamerM 2023-01-21 16:02:11 -03:00
parent a4d2101f54
commit c397c08e40
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
View File

@ -122,7 +122,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
nm.createNotificationChannels(channels); nm.createNotificationChannels(channels);
} }
builder=new Notification.Builder(context, accountID+"_"+pn.notificationType); builder=new Notification.Builder(context, accountID+"_"+pn.notificationType);
summaryNotification=new Notification.Builder(context, accountID); // summaryNotification=new Notification.Builder(context, accountID);
}else{ }else{
builder=new Notification.Builder(context) builder=new Notification.Builder(context)
.setPriority(Notification.PRIORITY_DEFAULT) .setPriority(Notification.PRIORITY_DEFAULT)
@ -145,8 +145,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
.setContentText(pn.body) .setContentText(pn.body)
.setContentTitle(pn.title) .setContentTitle(pn.title)
.setStyle(new Notification.InboxStyle() .setStyle(new Notification.InboxStyle()
.addLine(pn.body) .addLine(pn.body))
.setSummaryText(accountName))
.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT)) .setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli()) .setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
.setShowWhen(true) .setShowWhen(true)
@ -174,27 +173,8 @@ public class PushNotificationReceiver extends BroadcastReceiver{
builder.setSubText(accountName); builder.setSubText(accountName);
} }
summaryNotification.setContentTitle(accountName)
//set content text to support devices running API level < 24
.setContentText(accountName)
.setSmallIcon(R.drawable.ic_ntf_logo)
//build summary info into InboxStyle template
.setStyle(new Notification.InboxStyle()
.addLine(pn.title)
.setBigContentTitle("2 new messages")
.setSummaryText(accountName))
//specify which group this notification belongs to
.setGroup(accountID)
//set this notification as the summary for the group
.setGroupSummary(true)
.build();
notificationId++; notificationId++;
// nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId, builder.build());
nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId, builder.build()); nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId, builder.build());
nm.notify(Integer.parseInt(accountID), summaryNotification.build());
} }
} }