add sticky to sticky notifications

Author: Razeeman

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/activitySwitch/manager/NotificationActivitySwitchManager.kt

@@ -17,6 +17,7 @@ import androidx.core.app.NotificationManagerCompat
 import com.example.util.simpletimetracker.core.extension.allowVmViolations
 import com.example.util.simpletimetracker.core.utils.PendingIntents
 import com.example.util.simpletimetracker.feature_notification.R
+import com.example.util.simpletimetracker.feature_notification.recevier.NotificationReceiver
 import com.example.util.simpletimetracker.feature_notification.recordType.customView.NotificationIconView
 import com.example.util.simpletimetracker.feature_views.extension.getBitmapFromView
 import com.example.util.simpletimetracker.feature_views.extension.measureExactly
@@ -63,6 +64,9 @@ class NotificationActivitySwitchManager @Inject constructor(
             startIntent,
             PendingIntents.getFlags(),
         )
+        val cancelIntent = getCancelIntent(
+            context = context,
+        )
 
         // TODO fix default duration type click when show tags is enabled,
         //  no animation / indication.
@@ -72,6 +76,8 @@ class NotificationActivitySwitchManager @Inject constructor(
             .setContentIntent(contentIntent)
             .setOngoing(true)
             .setAutoCancel(false)
+            // setOngoing(true) doesn't work on api 34, reshow notification on cancel.
+            .setDeleteIntent(cancelIntent) //
             .setCustomContentView(prepareView(params, isBig = false))
             .setCustomBigContentView(prepareView(params, isBig = true))
             .setStyle(NotificationCompat.DecoratedCustomViewStyle())
@@ -149,7 +155,23 @@ class NotificationActivitySwitchManager @Inject constructor(
         }.getBitmapFromView()
     }
 
+    private fun getCancelIntent(
+        context: Context,
+    ): PendingIntent {
+        val intent = Intent(context, NotificationReceiver::class.java)
+        intent.action = ACTION_NOTIFICATION_SWITCH_CANCEL
+        return PendingIntent.getBroadcast(
+            context,
+            0,
+            intent,
+            PendingIntents.getFlags(),
+        )
+    }
+
     companion object {
+        const val ACTION_NOTIFICATION_SWITCH_CANCEL =
+            "com.example.util.simpletimetracker.feature_notification.switch.onCancel"
+
         private const val NOTIFICATIONS_CHANNEL_ID = "ACTIVITY_SWITCH"
         private const val NOTIFICATIONS_CHANNEL_NAME = "Activity Switch"
 

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recevier/NotificationReceiver.kt

@@ -25,6 +25,7 @@ import com.example.util.simpletimetracker.core.utils.EXTRA_RECORD_TIME_STARTED
 import com.example.util.simpletimetracker.core.utils.EXTRA_RECORD_TYPE_ICON
 import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
 import com.example.util.simpletimetracker.feature_notification.activity.controller.NotificationActivityBroadcastController
+import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationActivitySwitchManager.Companion.ACTION_NOTIFICATION_SWITCH_CANCEL
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ACTION_NOTIFICATION_CONTROLS_STOP
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ACTION_NOTIFICATION_CONTROLS_TAGS_NEXT
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ACTION_NOTIFICATION_CONTROLS_TAGS_PREV
@@ -50,6 +51,7 @@ import com.example.util.simpletimetracker.feature_notification.activitySwitch.ma
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ARGS_TYPES_SHIFT
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.manager.NotificationControlsManager.Companion.ARGS_TYPE_ID
 import com.example.util.simpletimetracker.feature_notification.external.NotificationExternalBroadcastController
+import com.example.util.simpletimetracker.feature_notification.recordType.manager.NotificationTypeManager.Companion.ACTION_NOTIFICATION_TYPE_CANCEL
 import com.example.util.simpletimetracker.feature_notification.recordType.manager.NotificationTypeManager.Companion.ACTION_NOTIFICATION_TYPE_STOP
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -292,6 +294,13 @@ class NotificationReceiver : BroadcastReceiver() {
                     typesShift = typesShift,
                 )
             }
+            ACTION_NOTIFICATION_TYPE_CANCEL -> {
+                val typeId = intent.getLongExtra(ARGS_TYPE_ID, 0)
+                typeController.onTypeCancel(typeId)
+            }
+            ACTION_NOTIFICATION_SWITCH_CANCEL -> {
+                typeController.onActivitySwitchCancel()
+            }
             Intent.ACTION_BOOT_COMPLETED -> {
                 onBootCompleted()
             }

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recordType/controller/NotificationTypeBroadcastController.kt

