feat(AdBottomsheet): Reopen deeplink after connection when user wants…

… to execute actions
Infomaniak · Oct 1, 2024 · c5bc274 · c5bc274
1 parent 51b4726
commit c5bc274
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 8 deletions.
diff --git a/app/src/main/java/com/infomaniak/drive/ui/login/LoginActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/login/LoginActivity.kt
@@ -25,6 +25,7 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.net.toUri
 import androidx.core.view.isInvisible
 import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.widget.ViewPager2
@@ -38,6 +39,7 @@ import com.infomaniak.drive.data.cache.DriveInfosController
 import com.infomaniak.drive.data.documentprovider.CloudStorageProvider
 import com.infomaniak.drive.data.models.drive.DriveInfo
 import com.infomaniak.drive.databinding.ActivityLoginBinding
+import com.infomaniak.drive.ui.LaunchActivity
 import com.infomaniak.drive.ui.MainActivity
 import com.infomaniak.drive.utils.AccountUtils
 import com.infomaniak.drive.utils.getInfomaniakLogin
@@ -54,8 +56,8 @@ import com.infomaniak.lib.core.utils.Utils.lockOrientationForSmallScreens
 import com.infomaniak.lib.login.ApiToken
 import com.infomaniak.lib.login.InfomaniakLogin
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.invoke
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class LoginActivity : AppCompatActivity() {
 
@@ -169,19 +171,25 @@ class LoginActivity : AppCompatActivity() {
         lifecycleScope.launch(Dispatchers.IO) {
             when (val returnValue = authenticateUser(this@LoginActivity, apiToken)) {
                 is User -> {
-                    trackUserId(AccountUtils.currentUserId)
-                    trackAccountEvent("loggedIn")
-                    launchMainActivity()
+                    val deeplink = navigationArgs?.publicShareDeeplink
+                    if (deeplink.isNullOrBlank()) {
+                        trackUserId(AccountUtils.currentUserId)
+                        trackAccountEvent("loggedIn")
+                        launchMainActivity()
+                    } else {
+                        launchDeeplinkAndFinish(deeplink)
+                    }
+
                     return@launch
                 }
-                is ApiResponse<*> -> withContext(Dispatchers.Main) {
+                is ApiResponse<*> -> Dispatchers.Main {
                     if (returnValue.error?.code == ErrorCode.NO_DRIVE) {
                         launchNoDriveActivity()
                     } else {
                         showError(getString(returnValue.translatedError))
                     }
                 }
-                else -> withContext(Dispatchers.Main) { showError(getString(R.string.anErrorHasOccurred)) }
+                else -> Dispatchers.Main { showError(getString(R.string.anErrorHasOccurred)) }
             }
 
             infomaniakLogin.deleteToken(
@@ -199,6 +207,14 @@ class LoginActivity : AppCompatActivity() {
         if (!connectButton.isEnabled) connectButton.isEnabled = true
     }
 
+    private fun launchDeeplinkAndFinish(deeplink: String) {
+        Intent(this@LoginActivity, LaunchActivity::class.java).apply {
+            setData(deeplink.toUri())
+            clearStack()
+        }.also(::startActivity)
+        finishAffinity()
+    }
+
     private fun launchMainActivity() {
         startActivity(Intent(this, MainActivity::class.java).clearStack())
     }

diff --git a/app/src/main/java/com/infomaniak/drive/ui/publicShare/ObtainKDriveAdBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/drive/ui/publicShare/ObtainKDriveAdBottomSheetDialog.kt
@@ -22,6 +22,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.infomaniak.drive.databinding.FragmentBottomSheetObtainKdriveAdBinding
@@ -32,6 +33,7 @@ import com.infomaniak.lib.core.utils.safeBinding
 class ObtainKDriveAdBottomSheetDialog : BottomSheetDialogFragment() {
 
     private var binding: FragmentBottomSheetObtainKdriveAdBinding by safeBinding()
+    private val publicShareViewModel: PublicShareViewModel by activityViewModels()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return FragmentBottomSheetObtainKdriveAdBinding.inflate(inflater, container, false).also { binding = it }.root
@@ -44,9 +46,14 @@ class ObtainKDriveAdBottomSheetDialog : BottomSheetDialogFragment() {
         binding.alreadyGotAnAccountButton.setOnClickListener { openLoginActivity(shouldLaunchAccountCreation = false) }
     }
 
-    private fun openLoginActivity(shouldLaunchAccountCreation: Boolean) {
+    private fun openLoginActivity(shouldLaunchAccountCreation: Boolean) = with(publicShareViewModel) {
         Intent(requireActivity(), LoginActivity::class.java).apply {
-            putExtras(LoginActivityArgs(shouldLaunchAccountCreation = shouldLaunchAccountCreation).toBundle())
+            putExtras(
+                LoginActivityArgs(
+                    shouldLaunchAccountCreation = shouldLaunchAccountCreation,
+                    publicShareDeeplink = "https://kdrive.infomaniak.com/app/share/$driveId/$publicShareUuid",
+                ).toBundle()
+            )
         }.also(::startActivity)
         findNavController().popBackStack()
     }

diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
@@ -417,6 +417,10 @@
             android:name="shouldLaunchAccountCreation"
             android:defaultValue="false"
             app:argType="boolean" />
+        <argument
+            android:name="publicShareDeeplink"
+            android:defaultValue=""
+            app:argType="string" />
     </activity>
 
     <dialog