forked from upstream-mirrors/quik
display contact names loaded from db
This commit is contained in:
@@ -2,6 +2,8 @@
|
|||||||
<manifest package="com.moez.QKSMS"
|
<manifest package="com.moez.QKSMS"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
|
<uses-permission android:name="android.permission.READ_CONTACTS" />
|
||||||
<uses-permission android:name="android.permission.READ_SMS" />
|
<uses-permission android:name="android.permission.READ_SMS" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
|
|||||||
@@ -7,10 +7,8 @@ open class Contact() : RealmObject() {
|
|||||||
|
|
||||||
@PrimaryKey var recipientId: Long = 0
|
@PrimaryKey var recipientId: Long = 0
|
||||||
var address: String = ""
|
var address: String = ""
|
||||||
|
var name: String = ""
|
||||||
|
|
||||||
/**
|
|
||||||
* For inflating the contact using the cursor
|
|
||||||
*/
|
|
||||||
constructor(id: Long, address: String) : this() {
|
constructor(id: Long, address: String) : this() {
|
||||||
this.recipientId = id
|
this.recipientId = id
|
||||||
this.address = address
|
this.address = address
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ open class Conversation() : RealmObject() {
|
|||||||
fun getTitle(): String {
|
fun getTitle(): String {
|
||||||
var title = ""
|
var title = ""
|
||||||
contacts.forEachIndexed { index, recipient ->
|
contacts.forEachIndexed { index, recipient ->
|
||||||
title += recipient.address
|
title += if (recipient.name.isNotEmpty()) recipient.name else recipient.address
|
||||||
if (index < contacts.size - 1) {
|
if (index < contacts.size - 1) {
|
||||||
title += ", "
|
title += ", "
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,14 @@ package com.moez.QKSMS.data.repository
|
|||||||
|
|
||||||
import android.content.ContentUris
|
import android.content.ContentUris
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.database.Cursor
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
|
import android.provider.BaseColumns
|
||||||
|
import android.provider.ContactsContract
|
||||||
import com.moez.QKSMS.data.model.Contact
|
import com.moez.QKSMS.data.model.Contact
|
||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
|
|
||||||
|
|
||||||
class ContactRepository(val context: Context) {
|
class ContactRepository(val context: Context) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -42,11 +46,23 @@ class ContactRepository(val context: Context) {
|
|||||||
private fun getContactFromContentProvider(recipientId: Long): Contact? {
|
private fun getContactFromContentProvider(recipientId: Long): Contact? {
|
||||||
var contact: Contact? = null
|
var contact: Contact? = null
|
||||||
|
|
||||||
val cursor = context.contentResolver.query(ContentUris.withAppendedId(URI, recipientId), null, null, null, null)
|
val recipientCursor = context.contentResolver.query(ContentUris.withAppendedId(URI, recipientId), null, null, null, null)
|
||||||
if (cursor.moveToFirst()) {
|
if (recipientCursor.moveToFirst()) {
|
||||||
contact = Contact(recipientId, cursor.getString(0))
|
contact = Contact(recipientId, recipientCursor.getString(0))
|
||||||
|
}
|
||||||
|
recipientCursor.close()
|
||||||
|
|
||||||
|
val contactUri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(contact?.address))
|
||||||
|
var contactCursor: Cursor? = null
|
||||||
|
try {
|
||||||
|
contactCursor = context.contentResolver.query(contactUri, arrayOf(BaseColumns._ID, ContactsContract.PhoneLookup.DISPLAY_NAME), null, null, null)
|
||||||
|
if (contactCursor.moveToFirst()) {
|
||||||
|
contact?.name = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Data.DISPLAY_NAME))
|
||||||
|
}
|
||||||
|
} catch (ignored: Exception) {
|
||||||
|
} finally {
|
||||||
|
contactCursor?.close()
|
||||||
}
|
}
|
||||||
cursor.close()
|
|
||||||
|
|
||||||
return contact
|
return contact
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ class ConversationRepository {
|
|||||||
fun getConversation(threadId: Long): RealmResults<Conversation> {
|
fun getConversation(threadId: Long): RealmResults<Conversation> {
|
||||||
return Realm.getDefaultInstance()
|
return Realm.getDefaultInstance()
|
||||||
.where(Conversation::class.java)
|
.where(Conversation::class.java)
|
||||||
.equalTo("recipientId", threadId)
|
.equalTo("id", threadId)
|
||||||
.findAllAsync()
|
.findAllAsync()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,8 +27,7 @@ class SyncManager(val context: Context, val contacts: ContactRepository) {
|
|||||||
// We need to setup realm on the io thread, and doOnSubscribe doesn't support setting a custom Scheduler
|
// We need to setup realm on the io thread, and doOnSubscribe doesn't support setting a custom Scheduler
|
||||||
realm = Realm.getDefaultInstance()
|
realm = Realm.getDefaultInstance()
|
||||||
realm?.beginTransaction()
|
realm?.beginTransaction()
|
||||||
realm?.delete(Conversation::class.java)
|
realm?.deleteAll()
|
||||||
realm?.delete(Message::class.java)
|
|
||||||
}
|
}
|
||||||
.flatMap { cursor -> cursor.asFlowable() }
|
.flatMap { cursor -> cursor.asFlowable() }
|
||||||
.map { cursor -> Conversation(cursor, contacts) }
|
.map { cursor -> Conversation(cursor, contacts) }
|
||||||
|
|||||||
@@ -5,11 +5,10 @@ import android.os.Bundle
|
|||||||
import android.support.v7.widget.LinearLayoutManager
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import com.karumi.dexter.Dexter
|
import com.karumi.dexter.Dexter
|
||||||
|
import com.karumi.dexter.MultiplePermissionsReport
|
||||||
import com.karumi.dexter.PermissionToken
|
import com.karumi.dexter.PermissionToken
|
||||||
import com.karumi.dexter.listener.PermissionDeniedResponse
|
|
||||||
import com.karumi.dexter.listener.PermissionGrantedResponse
|
|
||||||
import com.karumi.dexter.listener.PermissionRequest
|
import com.karumi.dexter.listener.PermissionRequest
|
||||||
import com.karumi.dexter.listener.single.PermissionListener
|
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.ui.base.QkActivity
|
import com.moez.QKSMS.ui.base.QkActivity
|
||||||
import kotlinx.android.synthetic.main.conversation_list_activity.*
|
import kotlinx.android.synthetic.main.conversation_list_activity.*
|
||||||
@@ -32,22 +31,19 @@ class ConversationListActivity : QkActivity() {
|
|||||||
viewModel.onRefresh { swipeRefresh.isRefreshing = false }
|
viewModel.onRefresh { swipeRefresh.isRefreshing = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
requestSmsPermission()
|
requestPermissions()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun requestSmsPermission() {
|
private fun requestPermissions() {
|
||||||
Dexter.withActivity(this)
|
Dexter.withActivity(this)
|
||||||
.withPermission(Manifest.permission.READ_SMS)
|
.withPermissions(arrayListOf(Manifest.permission.READ_CONTACTS, Manifest.permission.READ_SMS))
|
||||||
.withListener(object : PermissionListener {
|
.withListener(object : MultiplePermissionsListener {
|
||||||
override fun onPermissionGranted(response: PermissionGrantedResponse) {
|
override fun onPermissionRationaleShouldBeShown(request: MutableList<PermissionRequest>, token: PermissionToken) {
|
||||||
Log.d(TAG, "Permission granted")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onPermissionDenied(response: PermissionDeniedResponse) {
|
override fun onPermissionsChecked(report: MultiplePermissionsReport) {
|
||||||
Log.d(TAG, "Permission denied")
|
for (response in report.grantedPermissionResponses) Log.v(TAG, "Permission granted: ${response.permissionName}")
|
||||||
}
|
for (response in report.deniedPermissionResponses) Log.v(TAG, "Permission denied: ${response.permissionName}")
|
||||||
|
|
||||||
override fun onPermissionRationaleShouldBeShown(permission: PermissionRequest, token: PermissionToken) {
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.check()
|
.check()
|
||||||
|
|||||||
Reference in New Issue
Block a user