diff --git a/qksms/src/main/java/common/util/NotificationManager.kt b/qksms/src/main/java/common/util/NotificationManager.kt index 43d8cd20..5e5658e2 100644 --- a/qksms/src/main/java/common/util/NotificationManager.kt +++ b/qksms/src/main/java/common/util/NotificationManager.kt @@ -133,6 +133,37 @@ class NotificationManager @Inject constructor( notificationManager.notify(threadId.toInt(), notification.build()) } + fun notifyFailed(msgId: Long) { + val message = messageRepo.getMessage(msgId) + + if (message == null || !message.isFailedMessage()) { + return + } + + val threadId = message.threadId + val conversation = messageRepo.getConversation(threadId) ?: return + + val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId) + val taskStackBuilder = TaskStackBuilder.create(context) + taskStackBuilder.addParentStack(ComposeActivity::class.java) + taskStackBuilder.addNextIntent(contentIntent) + val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt() + 40000, PendingIntent.FLAG_UPDATE_CURRENT) + + val notification = NotificationCompat.Builder(context, DEFAULT_CHANNEL_ID) + .setContentTitle(context.getString(R.string.notification_message_failed_title)) + .setContentText(context.getString(R.string.notification_message_failed_text, conversation.getTitle())) + .setColor(colors.theme.blockingFirst()) + .setPriority(NotificationManagerCompat.IMPORTANCE_MAX) + .setSmallIcon(R.drawable.ic_notification_failed) + .setAutoCancel(true) + .setContentIntent(contentPI) + .setSound(Uri.parse(prefs.ringtone.get())) + .setLights(Color.WHITE, 500, 2000) + .setVibrate(if (prefs.vibration.get()) VIBRATE_PATTERN else longArrayOf(0)) + + notificationManager.notify(threadId.toInt() + 50000, notification.build()) + } + private fun getReplyAction(address: String, threadId: Long): NotificationCompat.Action { val replyIntent = Intent(context, RemoteMessagingReceiver::class.java) .putExtra("address", address) diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index a9bfbf11..d67524a2 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -142,6 +142,13 @@ class MessageRepository @Inject constructor( .findAll() } + fun getMessage(id: Long): Message? { + return Realm.getDefaultInstance() + .where(Message::class.java) + .equalTo("id", id) + .findFirst() + } + /** * Retrieves the list of messages which should be shown in the notification * for a given conversation diff --git a/qksms/src/main/java/interactor/MarkFailed.kt b/qksms/src/main/java/interactor/MarkFailed.kt index 24def240..70c935d2 100644 --- a/qksms/src/main/java/interactor/MarkFailed.kt +++ b/qksms/src/main/java/interactor/MarkFailed.kt @@ -18,12 +18,16 @@ */ package interactor +import common.util.NotificationManager import data.repository.MessageRepository import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers import javax.inject.Inject -class MarkFailed @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkFailed @Inject constructor( + private val messageRepo: MessageRepository, + private val notificationManager: NotificationManager +) : Interactor() { data class Params(val id: Long, val resultCode: Int) @@ -31,6 +35,7 @@ class MarkFailed @Inject constructor(private val messageRepo: MessageRepository) return Flowable.just(Unit) .observeOn(AndroidSchedulers.mainThread()) .flatMap { messageRepo.markFailed(params.id, params.resultCode) } + .doOnNext { notificationManager.notifyFailed(params.id) } } } \ No newline at end of file diff --git a/qksms/src/main/res/drawable-xxxhdpi/ic_notification_failed.png b/qksms/src/main/res/drawable-xxxhdpi/ic_notification_failed.png new file mode 100755 index 00000000..aa29a01f Binary files /dev/null and b/qksms/src/main/res/drawable-xxxhdpi/ic_notification_failed.png differ diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index c0ac71bc..a56a8e5d 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -127,6 +127,9 @@ Moved to inbox You must unlock QKSMS+ to use this + Message not sent + The message to %s failed to send + Copy text Forward