From 09161d38779e88c5780923a0aaec41ac0ccd9a90 Mon Sep 17 00:00:00 2001 From: grigorii Date: Wed, 15 Sep 2021 13:04:35 +0300 Subject: [PATCH] fix conflicts after merging ubrir/master <- master --- android-configs/common-config.gradle | 4 ++-- .../src/main/java/ru/touchin/extensions/Context.kt | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/android-configs/common-config.gradle b/android-configs/common-config.gradle index e189a5f..7871c2e 100644 --- a/android-configs/common-config.gradle +++ b/android-configs/common-config.gradle @@ -1,10 +1,10 @@ apply plugin: 'kotlin-android' rootProject.ext { - compileSdk = 30 + compileSdk = 29 minSdk = 21 - targetSdk = 30 + targetSdk = 29 } android { diff --git a/kotlin-extensions/src/main/java/ru/touchin/extensions/Context.kt b/kotlin-extensions/src/main/java/ru/touchin/extensions/Context.kt index 3699ce6..c50b127 100644 --- a/kotlin-extensions/src/main/java/ru/touchin/extensions/Context.kt +++ b/kotlin-extensions/src/main/java/ru/touchin/extensions/Context.kt @@ -1,19 +1,13 @@ package ru.touchin.extensions -import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent import android.net.Uri import android.os.Bundle -import ru.touchin.roboswag.core.log.Lc import android.provider.Browser -fun Context.safeStartActivity(intent: Intent, options: Bundle? = null) = - try { - startActivity(intent, options) - } catch (e: ActivityNotFoundException) { - Lc.e(e, "Couldn't find activity with this parameters") - } +fun Context.safeStartActivity(intent: Intent, options: Bundle? = null, resolveFlags: Int = 0): Boolean = + packageManager.resolveActivity(intent, resolveFlags)?.let { startActivity(intent, options) } != null fun Context.openBrowser(url: String) = Intent(Intent.ACTION_VIEW) .setData(Uri.parse(url)) @@ -34,3 +28,4 @@ fun Context.openBrowserWithHeaders(url: String, headersMap: Map) fun Context.callToPhoneNumber(phoneNumber: String) = Intent(Intent.ACTION_VIEW) .setData(Uri.parse("tel:$phoneNumber")) .let { intent -> safeStartActivity(intent) } +