diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml
index 443f71a8..faa6bfc9 100644
--- a/qksms/src/main/AndroidManifest.xml
+++ b/qksms/src/main/AndroidManifest.xml
@@ -103,6 +103,11 @@
+
+
+
+
+
() {
+class SyncMessage @Inject constructor(private val syncManager: SyncManager) : Interactor() {
override fun buildObservable(params: Uri): Flowable {
return Flowable.just(params)
diff --git a/qksms/src/main/java/presentation/receiver/SmsProviderChangedReceiver.kt b/qksms/src/main/java/presentation/receiver/SmsProviderChangedReceiver.kt
new file mode 100644
index 00000000..cba9e02b
--- /dev/null
+++ b/qksms/src/main/java/presentation/receiver/SmsProviderChangedReceiver.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package presentation.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import common.di.appComponent
+import interactor.SyncMessage
+import javax.inject.Inject
+
+/**
+ * When the SMS contentprovider is changed by a process other than us, we need to sync the Uri that
+ * was changed.
+ *
+ * This can happen if a message is sent through something like Pushbullet or Google Assistant.
+ *
+ * This only works on API 24+, so to fully solve this problem we'll need a smarter way of running
+ * partial syncs on older devices.
+ *
+ * https://developer.android.com/reference/android/provider/Telephony.Sms.Intents.html#ACTION_EXTERNAL_PROVIDER_CHANGE
+ */
+class SmsProviderChangedReceiver : BroadcastReceiver() {
+
+ @Inject lateinit var syncMessage: SyncMessage
+
+ override fun onReceive(context: Context, intent: Intent) {
+ appComponent.inject(this)
+
+ // Obtain the uri for the changed data
+ val uri = intent.data
+
+ // Sync the message to our realm
+ val pendingResult = goAsync()
+ syncMessage.execute(uri) { pendingResult.finish() }
+ }
+
+}
\ No newline at end of file