diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt index 4ca558f7..18c84028 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt @@ -18,13 +18,41 @@ class NativeMessageTransaction(private val context: Context) : MessageTransactio } override fun markSeen() { + // TODO also need to mark MMS in ContentProvider as Seen + val projection = arrayOf(BaseColumns._ID) + val selection = "${Telephony.Sms.SEEN} = 0" + val contentResolver = context.contentResolver + contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null) + .asFlowable() + .subscribeOn(Schedulers.io()) + .map { cursor -> cursor.getLong(0) } + .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) } + .subscribe { uri -> + val values = ContentValues() + values.put(Telephony.Sms.SEEN, true) + contentResolver.update(uri, values, null, null) + } } override fun markSeen(threadId: Long) { + // TODO also need to mark MMS in ContentProvider as Seen + val projection = arrayOf(BaseColumns._ID) + val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND ${Telephony.Sms.SEEN} = 0" + val contentResolver = context.contentResolver + contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null) + .asFlowable() + .subscribeOn(Schedulers.io()) + .map { cursor -> cursor.getLong(0) } + .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) } + .subscribe { uri -> + val values = ContentValues() + values.put(Telephony.Sms.SEEN, true) + contentResolver.update(uri, values, null, null) + } } override fun markRead(threadId: Long) { - // Messages in SMS ContentProvider + // TODO also need to mark MMS in ContentProvider as Read val projection = arrayOf(BaseColumns._ID) val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND (${Telephony.Sms.SEEN} = 0 OR ${Telephony.Sms.READ} = 0)" val contentResolver = context.contentResolver @@ -39,8 +67,6 @@ class NativeMessageTransaction(private val context: Context) : MessageTransactio values.put(Telephony.Sms.READ, true) contentResolver.update(uri, values, null, null) } - - // TODO also need to mark MMS in ContentProvider as Read } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt index 6511a1ea..f13edcd9 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt @@ -17,9 +17,29 @@ class RealmMessageTransaction @Inject constructor() : MessageTransaction { } override fun markSeen() { + Schedulers.io().scheduleDirect { + val realm = Realm.getDefaultInstance() + val messages = realm.where(Message::class.java).equalTo("seen", false).findAll() + realm.executeTransaction { messages.forEach { message -> message.seen = true } } + realm.close() + } } override fun markSeen(threadId: Long) { + 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() + } } override fun markRead(threadId: Long) { diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 00dce1dc..b0d56c9e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -5,11 +5,9 @@ import android.content.ContentValues import android.content.Context import android.content.Intent import android.net.Uri -import android.provider.BaseColumns import android.provider.Telephony.Sms import android.telephony.SmsManager import com.moez.QKSMS.common.util.NotificationManager -import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.common.util.extensions.insertOrUpdate import com.moez.QKSMS.data.datasource.native.NativeMessageTransaction import com.moez.QKSMS.data.datasource.realm.RealmMessageTransaction @@ -89,65 +87,13 @@ class MessageRepository @Inject constructor( } fun markAllSeen() { - // Messages in SMS ContentProvider - val projection = arrayOf(BaseColumns._ID) - val selection = "${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("seen", false).findAll() - realm.executeTransaction { messages.forEach { message -> message.seen = true } } - realm.close() - } + nativeMessageTransaction.markSeen() + realmMessageTransaction.markSeen() } 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() - } + nativeMessageTransaction.markSeen(threadId) + realmMessageTransaction.markSeen(threadId) } fun markRead(threadId: Long) {