From 39be6fee0b0b37802285e98df0ebdbca30a32ef5 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 28 Aug 2017 16:41:54 -0700 Subject: [PATCH] display contact names loaded from db --- qksms/src/main/AndroidManifest.xml | 2 ++ .../java/com/moez/QKSMS/data/model/Contact.kt | 4 +--- .../com/moez/QKSMS/data/model/Conversation.kt | 2 +- .../data/repository/ContactRepository.kt | 24 +++++++++++++++---- .../data/repository/ConversationRepository.kt | 2 +- .../com/moez/QKSMS/data/sync/SyncManager.kt | 3 +-- .../conversations/ConversationListActivity.kt | 24 ++++++++----------- 7 files changed, 36 insertions(+), 25 deletions(-) diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index ec4a0449..4439cf08 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + - title += recipient.address + title += if (recipient.name.isNotEmpty()) recipient.name else recipient.address if (index < contacts.size - 1) { title += ", " } diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt index 11615f5d..302f9f81 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt @@ -2,10 +2,14 @@ package com.moez.QKSMS.data.repository import android.content.ContentUris import android.content.Context +import android.database.Cursor import android.net.Uri +import android.provider.BaseColumns +import android.provider.ContactsContract import com.moez.QKSMS.data.model.Contact import io.realm.Realm + class ContactRepository(val context: Context) { /** @@ -42,11 +46,23 @@ class ContactRepository(val context: Context) { private fun getContactFromContentProvider(recipientId: Long): Contact? { var contact: Contact? = null - val cursor = context.contentResolver.query(ContentUris.withAppendedId(URI, recipientId), null, null, null, null) - if (cursor.moveToFirst()) { - contact = Contact(recipientId, cursor.getString(0)) + val recipientCursor = context.contentResolver.query(ContentUris.withAppendedId(URI, recipientId), null, null, null, null) + if (recipientCursor.moveToFirst()) { + 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 } diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt index 0dda594b..0ada43ad 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt @@ -9,7 +9,7 @@ class ConversationRepository { fun getConversation(threadId: Long): RealmResults { return Realm.getDefaultInstance() .where(Conversation::class.java) - .equalTo("recipientId", threadId) + .equalTo("id", threadId) .findAllAsync() } diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt index 7a4e9949..9832b5eb 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt @@ -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 realm = Realm.getDefaultInstance() realm?.beginTransaction() - realm?.delete(Conversation::class.java) - realm?.delete(Message::class.java) + realm?.deleteAll() } .flatMap { cursor -> cursor.asFlowable() } .map { cursor -> Conversation(cursor, contacts) } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt index d7672e5c..3ed4bb6c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt @@ -5,11 +5,10 @@ import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.util.Log import com.karumi.dexter.Dexter +import com.karumi.dexter.MultiplePermissionsReport 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.single.PermissionListener +import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.moez.QKSMS.R import com.moez.QKSMS.ui.base.QkActivity import kotlinx.android.synthetic.main.conversation_list_activity.* @@ -32,22 +31,19 @@ class ConversationListActivity : QkActivity() { viewModel.onRefresh { swipeRefresh.isRefreshing = false } } - requestSmsPermission() + requestPermissions() } - private fun requestSmsPermission() { + private fun requestPermissions() { Dexter.withActivity(this) - .withPermission(Manifest.permission.READ_SMS) - .withListener(object : PermissionListener { - override fun onPermissionGranted(response: PermissionGrantedResponse) { - Log.d(TAG, "Permission granted") + .withPermissions(arrayListOf(Manifest.permission.READ_CONTACTS, Manifest.permission.READ_SMS)) + .withListener(object : MultiplePermissionsListener { + override fun onPermissionRationaleShouldBeShown(request: MutableList, token: PermissionToken) { } - override fun onPermissionDenied(response: PermissionDeniedResponse) { - Log.d(TAG, "Permission denied") - } - - override fun onPermissionRationaleShouldBeShown(permission: PermissionRequest, token: PermissionToken) { + override fun onPermissionsChecked(report: MultiplePermissionsReport) { + for (response in report.grantedPermissionResponses) Log.v(TAG, "Permission granted: ${response.permissionName}") + for (response in report.deniedPermissionResponses) Log.v(TAG, "Permission denied: ${response.permissionName}") } }) .check()