@@ -5,6 +5,7 @@ import com.example.util.simpletimetracker.domain.notifications.interactor.Notifi
 import com.example.util.simpletimetracker.domain.notifications.interactor.NotificationTypeInteractor
 import com.example.util.simpletimetracker.feature_notification.activitySwitch.mapper.NotificationControlsMapper
 import com.example.util.simpletimetracker.feature_notification.recordType.interactor.ActivityStartStopFromBroadcastInteractor
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -22,7 +23,7 @@ class NotificationTypeBroadcastController @Inject constructor(
         typeId: Long,
     ) {
         if (typeId == 0L) return
-        allowDiskRead { MainScope() }.launch {
+        safeLaunch {
             activityStartStopFromBroadcastInteractor.onActionActivityStop(
                 typeId = typeId,
             )
@@ -35,12 +36,12 @@ class NotificationTypeBroadcastController @Inject constructor(
         selectedTypeId: Long,
         typesShift: Int,
     ) {
-        allowDiskRead { MainScope() }.launch {
+        safeLaunch {
             activityStartStopFromBroadcastInteractor.onActionTypeClick(
                 from = notificationControlsMapper.mapExtraToFrom(
                     extra = from,
                     recordTypeId = typeId,
-                ) ?: return@launch,
+                ) ?: return@safeLaunch,
                 selectedTypeId = selectedTypeId,
                 typesShift = typesShift,
             )
@@ -54,12 +55,12 @@ class NotificationTypeBroadcastController @Inject constructor(
         tagId: Long,
         typesShift: Int,
     ) {
-        allowDiskRead { MainScope() }.launch {
+        safeLaunch {
             activityStartStopFromBroadcastInteractor.onActionTagClick(
                 from = notificationControlsMapper.mapExtraToFrom(
                     extra = from,
                     recordTypeId = typeId,
-                ) ?: return@launch,
+                ) ?: return@safeLaunch,
                 selectedTypeId = selectedTypeId,
                 tagId = tagId,
                 typesShift = typesShift,
@@ -75,12 +76,12 @@ class NotificationTypeBroadcastController @Inject constructor(
         tagValue: String?,
         typesShift: Int,
     ) {
-        allowDiskRead { MainScope() }.launch {
+        safeLaunch {
             activityStartStopFromBroadcastInteractor.onActionTagValueSave(
                 from = notificationControlsMapper.mapExtraToFrom(
                     extra = from,
                     recordTypeId = typeId,
-                ) ?: return@launch,
+                ) ?: return@safeLaunch,
                 selectedTypeId = selectedTypeId,
                 tagId = tagId,
                 tagValue = tagValue,
@@ -98,12 +99,12 @@ class NotificationTypeBroadcastController @Inject constructor(
         typesShift: Int,
         tagsShift: Int,
     ) {
-        allowDiskRead { MainScope() }.launch {
+        safeLaunch {
             activityStartStopFromBroadcastInteractor.onRequestUpdate(
                 from = notificationControlsMapper.mapExtraToFrom(
                     extra = from,
                     typeId,
-                ) ?: return@launch,
+                ) ?: return@safeLaunch,
                 selectedTypeId = selectedTypeId,
                 selectedTagId = selectedTagId,
                 selectedTagValue = selectedTagValue,
@@ -113,10 +114,30 @@ class NotificationTypeBroadcastController @Inject constructor(
         }
     }
 
+    fun onTypeCancel(
+        typeId: Long,
+    ) {
+        safeLaunch {
+            notificationTypeInteractor.checkAndShow(typeId)
+        }
+    }
+
+    fun onActivitySwitchCancel() {
+        safeLaunch {
+            notificationActivitySwitchInteractor.updateNotification()
+        }
+    }
+
     fun onBootCompleted() {
-        allowDiskRead { MainScope() }.launch {
+        safeLaunch {
             notificationTypeInteractor.updateNotifications()
             notificationActivitySwitchInteractor.updateNotification()
         }
     }
+
+    private fun safeLaunch(
+        block: suspend CoroutineScope.() -> Unit
+    ) {
+        allowDiskRead { MainScope() }.launch(block = block)
+    }
 }

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recordType/manager/NotificationTypeManager.kt

@@ -72,6 +72,11 @@ class NotificationTypeManager @Inject constructor(
             requestCode = params.id.toInt(),
             recordTypeId = params.id,
         )
+        val cancelIntent = getCancelIntent(
+            context = context,
+            requestCode = params.id.toInt(),
+            recordTypeId = params.id,
+        )
 
         // TODO add manual notification grouping by adding setGroup() to all,
         //  and showing separate notification with setGroupSummary(),
@@ -83,6 +88,8 @@ class NotificationTypeManager @Inject constructor(
             .setContentIntent(contentIntent)
             .setOngoing(true)
             .setAutoCancel(false)
+            // setOngoing(true) doesn't work on api 34, reshow notification on cancel.
+            .setDeleteIntent(cancelIntent)
             .setCustomContentView(prepareView(params, isBig = false))
             .setCustomBigContentView(prepareView(params, isBig = true))
             .addAction(0, params.stopButton, stopIntent)
@@ -158,6 +165,22 @@ class NotificationTypeManager @Inject constructor(
         )
     }
 
+    private fun getCancelIntent(
+        context: Context,
+        requestCode: Int,
+        recordTypeId: Long,
+    ): PendingIntent {
+        val intent = Intent(context, NotificationReceiver::class.java)
+        intent.action = ACTION_NOTIFICATION_TYPE_CANCEL
+        intent.putExtra(ARGS_TYPE_ID, recordTypeId)
+        return PendingIntent.getBroadcast(
+            context,
+            requestCode,
+            intent,
+            PendingIntents.getFlags(),
+        )
+    }
+
     private fun getIconBitmap(
         icon: RecordTypeIcon,
         color: Int,
@@ -176,6 +199,8 @@ class NotificationTypeManager @Inject constructor(
     companion object {
         const val ACTION_NOTIFICATION_TYPE_STOP =
             "com.example.util.simpletimetracker.feature_notification.recordType.onStop"
+        const val ACTION_NOTIFICATION_TYPE_CANCEL =
+            "com.example.util.simpletimetracker.feature_notification.recordType.onCancel"
 
         private const val NOTIFICATIONS_CHANNEL_ID = "NOTIFICATIONS"
         private const val NOTIFICATIONS_CHANNEL_NAME = "Notifications"