CodeMirror/ntfy-android
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy-android.git synced 2024-05-17 11:02:36 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into constant-ring

Browse source
This commit is contained in:
Philipp Heckel 2022-11-29 14:25:46 -05:00
parent b3a0a10b60 1b587ab82a
commit e18be4a2a7
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
View file

@ -364,7 +364,7 @@ class NotificationService(val context: Context) {
}
return TaskStackBuilder.create(context).run {
addNextIntentWithParentStack(intent) // Add the intent, which inflates the back stack
getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) // Get the PendingIntent containing the entire back stack
getPendingIntent(Random().nextInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) // Get the PendingIntent containing the entire back stack
}
}

1
app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
View file

@ -297,6 +297,7 @@ class SubscriberService : Service() {
.setContentIntent(pendingIntent)
.setSound(null)
.setShowWhen(false) // Don't show date/time
.setOngoing(true) // Starting SDK 33 / Android 13, foreground notifications can be swiped away
.setGroup(NOTIFICATION_GROUP_ID) // Do not group with other notifications
.build()
}

2
fastlane/metadata/android/en-US/changelog/29.txt
View file

@ -5,11 +5,13 @@ Bug fixes + maintenance:
* Upgrade Android dependencies and build toolchain to SDK 33 (no ticket)
* Simplify F-Droid build: Disable tasks for Google Services (#516, thanks to @markosopcic)
* Android 13: Ask for permission to post notifications (#508)
* Android 13: Do not allow swiping away the foreground notification (#521, thanks to @alexhorner for reporting)
* Remove timestamp when copying message text (#471, thanks to @wunter8)
* Fix auto-delete if some icons do not exist anymore (#506)
* Fix notification icon color (#480, thanks to @s-h-a-r-d for reporting)
* Fix topics do not re-subscribe to Firebase after restoring from backup (#511)
* Fix crashes from large images (#474, thanks to @daedric7 for reporting)
* Fix notification click opens wrong subscription (#261, thanks to @SMAW for reporting)
* Add donate button (no ticket)
Additional translations: