From e29aae3bf19bd42724dda92a7b1869b116aa06d1 Mon Sep 17 00:00:00 2001 From: gavine99 Date: Wed, 7 May 2025 11:56:36 +1000 Subject: [PATCH] add expedited worker getForegroundInfo()/notification for android platform versions older than 12 --- .../com/moez/QKSMS/worker/InjectionWorkerFactory.kt | 10 ++++++++-- .../java/com/moez/QKSMS/worker/ReceiveMmsWorker.kt | 9 ++++++++- .../java/com/moez/QKSMS/worker/ReceiveSmsWorker.kt | 8 ++++++++ .../com/moez/QKSMS/manager/NotificationManager.kt | 3 +++ .../QKSMS/common/util/NotificationManagerImpl.kt | 12 ++++++++++++ presentation/src/main/res/values/strings.xml | 1 + 6 files changed, 40 insertions(+), 3 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/worker/InjectionWorkerFactory.kt b/data/src/main/java/com/moez/QKSMS/worker/InjectionWorkerFactory.kt index 52bd3d29..4464246e 100644 --- a/data/src/main/java/com/moez/QKSMS/worker/InjectionWorkerFactory.kt +++ b/data/src/main/java/com/moez/QKSMS/worker/InjectionWorkerFactory.kt @@ -25,6 +25,7 @@ import androidx.work.WorkerFactory import androidx.work.WorkerParameters import dev.octoshrimpy.quik.interactor.ReceiveMms import dev.octoshrimpy.quik.interactor.ReceiveSms +import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import javax.inject.Inject @@ -32,6 +33,7 @@ class InjectionWorkerFactory @Inject constructor( private val receiveSms: ReceiveSms, private val receiveMms: ReceiveMms, private val scheduledMessageRepository: ScheduledMessageRepository, + private val notificationManager: NotificationManager, ) : WorkerFactory() { override fun createWorker( appContext: Context, @@ -47,10 +49,14 @@ class InjectionWorkerFactory @Inject constructor( when (instance) { is HousekeepingWorker -> instance.scheduledMessageRepository = scheduledMessageRepository - is ReceiveSmsWorker -> + is ReceiveSmsWorker -> { instance.receiveSms = receiveSms - is ReceiveMmsWorker -> + instance.notificationManager = notificationManager + } + is ReceiveMmsWorker -> { instance.receiveMms = receiveMms + instance.notificationManager = notificationManager + } } return instance diff --git a/data/src/main/java/com/moez/QKSMS/worker/ReceiveMmsWorker.kt b/data/src/main/java/com/moez/QKSMS/worker/ReceiveMmsWorker.kt index 29a9caa4..3f12fda6 100644 --- a/data/src/main/java/com/moez/QKSMS/worker/ReceiveMmsWorker.kt +++ b/data/src/main/java/com/moez/QKSMS/worker/ReceiveMmsWorker.kt @@ -19,9 +19,11 @@ package dev.octoshrimpy.quik.worker import android.content.Context +import androidx.work.ForegroundInfo import androidx.work.Worker import androidx.work.WorkerParameters import dev.octoshrimpy.quik.interactor.ReceiveMms +import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.receiver.MmsReceivedReceiver import timber.log.Timber import javax.inject.Inject @@ -37,11 +39,11 @@ class ReceiveMmsWorker(appContext: Context, workerParams: WorkerParameters) } @Inject lateinit var receiveMms: ReceiveMms + @Inject lateinit var notificationManager: NotificationManager override fun doWork(): Result { Timber.v("started") - MmsReceivedReceiver.onReceiveWorker( applicationContext, inputData.getInt(INPUT_DATA_SUBSCRIPTION_ID, -1), @@ -57,4 +59,9 @@ class ReceiveMmsWorker(appContext: Context, workerParams: WorkerParameters) return Result.success() } + override fun getForegroundInfo() = ForegroundInfo( + 0, + notificationManager.getForegroundNotificationForWorkersOnOlderAndroids() + ) + } diff --git a/data/src/main/java/com/moez/QKSMS/worker/ReceiveSmsWorker.kt b/data/src/main/java/com/moez/QKSMS/worker/ReceiveSmsWorker.kt index f408e48c..ecedee37 100644 --- a/data/src/main/java/com/moez/QKSMS/worker/ReceiveSmsWorker.kt +++ b/data/src/main/java/com/moez/QKSMS/worker/ReceiveSmsWorker.kt @@ -19,9 +19,11 @@ package dev.octoshrimpy.quik.worker import android.content.Context +import androidx.work.ForegroundInfo import androidx.work.Worker import androidx.work.WorkerParameters import dev.octoshrimpy.quik.interactor.ReceiveSms +import dev.octoshrimpy.quik.manager.NotificationManager import timber.log.Timber import javax.inject.Inject @@ -32,6 +34,7 @@ class ReceiveSmsWorker(appContext: Context, workerParams: WorkerParameters) } @Inject lateinit var receiveSms: ReceiveSms + @Inject lateinit var notificationManager: NotificationManager override fun doWork(): Result { Timber.v("started") @@ -50,4 +53,9 @@ class ReceiveSmsWorker(appContext: Context, workerParams: WorkerParameters) return Result.success() } + override fun getForegroundInfo() = ForegroundInfo( + 0, + notificationManager.getForegroundNotificationForWorkersOnOlderAndroids() + ) + } diff --git a/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt index 98d74af7..1fdb53ee 100644 --- a/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt @@ -18,10 +18,13 @@ */ package dev.octoshrimpy.quik.manager +import android.app.Notification import androidx.core.app.NotificationCompat interface NotificationManager { + fun getForegroundNotificationForWorkersOnOlderAndroids(): Notification + fun update(threadId: Long) fun notifyFailed(threadId: Long) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt index fb6384ac..91642cdd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt @@ -90,6 +90,18 @@ class NotificationManagerImpl @Inject constructor( createNotificationChannel() } + override fun getForegroundNotificationForWorkersOnOlderAndroids() = + NotificationCompat.Builder(context, DEFAULT_CHANNEL_ID) + .setContentTitle(context.getString(R.string.notification_foreground_worker_text)) + .setShowWhen(false) + .setWhen(System.currentTimeMillis()) + .setSmallIcon(R.drawable.ic_notification) + .setColor(colors.theme().theme) + .setCategory(NotificationCompat.CATEGORY_MESSAGE) + .setPriority(NotificationCompat.PRIORITY_MIN) + .setOngoing(true) + .build() + /** * Updates the notification for a particular conversation */ diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index cc559867..85aa5f15 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -487,6 +487,7 @@ Message not sent The message to %s failed to send + Receiving message System