improving some intent handling for Android 11+

tibbi · tibbi · commit c459cda97219 · 2021-04-04T09:15:50.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -56,7 +56,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:5cec51606a'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:8084f88f20'
     implementation 'joda-time:joda-time:2.10.3'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
     implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
@@ -1,6 +1,7 @@
 package com.simplemobiletools.contacts.pro.activities
 
 import android.app.Activity
+import android.content.ActivityNotFoundException
 import android.content.ClipData
 import android.content.ContentValues
 import android.content.Intent
@@ -275,11 +276,7 @@ class EditContactActivity : ContactActivity() {
         Intent().apply {
             action = Intent.ACTION_EDIT
             data = getContactPublicUri(contact!!)
-            if (resolveActivity(packageManager) != null) {
-                startActivity(this)
-            } else {
-                toast(R.string.no_app_found)
-            }
+            launchActivityIntent(this)
         }
     }
 
@@ -320,10 +317,13 @@ class EditContactActivity : ContactActivity() {
             putExtra("scaleUpIfNeeded", "true")
             clipData = ClipData("Attachment", arrayOf("text/primaryUri-list"), ClipData.Item(lastPhotoIntentUri))
             addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            if (resolveActivity(packageManager) != null) {
+
+            try {
                 startActivityForResult(this, INTENT_CROP_PHOTO)
-            } else {
+            } catch (e: ActivityNotFoundException) {
                 toast(R.string.no_app_found)
+            } catch (e: Exception) {
+                showErrorToast(e)
             }
         }
     }
