forked from upstream-mirrors/quik
#329 - Sync contact after adding
This commit is contained in:
@@ -0,0 +1,54 @@
|
|||||||
|
package com.moez.QKSMS.listener
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.database.ContentObserver
|
||||||
|
import android.net.Uri
|
||||||
|
import android.os.Handler
|
||||||
|
import android.provider.ContactsContract
|
||||||
|
import com.moez.QKSMS.repository.SyncRepository
|
||||||
|
import io.reactivex.Observable
|
||||||
|
import io.reactivex.Single
|
||||||
|
import io.reactivex.subjects.PublishSubject
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Listens for a contact being added, and then syncs it to Realm
|
||||||
|
*
|
||||||
|
* TODO: Stop listening automatically. Currently, this will only happen if the contact is added
|
||||||
|
*/
|
||||||
|
class ContactAddedListenerImpl @Inject constructor(
|
||||||
|
private val context: Context,
|
||||||
|
private val syncRepo: SyncRepository
|
||||||
|
) : ContactAddedListener {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private val URI = ContactsContract.CommonDataKinds.Phone.CONTENT_URI
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun listen(address: String): Single<*> {
|
||||||
|
val observable = ContactContentObserver(context).observable
|
||||||
|
.filter { syncRepo.syncContact(address) }
|
||||||
|
|
||||||
|
return Single.fromObservable(observable)
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ContactContentObserver(context: Context) : ContentObserver(Handler()) {
|
||||||
|
|
||||||
|
private val subject = PublishSubject.create<Unit>()
|
||||||
|
|
||||||
|
val observable: Observable<Unit> = subject
|
||||||
|
.doOnSubscribe { context.contentResolver.registerContentObserver(URI, true, this) }
|
||||||
|
.doOnDispose { context.contentResolver.unregisterContentObserver(this) }
|
||||||
|
.share()
|
||||||
|
|
||||||
|
override fun onChange(selfChange: Boolean) {
|
||||||
|
this.onChange(selfChange, null)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onChange(selfChange: Boolean, uri: Uri?) {
|
||||||
|
subject.onNext(Unit)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -26,6 +26,7 @@ import android.telephony.PhoneNumberUtils
|
|||||||
import com.f2prateek.rx.preferences2.RxSharedPreferences
|
import com.f2prateek.rx.preferences2.RxSharedPreferences
|
||||||
import com.moez.QKSMS.extensions.insertOrUpdate
|
import com.moez.QKSMS.extensions.insertOrUpdate
|
||||||
import com.moez.QKSMS.extensions.map
|
import com.moez.QKSMS.extensions.map
|
||||||
|
import com.moez.QKSMS.filter.PhoneNumberFilter
|
||||||
import com.moez.QKSMS.manager.KeyManager
|
import com.moez.QKSMS.manager.KeyManager
|
||||||
import com.moez.QKSMS.mapper.CursorToContact
|
import com.moez.QKSMS.mapper.CursorToContact
|
||||||
import com.moez.QKSMS.mapper.CursorToConversation
|
import com.moez.QKSMS.mapper.CursorToConversation
|
||||||
@@ -54,6 +55,7 @@ class SyncRepositoryImpl @Inject constructor(
|
|||||||
private val cursorToRecipient: CursorToRecipient,
|
private val cursorToRecipient: CursorToRecipient,
|
||||||
private val cursorToContact: CursorToContact,
|
private val cursorToContact: CursorToContact,
|
||||||
private val keys: KeyManager,
|
private val keys: KeyManager,
|
||||||
|
private val phoneNumberFilter: PhoneNumberFilter,
|
||||||
private val rxPrefs: RxSharedPreferences
|
private val rxPrefs: RxSharedPreferences
|
||||||
) : SyncRepository {
|
) : SyncRepository {
|
||||||
|
|
||||||
@@ -239,6 +241,30 @@ class SyncRepositoryImpl @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun syncContact(address: String): Boolean {
|
||||||
|
// See if there's a contact that matches this phone number
|
||||||
|
var contact = getContacts().firstOrNull {
|
||||||
|
it.numbers.any { number -> PhoneNumberUtils.compare(number.address, address) }
|
||||||
|
} ?: return false
|
||||||
|
|
||||||
|
Realm.getDefaultInstance().use { realm ->
|
||||||
|
val recipients = realm.where(Recipient::class.java).findAll()
|
||||||
|
|
||||||
|
realm.executeTransaction {
|
||||||
|
contact = realm.copyToRealm(contact)
|
||||||
|
|
||||||
|
// Update all the matching recipients with the new contact
|
||||||
|
val updatedRecipients = recipients
|
||||||
|
.filter { recipient -> contact.numbers.any { number -> PhoneNumberUtils.compare(recipient.address, number.address) } }
|
||||||
|
.map { recipient -> recipient.apply { this.contact = contact } }
|
||||||
|
|
||||||
|
realm.insertOrUpdate(updatedRecipients)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
private fun getContacts(): List<Contact> {
|
private fun getContacts(): List<Contact> {
|
||||||
return cursorToContact.getContactsCursor()
|
return cursorToContact.getContactsCursor()
|
||||||
?.map { cursor -> cursorToContact.map(cursor) }
|
?.map { cursor -> cursorToContact.map(cursor) }
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package com.moez.QKSMS.listener
|
||||||
|
|
||||||
|
import io.reactivex.Single
|
||||||
|
|
||||||
|
interface ContactAddedListener {
|
||||||
|
|
||||||
|
fun listen(address: String): Single<*>
|
||||||
|
|
||||||
|
}
|
||||||
@@ -37,4 +37,11 @@ interface SyncRepository {
|
|||||||
|
|
||||||
fun syncContacts()
|
fun syncContacts()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Syncs a single contact to the Realm
|
||||||
|
*
|
||||||
|
* Return false if the contact couldn't be found
|
||||||
|
*/
|
||||||
|
fun syncContact(address: String): Boolean
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -31,15 +31,19 @@ import com.moez.QKSMS.common.util.Colors
|
|||||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||||
import com.moez.QKSMS.common.util.extensions.setTint
|
import com.moez.QKSMS.common.util.extensions.setTint
|
||||||
import com.moez.QKSMS.injection.appComponent
|
import com.moez.QKSMS.injection.appComponent
|
||||||
|
import com.moez.QKSMS.listener.ContactAddedListener
|
||||||
import com.moez.QKSMS.model.Contact
|
import com.moez.QKSMS.model.Contact
|
||||||
import com.moez.QKSMS.model.Recipient
|
import com.moez.QKSMS.model.Recipient
|
||||||
import com.moez.QKSMS.util.GlideApp
|
import com.moez.QKSMS.util.GlideApp
|
||||||
|
import com.uber.autodispose.android.ViewScopeProvider
|
||||||
|
import com.uber.autodispose.kotlin.autoDisposable
|
||||||
import kotlinx.android.synthetic.main.avatar_view.view.*
|
import kotlinx.android.synthetic.main.avatar_view.view.*
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {
|
class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {
|
||||||
|
|
||||||
@Inject lateinit var colors: Colors
|
@Inject lateinit var colors: Colors
|
||||||
|
@Inject lateinit var contactAddedListener: ContactAddedListener
|
||||||
@Inject lateinit var navigator: Navigator
|
@Inject lateinit var navigator: Navigator
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -68,7 +72,15 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet
|
|||||||
|
|
||||||
setOnClickListener {
|
setOnClickListener {
|
||||||
if (lookupKey.isNullOrEmpty()) {
|
if (lookupKey.isNullOrEmpty()) {
|
||||||
address?.let { address -> navigator.addContact(address) }
|
address?.let { address ->
|
||||||
|
// Allow the user to add the contact
|
||||||
|
navigator.addContact(address)
|
||||||
|
|
||||||
|
// Listen for contact changes
|
||||||
|
contactAddedListener.listen(address)
|
||||||
|
.autoDisposable(ViewScopeProvider.from(this))
|
||||||
|
.subscribe()
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, lookupKey)
|
val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, lookupKey)
|
||||||
ContactsContract.QuickContact.showQuickContact(context, this@AvatarView, uri,
|
ContactsContract.QuickContact.showQuickContact(context, this@AvatarView, uri,
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ import com.moez.QKSMS.common.ViewModelFactory
|
|||||||
import com.moez.QKSMS.common.util.NotificationManagerImpl
|
import com.moez.QKSMS.common.util.NotificationManagerImpl
|
||||||
import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent
|
import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent
|
||||||
import com.moez.QKSMS.feature.themepicker.injection.ThemePickerComponent
|
import com.moez.QKSMS.feature.themepicker.injection.ThemePickerComponent
|
||||||
|
import com.moez.QKSMS.listener.ContactAddedListener
|
||||||
|
import com.moez.QKSMS.listener.ContactAddedListenerImpl
|
||||||
import com.moez.QKSMS.manager.AlarmManager
|
import com.moez.QKSMS.manager.AlarmManager
|
||||||
import com.moez.QKSMS.manager.AlarmManagerImpl
|
import com.moez.QKSMS.manager.AlarmManagerImpl
|
||||||
import com.moez.QKSMS.manager.AnalyticsManager
|
import com.moez.QKSMS.manager.AnalyticsManager
|
||||||
@@ -100,6 +102,11 @@ class AppModule(private var application: Application) {
|
|||||||
@Provides
|
@Provides
|
||||||
fun provideViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory = factory
|
fun provideViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory = factory
|
||||||
|
|
||||||
|
// Listener
|
||||||
|
|
||||||
|
@Provides
|
||||||
|
fun provideContactAddedListener(listener: ContactAddedListenerImpl): ContactAddedListener = listener
|
||||||
|
|
||||||
// Manager
|
// Manager
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
|
|||||||
Reference in New Issue
Block a user