moving the sso redirect parameter to the sso redirect activity for sharing

vector/src/main/java/im/vector/app/features/login/AbstractSSOLoginFragment.kt

@@ -88,7 +88,7 @@ abstract class AbstractSSOLoginFragment<VB : ViewBinding> : AbstractLoginFragmen
             if (state.loginMode.hasSso() && state.loginMode.ssoIdentityProviders().isNullOrEmpty()) {
                 // in this case we can prefetch (not other cases for privacy concerns)
                 loginViewModel.getSsoUrl(
-                        redirectUrl = LoginActivity.VECTOR_REDIRECT_URL,
+                        redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                         deviceId = state.deviceId,
                         providerId = null
                 )

vector/src/main/java/im/vector/app/features/login/LoginActivity.kt

@@ -356,9 +356,6 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), ToolbarCo
 
         private const val EXTRA_CONFIG = "EXTRA_CONFIG"
 
-        // Note that the domain can be displayed to the user for confirmation that he trusts it. So use a human readable string
-        const val VECTOR_REDIRECT_URL = "element://connect"
-
         fun newIntent(context: Context, loginConfig: LoginConfig?): Intent {
             return Intent(context, LoginActivity::class.java).apply {
                 putExtra(EXTRA_CONFIG, loginConfig)

vector/src/main/java/im/vector/app/features/login/LoginFragment.kt

@@ -200,7 +200,7 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
                 views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
                     override fun onProviderSelected(id: String?) {
                         loginViewModel.getSsoUrl(
-                                redirectUrl = LoginActivity.VECTOR_REDIRECT_URL,
+                                redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                                 deviceId = state.deviceId,
                                 providerId = id
                         )

vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt

@@ -76,7 +76,7 @@ class LoginSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOLogi
                 views.loginSignupSigninSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
                     override fun onProviderSelected(id: String?) {
                         loginViewModel.getSsoUrl(
-                                redirectUrl = LoginActivity.VECTOR_REDIRECT_URL,
+                                redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                                 deviceId = state.deviceId,
                                 providerId = id
                         )
@@ -109,7 +109,7 @@ class LoginSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOLogi
     private fun submit() = withState(loginViewModel) { state ->
         if (state.loginMode is LoginMode.Sso) {
             loginViewModel.getSsoUrl(
-                    redirectUrl = LoginActivity.VECTOR_REDIRECT_URL,
+                    redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                     deviceId = state.deviceId,
                     providerId = null
             )

vector/src/main/java/im/vector/app/features/login/SSORedirectRouterActivity.kt

@@ -32,4 +32,9 @@ class SSORedirectRouterActivity : AppCompatActivity() {
         navigator.loginSSORedirect(this, intent.data)
         finish()
     }
+
+    companion object {
+        // Note that the domain can be displayed to the user for confirmation that he trusts it. So use a human readable string
+        const val VECTOR_REDIRECT_URL = "element://connect"
+    }
 }

vector/src/main/java/im/vector/app/features/login2/AbstractSSOLoginFragment2.kt

@@ -24,6 +24,7 @@ import androidx.browser.customtabs.CustomTabsSession
 import androidx.viewbinding.ViewBinding
 import com.airbnb.mvrx.withState
 import im.vector.app.core.utils.openUrlInChromeCustomTab
+import im.vector.app.features.login.SSORedirectRouterActivity
 import im.vector.app.features.login.hasSso
 import im.vector.app.features.login.ssoIdentityProviders
 
@@ -90,7 +91,7 @@ abstract class AbstractSSOLoginFragment2<VB : ViewBinding> : AbstractLoginFragme
             if (state.loginMode.hasSso() && state.loginMode.ssoIdentityProviders().isNullOrEmpty()) {
                 // in this case we can prefetch (not other cases for privacy concerns)
                 loginViewModel.getSsoUrl(
-                        redirectUrl = LoginActivity2.VECTOR_REDIRECT_URL,
+                        redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                         deviceId = state.deviceId,
                         providerId = null
                 )

vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupUsername2.kt

@@ -30,6 +30,7 @@ import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentLoginSignupUsername2Binding
 import im.vector.app.features.login.LoginMode
+import im.vector.app.features.login.SSORedirectRouterActivity
 import im.vector.app.features.login.SocialLoginButtonsView
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
@@ -97,7 +98,7 @@ class LoginFragmentSignupUsername2 @Inject constructor() : AbstractSSOLoginFragm
             views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
                 override fun onProviderSelected(id: String?) {
                     loginViewModel.getSsoUrl(
-                            redirectUrl = LoginActivity2.VECTOR_REDIRECT_URL,
+                            redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                             deviceId = state.deviceId,
                             providerId = id
                     )

vector/src/main/java/im/vector/app/features/login2/LoginFragmentToAny2.kt

@@ -31,6 +31,7 @@ import im.vector.app.core.extensions.hidePassword
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentLoginSigninToAny2Binding
 import im.vector.app.features.login.LoginMode
+import im.vector.app.features.login.SSORedirectRouterActivity
 import im.vector.app.features.login.SocialLoginButtonsView
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
@@ -124,7 +125,7 @@ class LoginFragmentToAny2 @Inject constructor() : AbstractSSOLoginFragment2<Frag
             views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
                 override fun onProviderSelected(id: String?) {
                     loginViewModel.getSsoUrl(
-                            redirectUrl = LoginActivity2.VECTOR_REDIRECT_URL,
+                            redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                             deviceId = state.deviceId,
                             providerId = id
                     )

vector/src/main/java/im/vector/app/features/login2/LoginSsoOnlyFragment2.kt

@@ -24,6 +24,7 @@ import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentLoginSsoOnly2Binding
+import im.vector.app.features.login.SSORedirectRouterActivity
 import javax.inject.Inject
 
 /**
@@ -51,7 +52,7 @@ class LoginSsoOnlyFragment2 @Inject constructor() : AbstractSSOLoginFragment2<Fr
 
     private fun submit() = withState(loginViewModel) { state ->
         loginViewModel.getSsoUrl(
-                redirectUrl = LoginActivity2.VECTOR_REDIRECT_URL,
+                redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                 deviceId = state.deviceId,
                 providerId = null
         )