From fcd1cfcf60e0c8dfd7062c8623ad795eb3709db0 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 12 Feb 2018 00:50:42 -0500 Subject: [PATCH] Fix crash when starting external activity for intent without a default set --- .../src/main/java/presentation/common/Navigator.kt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/qksms/src/main/java/presentation/common/Navigator.kt b/qksms/src/main/java/presentation/common/Navigator.kt index e98c15b7..fd67aba3 100644 --- a/qksms/src/main/java/presentation/common/Navigator.kt +++ b/qksms/src/main/java/presentation/common/Navigator.kt @@ -51,6 +51,14 @@ class Navigator @Inject constructor(val context: Context) { context.startActivity(intent) } + private fun startActivityExternal(intent: Intent) { + if (intent.resolveActivity(context.packageManager) != null) { + startActivity(intent) + } else { + startActivity(Intent.createChooser(intent, null)) + } + } + fun showSetupActivity() { val intent = Intent(context, SetupActivity::class.java) startActivity(intent) @@ -93,20 +101,20 @@ class Navigator @Inject constructor(val context: Context) { fun makePhoneCall(address: String) { val intent = Intent(Intent.ACTION_DIAL, Uri.parse("tel:$address")) - startActivity(intent) + startActivityExternal(intent) } fun showSupport() { val intent = Intent(Intent.ACTION_SENDTO) intent.data = Uri.parse("mailto:") intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("team@qklabs.com")) - startActivity(intent) + startActivityExternal(intent) } fun addContact(address: String) { val uri = Uri.parse("tel: $address") val intent = Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT, uri) - startActivity(intent) + startActivityExternal(intent) } @TargetApi(Build.VERSION_CODES.O)