Skip to content

Commit d6cd95a

Browse files
authored
Merge pull request #446 from axllent/duplicates
fix: Duplicated notifications
2 parents 1818ffb + 05ff882 commit d6cd95a

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ internal class MessagesActivity :
311311
}
312312

313313
override fun onResume() {
314+
Logger.info("OnResume " + javaClass.simpleName)
314315
val context = applicationContext
315316
val nManager = context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
316317
nManager.cancelAll()

app/src/main/kotlin/com/github/gotify/messages/provider/MessageStateHolder.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.github.gotify.messages.provider
33
import com.github.gotify.client.model.Message
44
import com.github.gotify.client.model.PagedMessages
55
import kotlin.math.max
6+
import org.tinylog.kotlin.Logger
67

78
internal class MessageStateHolder {
89
@get:Synchronized
@@ -42,6 +43,12 @@ internal class MessageStateHolder {
4243

4344
@Synchronized
4445
fun newMessage(message: Message) {
46+
if (lastReceivedMessage >= message.id) {
47+
Logger.warn {
48+
"Skipping processing message with id ${message.id} as it's already processed (lastReceivedMessage: $lastReceivedMessage)"
49+
}
50+
return
51+
}
4552
// If there is a message with pending deletion, its indices are going to change. To keep
4653
// them consistent the deletion is undone first and redone again after adding the new
4754
// message.

0 commit comments

Comments
 (0)