forked from upstream-mirrors/quik
Merge pull request #478 from Inhishonor/notify-improvements
Notification improvements
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.receiver
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
@@ -27,6 +28,7 @@ import dev.octoshrimpy.quik.interactor.MarkBlocked
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import timber.log.Timber
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockThreadReceiver : BroadcastReceiver() {
|
||||
@@ -36,6 +38,7 @@ class BlockThreadReceiver : BroadcastReceiver() {
|
||||
@Inject lateinit var markBlocked: MarkBlocked
|
||||
@Inject lateinit var prefs: Preferences
|
||||
|
||||
@SuppressLint("CheckResult")
|
||||
override fun onReceive(context: Context, intent: Intent) {
|
||||
AndroidInjection.inject(this, context)
|
||||
|
||||
@@ -54,8 +57,14 @@ class BlockThreadReceiver : BroadcastReceiver() {
|
||||
MarkBlocked.Params(listOf(threadId), prefs.blockingManager.get(), null)
|
||||
)
|
||||
)
|
||||
.subscribe { goAsync().finish() }
|
||||
.dispose()
|
||||
.subscribe(
|
||||
{
|
||||
goAsync().finish()
|
||||
},
|
||||
{ error ->
|
||||
Timber.e("BlockThreadReceiver", "blocking failed")
|
||||
goAsync().finish()
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,12 +19,16 @@
|
||||
package dev.octoshrimpy.quik.interactor
|
||||
|
||||
import dev.octoshrimpy.quik.extensions.mapNotNull
|
||||
import dev.octoshrimpy.quik.manager.NotificationManager
|
||||
import dev.octoshrimpy.quik.model.Message
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import javax.inject.Inject
|
||||
|
||||
class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
|
||||
class RetrySending @Inject constructor(
|
||||
private val messageRepo: MessageRepository,
|
||||
private val notificationManager: NotificationManager
|
||||
) : Interactor<Long>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Message> {
|
||||
return Flowable.just(params)
|
||||
@@ -35,6 +39,8 @@ class RetrySending @Inject constructor(private val messageRepo: MessageRepositor
|
||||
true -> messageRepo.sendSms(message)
|
||||
false -> messageRepo.resendMms(message)
|
||||
}
|
||||
val threadId = message.threadId
|
||||
notificationManager.cancel(threadId.toInt() + 100000)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -32,4 +32,6 @@ interface NotificationManager {
|
||||
|
||||
fun getNotificationForBackup(): NotificationCompat.Builder
|
||||
|
||||
fun cancel(i: Int)
|
||||
|
||||
}
|
||||
|
||||
@@ -527,4 +527,8 @@ class NotificationManagerImpl @Inject constructor(
|
||||
.setOngoing(true)
|
||||
}
|
||||
|
||||
override fun cancel(i: Int) {
|
||||
notificationManager.cancel(i)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user