fenix
/
Simple-Dialer
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #95, do not require the Contacts permission at local contacts

This commit is contained in:
tibbi 2020-09-18 22:11:24 +02:00
parent 8dd903a6fc
commit 0eab858ca3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt
View File

@ -104,20 +104,19 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
val currAdapter = fragment_list.adapter
if (currAdapter == null) {
ContactsAdapter(activity as SimpleActivity, contacts, fragment_list, this) {
val lookupKey = SimpleContactsHelper(activity!!).getContactLookupKey((it as SimpleContact).rawId.toString())
val publicUri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, lookupKey)
val contact = it as SimpleContact
// handle private contacts differently, only Simple Contacts Pro can open them
val simpleContacts = "com.simplemobiletools.contacts.pro"
val simpleContactsDebug = "com.simplemobiletools.contacts.pro.debug"
if (lookupKey.isEmpty() && it.rawId > 1000000 && it.contactId > 1000000 && it.rawId == it.contactId &&
if (it.rawId > 1000000 && it.contactId > 1000000 && it.rawId == it.contactId &&
(context.isPackageInstalled(simpleContacts) || context.isPackageInstalled(simpleContactsDebug))) {
Intent().apply {
action = Intent.ACTION_VIEW
putExtra(CONTACT_ID, it.rawId)
putExtra(IS_PRIVATE, true)
`package` = if (context.isPackageInstalled(simpleContacts)) simpleContacts else simpleContactsDebug
setDataAndType(publicUri, "vnd.android.cursor.dir/person")
setDataAndType(ContactsContract.Contacts.CONTENT_LOOKUP_URI, "vnd.android.cursor.dir/person")
if (resolveActivity(context.packageManager) != null) {
activity?.startActivity(this)
} else {
@ -125,6 +124,8 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
}
}
} else {
val lookupKey = SimpleContactsHelper(activity!!).getContactLookupKey((contact).rawId.toString())
val publicUri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, lookupKey)
activity!!.launchViewContactIntent(publicUri)
}
}.apply {