forked from upstream-mirrors/quik
#207 - Dual SIM support
commit c3dc3ada558c466be5115cd7ddbf9651a229c217 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Sat Jun 2 02:54:06 2018 -0400 Dual SIM support for QK Reply commit 48688dd4720bd1b3abc049d365e208e1dfe5ccb8 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Sat Jun 2 00:37:08 2018 -0400 #1172 - Load all recipients and subId from threadId when sending message from notification reply bar commit 0b7195fb134c0a9f2a6b551176c6c25a26bf5838 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri Jun 1 23:43:30 2018 -0400 Fix missing subId for RetrySending params commit 0d3ec43c0e60bab4acc293947ea9f6d2228c1b19 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri Jun 1 23:27:56 2018 -0400 Switch to appropriate SIM when new message is received commit 1ae883af890104cf1da9e970571371c95666db66 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri Jun 1 23:07:16 2018 -0400 Fix message grouping for incoming messages commit 2bf7b2d99ddbfdcafff873f305180d6d38c37d65 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri Jun 1 22:56:31 2018 -0400 Correctly assign subId for incoming SMS commit 1f6028f8921320358a3053a2dbc2c6e05410964b Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri Jun 1 20:52:01 2018 -0400 Abstract SubscriptionManager usage behind SubscriptionUtils commit 8b18f16271f19a42800c737cfbd867365c4aa781 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri Jun 1 20:05:52 2018 -0400 Store subId when receiving SMS commit f0e4ffdf15eb54d8ef78adfe244943ef4cb95d4e Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Fri Jun 1 19:52:40 2018 -0400 Use appropriate SIM card based on last message commit b7893d69891e4fb61755b0733a5fab561e86bbf3 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Thu May 31 00:20:42 2018 -0400 Fix crash when device doesn't support multi-sim commit bb038068129227e931167976628e1a535efb09a0 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Wed May 30 23:54:14 2018 -0400 Show sim indicator when subId changes in conversation commit 952f15f7ebfb85a03feef51373ef30568b76d5eb Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Wed May 30 22:13:57 2018 -0400 Send message from selected SIM commit 4cfab7ca9ec9bd9c7ce82b3eb5f228cf511a7c7b Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Wed May 30 21:46:01 2018 -0400 Fix filename for ActiveSubscriptionObservable commit 720cb79cb4fbfb98b10e169f2fea84be02fd2f91 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Wed May 30 20:35:30 2018 -0400 Allow cycling through inserted sims commit fa95980e9bc8e8c01dab7b4b8e4ed3a1c9a0f0b0 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Wed May 30 18:26:44 2018 -0400 Show sim card slot in compose bar
This commit is contained in:
@@ -25,24 +25,32 @@ import android.support.v4.app.RemoteInput
|
||||
import dagger.android.AndroidInjection
|
||||
import interactor.MarkRead
|
||||
import interactor.SendMessage
|
||||
import repository.MessageRepository
|
||||
import util.SubscriptionUtils
|
||||
import javax.inject.Inject
|
||||
|
||||
class RemoteMessagingReceiver : BroadcastReceiver() {
|
||||
|
||||
@Inject lateinit var sendMessage: SendMessage
|
||||
@Inject lateinit var markRead: MarkRead
|
||||
@Inject lateinit var messageRepo: MessageRepository
|
||||
@Inject lateinit var sendMessage: SendMessage
|
||||
@Inject lateinit var subUtils: SubscriptionUtils
|
||||
|
||||
override fun onReceive(context: Context, intent: Intent) {
|
||||
AndroidInjection.inject(this, context)
|
||||
|
||||
val remoteInput = RemoteInput.getResultsFromIntent(intent)
|
||||
val bundle = intent.extras
|
||||
if (remoteInput != null && bundle != null) {
|
||||
val address = bundle.getString("address")
|
||||
val threadId = bundle.getLong("threadId")
|
||||
val body = remoteInput.getCharSequence("body").toString()
|
||||
markRead.execute(threadId)
|
||||
sendMessage.execute(SendMessage.Params(threadId, listOf(address), body))
|
||||
}
|
||||
val remoteInput = RemoteInput.getResultsFromIntent(intent) ?: return
|
||||
val bundle = intent.extras ?: return
|
||||
|
||||
val threadId = bundle.getLong("threadId")
|
||||
val body = remoteInput.getCharSequence("body").toString()
|
||||
markRead.execute(threadId)
|
||||
|
||||
val lastMessage = messageRepo.getMessages(threadId).lastOrNull()
|
||||
val subId = subUtils.subscriptions.firstOrNull { it.subscriptionId == lastMessage?.subId }?.subscriptionId ?: -1
|
||||
val addresses = messageRepo.getConversation(threadId)?.recipients?.map { it.address } ?: return
|
||||
|
||||
val pendingRepository = goAsync()
|
||||
sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body)) { pendingRepository.finish() }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user