Skip to content
This repository was archived by the owner on May 23, 2025. It is now read-only.

Show notifications as popup #4974

Open
Lakoja wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Show notifications as popup #4974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2caeede
Show notifications as popup
Lakoja Mar 5, 2025
d1832fd
Fix the popup content: Every notification can have an alert (scheduli…
Lakoja Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions ...c/main/java/com/keylesspalace/tusky/components/systemnotifications/NotificationService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ class NotificationService @Inject constructor(
NotificationChannel(
it.getChannelId(account),
context.getString(it.title),
NotificationManager.IMPORTANCE_DEFAULT
// HIGH: to show up as popup like with any other app
NotificationManager.IMPORTANCE_HIGH,
).apply {
description = context.getString(it.description)
enableLights(true)
Expand Down Expand Up @@ -401,7 +402,6 @@ class NotificationService @Inject constructor(
.setCategory(NotificationCompat.CATEGORY_SOCIAL)
.setGroup(typeChannelId)
.setGroupSummary(true)
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)

setSoundVibrationLight(account, summaryBuilder)

Expand Down Expand Up @@ -469,7 +469,6 @@ class NotificationService @Inject constructor(
.setCategory(NotificationCompat.CATEGORY_SOCIAL)
.setOnlyAlertOnce(true)
.setGroup(channelId)
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY) // Only ever alert for the summary notification

setSoundVibrationLight(account, builder)

Expand Down Expand Up @@ -582,16 +581,11 @@ class NotificationService @Inject constructor(
}

private fun joinNames(notifications1: List<StatusBarNotification>, notifications2: List<Notification>): String? {
val names = java.util.ArrayList<String>(notifications1.size + notifications2.size)
val names1 = notifications1.mapNotNull { it.notification.extras.getString(EXTRA_ACCOUNT_NAME) }
val names2 = notifications2.map { it.account.name }

for (notification in notifications1) {
val author = notification.notification.extras.getString(EXTRA_ACCOUNT_NAME) ?: continue
names.add(author)
}

for (noti in notifications2) {
names.add(noti.account.name)
}
// Collapsing the same names
val names: List<String> = (names1 + names2).distinct()

if (names.size > 3) {
val length = names.size
Expand All @@ -615,6 +609,8 @@ class NotificationService @Inject constructor(
names[1].unicodeWrap(),
names[0].unicodeWrap()
)
} else if (names.size == 1) {
return names[0].unicodeWrap()
}

return null
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@

<string name="notification_mention_format">%1$s mentioned you</string>
<string name="notification_summary_large">%1$s, %2$s, %3$s and %4$d others</string>
<string name="notification_summary_medium">%1$s, %2$s, and %3$s</string>
<string name="notification_summary_medium">%1$s, %2$s and %3$s</string>
<string name="notification_summary_small">%1$s and %2$s</string>
<plurals name="notification_title_summary">
<item quantity="one">%1$d new interaction</item>
Expand Down