@@ -494,9 +494,9 @@ class EditContactActivity : ContactActivity() {
     private fun setupRingtone() {
         contact_ringtone.setOnClickListener {
             val ringtonePickerIntent = getRingtonePickerIntent()
-            if (ringtonePickerIntent.resolveActivity(packageManager) != null) {
+            try {
                 startActivityForResult(ringtonePickerIntent, INTENT_SELECT_RINGTONE)
-            } else {
+            } catch (e: Exception) {
                 val currentRingtone = contact!!.ringtone ?: getDefaultAlarmSound(RingtoneManager.TYPE_RINGTONE).uri
                 SelectAlarmSoundDialog(this, currentRingtone, AudioManager.STREAM_RING, PICK_RINGTONE_INTENT_ID, RingtoneManager.TYPE_RINGTONE, true,
                     onAlarmPicked = {
@@ -1227,10 +1227,13 @@ class EditContactActivity : ContactActivity() {
         lastPhotoIntentUri = uri
         Intent(MediaStore.ACTION_IMAGE_CAPTURE).apply {
             putExtra(MediaStore.EXTRA_OUTPUT, uri)
-            if (resolveActivity(packageManager) != null) {
+
+            try {
                 startActivityForResult(this, INTENT_TAKE_PHOTO)
-            } else {
+            } catch (e: ActivityNotFoundException) {
                 toast(R.string.no_app_found)
+            } catch (e: Exception) {
+                showErrorToast(e)
             }
         }
     }
@@ -1243,10 +1246,13 @@ class EditContactActivity : ContactActivity() {
             clipData = ClipData("Attachment", arrayOf("text/uri-list"), ClipData.Item(uri))
             addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
             putExtra(MediaStore.EXTRA_OUTPUT, uri)
-            if (resolveActivity(packageManager) != null) {
+
+            try {
                 startActivityForResult(this, INTENT_CHOOSE_PHOTO)
-            } else {
+            } catch (e: ActivityNotFoundException) {
                 toast(R.string.no_app_found)
+            } catch (e: Exception) {
+                showErrorToast(e)
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt
@@ -2,6 +2,7 @@ package com.simplemobiletools.contacts.pro.activities
 
 import android.app.Activity
 import android.app.SearchManager
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.ColorDrawable
@@ -269,10 +270,12 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
                 putExtra(KEY_EMAIL, email)
             }
 
-            if (resolveActivity(packageManager) != null) {
+            try {
                 startActivityForResult(this, START_INSERT_ACTIVITY)
-            } else {
+            } catch (e: ActivityNotFoundException) {
                 toast(R.string.no_app_found)
+            } catch (e: Exception) {
+                showErrorToast(e)
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
@@ -595,9 +595,9 @@ class ViewContactActivity : ContactActivity() {
 
             contact_ringtone.setOnClickListener {
                 val ringtonePickerIntent = getRingtonePickerIntent()
-                if (ringtonePickerIntent.resolveActivity(packageManager) != null) {
+                try {
                     startActivityForResult(ringtonePickerIntent, INTENT_SELECT_RINGTONE)
-                } else {
+                } catch (e: Exception) {
                     val currentRingtone = contact!!.ringtone ?: getDefaultAlarmSound(RingtoneManager.TYPE_RINGTONE).uri
                     SelectAlarmSoundDialog(this@ViewContactActivity, currentRingtone, AudioManager.STREAM_RING, PICK_RINGTONE_INTENT_ID, RingtoneManager.TYPE_RINGTONE, true,
                         onAlarmPicked = {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt
@@ -21,12 +21,7 @@ fun SimpleActivity.startCallIntent(recipient: String) {
         val action = if (it) Intent.ACTION_CALL else Intent.ACTION_DIAL
         Intent(action).apply {
             data = Uri.fromParts("tel", recipient, null)
-
-            if (resolveActivity(packageManager) != null) {
-                startActivity(this)
-            } else {
-                toast(R.string.no_app_found)
-            }
+            launchActivityIntent(this)
         }
     }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
@@ -58,11 +58,7 @@ fun Context.editContact(contact: Contact) {
 fun Context.sendEmailIntent(recipient: String) {
     Intent(Intent.ACTION_SENDTO).apply {
         data = Uri.fromParts(KEY_MAILTO, recipient, null)
-        if (resolveActivity(packageManager) != null) {
-            startActivity(this)
-        } else {
-            toast(R.string.no_app_found)
-        }
+        launchActivityIntent(this)
     }
 }
 
@@ -71,11 +67,7 @@ fun Context.sendAddressIntent(address: String) {
     val uri = Uri.parse("geo:0,0?q=$location")
 
     Intent(Intent.ACTION_VIEW, uri).apply {
-        if (resolveActivity(packageManager) != null) {
-            startActivity(this)
-        } else {
-            toast(R.string.no_app_found)
-        }
+        launchActivityIntent(this)
     }
 }
 
@@ -88,11 +80,7 @@ fun Context.openWebsiteIntent(url: String) {
 
     Intent(Intent.ACTION_VIEW).apply {
         data = Uri.parse(website)
-        if (resolveActivity(packageManager) != null) {
-            startActivity(this)
-        } else {
-            toast(R.string.no_app_found)
-        }
+        launchActivityIntent(this)
     }
 }
 
@@ -235,11 +223,7 @@ fun Context.sendSMSToContacts(contacts: ArrayList<Contact>) {
 
     val uriString = "smsto:${numbers.toString().trimEnd(';')}"
     Intent(Intent.ACTION_SENDTO, Uri.parse(uriString)).apply {
-        if (resolveActivity(packageManager) != null) {
-            startActivity(this)
-        } else {
-            toast(R.string.no_app_found)
-        }
+        launchActivityIntent(this)
     }
 }
 
@@ -256,11 +240,7 @@ fun Context.sendEmailToContacts(contacts: ArrayList<Contact>) {
     Intent(Intent.ACTION_SEND_MULTIPLE).apply {
         type = "message/rfc822"
         putExtra(Intent.EXTRA_EMAIL, emails.toTypedArray())
-        if (resolveActivity(packageManager) != null) {
-            startActivity(this)
-        } else {
-            toast(R.string.no_app_found)
-        }
+        launchActivityIntent(this)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ android {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`dependencies {`
`59`		`- implementation 'com.github.SimpleMobileTools:Simple-Commons:5cec51606a'`
	`59`	`+ implementation 'com.github.SimpleMobileTools:Simple-Commons:8084f88f20'`
`60`	`60`	`implementation 'joda-time:joda-time:2.10.3'`
`61`	`61`	`implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'`
`62`	`62`	`implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package com.simplemobiletools.contacts.pro.activities`
`2`	`2`
`3`	`3`	`import android.app.Activity`
`4`	`4`	`import android.app.SearchManager`
	`5`	`+import android.content.ActivityNotFoundException`
`5`	`6`	`import android.content.Context`
`6`	`7`	`import android.content.Intent`
`7`	`8`	`import android.graphics.drawable.ColorDrawable`
`@@ -269,10 +270,12 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {`
`269`	`270`	`putExtra(KEY_EMAIL, email)`
`270`	`271`	`}`
`271`	`272`
`272`		`- if (resolveActivity(packageManager) != null) {`
	`273`	`+ try {`
`273`	`274`	`startActivityForResult(this, START_INSERT_ACTIVITY)`
`274`		`- } else {`
	`275`	`+ } catch (e: ActivityNotFoundException) {`
`275`	`276`	`toast(R.string.no_app_found)`
	`277`	`+ } catch (e: Exception) {`
	`278`	`+ showErrorToast(e)`
`276`	`279`	`}`
`277`	`280`	`}`
`278`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,7 @@ fun SimpleActivity.startCallIntent(recipient: String) {`
`21`	`21`	`val action = if (it) Intent.ACTION_CALL else Intent.ACTION_DIAL`
`22`	`22`	`Intent(action).apply {`
`23`	`23`	`data = Uri.fromParts("tel", recipient, null)`
`24`		`-`
`25`		`- if (resolveActivity(packageManager) != null) {`
`26`		`- startActivity(this)`
`27`		`- } else {`
`28`		`- toast(R.string.no_app_found)`
`29`		`- }`
	`24`	`+ launchActivityIntent(this)`
`30`	`25`	`}`
`31`	`26`	`}`
`32`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,7 @@ fun Context.editContact(contact: Contact) {`
`58`	`58`	`fun Context.sendEmailIntent(recipient: String) {`
`59`	`59`	`Intent(Intent.ACTION_SENDTO).apply {`
`60`	`60`	`data = Uri.fromParts(KEY_MAILTO, recipient, null)`
`61`		`- if (resolveActivity(packageManager) != null) {`
`62`		`- startActivity(this)`
`63`		`- } else {`
`64`		`- toast(R.string.no_app_found)`
`65`		`- }`
	`61`	`+ launchActivityIntent(this)`
`66`	`62`	`}`
`67`	`63`	`}`
`68`	`64`
`@@ -71,11 +67,7 @@ fun Context.sendAddressIntent(address: String) {`
`71`	`67`	`val uri = Uri.parse("geo:0,0?q=$location")`
`72`	`68`
`73`	`69`	`Intent(Intent.ACTION_VIEW, uri).apply {`
`74`		`- if (resolveActivity(packageManager) != null) {`
`75`		`- startActivity(this)`
`76`		`- } else {`
`77`		`- toast(R.string.no_app_found)`
`78`		`- }`
	`70`	`+ launchActivityIntent(this)`
`79`	`71`	`}`
`80`	`72`	`}`
`81`	`73`
`@@ -88,11 +80,7 @@ fun Context.openWebsiteIntent(url: String) {`
`88`	`80`
`89`	`81`	`Intent(Intent.ACTION_VIEW).apply {`
`90`	`82`	`data = Uri.parse(website)`
`91`		`- if (resolveActivity(packageManager) != null) {`
`92`		`- startActivity(this)`
`93`		`- } else {`
`94`		`- toast(R.string.no_app_found)`
`95`		`- }`
	`83`	`+ launchActivityIntent(this)`
`96`	`84`	`}`
`97`	`85`	`}`
`98`	`86`
`@@ -235,11 +223,7 @@ fun Context.sendSMSToContacts(contacts: ArrayList<Contact>) {`
`235`	`223`
`236`	`224`	`val uriString = "smsto:${numbers.toString().trimEnd(';')}"`
`237`	`225`	`Intent(Intent.ACTION_SENDTO, Uri.parse(uriString)).apply {`
`238`		`- if (resolveActivity(packageManager) != null) {`
`239`		`- startActivity(this)`
`240`		`- } else {`
`241`		`- toast(R.string.no_app_found)`
`242`		`- }`
	`226`	`+ launchActivityIntent(this)`
`243`	`227`	`}`
`244`	`228`	`}`
`245`	`229`
`@@ -256,11 +240,7 @@ fun Context.sendEmailToContacts(contacts: ArrayList<Contact>) {`
`256`	`240`	`Intent(Intent.ACTION_SEND_MULTIPLE).apply {`
`257`	`241`	`type = "message/rfc822"`
`258`	`242`	`putExtra(Intent.EXTRA_EMAIL, emails.toTypedArray())`
`259`		`- if (resolveActivity(packageManager) != null) {`
`260`		`- startActivity(this)`
`261`		`- } else {`
`262`		`- toast(R.string.no_app_found)`
`263`		`- }`
	`243`	`+ launchActivityIntent(this)`
`264`	`244`	`}`
`265`	`245`	`}`
`266`	`246`