From ce8f01b707a2dd40b15f53771da0572221a16280 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 12 Feb 2018 23:21:44 -0500 Subject: [PATCH] Show notification if message failed to send --- .../java/common/util/NotificationManager.kt | 31 ++++++++++++++++++ .../java/data/repository/MessageRepository.kt | 7 ++++ qksms/src/main/java/interactor/MarkFailed.kt | 7 +++- .../ic_notification_failed.png | Bin 0 -> 5443 bytes qksms/src/main/res/values/strings.xml | 3 ++ 5 files changed, 47 insertions(+), 1 deletion(-) create mode 100755 qksms/src/main/res/drawable-xxxhdpi/ic_notification_failed.png 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 0000000000000000000000000000000000000000..aa29a01fe94e1998cfb04bd70806ce420d99f70d GIT binary patch literal 5443 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 to inbox You must unlock QKSMS+ to use this + Message not sent + The message to %s failed to send + Copy text Forward