forked from upstream-mirrors/quik
Fix implicit broadcast usage for SMS intents
This commit is contained in:
@@ -22,16 +22,14 @@ import android.app.PendingIntent
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import com.klinker.android.send_message.BroadcastUtils
|
import com.moez.QKSMS.service.SendScheduledMessageService
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class AlarmManagerImpl @Inject constructor(private val context: Context) : AlarmManager {
|
class AlarmManagerImpl @Inject constructor(private val context: Context) : AlarmManager {
|
||||||
|
|
||||||
override fun getScheduledMessageIntent(id: Long): PendingIntent {
|
override fun getScheduledMessageIntent(id: Long): PendingIntent {
|
||||||
val action = "com.moez.QKSMS.SEND_SCHEDULED_MESSAGE"
|
val intent = Intent(context, SendScheduledMessageService::class.java).putExtra("id", id)
|
||||||
val intent = Intent(action).putExtra("id", id)
|
return PendingIntent.getService(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
BroadcastUtils.addClassName(context, intent, action)
|
|
||||||
return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun setAlarm(date: Long, intent: PendingIntent) {
|
override fun setAlarm(date: Long, intent: PendingIntent) {
|
||||||
|
|||||||
@@ -29,11 +29,16 @@ import javax.inject.Inject
|
|||||||
|
|
||||||
class SmsDeliveredReceiver : BroadcastReceiver() {
|
class SmsDeliveredReceiver : BroadcastReceiver() {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val ACTION = "com.moez.QKSMS.SMS_DELIVERED"
|
||||||
|
}
|
||||||
|
|
||||||
@Inject lateinit var markDelivered: MarkDelivered
|
@Inject lateinit var markDelivered: MarkDelivered
|
||||||
@Inject lateinit var markDeliveryFailed: MarkDeliveryFailed
|
@Inject lateinit var markDeliveryFailed: MarkDeliveryFailed
|
||||||
|
|
||||||
override fun onReceive(context: Context, intent: Intent) {
|
override fun onReceive(context: Context, intent: Intent) {
|
||||||
AndroidInjection.inject(this, context)
|
AndroidInjection.inject(this, context)
|
||||||
|
context.unregisterReceiver(this)
|
||||||
|
|
||||||
val id = intent.getLongExtra("id", 0L)
|
val id = intent.getLongExtra("id", 0L)
|
||||||
|
|
||||||
|
|||||||
@@ -30,11 +30,16 @@ import javax.inject.Inject
|
|||||||
|
|
||||||
class SmsSentReceiver : BroadcastReceiver() {
|
class SmsSentReceiver : BroadcastReceiver() {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val ACTION = "com.moez.QKSMS.SMS_SENT"
|
||||||
|
}
|
||||||
|
|
||||||
@Inject lateinit var markSent: MarkSent
|
@Inject lateinit var markSent: MarkSent
|
||||||
@Inject lateinit var markFailed: MarkFailed
|
@Inject lateinit var markFailed: MarkFailed
|
||||||
|
|
||||||
override fun onReceive(context: Context, intent: Intent) {
|
override fun onReceive(context: Context, intent: Intent) {
|
||||||
AndroidInjection.inject(this, context)
|
AndroidInjection.inject(this, context)
|
||||||
|
context.unregisterReceiver(this)
|
||||||
|
|
||||||
val id = intent.getLongExtra("id", 0L)
|
val id = intent.getLongExtra("id", 0L)
|
||||||
|
|
||||||
|
|||||||
@@ -24,13 +24,13 @@ import android.content.ContentUris
|
|||||||
import android.content.ContentValues
|
import android.content.ContentValues
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
|
import android.content.IntentFilter
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.provider.Telephony
|
import android.provider.Telephony
|
||||||
import android.telephony.PhoneNumberUtils
|
import android.telephony.PhoneNumberUtils
|
||||||
import android.telephony.SmsManager
|
import android.telephony.SmsManager
|
||||||
import com.google.android.mms.ContentType
|
import com.google.android.mms.ContentType
|
||||||
import com.google.android.mms.MMSPart
|
import com.google.android.mms.MMSPart
|
||||||
import com.klinker.android.send_message.BroadcastUtils
|
|
||||||
import com.klinker.android.send_message.SmsManagerFactory
|
import com.klinker.android.send_message.SmsManagerFactory
|
||||||
import com.klinker.android.send_message.StripAccents
|
import com.klinker.android.send_message.StripAccents
|
||||||
import com.klinker.android.send_message.Transaction
|
import com.klinker.android.send_message.Transaction
|
||||||
@@ -41,6 +41,9 @@ import com.moez.QKSMS.model.Attachment
|
|||||||
import com.moez.QKSMS.model.Conversation
|
import com.moez.QKSMS.model.Conversation
|
||||||
import com.moez.QKSMS.model.Message
|
import com.moez.QKSMS.model.Message
|
||||||
import com.moez.QKSMS.model.MmsPart
|
import com.moez.QKSMS.model.MmsPart
|
||||||
|
import com.moez.QKSMS.receiver.SmsDeliveredReceiver
|
||||||
|
import com.moez.QKSMS.receiver.SmsSentReceiver
|
||||||
|
import com.moez.QKSMS.service.SendSmsService
|
||||||
import com.moez.QKSMS.util.ImageUtils
|
import com.moez.QKSMS.util.ImageUtils
|
||||||
import com.moez.QKSMS.util.Preferences
|
import com.moez.QKSMS.util.Preferences
|
||||||
import com.moez.QKSMS.util.tryOrNull
|
import com.moez.QKSMS.util.tryOrNull
|
||||||
@@ -265,16 +268,14 @@ class MessageRepositoryImpl @Inject constructor(
|
|||||||
?: arrayListOf()
|
?: arrayListOf()
|
||||||
|
|
||||||
val sentIntents = parts.map {
|
val sentIntents = parts.map {
|
||||||
val action = "com.moez.QKSMS.SMS_SENT"
|
context.registerReceiver(SmsSentReceiver(), IntentFilter(SmsSentReceiver.ACTION))
|
||||||
val intent = Intent(action).putExtra("id", message.id)
|
val intent = Intent(SmsSentReceiver.ACTION).putExtra("id", message.id)
|
||||||
BroadcastUtils.addClassName(context, intent, action)
|
|
||||||
PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
}
|
}
|
||||||
|
|
||||||
val deliveredIntents = parts.map {
|
val deliveredIntents = parts.map {
|
||||||
val action = "com.moez.QKSMS.SMS_DELIVERED"
|
context.registerReceiver(SmsDeliveredReceiver(), IntentFilter(SmsDeliveredReceiver.ACTION))
|
||||||
val intent = Intent(action).putExtra("id", message.id)
|
val intent = Intent(SmsDeliveredReceiver.ACTION).putExtra("id", message.id)
|
||||||
BroadcastUtils.addClassName(context, intent, action)
|
|
||||||
val pendingIntent = PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
val pendingIntent = PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
if (prefs.delivery.get()) pendingIntent else null
|
if (prefs.delivery.get()) pendingIntent else null
|
||||||
}
|
}
|
||||||
@@ -288,10 +289,8 @@ class MessageRepositoryImpl @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun getIntentForDelayedSms(id: Long): PendingIntent {
|
private fun getIntentForDelayedSms(id: Long): PendingIntent {
|
||||||
val action = "com.moez.QKSMS.SEND_SMS"
|
val intent = Intent(context, SendSmsService::class.java).putExtra("id", id)
|
||||||
val intent = Intent(action).putExtra("id", id)
|
return PendingIntent.getService(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
BroadcastUtils.addClassName(context, intent, action)
|
|
||||||
return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun insertSentSms(subId: Int, threadId: Long, address: String, body: String, date: Long): Message {
|
override fun insertSentSms(subId: Int, threadId: Long, address: String, body: String, date: Long): Message {
|
||||||
|
|||||||
+6
-8
@@ -16,27 +16,25 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package com.moez.QKSMS.receiver
|
package com.moez.QKSMS.service
|
||||||
|
|
||||||
import android.content.BroadcastReceiver
|
import android.app.IntentService
|
||||||
import android.content.Context
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import com.moez.QKSMS.interactor.SendScheduledMessage
|
import com.moez.QKSMS.interactor.SendScheduledMessage
|
||||||
import com.moez.QKSMS.repository.MessageRepository
|
import com.moez.QKSMS.repository.MessageRepository
|
||||||
import dagger.android.AndroidInjection
|
import dagger.android.AndroidInjection
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class SendScheduledMessageReceiver : BroadcastReceiver() {
|
class SendScheduledMessageService : IntentService(null) {
|
||||||
|
|
||||||
@Inject lateinit var messageRepo: MessageRepository
|
@Inject lateinit var messageRepo: MessageRepository
|
||||||
@Inject lateinit var sendScheduledMessage: SendScheduledMessage
|
@Inject lateinit var sendScheduledMessage: SendScheduledMessage
|
||||||
|
|
||||||
override fun onReceive(context: Context, intent: Intent) {
|
override fun onHandleIntent(intent: Intent) {
|
||||||
AndroidInjection.inject(this, context)
|
AndroidInjection.inject(this)
|
||||||
|
|
||||||
intent.getLongExtra("id", -1L).takeIf { it >= 0 }?.let { id ->
|
intent.getLongExtra("id", -1L).takeIf { it >= 0 }?.let { id ->
|
||||||
val result = goAsync()
|
sendScheduledMessage.buildObservable(id).blockingSubscribe()
|
||||||
sendScheduledMessage.execute(id) { result.finish() }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+6
-8
@@ -16,28 +16,26 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package com.moez.QKSMS.receiver
|
package com.moez.QKSMS.service
|
||||||
|
|
||||||
import android.content.BroadcastReceiver
|
import android.app.IntentService
|
||||||
import android.content.Context
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import com.moez.QKSMS.interactor.RetrySending
|
import com.moez.QKSMS.interactor.RetrySending
|
||||||
import com.moez.QKSMS.repository.MessageRepository
|
import com.moez.QKSMS.repository.MessageRepository
|
||||||
import dagger.android.AndroidInjection
|
import dagger.android.AndroidInjection
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class SendSmsReceiver : BroadcastReceiver() {
|
class SendSmsService : IntentService(null) {
|
||||||
|
|
||||||
@Inject lateinit var messageRepo: MessageRepository
|
@Inject lateinit var messageRepo: MessageRepository
|
||||||
@Inject lateinit var retrySending: RetrySending
|
@Inject lateinit var retrySending: RetrySending
|
||||||
|
|
||||||
override fun onReceive(context: Context, intent: Intent) {
|
override fun onHandleIntent(intent: Intent) {
|
||||||
AndroidInjection.inject(this, context)
|
AndroidInjection.inject(this)
|
||||||
|
|
||||||
val id = intent.getLongExtra("id", 0L)
|
val id = intent.getLongExtra("id", 0L)
|
||||||
messageRepo.getMessage(id)?.let { message ->
|
messageRepo.getMessage(id)?.let { message ->
|
||||||
val result = goAsync()
|
retrySending.buildObservable(message).blockingSubscribe()
|
||||||
retrySending.execute(message) { result.finish() }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
<uses-permission android:name="android.permission.READ_CONTACTS" />
|
<uses-permission android:name="android.permission.READ_CONTACTS" />
|
||||||
<uses-permission android:name="android.permission.READ_SMS" />
|
<uses-permission android:name="android.permission.READ_SMS" />
|
||||||
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
||||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||||
<uses-permission android:name="android.permission.RECEIVE_MMS" />
|
<uses-permission android:name="android.permission.RECEIVE_MMS" />
|
||||||
<uses-permission android:name="android.permission.RECEIVE_SMS" />
|
<uses-permission android:name="android.permission.RECEIVE_SMS" />
|
||||||
<uses-permission android:name="android.permission.SEND_SMS" />
|
<uses-permission android:name="android.permission.SEND_SMS" />
|
||||||
@@ -96,7 +96,7 @@
|
|||||||
|
|
||||||
<receiver android:name=".receiver.BootReceiver">
|
<receiver android:name=".receiver.BootReceiver">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.BOOT_COMPLETED"/>
|
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
<receiver android:name=".receiver.DefaultSmsChangedReceiver">
|
<receiver android:name=".receiver.DefaultSmsChangedReceiver">
|
||||||
@@ -128,18 +128,6 @@
|
|||||||
<receiver
|
<receiver
|
||||||
android:name=".receiver.MmsReceivedReceiver"
|
android:name=".receiver.MmsReceivedReceiver"
|
||||||
android:taskAffinity="com.klinker.android.messaging.MMS_RECEIVED" />
|
android:taskAffinity="com.klinker.android.messaging.MMS_RECEIVED" />
|
||||||
<receiver
|
|
||||||
android:name=".receiver.SendScheduledMessageReceiver"
|
|
||||||
android:taskAffinity="com.moez.QKSMS.SEND_SCHEDULED_MESSAGE" />
|
|
||||||
<receiver
|
|
||||||
android:name=".receiver.SendSmsReceiver"
|
|
||||||
android:taskAffinity="com.moez.QKSMS.SEND_SMS" />
|
|
||||||
<receiver
|
|
||||||
android:name=".receiver.SmsSentReceiver"
|
|
||||||
android:taskAffinity="com.moez.QKSMS.SMS_SENT" />
|
|
||||||
<receiver
|
|
||||||
android:name=".receiver.SmsDeliveredReceiver"
|
|
||||||
android:taskAffinity="com.moez.QKSMS.SMS_DELIVERED" />
|
|
||||||
<receiver android:name=".receiver.MarkSeenReceiver" />
|
<receiver android:name=".receiver.MarkSeenReceiver" />
|
||||||
<receiver android:name=".receiver.MarkReadReceiver" />
|
<receiver android:name=".receiver.MarkReadReceiver" />
|
||||||
<receiver android:name=".receiver.RemoteMessagingReceiver" />
|
<receiver android:name=".receiver.RemoteMessagingReceiver" />
|
||||||
@@ -180,6 +168,8 @@
|
|||||||
<service
|
<service
|
||||||
android:name=".feature.widget.WidgetService"
|
android:name=".feature.widget.WidgetService"
|
||||||
android:permission="android.permission.BIND_REMOTEVIEWS" />
|
android:permission="android.permission.BIND_REMOTEVIEWS" />
|
||||||
|
<service android:name=".service.SendScheduledMessageService" />
|
||||||
|
<service android:name=".service.SendSmsService" />
|
||||||
|
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="preloaded_fonts"
|
android:name="preloaded_fonts"
|
||||||
|
|||||||
+2
-10
@@ -30,12 +30,12 @@ import com.moez.QKSMS.receiver.MmsSentReceiver
|
|||||||
import com.moez.QKSMS.receiver.MmsUpdatedReceiver
|
import com.moez.QKSMS.receiver.MmsUpdatedReceiver
|
||||||
import com.moez.QKSMS.receiver.NightModeReceiver
|
import com.moez.QKSMS.receiver.NightModeReceiver
|
||||||
import com.moez.QKSMS.receiver.RemoteMessagingReceiver
|
import com.moez.QKSMS.receiver.RemoteMessagingReceiver
|
||||||
import com.moez.QKSMS.receiver.SendScheduledMessageReceiver
|
|
||||||
import com.moez.QKSMS.receiver.SendSmsReceiver
|
|
||||||
import com.moez.QKSMS.receiver.SmsDeliveredReceiver
|
import com.moez.QKSMS.receiver.SmsDeliveredReceiver
|
||||||
import com.moez.QKSMS.receiver.SmsProviderChangedReceiver
|
import com.moez.QKSMS.receiver.SmsProviderChangedReceiver
|
||||||
import com.moez.QKSMS.receiver.SmsReceiver
|
import com.moez.QKSMS.receiver.SmsReceiver
|
||||||
import com.moez.QKSMS.receiver.SmsSentReceiver
|
import com.moez.QKSMS.receiver.SmsSentReceiver
|
||||||
|
import com.moez.QKSMS.service.SendScheduledMessageService
|
||||||
|
import com.moez.QKSMS.service.SendSmsService
|
||||||
import dagger.Module
|
import dagger.Module
|
||||||
import dagger.android.ContributesAndroidInjector
|
import dagger.android.ContributesAndroidInjector
|
||||||
|
|
||||||
@@ -82,14 +82,6 @@ abstract class BroadcastReceiverBuilderModule {
|
|||||||
@ContributesAndroidInjector()
|
@ContributesAndroidInjector()
|
||||||
abstract fun bindRemoteMessagingReceiver(): RemoteMessagingReceiver
|
abstract fun bindRemoteMessagingReceiver(): RemoteMessagingReceiver
|
||||||
|
|
||||||
@ActivityScope
|
|
||||||
@ContributesAndroidInjector()
|
|
||||||
abstract fun bindSendScheduledMessageReceiver(): SendScheduledMessageReceiver
|
|
||||||
|
|
||||||
@ActivityScope
|
|
||||||
@ContributesAndroidInjector()
|
|
||||||
abstract fun bindSendSmsReceiver(): SendSmsReceiver
|
|
||||||
|
|
||||||
@ActivityScope
|
@ActivityScope
|
||||||
@ContributesAndroidInjector()
|
@ContributesAndroidInjector()
|
||||||
abstract fun bindSmsDeliveredReceiver(): SmsDeliveredReceiver
|
abstract fun bindSmsDeliveredReceiver(): SmsDeliveredReceiver
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ package com.moez.QKSMS.injection.android
|
|||||||
|
|
||||||
import com.moez.QKSMS.injection.scope.ActivityScope
|
import com.moez.QKSMS.injection.scope.ActivityScope
|
||||||
import com.moez.QKSMS.service.HeadlessSmsSendService
|
import com.moez.QKSMS.service.HeadlessSmsSendService
|
||||||
|
import com.moez.QKSMS.service.SendScheduledMessageService
|
||||||
|
import com.moez.QKSMS.service.SendSmsService
|
||||||
import dagger.Module
|
import dagger.Module
|
||||||
import dagger.android.ContributesAndroidInjector
|
import dagger.android.ContributesAndroidInjector
|
||||||
|
|
||||||
@@ -30,4 +32,12 @@ abstract class ServiceBuilderModule {
|
|||||||
@ContributesAndroidInjector()
|
@ContributesAndroidInjector()
|
||||||
abstract fun bindHeadlessSmsSendService(): HeadlessSmsSendService
|
abstract fun bindHeadlessSmsSendService(): HeadlessSmsSendService
|
||||||
|
|
||||||
|
@ActivityScope
|
||||||
|
@ContributesAndroidInjector()
|
||||||
|
abstract fun bindSendScheduledMessageReceiver(): SendScheduledMessageService
|
||||||
|
|
||||||
|
@ActivityScope
|
||||||
|
@ContributesAndroidInjector()
|
||||||
|
abstract fun bindSendSmsReceiver(): SendSmsService
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user