Properly summarize all notifications (#4848)
Do summary notifications like the Api defines it: * Schedule and summarize without delay (in order for summerization to work) * Always have a summary notification: simplify code with this and make more reliable * Do not care about single notification count (the system already does that as well) * **Bugfix: Schedule summary first: This avoids a rate limit problem that (then) not groups at all** Testing this is probably the most difficult part. For example I couldn't get any notification to ring with older Api versions in the debugger. (Same as for current develop) However one hack to always get notifications: Fix "minId" in "fetchNewNotifications()" to a somewhat older value. Next possible step: Have only one summary notification at all (for all channels/notification types). You can still configure single channels differently. Or: For very many notifications: Only use a true summary one (something like "you have 28 favorites and 7 boosts"). Generally: The notification timeline must be improved now. Because that must be the go-to solution for any large number of notifications. It must be easy to read. E. g. with grouping per post.
This commit is contained in:
UlrichKu
GitHub
parent
5741d576c9
commit
6cbcf3eef0
3 changed files with 154 additions and 201 deletions
|
|
@ -1,9 +1,13 @@
|
|||
package com.keylesspalace.tusky.components.systemnotifications
|
||||
|
||||
import android.Manifest
|
||||
import android.app.NotificationManager
|
||||
import android.content.Context
|
||||
import android.content.pm.PackageManager
|
||||
import android.util.Log
|
||||
import androidx.annotation.WorkerThread
|
||||
import androidx.core.app.ActivityCompat
|
||||
import androidx.core.app.NotificationManagerCompat
|
||||
import com.keylesspalace.tusky.appstore.EventHub
|
||||
import com.keylesspalace.tusky.appstore.NewNotificationsEvent
|
||||
import com.keylesspalace.tusky.components.systemnotifications.NotificationHelper.filterNotification
|
||||
|
|
@ -16,9 +20,6 @@ import com.keylesspalace.tusky.util.HttpHeaderLink
|
|||
import com.keylesspalace.tusky.util.isLessThan
|
||||
import dagger.hilt.android.qualifiers.ApplicationContext
|
||||
import javax.inject.Inject
|
||||
import kotlin.math.min
|
||||
import kotlin.time.Duration.Companion.milliseconds
|
||||
import kotlinx.coroutines.delay
|
||||
|
||||
/** Models next/prev links from the "Links" header in an API response */
|
||||
data class Links(val next: String?, val prev: String?) {
|
||||
|
|
@ -53,6 +54,10 @@ class NotificationFetcher @Inject constructor(
|
|||
private val eventHub: EventHub
|
||||
) {
|
||||
suspend fun fetchAndShow() {
|
||||
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
|
||||
return
|
||||
}
|
||||
|
||||
for (account in accountManager.getAllAccountsOrderedByActive()) {
|
||||
if (account.notificationsEnabled) {
|
||||
try {
|
||||
|
|
@ -60,80 +65,50 @@ class NotificationFetcher @Inject constructor(
|
|||
Context.NOTIFICATION_SERVICE
|
||||
) as NotificationManager
|
||||
|
||||
val notificationManagerCompat = NotificationManagerCompat.from(context)
|
||||
|
||||
// Create sorted list of new notifications
|
||||
val notifications = fetchNewNotifications(account)
|
||||
.filter { filterNotification(notificationManager, account, it) }
|
||||
.sortedWith(
|
||||
compareBy({ it.id.length }, { it.id })
|
||||
) // oldest notifications first
|
||||
.toMutableList()
|
||||
|
||||
// TODO do this before filter above? But one could argue that (for example) a tab badge is also a notification
|
||||
// (and should therefore adhere to the notification config).
|
||||
eventHub.dispatch(NewNotificationsEvent(account.accountId, notifications))
|
||||
|
||||
// There's a maximum limit on the number of notifications an Android app
|
||||
// can display. If the total number of notifications (current notifications,
|
||||
// plus new ones) exceeds this then some newer notifications will be dropped.
|
||||
//
|
||||
// Err on the side of removing *older* notifications to make room for newer
|
||||
// notifications.
|
||||
val currentAndroidNotifications = notificationManager.activeNotifications
|
||||
.sortedWith(
|
||||
compareBy({ it.tag.length }, { it.tag })
|
||||
) // oldest notifications first
|
||||
val newNotifications = ArrayList<NotificationManagerCompat.NotificationWithIdAndTag>()
|
||||
|
||||
// Check to see if any notifications need to be removed
|
||||
val toRemove = currentAndroidNotifications.size + notifications.size - MAX_NOTIFICATIONS
|
||||
if (toRemove > 0) {
|
||||
// Prefer to cancel old notifications first
|
||||
currentAndroidNotifications.subList(
|
||||
0,
|
||||
min(toRemove, currentAndroidNotifications.size)
|
||||
)
|
||||
.forEach { notificationManager.cancel(it.tag, it.id) }
|
||||
|
||||
// Still got notifications to remove? Trim the list of new notifications,
|
||||
// starting with the oldest.
|
||||
while (notifications.size > MAX_NOTIFICATIONS) {
|
||||
notifications.removeAt(0)
|
||||
}
|
||||
}
|
||||
|
||||
val notificationsByType = notifications.groupBy { it.type }
|
||||
|
||||
// Make and send the new notifications
|
||||
// TODO: Use the batch notification API available in NotificationManagerCompat
|
||||
// 1.11 and up (https://developer.android.com/jetpack/androidx/releases/core#1.11.0-alpha01)
|
||||
// when it is released.
|
||||
|
||||
notificationsByType.forEach { notificationsGroup ->
|
||||
notificationsGroup.value.forEach { notification ->
|
||||
val androidNotification = NotificationHelper.make(
|
||||
val notificationsByType: Map<Notification.Type, List<Notification>> = notifications.groupBy { it.type }
|
||||
notificationsByType.forEach { notificationsGroup: Map.Entry<Notification.Type, List<Notification>> ->
|
||||
// NOTE Enqueue the summary first: Needed to avoid rate limit problems:
|
||||
// ie. single notification is enqueued but that later summary one is filtered and thus no grouping
|
||||
// takes place.
|
||||
newNotifications.add(
|
||||
NotificationHelper.makeSummaryNotification(
|
||||
context,
|
||||
notificationManager,
|
||||
notification,
|
||||
account,
|
||||
notificationsGroup.value.size == 1
|
||||
)
|
||||
notificationManager.notify(
|
||||
notification.id,
|
||||
account.id.toInt(),
|
||||
androidNotification
|
||||
notificationsGroup.key,
|
||||
notificationsGroup.value
|
||||
)
|
||||
)
|
||||
|
||||
// Android will rate limit / drop notifications if they're posted too
|
||||
// quickly. There is no indication to the user that this happened.
|
||||
// See https://github.com/tuskyapp/Tusky/pull/3626#discussion_r1192963664
|
||||
delay(1000.milliseconds)
|
||||
notificationsGroup.value.forEach { notification ->
|
||||
newNotifications.add(
|
||||
NotificationHelper.make(
|
||||
context,
|
||||
notificationManager,
|
||||
notification,
|
||||
account
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
NotificationHelper.updateSummaryNotifications(
|
||||
context,
|
||||
notificationManager,
|
||||
account
|
||||
)
|
||||
// NOTE having multiple summary notifications this here should still collapse them in only one occurrence
|
||||
notificationManagerCompat.notify(newNotifications)
|
||||
|
||||
accountManager.saveAccount(account)
|
||||
} catch (e: Exception) {
|
||||
|
|
@ -246,12 +221,5 @@ class NotificationFetcher @Inject constructor(
|
|||
|
||||
companion object {
|
||||
private const val TAG = "NotificationFetcher"
|
||||
|
||||
// There's a system limit on the maximum number of notifications an app
|
||||
// can show, NotificationManagerService.MAX_PACKAGE_NOTIFICATIONS. Unfortunately
|
||||
// that's not available to client code or via the NotificationManager API.
|
||||
// The current value in the Android source code is 50, set 40 here to both
|
||||
// be conservative, and allow some headroom for summary notifications.
|
||||
private const val MAX_NOTIFICATIONS = 40
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ import androidx.annotation.NonNull;
|
|||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.StringRes;
|
||||
import androidx.core.app.NotificationCompat;
|
||||
import androidx.core.app.NotificationManagerCompat;
|
||||
import androidx.core.app.RemoteInput;
|
||||
import androidx.core.app.TaskStackBuilder;
|
||||
import androidx.work.Constraints;
|
||||
|
|
@ -68,10 +69,8 @@ import com.keylesspalace.tusky.worker.NotificationWorker;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
|
@ -149,7 +148,16 @@ public class NotificationHelper {
|
|||
* @return the new notification
|
||||
*/
|
||||
@NonNull
|
||||
public static android.app.Notification make(final @NonNull Context context, @NonNull NotificationManager notificationManager, @NonNull Notification body, @NonNull AccountEntity account, boolean isOnlyOneInGroup) {
|
||||
public static NotificationManagerCompat.NotificationWithIdAndTag make(final @NonNull Context context, @NonNull NotificationManager notificationManager, @NonNull Notification body, @NonNull AccountEntity account) {
|
||||
return new NotificationManagerCompat.NotificationWithIdAndTag(
|
||||
body.getId(),
|
||||
(int)account.getId(),
|
||||
NotificationHelper.makeBaseNotification(context, notificationManager, body, account)
|
||||
);
|
||||
}
|
||||
|
||||
@NonNull
|
||||
public static android.app.Notification makeBaseNotification(final @NonNull Context context, @NonNull NotificationManager notificationManager, @NonNull Notification body, @NonNull AccountEntity account) {
|
||||
body = body.rewriteToStatusTypeIfNeeded(account.getAccountId());
|
||||
String mastodonNotificationId = body.getId();
|
||||
int accountId = (int) account.getId();
|
||||
|
|
@ -163,9 +171,6 @@ public class NotificationHelper {
|
|||
}
|
||||
}
|
||||
|
||||
// Notification group member
|
||||
// =========================
|
||||
|
||||
notificationId++;
|
||||
// Create the notification -- either create a new one, or use the existing one.
|
||||
NotificationCompat.Builder builder;
|
||||
|
|
@ -240,128 +245,103 @@ public class NotificationHelper {
|
|||
extras.putString(EXTRA_NOTIFICATION_TYPE, body.getType().name());
|
||||
builder.addExtras(extras);
|
||||
|
||||
// Only alert for the first notification of a batch to avoid multiple alerts at once
|
||||
if(!isOnlyOneInGroup) {
|
||||
builder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
|
||||
}
|
||||
// Only ever alert for the summary notification
|
||||
builder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
|
||||
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the summary notifications for each notification group.
|
||||
* Creates the summary notifications for a notification type.
|
||||
* <p>
|
||||
* Notifications are sent to channels. Within each channel they may be grouped, and the group
|
||||
* may have a summary.
|
||||
* Notifications are sent to channels. Within each channel they are grouped and the group has a summary.
|
||||
* <p>
|
||||
* Tusky uses N notification channels for each account, each channel corresponds to a type
|
||||
* of notification (follow, reblog, mention, etc). Therefore each channel also has exactly
|
||||
* 0 or 1 summary notifications along with its regular notifications.
|
||||
* of notification (follow, reblog, mention, etc). Each channel also has a
|
||||
* summary notifications along with its regular notifications.
|
||||
* <p>
|
||||
* The group key is the same as the channel ID.
|
||||
* <p>
|
||||
* Regnerates the summary notifications for all active Tusky notifications for `account`.
|
||||
* This may delete the summary notification if there are no active notifications for that
|
||||
* account in a group.
|
||||
*
|
||||
* @see <a href="https://developer.android.com/develop/ui/views/notifications/group">Create a
|
||||
* notification group</a>
|
||||
* @param context to access application preferences and services
|
||||
* @param notificationManager the system's NotificationManager
|
||||
* @param account the account for which the notification should be shown
|
||||
*/
|
||||
public static void updateSummaryNotifications(@NonNull Context context, @NonNull NotificationManager notificationManager, @NonNull AccountEntity account) {
|
||||
// Map from the channel ID to a list of notifications in that channel. Those are the
|
||||
// notifications that will be summarised.
|
||||
Map<String, List<StatusBarNotification>> channelGroups = new HashMap<>();
|
||||
public static NotificationManagerCompat.NotificationWithIdAndTag makeSummaryNotification(@NonNull Context context, @NonNull NotificationManager notificationManager, @NonNull AccountEntity account, @NonNull Notification.Type type, @NonNull List<Notification> additionalNotifications) {
|
||||
int accountId = (int) account.getId();
|
||||
|
||||
// Initialise the map with all channel IDs.
|
||||
for (Notification.Type ty : Notification.Type.getEntries()) {
|
||||
channelGroups.put(getChannelId(account, ty), new ArrayList<>());
|
||||
String typeChannelId = getChannelId(account, type);
|
||||
|
||||
if (typeChannelId == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Fetch all existing notifications. Add them to the map, ignoring notifications that:
|
||||
// - belong to a different account
|
||||
// - are summary notifications
|
||||
for (StatusBarNotification sn : notificationManager.getActiveNotifications()) {
|
||||
if (sn.getId() != accountId) continue;
|
||||
// Create a notification that summarises the other notifications in this group
|
||||
//
|
||||
// NOTE: We always create a summary notification (even for activeNotificationsForType.size() == 1):
|
||||
// - No need to especially track the grouping
|
||||
// - No need to change an existing single notification when there arrives another one of its group
|
||||
// - Only the summary one will get announced
|
||||
TaskStackBuilder summaryStackBuilder = TaskStackBuilder.create(context);
|
||||
summaryStackBuilder.addParentStack(MainActivity.class);
|
||||
Intent summaryResultIntent = MainActivity.openNotificationIntent(context, accountId, type);
|
||||
summaryStackBuilder.addNextIntent(summaryResultIntent);
|
||||
|
||||
String channelId = sn.getNotification().getGroup();
|
||||
String summaryTag = GROUP_SUMMARY_TAG + "." + channelId;
|
||||
if (summaryTag.equals(sn.getTag())) continue;
|
||||
PendingIntent summaryResultPendingIntent = summaryStackBuilder.getPendingIntent((int) (notificationId + account.getId() * 10000),
|
||||
pendingIntentFlags(false));
|
||||
|
||||
// TODO: API 26 supports getting the channel ID directly (sn.getNotification().getChannelId()).
|
||||
// This works here because the channelId and the groupKey are the same.
|
||||
List<StatusBarNotification> members = channelGroups.get(channelId);
|
||||
if (members == null) { // can't happen, but just in case...
|
||||
Log.e(TAG, "members == null for channel ID " + channelId);
|
||||
continue;
|
||||
}
|
||||
members.add(sn);
|
||||
}
|
||||
List<StatusBarNotification> activeNotifications = getActiveNotifications(notificationManager.getActiveNotifications(), accountId, typeChannelId);
|
||||
|
||||
// Create, update, or cancel the summary notifications for each group.
|
||||
for (Map.Entry<String, List<StatusBarNotification>> channelGroup : channelGroups.entrySet()) {
|
||||
String channelId = channelGroup.getKey();
|
||||
List<StatusBarNotification> members = channelGroup.getValue();
|
||||
String summaryTag = GROUP_SUMMARY_TAG + "." + channelId;
|
||||
int notificationCount = activeNotifications.size() + additionalNotifications.size();
|
||||
|
||||
// If there are 0-1 notifications in this group then the additional summary
|
||||
// notification is not needed and can be cancelled.
|
||||
if (members.size() <= 1) {
|
||||
notificationManager.cancel(summaryTag, accountId);
|
||||
continue;
|
||||
}
|
||||
String title = context.getResources().getQuantityString(R.plurals.notification_title_summary, notificationCount, notificationCount);
|
||||
String text = joinNames(context, activeNotifications, additionalNotifications);
|
||||
|
||||
// Create a notification that summarises the other notifications in this group
|
||||
NotificationCompat.Builder summaryBuilder = new NotificationCompat.Builder(context, typeChannelId)
|
||||
.setSmallIcon(R.drawable.ic_notify)
|
||||
.setContentIntent(summaryResultPendingIntent)
|
||||
.setColor(context.getColor(R.color.notification_color))
|
||||
.setAutoCancel(true)
|
||||
.setShortcutId(Long.toString(account.getId()))
|
||||
.setContentTitle(title)
|
||||
.setContentText(text)
|
||||
.setSubText(account.getFullName())
|
||||
.setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
|
||||
.setCategory(NotificationCompat.CATEGORY_SOCIAL)
|
||||
.setGroup(typeChannelId)
|
||||
.setGroupSummary(true)
|
||||
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
|
||||
;
|
||||
|
||||
// All notifications in this group have the same type, so get it from the first.
|
||||
String typeName = members.get(0).getNotification().extras.getString(EXTRA_NOTIFICATION_TYPE, Notification.Type.UNKNOWN.name());
|
||||
Notification.Type notificationType = Notification.Type.valueOf(typeName);
|
||||
setSoundVibrationLight(account, summaryBuilder);
|
||||
|
||||
Intent summaryResultIntent = MainActivity.openNotificationIntent(context, accountId, notificationType);
|
||||
String summaryTag = GROUP_SUMMARY_TAG + "." + typeChannelId;
|
||||
|
||||
TaskStackBuilder summaryStackBuilder = TaskStackBuilder.create(context);
|
||||
summaryStackBuilder.addParentStack(MainActivity.class);
|
||||
summaryStackBuilder.addNextIntent(summaryResultIntent);
|
||||
|
||||
PendingIntent summaryResultPendingIntent = summaryStackBuilder.getPendingIntent((int) (notificationId + account.getId() * 10000),
|
||||
pendingIntentFlags(false));
|
||||
|
||||
String title = context.getResources().getQuantityString(R.plurals.notification_title_summary, members.size(), members.size());
|
||||
String text = joinNames(context, members);
|
||||
|
||||
NotificationCompat.Builder summaryBuilder = new NotificationCompat.Builder(context, channelId)
|
||||
.setSmallIcon(R.drawable.ic_notify)
|
||||
.setContentIntent(summaryResultPendingIntent)
|
||||
.setColor(context.getColor(R.color.notification_color))
|
||||
.setAutoCancel(true)
|
||||
.setShortcutId(Long.toString(account.getId()))
|
||||
.setDefaults(0) // So it doesn't ring twice, notify only in Target callback
|
||||
.setContentTitle(title)
|
||||
.setContentText(text)
|
||||
.setSubText(account.getFullName())
|
||||
.setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
|
||||
.setCategory(NotificationCompat.CATEGORY_SOCIAL)
|
||||
.setOnlyAlertOnce(true)
|
||||
.setGroup(channelId)
|
||||
.setGroupSummary(true);
|
||||
|
||||
setSoundVibrationLight(account, summaryBuilder);
|
||||
|
||||
// TODO: Use the batch notification API available in NotificationManagerCompat
|
||||
// 1.11 and up (https://developer.android.com/jetpack/androidx/releases/core#1.11.0-alpha01)
|
||||
// when it is released.
|
||||
notificationManager.notify(summaryTag, accountId, summaryBuilder.build());
|
||||
|
||||
// Android will rate limit / drop notifications if they're posted too
|
||||
// quickly. There is no indication to the user that this happened.
|
||||
// See https://github.com/tuskyapp/Tusky/pull/3626#discussion_r1192963664
|
||||
try { Thread.sleep(1000); } catch (InterruptedException ignored) { }
|
||||
}
|
||||
return new NotificationManagerCompat.NotificationWithIdAndTag(summaryTag, accountId, summaryBuilder.build());
|
||||
}
|
||||
|
||||
private static List<StatusBarNotification> getActiveNotifications(StatusBarNotification[] allNotifications, int accountId, String typeChannelId) {
|
||||
// Return all active notifications, ignoring notifications that:
|
||||
// - belong to a different account
|
||||
// - belong to a different type
|
||||
// - are summary notifications
|
||||
List<StatusBarNotification> activeNotificationsForType = new ArrayList<>();
|
||||
for (StatusBarNotification sn : allNotifications) {
|
||||
if (sn.getId() != accountId)
|
||||
continue;
|
||||
|
||||
String channelId = sn.getNotification().getGroup();
|
||||
|
||||
if (!channelId.equals(typeChannelId))
|
||||
continue;
|
||||
|
||||
String summaryTag = GROUP_SUMMARY_TAG + "." + channelId;
|
||||
if (summaryTag.equals(sn.getTag()))
|
||||
continue;
|
||||
|
||||
activeNotificationsForType.add(sn);
|
||||
}
|
||||
|
||||
return activeNotificationsForType;
|
||||
}
|
||||
|
||||
private static NotificationCompat.Builder newAndroidNotification(Context context, Notification body, AccountEntity account) {
|
||||
|
||||
|
|
@ -747,29 +727,41 @@ public class NotificationHelper {
|
|||
}
|
||||
}
|
||||
|
||||
private static String wrapItemAt(StatusBarNotification notification) {
|
||||
return StringUtils.unicodeWrap(notification.getNotification().extras.getString(EXTRA_ACCOUNT_NAME));//getAccount().getName());
|
||||
private static String joinNames(Context context, List<StatusBarNotification> notifications1, List<Notification> notifications2) {
|
||||
List<String> names = new ArrayList<>(notifications1.size() + notifications2.size());
|
||||
|
||||
for (StatusBarNotification notification: notifications1) {
|
||||
names.add(notification.getNotification().extras.getString(EXTRA_ACCOUNT_NAME));
|
||||
}
|
||||
|
||||
for (Notification notification : notifications2) {
|
||||
names.add(notification.getAccount().getName());
|
||||
}
|
||||
|
||||
return joinNames(context, names);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private static String joinNames(Context context, List<StatusBarNotification> notifications) {
|
||||
if (notifications.size() > 3) {
|
||||
int length = notifications.size();
|
||||
//notifications.get(0).getNotification().extras.getString(EXTRA_ACCOUNT_NAME);
|
||||
return String.format(context.getString(R.string.notification_summary_large),
|
||||
wrapItemAt(notifications.get(length - 1)),
|
||||
wrapItemAt(notifications.get(length - 2)),
|
||||
wrapItemAt(notifications.get(length - 3)),
|
||||
length - 3);
|
||||
} else if (notifications.size() == 3) {
|
||||
return String.format(context.getString(R.string.notification_summary_medium),
|
||||
wrapItemAt(notifications.get(2)),
|
||||
wrapItemAt(notifications.get(1)),
|
||||
wrapItemAt(notifications.get(0)));
|
||||
} else if (notifications.size() == 2) {
|
||||
return String.format(context.getString(R.string.notification_summary_small),
|
||||
wrapItemAt(notifications.get(1)),
|
||||
wrapItemAt(notifications.get(0)));
|
||||
private static String joinNames(Context context, List<String> names) {
|
||||
if (names.size() > 3) {
|
||||
int length = names.size();
|
||||
return context.getString(R.string.notification_summary_large,
|
||||
StringUtils.unicodeWrap(names.get(length - 1)),
|
||||
StringUtils.unicodeWrap(names.get(length - 2)),
|
||||
StringUtils.unicodeWrap(names.get(length - 3)),
|
||||
length - 3
|
||||
);
|
||||
} else if (names.size() == 3) {
|
||||
return context.getString(R.string.notification_summary_medium,
|
||||
StringUtils.unicodeWrap(names.get(2)),
|
||||
StringUtils.unicodeWrap(names.get(1)),
|
||||
StringUtils.unicodeWrap(names.get(0))
|
||||
);
|
||||
} else if (names.size() == 2) {
|
||||
return context.getString(R.string.notification_summary_small,
|
||||
StringUtils.unicodeWrap(names.get(1)),
|
||||
StringUtils.unicodeWrap(names.get(0))
|
||||
);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
|
@ -780,23 +772,17 @@ public class NotificationHelper {
|
|||
String accountName = StringUtils.unicodeWrap(notification.getAccount().getName());
|
||||
switch (notification.getType()) {
|
||||
case MENTION:
|
||||
return String.format(context.getString(R.string.notification_mention_format),
|
||||
accountName);
|
||||
return context.getString(R.string.notification_mention_format, accountName);
|
||||
case STATUS:
|
||||
return String.format(context.getString(R.string.notification_subscription_format),
|
||||
accountName);
|
||||
return context.getString(R.string.notification_subscription_format, accountName);
|
||||
case FOLLOW:
|
||||
return String.format(context.getString(R.string.notification_follow_format),
|
||||
accountName);
|
||||
return context.getString(R.string.notification_follow_format, accountName);
|
||||
case FOLLOW_REQUEST:
|
||||
return String.format(context.getString(R.string.notification_follow_request_format),
|
||||
accountName);
|
||||
return context.getString(R.string.notification_follow_request_format, accountName);
|
||||
case FAVOURITE:
|
||||
return String.format(context.getString(R.string.notification_favourite_format),
|
||||
accountName);
|
||||
return context.getString(R.string.notification_favourite_format, accountName);
|
||||
case REBLOG:
|
||||
return String.format(context.getString(R.string.notification_reblog_format),
|
||||
accountName);
|
||||
return context.getString(R.string.notification_reblog_format, accountName);
|
||||
case POLL:
|
||||
if(notification.getStatus().getAccount().getId().equals(account.getAccountId())) {
|
||||
return context.getString(R.string.poll_ended_created);
|
||||
|
|
@ -804,9 +790,9 @@ public class NotificationHelper {
|
|||
return context.getString(R.string.poll_ended_voted);
|
||||
}
|
||||
case SIGN_UP:
|
||||
return String.format(context.getString(R.string.notification_sign_up_format), accountName);
|
||||
return context.getString(R.string.notification_sign_up_format, accountName);
|
||||
case UPDATE:
|
||||
return String.format(context.getString(R.string.notification_update_format), accountName);
|
||||
return context.getString(R.string.notification_update_format, accountName);
|
||||
case REPORT:
|
||||
return context.getString(R.string.notification_report_format, account.getDomain());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ class MainActivityTest {
|
|||
NotificationHelper.createNotificationChannelsForAccount(accountEntity, context)
|
||||
|
||||
runInBackground {
|
||||
val notification = NotificationHelper.make(
|
||||
val notification = NotificationHelper.makeBaseNotification(
|
||||
context,
|
||||
notificationManager,
|
||||
Notification(
|
||||
|
|
@ -116,8 +116,7 @@ class MainActivityTest {
|
|||
status = null,
|
||||
report = null
|
||||
),
|
||||
accountEntity,
|
||||
true
|
||||
accountEntity
|
||||
)
|
||||
notificationManager.notify("id", 1, notification)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue