Avoid crashing on devices with no default browser

pimterry · pimterry · commit ab7695fde5e9 · 2020-08-31T15:29:54.000+02:00
diff --git a/app/src/main/java/tech/httptoolkit/android/MainActivity.kt b/app/src/main/java/tech/httptoolkit/android/MainActivity.kt
@@ -604,10 +604,10 @@ private fun isPackageAvailable(context: Context, packageName: String) = try {
     false
 }
 
-private fun getDefaultBrowserPackage(context: Context): String {
+private fun getDefaultBrowserPackage(context: Context): String? {
     val browserIntent = Intent("android.intent.action.VIEW", Uri.parse("http://example.com"))
     val resolveInfo = context.packageManager.resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY)
-    return resolveInfo.activityInfo.packageName
+    return resolveInfo?.activityInfo?.packageName
 }
 
 private fun getTestBrowserPackage(context: Context): String? {

Original file line number	Diff line number	Diff line change
`@@ -604,10 +604,10 @@ private fun isPackageAvailable(context: Context, packageName: String) = try {`
`604`	`604`	`false`
`605`	`605`	`}`
`606`	`606`
`607`		`-private fun getDefaultBrowserPackage(context: Context): String {`
	`607`	`+private fun getDefaultBrowserPackage(context: Context): String? {`
`608`	`608`	`val browserIntent = Intent("android.intent.action.VIEW", Uri.parse("http://example.com"))`
`609`	`609`	`val resolveInfo = context.packageManager.resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY)`
`610`		`- return resolveInfo.activityInfo.packageName`
	`610`	`+ return resolveInfo?.activityInfo?.packageName`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`private fun getTestBrowserPackage(context: Context): String? {`