diff --git a/changelog.d/1116.improvements b/changelog.d/1116.improvements new file mode 100644 index 0000000000..c1cbd69cbb --- /dev/null +++ b/changelog.d/1116.improvements @@ -0,0 +1 @@ +Faciliter l'accès à l'aide sur la vérification d'appareil \ No newline at end of file diff --git a/library/ui-strings/src/main/res/values-fr/strings.xml b/library/ui-strings/src/main/res/values-fr/strings.xml index 625c371f77..5cb568bf91 100644 --- a/library/ui-strings/src/main/res/values-fr/strings.xml +++ b/library/ui-strings/src/main/res/values-fr/strings.xml @@ -1542,7 +1542,7 @@ Définir le rôle Vous redémarrerez sans aucun historique, message, appareil ou utilisateurs connus Si vous réinitialisez tout - Uniquement si vous avez perdu votre Code et n\'avez aucun autre appareil connecté à ${app_name}. + Uniquement si vous avez perdu votre code et n\'avez aucun autre appareil connecté à ${app_name}. Réinitialiser tout Générer un nouveau Code de Récupération Impossible d’enregistrer le fichier multimédia 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 f084939c09..3e99cbc478 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 @@ -116,6 +116,7 @@ La vérification de votre nouvelle session a échoué. + Obtenir de l’aide Voir l’état du service diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml index 3bca8e05b4..978ba4530e 100644 --- a/library/ui-strings/src/main/res/values/strings.xml +++ b/library/ui-strings/src/main/res/values/strings.xml @@ -2688,7 +2688,7 @@ Failed to access secure storage Lost your Recovery Code? Generate a new one. Reset everything - Only do this if you have no other device you can verify this device with. + Only do this if you lost your recovery code and you have no other device connected to ${app_name}. Resetting your verification keys cannot be undone. After resetting, you won\'t have access to old encrypted messages, and any friends who have previously verified you will see security warnings until you re-verify with them. If you reset everything 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 6be5bb78a1..c8d27399a3 100644 --- a/library/ui-strings/src/main/res/values/strings_tchap.xml +++ b/library/ui-strings/src/main/res/values/strings_tchap.xml @@ -116,6 +116,7 @@ Failed to verify your new session. + Get help View the status of services diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt index 506d4222b8..ca450af7cc 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt @@ -54,6 +54,7 @@ class SelfVerificationController @Inject constructor( ) : BaseEpoxyVerificationController(stringProvider, colorProvider, eventHtmlRenderer) { interface InteractionListener : BaseEpoxyVerificationController.InteractionListener { + fun onClickHelp() fun onClickRecoverFromPassphrase() fun onClickSkip() fun onClickResetSecurity() @@ -320,6 +321,15 @@ class SelfVerificationController @Inject constructor( listener { host.selfVerificationListener?.onClickResetSecurity() } } + bottomSheetVerificationActionItem { + id("help") + title(host.stringProvider.getString(CommonStrings.tchap_verification_get_help)) + titleColor(host.colorProvider.getColorFromAttribute(com.google.android.material.R.attr.colorError)) + iconRes(R.drawable.ic_arrow_right) + iconColor(host.colorProvider.getColorFromAttribute(com.google.android.material.R.attr.colorError)) + listener { host.selfVerificationListener?.onClickHelp() } + } + if (!state.isVerificationRequired) { bottomSheetDividerItem { id("reset_div") diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationFragment.kt index cce2290bfe..293c9ee7f4 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationFragment.kt @@ -37,10 +37,12 @@ import im.vector.app.core.platform.VectorBaseFragment import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO import im.vector.app.core.utils.checkPermissions import im.vector.app.core.utils.onPermissionDeniedDialog +import im.vector.app.core.utils.openUrlInChromeCustomTab import im.vector.app.core.utils.registerForPermissionsResult import im.vector.app.databinding.BottomSheetVerificationChildFragmentBinding import im.vector.app.features.crypto.verification.VerificationAction import im.vector.app.features.qrcode.QrCodeScannerActivity +import im.vector.app.features.settings.VectorSettingsUrls import im.vector.lib.strings.CommonStrings import org.matrix.android.sdk.api.session.crypto.verification.EVerificationState import timber.log.Timber @@ -94,6 +96,10 @@ class SelfVerificationFragment : VectorBaseFragment