From 43c37604f9c7938b4ccb8589fe86627b28edd784 Mon Sep 17 00:00:00 2001 From: Abdourahamane Boinaidi Date: Fri, 27 Dec 2024 10:21:29 +0100 Subject: [PATCH] chore: Use Deeplink extensions --- .../com/infomaniak/swisstransfer/ui/LaunchActivity.kt | 9 ++------- .../java/com/infomaniak/swisstransfer/ui/MainActivity.kt | 5 +++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/LaunchActivity.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/LaunchActivity.kt index 3a4781ba91..fff558bc20 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/LaunchActivity.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/LaunchActivity.kt @@ -25,6 +25,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.lifecycle.lifecycleScope import com.infomaniak.sentry.SentryLog import com.infomaniak.swisstransfer.ui.utils.AccountUtils +import com.infomaniak.swisstransfer.ui.utils.hasValidTransferDeeplink import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch import javax.inject.Inject @@ -52,7 +53,7 @@ class LaunchActivity : ComponentActivity() { } private suspend fun startTargetActivity() { - if (isValidTransferDeeplink()) { + if (hasValidTransferDeeplink()) { if (!accountUtils.isUserConnected()) accountUtils.login() createDeeplink() } else { @@ -65,11 +66,6 @@ class LaunchActivity : ComponentActivity() { else -> OnboardingActivity::class }.java - private fun isValidTransferDeeplink(): Boolean { - val deeplink = intent?.data?.toString() - return deeplink?.matches(TRANSFER_DEEPLINK_REGEX) == true - } - private fun createDeeplink() { val deepLinkIntent = Intent(Intent.ACTION_VIEW, intent.data, /*context*/this, MainActivity::class.java) startActivity(deepLinkIntent) @@ -77,6 +73,5 @@ class LaunchActivity : ComponentActivity() { companion object { private val TAG = LaunchActivity::class.java.simpleName - private val TRANSFER_DEEPLINK_REGEX = "https://.+/d/.+".toRegex() } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/MainActivity.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/MainActivity.kt index 20372d03b3..56087b879b 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/MainActivity.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/MainActivity.kt @@ -30,6 +30,7 @@ import com.infomaniak.multiplatform_swisstransfer.common.models.Theme import com.infomaniak.swisstransfer.ui.screen.main.MainScreen import com.infomaniak.swisstransfer.ui.screen.main.settings.SettingsViewModel import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme +import com.infomaniak.swisstransfer.ui.utils.hasValidTransferDeeplink import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint @@ -40,11 +41,11 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { enableEdgeToEdge() super.onCreate(savedInstanceState) - val isReceivedDeeplink = intent.data != null + val isTransferDeeplink = hasValidTransferDeeplink() setContent { val appSettings by settingsViewModel.appSettingsFlow.collectAsStateWithLifecycle(null) SwissTransferTheme(isDarkTheme = isDarkTheme(getTheme = { appSettings?.theme })) { - MainScreen(isReceivedDeeplink) + MainScreen(isTransferDeeplink) } } }