fenix/Simple-Dialer
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git synced 2025-06-05 21:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

properly handle intents on Android 11+

Browse Source
This commit is contained in:
tibbi
2021-04-05 21:19:43 +02:00
parent b8f0457494
commit ee166494bc
4 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
View File

@ -123,11 +123,7 @@ class DialpadActivity : SimpleActivity() {
action = Intent.ACTION_INSERT_OR_EDIT action = Intent.ACTION_INSERT_OR_EDIT
type = "vnd.android.cursor.item/contact" type = "vnd.android.cursor.item/contact"
putExtra(KEY_PHONE, dialpad_input.value) putExtra(KEY_PHONE, dialpad_input.value)
if (resolveActivity(packageManager) != null) { launchActivityIntent(this)
startActivity(this)
} else {
toast(R.string.no_app_found)
}
} }
} }

13
app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
View File

@ -27,8 +27,10 @@ import com.simplemobiletools.dialer.models.RecentCall
import kotlinx.android.synthetic.main.item_recent_call.view.* import kotlinx.android.synthetic.main.item_recent_call.view.*
import java.util.* import java.util.*
class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<RecentCall>, recyclerView: MyRecyclerView, val refreshItemsListener: RefreshItemsListener?, class RecentCallsAdapter(
itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) { activity: SimpleActivity, var recentCalls: ArrayList<RecentCall>, recyclerView: MyRecyclerView, val refreshItemsListener: RefreshItemsListener?,
itemClick: (Any) -> Unit
) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {
private lateinit var outgoingCallIcon: Drawable private lateinit var outgoingCallIcon: Drawable
private lateinit var incomingCallIcon: Drawable private lateinit var incomingCallIcon: Drawable
@ -167,12 +169,7 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
action = Intent.ACTION_INSERT_OR_EDIT action = Intent.ACTION_INSERT_OR_EDIT
type = "vnd.android.cursor.item/contact" type = "vnd.android.cursor.item/contact"
putExtra(KEY_PHONE, phoneNumber) putExtra(KEY_PHONE, phoneNumber)
activity.launchActivityIntent(this)
if (resolveActivity(activity.packageManager) != null) {
activity.startActivity(this)
} else {
activity.toast(R.string.no_app_found)
}
} }
} }

10
app/src/main/kotlin/com/simplemobiletools/dialer/extensions/Activity.kt
View File

@ -12,7 +12,6 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.models.SimpleContact import com.simplemobiletools.commons.models.SimpleContact
import com.simplemobiletools.dialer.R
import com.simplemobiletools.dialer.activities.SimpleActivity import com.simplemobiletools.dialer.activities.SimpleActivity
import com.simplemobiletools.dialer.dialogs.SelectSIMDialog import com.simplemobiletools.dialer.dialogs.SelectSIMDialog
@ -39,18 +38,15 @@ fun Activity.startContactDetailsIntent(contact: SimpleContact) {
val simpleContacts = "com.simplemobiletools.contacts.pro" val simpleContacts = "com.simplemobiletools.contacts.pro"
val simpleContactsDebug = "com.simplemobiletools.contacts.pro.debug" val simpleContactsDebug = "com.simplemobiletools.contacts.pro.debug"
if (contact.rawId > 1000000 && contact.contactId > 1000000 && contact.rawId == contact.contactId && if (contact.rawId > 1000000 && contact.contactId > 1000000 && contact.rawId == contact.contactId &&
(isPackageInstalled(simpleContacts) || isPackageInstalled(simpleContactsDebug))) { (isPackageInstalled(simpleContacts) || isPackageInstalled(simpleContactsDebug))
) {
Intent().apply { Intent().apply {
action = Intent.ACTION_VIEW action = Intent.ACTION_VIEW
putExtra(CONTACT_ID, contact.rawId) putExtra(CONTACT_ID, contact.rawId)
putExtra(IS_PRIVATE, true) putExtra(IS_PRIVATE, true)
`package` = if (isPackageInstalled(simpleContacts)) simpleContacts else simpleContactsDebug `package` = if (isPackageInstalled(simpleContacts)) simpleContacts else simpleContactsDebug
setDataAndType(ContactsContract.Contacts.CONTENT_LOOKUP_URI, "vnd.android.cursor.dir/person") setDataAndType(ContactsContract.Contacts.CONTENT_LOOKUP_URI, "vnd.android.cursor.dir/person")
if (resolveActivity(packageManager) != null) { launchActivityIntent(this)
startActivity(this)
} else {
toast(R.string.no_app_found)
}
} }
} else { } else {
ensureBackgroundThread { ensureBackgroundThread {

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

@ -166,11 +166,7 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
Intent().apply { Intent().apply {
action = Intent.ACTION_INSERT action = Intent.ACTION_INSERT
data = ContactsContract.Contacts.CONTENT_URI data = ContactsContract.Contacts.CONTENT_URI
if (resolveActivity(context.packageManager) != null) { context.launchActivityIntent(this)
context.startActivity(this)
} else {
context.toast(R.string.no_app_found)
}
} }
} }
} }