sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-14 18:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1886 from Hafizzle/Hafiz/fix-repeating-popupNotifs

Browse source 
Fix repeating notifications showing on Activity start
This commit is contained in:
Phillip Thelen 2022-12-14 14:52:46 +01:00 committed by GitHub
commit c808c22f59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
View file

@ -6,9 +6,11 @@ import com.habitrpg.android.habitica.data.ApiClient
import com.habitrpg.android.habitica.models.tasks.Task
import com.habitrpg.common.habitica.models.Notification
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.receiveAsFlow
import java.lang.ref.WeakReference
import java.util.Date
@ -29,8 +31,8 @@ class MainNotificationsManager: NotificationsManager {
private var lastNotificationHandling: Date? = null
val _notifications = MutableStateFlow<List<Notification>?>(null)
val _displaynotificationEvents = MutableStateFlow<Notification?>(null)
override val displayNotificationEvents: Flow<Notification> = _displaynotificationEvents.filterNotNull()
val _displaynotificationEvents = Channel<Notification>()
override val displayNotificationEvents: Flow<Notification> = _displaynotificationEvents.receiveAsFlow().filterNotNull()
init {
this.seenNotifications = HashMap()
@ -99,12 +101,11 @@ class MainNotificationsManager: NotificationsManager {
Notification.Type.ACHIEVEMENT_GENERIC.type -> true
Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type -> true
Notification.Type.LOGIN_INCENTIVE.type -> true
Notification.Type.NEW_MYSTERY_ITEMS.type -> true
else -> false
}
if (notificationDisplayed) {
_displaynotificationEvents.value = it
this.seenNotifications[it.id] = true
readNotification(it)
}
}
@ -114,6 +115,8 @@ class MainNotificationsManager: NotificationsManager {
private fun readNotification(notification: Notification) {
MainScope().launchCatching {
_displaynotificationEvents.send(notification)
seenNotifications[notification.id] = true
apiClient?.get()?.readNotification(notification.id)
}
}