diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt index 39167e79b..bd0f265c8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt @@ -32,7 +32,7 @@ interface NotificationsManager { } class MainNotificationsManager : NotificationsManager { - private val seenNotifications: MutableMap + private val seenNotifications: MutableMap = HashMap() override var apiClient: WeakReference? = null private var lastNotificationHandling: Date? = null @@ -41,10 +41,6 @@ class MainNotificationsManager : NotificationsManager { override val displayNotificationEvents: Flow = displayedNotificationEvents.receiveAsFlow().filterNotNull() - init { - this.seenNotifications = HashMap() - } - override fun setNotifications(current: List) { notificationsFlow.value = current this.handlePopupNotifications(current) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt index 0afbac2f9..6a0305fb8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt @@ -208,7 +208,7 @@ class TaskAlarmManager( context, intentId, intent, - PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABE + PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABLE ) val am = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager sender.cancel() @@ -261,7 +261,7 @@ class TaskAlarmManager( context, 0, notificationIntent, - PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABE + PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABLE ) setAlarm(context, triggerTime, pendingIntent) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt index 6d6616fca..a43a0f1ae 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt @@ -80,7 +80,7 @@ abstract class HabiticaLocalNotification( context, 3000, intent, - PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABE + PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABLE ) notificationBuilder.setContentIntent(pendingIntent) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt index d18a71fd1..25ab74fd7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt @@ -104,7 +104,7 @@ class TaskReceiver : BroadcastReceiver() { context, task.id.hashCode(), completeIntent, - PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABE + PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABLE ) notificationBuilder.addAction( 0, diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt index e500da723..f951a8568 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt @@ -202,7 +202,7 @@ class AvatarStatsWidgetProvider : BaseWidgetProvider() { context, 0, openAppIntent, - PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABE + PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABLE ) remoteViews.setOnClickPendingIntent(android.R.id.background, openApp) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt index 50ae945a7..19d4481ee 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt @@ -143,7 +143,7 @@ class HabitButtonWidgetService : Service() { context, widgetId + direction.hashCode(), taskIntent, - PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABE + PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABLE ) } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt index 262ab0842..836da57c0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt @@ -93,7 +93,7 @@ abstract class TaskListWidgetProvider : BaseWidgetProvider() { context, 0, openAppIntent, - PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABE + PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABLE ) rv.setOnClickPendingIntent(R.id.widget_title, openApp)