mobi/e-ntfy-android
1
0
Fork 0
Code Pull requests Activity

Discard truncated FCM messages if instant delivery is enabled; closes #84

Browse source
This commit is contained in:
Philipp Heckel 2022-01-04 21:10:36 +01:00
parent 4d9b9ca0c8
commit 598e3376bb
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/play/java/io/heckel/ntfy/firebase/FirebaseService.kt
View file

@ -56,6 +56,7 @@ class FirebaseService : FirebaseMessagingService() {
val message = data["message"] val message = data["message"]
val priority = data["priority"]?.toIntOrNull() val priority = data["priority"]?.toIntOrNull()
val tags = data["tags"] val tags = data["tags"]
val truncated = (data["truncated"] ?: "") == "1"
if (id == null || topic == null || message == null || timestamp == null) { if (id == null || topic == null || message == null || timestamp == null) {
Log.d(TAG, "Discarding unexpected message: from=${remoteMessage.from}, fcmprio=${remoteMessage.priority}, fcmprio_orig=${remoteMessage.originalPriority}, data=${data}") Log.d(TAG, "Discarding unexpected message: from=${remoteMessage.from}, fcmprio=${remoteMessage.priority}, fcmprio_orig=${remoteMessage.originalPriority}, data=${data}")
return return
@ -65,8 +66,14 @@ class FirebaseService : FirebaseMessagingService() {
CoroutineScope(job).launch { CoroutineScope(job).launch {
val baseUrl = getString(R.string.app_base_url) // Everything from Firebase comes from main service URL! val baseUrl = getString(R.string.app_base_url) // Everything from Firebase comes from main service URL!
// Add notification // Check if notification was truncated and discard if it will (or likely already did) arrive via instant delivery
val subscription = repository.getSubscription(baseUrl, topic) ?: return@launch val subscription = repository.getSubscription(baseUrl, topic) ?: return@launch
if (truncated && subscription.instant) {
Log.d(TAG, "Discarding truncated message that did/will arrive via instant delivery: from=${remoteMessage.from}, fcmprio=${remoteMessage.priority}, fcmprio_orig=${remoteMessage.originalPriority}, data=${data}")
return@launch
}
// Add notification
val notification = Notification( val notification = Notification(
id = id, id = id,
subscriptionId = subscription.id, subscriptionId = subscription.id,