From b9ec124af419d394701fe75ae2ae679efc42442f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 16 Jun 2023 10:13:26 +0200 Subject: [PATCH] Move extension `openUrlInChromeCustomTab` to :androidutils module. --- features/login/impl/build.gradle.kts | 1 + .../features/login/impl/oidc/customtab/CustomTabHandler.kt | 1 + libraries/androidutils/build.gradle.kts | 1 + .../android/libraries/androidutils/browser/ChromeCustomTab.kt | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/Extensions.kt => libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt (97%) diff --git a/features/login/impl/build.gradle.kts b/features/login/impl/build.gradle.kts index aacf4c0aeb..2236438e2a 100644 --- a/features/login/impl/build.gradle.kts +++ b/features/login/impl/build.gradle.kts @@ -40,6 +40,7 @@ dependencies { implementation(projects.anvilannotations) anvil(projects.anvilcodegen) implementation(projects.libraries.core) + implementation(projects.libraries.androidutils) implementation(projects.libraries.architecture) implementation(projects.libraries.matrix.api) implementation(projects.libraries.matrix.api) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/CustomTabHandler.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/CustomTabHandler.kt index 407459c5bf..48c674e0a0 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/CustomTabHandler.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/CustomTabHandler.kt @@ -23,6 +23,7 @@ import android.net.Uri import androidx.browser.customtabs.CustomTabsClient import androidx.browser.customtabs.CustomTabsServiceConnection import androidx.browser.customtabs.CustomTabsSession +import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab import io.element.android.libraries.di.ApplicationContext import javax.inject.Inject diff --git a/libraries/androidutils/build.gradle.kts b/libraries/androidutils/build.gradle.kts index e9a8feaa05..f98914e08a 100644 --- a/libraries/androidutils/build.gradle.kts +++ b/libraries/androidutils/build.gradle.kts @@ -28,5 +28,6 @@ dependencies { implementation(libs.androidx.activity.activity) implementation(libs.androidx.exifinterface) implementation(libs.androidx.security.crypto) + implementation(libs.androidx.browser) implementation(projects.libraries.core) } diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/Extensions.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt similarity index 97% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/Extensions.kt rename to libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt index be98566e7c..ec0d9662c7 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/Extensions.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.login.impl.oidc.customtab +package io.element.android.libraries.androidutils.browser import android.app.Activity import android.content.ActivityNotFoundException