From 9c826ff71e41a14560e7014b12e0d06eb176f119 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 26 Sep 2017 13:55:14 -0400 Subject: [PATCH] Display notifications for incoming messages, mark seen when notification dismissed --- qksms/src/main/AndroidManifest.xml | 1 + .../com/moez/QKSMS/dagger/AppComponent.kt | 2 + .../java/com/moez/QKSMS/dagger/AppModule.kt | 8 ++-- .../data/repository/MessageRepository.kt | 43 ++++++++++++++++++- .../moez/QKSMS/receiver/MarkSeenReceiver.kt | 21 +++++++++ .../moez/QKSMS/util/NotificationManager.kt | 43 ++++++++++--------- 6 files changed, 92 insertions(+), 26 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index 9b385680..514f1b53 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -61,6 +61,7 @@ + { return Realm.getDefaultInstance() @@ -70,7 +71,10 @@ class MessageRepository(val context: Context) { Flowable.just(values) .subscribeOn(Schedulers.io()) .map { contentResolver.insert(Sms.Inbox.CONTENT_URI, values) } - .subscribe { uri -> copyMessageToRealm(uri) } + .subscribe { uri -> + copyMessageToRealm(uri) + notificationManager.update(this) + } } fun markAllSeen() { @@ -100,6 +104,41 @@ class MessageRepository(val context: Context) { } } + fun markSeen(threadId: Long) { + // Messages in SMS ContentProvider + val projection = arrayOf(BaseColumns._ID) + val selection = "${Sms.THREAD_ID} = $threadId AND ${Sms.SEEN} = 0" + val contentResolver = context.contentResolver + contentResolver.query(Sms.Inbox.CONTENT_URI, projection, selection, null, null) + .asFlowable() + .subscribeOn(Schedulers.io()) + .map { cursor -> cursor.getLong(0) } + .map { id -> Uri.withAppendedPath(Sms.CONTENT_URI, id.toString()) } + .subscribe { uri -> + val values = ContentValues() + values.put(Sms.SEEN, true) + contentResolver.update(uri, values, null, null) + } + + // TODO also need to mark MMS in ContentProvider as Seen + + // Messages in Realm + Schedulers.io().scheduleDirect { + val realm = Realm.getDefaultInstance() + val messages = realm.where(Message::class.java) + .equalTo("threadId", threadId) + .equalTo("seen", false) + .findAll() + + realm.executeTransaction { + messages.forEach { message -> + message.seen = true + } + } + realm.close() + } + } + fun markRead(threadId: Long) { // Messages in SMS ContentProvider val projection = arrayOf(BaseColumns._ID) diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt new file mode 100644 index 00000000..a1043eea --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt @@ -0,0 +1,21 @@ +package com.moez.QKSMS.receiver + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.moez.QKSMS.dagger.AppComponentManager +import com.moez.QKSMS.data.repository.MessageRepository +import javax.inject.Inject + +class MarkSeenReceiver : BroadcastReceiver() { + + @Inject lateinit var messageRepo: MessageRepository + + override fun onReceive(context: Context, intent: Intent) { + AppComponentManager.appComponent.inject(this) + + val threadId = intent.getLongExtra("threadId", 0) + messageRepo.markSeen(threadId) + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt index 0b9e5cdd..4b0a7a2c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt @@ -2,26 +2,23 @@ package com.moez.QKSMS.util import android.app.NotificationChannel import android.app.NotificationManager +import android.app.PendingIntent import android.content.Context +import android.content.Intent import android.graphics.Color import android.os.Build import android.support.v4.app.NotificationCompat import android.support.v4.app.NotificationManagerCompat import com.moez.QKSMS.R -import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository -import javax.inject.Inject +import com.moez.QKSMS.receiver.MarkSeenReceiver -class NotificationManager(val context: Context, val messageRepo: MessageRepository) { - - @Inject lateinit var themeManager: ThemeManager +class NotificationManager(private val context: Context, private val themeManager: ThemeManager) { private val notificationManager = NotificationManagerCompat.from(context) init { - AppComponentManager.appComponent.inject(this) - if (Build.VERSION.SDK_INT >= 26) { val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager @@ -42,22 +39,28 @@ class NotificationManager(val context: Context, val messageRepo: MessageReposito } // https://developer.android.com/guide/topics/ui/notifiers/notifications.html - fun update() { - messageRepo.getUnreadUnseenMessages().groupBy { message -> message.threadId }.forEach { conversation -> + fun update(messageRepo: MessageRepository) { + messageRepo.getUnreadUnseenMessages() + .groupBy { message -> message.threadId } + .forEach { conversation -> - val style = NotificationCompat.MessagingStyle("Me") - conversation.value.forEach { message -> - val name = if (message.isMe()) null else "Person" - style.addMessage(message.body, message.date, name) - } + val style = NotificationCompat.MessagingStyle("Me") + conversation.value.forEach { message -> + val name = if (message.isMe()) null else "Person" + style.addMessage(message.body, message.date, name) + } - val notification = NotificationCompat.Builder(context, "channel_1") - .setColor(themeManager.color) - .setSmallIcon(R.mipmap.ic_launcher) - .setStyle(style) + val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", conversation.key) + val seenPI = PendingIntent.getBroadcast(context, conversation.key.toInt(), seenIntent, PendingIntent.FLAG_UPDATE_CURRENT) - notificationManager.notify(conversation.key.toInt(), notification.build()) - } + val notification = NotificationCompat.Builder(context, "channel_1") + .setColor(themeManager.color) + .setSmallIcon(R.mipmap.ic_launcher) + .setDeleteIntent(seenPI) + .setStyle(style) + + notificationManager.notify(conversation.key.toInt(), notification.build()) + } } } \ No newline at end of file