diff --git a/build.gradle b/build.gradle
index 85b155e403..4449e4366d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ buildscript {
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929'
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
classpath "com.likethesalad.android:stem-plugin:2.9.0"
- classpath 'org.owasp:dependency-check-gradle:8.2.1'
+ classpath 'org.owasp:dependency-check-gradle:11.1.0'
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.10"
classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
diff --git a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
index 1224a26b06..a61fdf2f97 100644
--- a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
@@ -80,6 +80,7 @@
Se connecter par mot de passe
La messagerie instantanée du secteur public
➜ Qu’est-ce que %s ?
+ ➜ Est-ce que %s est activé pour mon administration ?
Adresse mail professionnelle
Utilisez votre adresse professionnelle
Votre mot de passe doit contenir au moins 8 caractères, avec au moins un caractère de chaque type : majuscule, minuscule, chiffre, caractère spécial.
diff --git a/library/ui-strings/src/main/res/values/strings_tchap.xml b/library/ui-strings/src/main/res/values/strings_tchap.xml
index 77716b8db7..33130f10af 100644
--- a/library/ui-strings/src/main/res/values/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values/strings_tchap.xml
@@ -80,6 +80,7 @@
Login by password
Instant messaging of public sector
➜ What is %s ?
+ Is %s available for my organization ?
Professional email
Use your business address
Your password must include a lower-case letter, an upper-case letter, a number and a symbol and be at a minimum 8 characters in length.
diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml
index f5041ac0a0..612c7a050d 100755
--- a/vector-config/src/tchap/res/values/config-features.xml
+++ b/vector-config/src/tchap/res/values/config-features.xml
@@ -3,8 +3,8 @@
true
true
false
- true
- false
+ false
+ true
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
index 6ff552e706..42b43c9463 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
@@ -31,6 +31,7 @@ import im.vector.app.features.onboarding.OnboardingAction
import im.vector.app.features.onboarding.OnboardingViewEvents
import im.vector.app.features.onboarding.OnboardingViewModel
import im.vector.app.features.onboarding.OnboardingViewState
+import im.vector.app.features.settings.VectorSettingsUrls
import im.vector.lib.strings.CommonStrings
import kotlinx.coroutines.CancellationException
@@ -171,5 +172,6 @@ abstract class AbstractFtueAuthFragment : VectorBaseFragment {
- views.passwordFieldTil.isVisible = false
+ views.loginSubmit.setLeftDrawable(im.vector.lib.ui.styles.R.drawable.ic_tchap_proconnect)
views.loginSSOHelp.text = getString(CommonStrings.tchap_connection_sso_help, TCHAP_SSO_PROVIDER)
+ views.loginSSODescription.text = getString(CommonStrings.tchap_connection_sso_description, TCHAP_SSO_PROVIDER)
views.loginSSOHelp.debouncedClicks { openUrlInExternalBrowser(requireContext(), TCHAP_SSO_URL) }
+ views.loginSSODescription.debouncedClicks { openUrlInExternalBrowser(requireContext(), TCHAP_SSO_FAQ_URL) }
+ views.passwordFieldTil.isVisible = false
views.loginSSOHelp.isVisible = true
- views.loginSubmit.setLeftDrawable(im.vector.lib.ui.styles.R.drawable.ic_tchap_proconnect)
+ views.loginSSODescription.isVisible = true
}
else -> {
views.passwordField.imeOptions = EditorInfo.IME_ACTION_DONE
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index a0dbd372fa..600a121391 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -187,6 +187,13 @@
android:layout_height="wrap_content"
tools:text="@string/tchap_connection_sso_help" />
+
+