From d22240204a7ed0e7f757c1991e4ca4ffde10f68b Mon Sep 17 00:00:00 2001 From: mkhytarmkhoian Date: Thu, 6 Jun 2024 00:12:31 +0300 Subject: [PATCH] Small deeplink support improvements --- app/src/main/java/com/moove/app/di/MainModule.kt | 4 +--- .../deeplink/data/local/AppDeepLinkLocalDataSource.kt | 4 ++-- .../deeplink/data/remote/FirebaseDynamicLinkDataSource.kt | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/moove/app/di/MainModule.kt b/app/src/main/java/com/moove/app/di/MainModule.kt index 5c0fc65..4876ae2 100644 --- a/app/src/main/java/com/moove/app/di/MainModule.kt +++ b/app/src/main/java/com/moove/app/di/MainModule.kt @@ -16,9 +16,7 @@ import org.koin.dsl.module val mainModule = module { factory { - AppNavigator( - navController = get(), - ) + AppNavigator(navController = get()) } binds arrayOf( ScreenNavigator::class, GlobalAppNavigator::class, diff --git a/app/src/main/java/com/moove/app/feature/deeplink/data/local/AppDeepLinkLocalDataSource.kt b/app/src/main/java/com/moove/app/feature/deeplink/data/local/AppDeepLinkLocalDataSource.kt index 2567502..1cfceb8 100644 --- a/app/src/main/java/com/moove/app/feature/deeplink/data/local/AppDeepLinkLocalDataSource.kt +++ b/app/src/main/java/com/moove/app/feature/deeplink/data/local/AppDeepLinkLocalDataSource.kt @@ -64,8 +64,8 @@ class AppDeepLinkLocalDataSource( private fun String.isThat(type: String): Boolean { /** - * Handle two cases - * app/profile/ and app/profile + * Handle two cases with slash symbol at the end and without it + * app/home/ and app/home */ return contains(type, ignoreCase = true) } diff --git a/app/src/main/java/com/moove/app/feature/deeplink/data/remote/FirebaseDynamicLinkDataSource.kt b/app/src/main/java/com/moove/app/feature/deeplink/data/remote/FirebaseDynamicLinkDataSource.kt index 8e5041a..827dd95 100644 --- a/app/src/main/java/com/moove/app/feature/deeplink/data/remote/FirebaseDynamicLinkDataSource.kt +++ b/app/src/main/java/com/moove/app/feature/deeplink/data/remote/FirebaseDynamicLinkDataSource.kt @@ -11,15 +11,14 @@ import kotlinx.coroutines.withContext class FirebaseDynamicLinkDataSource( private val host: String, -// private val firebaseDynamicLinks: FirebaseDynamicLinks, + private val firebaseDynamicLinks: FirebaseDynamicLinks, private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO, ) { suspend fun parseLink(uri: String): String? = withContext(backgroundDispatcher) { if (uri.matchesPattern(host).not()) return@withContext null try { -// firebaseDynamicLinks.getDynamicLink(Uri.parse(uri)).await().link?.toString() - "https://moove.page.link/45hj45j" + firebaseDynamicLinks.getDynamicLink(Uri.parse(uri)).await().link?.toString() } catch (e: Exception) { throw DynamicLinkParseException(cause = e) }