mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-19 12:28:53 +01:00
Handle marking message failed/delivered in MessageRepository
This commit is contained in:
@@ -23,6 +23,7 @@ interface AppComponent {
|
|||||||
fun inject(manager: NotificationManager)
|
fun inject(manager: NotificationManager)
|
||||||
|
|
||||||
fun inject(receiver: SmsReceiver)
|
fun inject(receiver: SmsReceiver)
|
||||||
|
fun inject(receiver: MessageDeliveredReceiver)
|
||||||
fun inject(receiver: MessageSentReceiver)
|
fun inject(receiver: MessageSentReceiver)
|
||||||
fun inject(receiver: MarkSeenReceiver)
|
fun inject(receiver: MarkSeenReceiver)
|
||||||
fun inject(receiver: MarkReadReceiver)
|
fun inject(receiver: MarkReadReceiver)
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import io.reactivex.schedulers.Schedulers
|
|||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
import io.realm.RealmResults
|
import io.realm.RealmResults
|
||||||
import io.realm.Sort
|
import io.realm.Sort
|
||||||
|
import java.util.*
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
import javax.inject.Singleton
|
import javax.inject.Singleton
|
||||||
|
|
||||||
@@ -116,7 +117,31 @@ class MessageRepository @Inject constructor(private val context: Context) {
|
|||||||
realm.close()
|
realm.close()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun updateMessageFromUri(values: ContentValues, uri: Uri) {
|
fun markFailed(uri: Uri, resultCode: Int) {
|
||||||
|
val values = ContentValues()
|
||||||
|
values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_FAILED)
|
||||||
|
values.put(Telephony.Sms.ERROR_CODE, resultCode)
|
||||||
|
updateMessageFromUri(uri, values)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun markDelivered(uri: Uri) {
|
||||||
|
val values = ContentValues()
|
||||||
|
values.put("status", Telephony.TextBasedSmsColumns.STATUS_COMPLETE)
|
||||||
|
values.put("date_sent", Calendar.getInstance().timeInMillis)
|
||||||
|
values.put("read", true)
|
||||||
|
updateMessageFromUri(uri, values)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun markDeliveryFailed(uri: Uri, resultCode: Int) {
|
||||||
|
val values = ContentValues()
|
||||||
|
values.put("status", Telephony.TextBasedSmsColumns.STATUS_FAILED)
|
||||||
|
values.put("date_sent", Calendar.getInstance().timeInMillis)
|
||||||
|
values.put("read", true)
|
||||||
|
values.put("error_code", resultCode)
|
||||||
|
updateMessageFromUri(uri, values)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun updateMessageFromUri(uri: Uri, values: ContentValues) {
|
||||||
val contentResolver = context.contentResolver
|
val contentResolver = context.contentResolver
|
||||||
Flowable.just(values)
|
Flowable.just(values)
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package com.moez.QKSMS.domain.interactor
|
package com.moez.QKSMS.domain.interactor
|
||||||
|
|
||||||
import android.content.ContentValues
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.Telephony
|
|
||||||
import com.moez.QKSMS.data.repository.MessageRepository
|
import com.moez.QKSMS.data.repository.MessageRepository
|
||||||
import io.reactivex.Flowable
|
import io.reactivex.Flowable
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@@ -13,12 +11,7 @@ class MarkFailed @Inject constructor(val messageRepo: MessageRepository) : Inter
|
|||||||
|
|
||||||
override fun buildObservable(params: Params): Flowable<Unit> {
|
override fun buildObservable(params: Params): Flowable<Unit> {
|
||||||
return Flowable.just(Unit)
|
return Flowable.just(Unit)
|
||||||
.doOnNext {
|
.doOnNext { messageRepo.markFailed(params.uri, params.resultCode) }
|
||||||
val values = ContentValues()
|
|
||||||
values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_FAILED)
|
|
||||||
values.put(Telephony.Sms.ERROR_CODE, params.resultCode)
|
|
||||||
messageRepo.updateMessageFromUri(values, params.uri)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,7 @@ class MarkSent @Inject constructor(val messageRepo: MessageRepository) : Interac
|
|||||||
.doOnNext {
|
.doOnNext {
|
||||||
val values = ContentValues()
|
val values = ContentValues()
|
||||||
values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_SENT)
|
values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_SENT)
|
||||||
messageRepo.updateMessageFromUri(values, params)
|
messageRepo.updateMessageFromUri(params, values)
|
||||||
}
|
}
|
||||||
.map { Unit }
|
.map { Unit }
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -5,7 +5,6 @@ import android.arch.lifecycle.ViewModel
|
|||||||
import com.moez.QKSMS.common.di.AppComponentManager
|
import com.moez.QKSMS.common.di.AppComponentManager
|
||||||
import com.moez.QKSMS.data.model.Message
|
import com.moez.QKSMS.data.model.Message
|
||||||
import com.moez.QKSMS.data.repository.MessageRepository
|
import com.moez.QKSMS.data.repository.MessageRepository
|
||||||
import com.moez.QKSMS.data.sync.SyncManager
|
|
||||||
import com.moez.QKSMS.domain.interactor.MarkAllSeen
|
import com.moez.QKSMS.domain.interactor.MarkAllSeen
|
||||||
import com.moez.QKSMS.domain.interactor.SyncConversations
|
import com.moez.QKSMS.domain.interactor.SyncConversations
|
||||||
import io.reactivex.subjects.PublishSubject
|
import io.reactivex.subjects.PublishSubject
|
||||||
|
|||||||
@@ -2,35 +2,27 @@ package com.moez.QKSMS.receiver
|
|||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.content.BroadcastReceiver
|
import android.content.BroadcastReceiver
|
||||||
import android.content.ContentValues
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.Telephony
|
import com.moez.QKSMS.common.di.AppComponentManager
|
||||||
import java.util.*
|
import com.moez.QKSMS.data.repository.MessageRepository
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
class MessageDeliveredReceiver : BroadcastReceiver() {
|
class MessageDeliveredReceiver : BroadcastReceiver() {
|
||||||
|
|
||||||
|
@Inject lateinit var messageRepo: MessageRepository
|
||||||
|
|
||||||
override fun onReceive(context: Context, intent: Intent) {
|
override fun onReceive(context: Context, intent: Intent) {
|
||||||
val uri = Uri.parse(intent.getStringExtra("uri"))
|
val uri = Uri.parse(intent.getStringExtra("uri"))
|
||||||
|
AppComponentManager.appComponent.inject(this)
|
||||||
|
|
||||||
when (resultCode) {
|
when (resultCode) {
|
||||||
Activity.RESULT_OK -> { // TODO notify about delivery
|
// TODO notify about delivery
|
||||||
val values = ContentValues()
|
Activity.RESULT_OK -> messageRepo.markDelivered(uri)
|
||||||
values.put("status", Telephony.TextBasedSmsColumns.STATUS_COMPLETE)
|
|
||||||
values.put("date_sent", Calendar.getInstance().timeInMillis)
|
|
||||||
values.put("read", true)
|
|
||||||
context.contentResolver.update(uri, values, null, null)
|
|
||||||
}
|
|
||||||
|
|
||||||
Activity.RESULT_CANCELED -> { // TODO notify about delivery failure
|
// TODO notify about delivery failure
|
||||||
val values = ContentValues()
|
Activity.RESULT_CANCELED -> messageRepo.markDeliveryFailed(uri, resultCode)
|
||||||
values.put("status", Telephony.TextBasedSmsColumns.STATUS_FAILED)
|
|
||||||
values.put("date_sent", Calendar.getInstance().timeInMillis)
|
|
||||||
values.put("read", true)
|
|
||||||
values.put("error_code", resultCode)
|
|
||||||
context.contentResolver.update(uri, values, null, null)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user