#1279 - Fix scheduled messages not sending

This was an issue with background services on Android O
This commit is contained in:
Moez Bhatti
2018-09-19 19:33:09 -04:00
parent adf007f92c
commit 116f9824e9
5 changed files with 15 additions and 16 deletions
@@ -22,14 +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.moez.QKSMS.service.SendScheduledMessageService import com.moez.QKSMS.receiver.SendScheduledMessageReceiver
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 intent = Intent(context, SendScheduledMessageService::class.java).putExtra("id", id) val intent = Intent(context, SendScheduledMessageReceiver::class.java).putExtra("id", id)
return PendingIntent.getService(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) 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) {
@@ -16,22 +16,23 @@
* 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.service package com.moez.QKSMS.receiver
import android.app.IntentService import android.content.BroadcastReceiver
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 SendScheduledMessageService : IntentService(null) { class SendScheduledMessageReceiver : BroadcastReceiver() {
@Inject lateinit var messageRepo: MessageRepository @Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var sendScheduledMessage: SendScheduledMessage @Inject lateinit var sendScheduledMessage: SendScheduledMessage
override fun onHandleIntent(intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
AndroidInjection.inject(this) AndroidInjection.inject(this, context)
intent.getLongExtra("id", -1L).takeIf { it >= 0 }?.let { id -> intent.getLongExtra("id", -1L).takeIf { it >= 0 }?.let { id ->
sendScheduledMessage.buildObservable(id).blockingSubscribe() sendScheduledMessage.buildObservable(id).blockingSubscribe()
+1 -1
View File
@@ -147,6 +147,7 @@
<action android:name="android.provider.action.EXTERNAL_PROVIDER_CHANGE" /> <action android:name="android.provider.action.EXTERNAL_PROVIDER_CHANGE" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name=".receiver.SendScheduledMessageReceiver" />
<receiver android:name=".feature.widget.WidgetProvider"> <receiver android:name=".feature.widget.WidgetProvider">
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -187,7 +188,6 @@
<action android:name="android.service.chooser.ChooserTargetService" /> <action android:name="android.service.chooser.ChooserTargetService" />
</intent-filter> </intent-filter>
</service> </service>
<service android:name=".service.SendScheduledMessageService" />
<service android:name=".service.SendSmsService" /> <service android:name=".service.SendSmsService" />
<meta-data <meta-data
@@ -31,12 +31,11 @@ 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.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
@@ -87,6 +86,10 @@ abstract class BroadcastReceiverBuilderModule {
@ContributesAndroidInjector() @ContributesAndroidInjector()
abstract fun bindRemoteMessagingReceiver(): RemoteMessagingReceiver abstract fun bindRemoteMessagingReceiver(): RemoteMessagingReceiver
@ActivityScope
@ContributesAndroidInjector()
abstract fun bindSendScheduledMessageReceiver(): SendScheduledMessageReceiver
@ActivityScope @ActivityScope
@ContributesAndroidInjector() @ContributesAndroidInjector()
abstract fun bindSmsDeliveredReceiver(): SmsDeliveredReceiver abstract fun bindSmsDeliveredReceiver(): SmsDeliveredReceiver
@@ -21,7 +21,6 @@ package com.moez.QKSMS.injection.android
import com.moez.QKSMS.feature.backup.RestoreBackupService import com.moez.QKSMS.feature.backup.RestoreBackupService
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 com.moez.QKSMS.service.SendSmsService
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector
@@ -37,10 +36,6 @@ abstract class ServiceBuilderModule {
@ContributesAndroidInjector() @ContributesAndroidInjector()
abstract fun bindRestoreBackupService(): RestoreBackupService abstract fun bindRestoreBackupService(): RestoreBackupService
@ActivityScope
@ContributesAndroidInjector()
abstract fun bindSendScheduledMessageReceiver(): SendScheduledMessageService
@ActivityScope @ActivityScope
@ContributesAndroidInjector() @ContributesAndroidInjector()
abstract fun bindSendSmsReceiver(): SendSmsService abstract fun bindSendSmsReceiver(): SendSmsService