From e1110b6bb4c08fbcbd841d144eb5d5cdda6bf3a1 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Tue, 11 Jul 2023 15:35:45 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Am=C3=A9lioration=20UX,=20wording=20et=20or?= =?UTF-8?q?ganisation=20des=20settings=20s=C3=A9curit=C3=A9=20(partie=20II?= =?UTF-8?q?,=20multidevice)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values-fr/strings.xml | 2 +- ...eysBackupSettingsRecyclerViewController.kt | 5 +++-- .../VectorSettingsSecurityPrivacyFragment.kt | 15 +++++++++++++-- .../CrossSigningSettingsController.kt | 19 ++++++++++--------- .../src/main/res/drawable/ic_tchap_cancel.xml | 5 +++++ .../xml/vector_settings_security_privacy.xml | 13 ++++++------- 6 files changed, 38 insertions(+), 21 deletions(-) create mode 100644 vector/src/main/res/drawable/ic_tchap_cancel.xml 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 a3d7edbb81..91efbce467 100644 --- a/library/ui-strings/src/main/res/values-fr/strings.xml +++ b/library/ui-strings/src/main/res/values-fr/strings.xml @@ -676,7 +676,7 @@ Configurer les notifications silencieuses Choisir la couleur de la LED, les vibrations, le son… Clés Tchap - Gérer la sauvegarde + Récupérer mes messages Silencieuse Veuillez saisir une phrase secrète La phrase secrète est trop faible diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt index 73ccef10c8..ee00951725 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt @@ -178,8 +178,9 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor( textButton1(host.stringProvider.getString(R.string.keys_backup_settings_restore_backup_button)) clickOnButton1 { host.listener?.didSelectRestoreMessageRecovery() } - textButton2(host.stringProvider.getString(R.string.keys_backup_settings_delete_backup_button)) - clickOnButton2 { host.listener?.didSelectDeleteSetupMessageRecovery() } + // Tchap : hide "Suppress backup" button +// textButton2(host.stringProvider.getString(R.string.keys_backup_settings_delete_backup_button)) +// clickOnButton2 { host.listener?.didSelectDeleteSetupMessageRecovery() } } else { textButton1(host.stringProvider.getString(R.string.keys_backup_setup)) clickOnButton1 { host.listener?.didSelectSetupMessageRecovery() } diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt index e08cd1d6f7..2126902858 100644 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt @@ -233,7 +233,18 @@ class VectorSettingsSecurityPrivacyFragment : } else { // just hide all, you can't setup from here // you should synchronize to get gossips - secureBackupCategory.isVisible = false + // Tchap : here, the section is hidden on Element. + // In Tchap, we want to show it. + secureBackupCategory.isVisible = true + secureBackupPreference.title = getString(R.string.settings_secure_backup_enter_to_setup) + secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener { + vectorActivity.let { + it.navigator.requestSelfSessionVerification(it) + } + true + } + // Tchap : remove "Manage backup" button because Secure backup is not activated + manageBackupPref.isVisible = false } } else { // so here we know that 4S is setup @@ -372,7 +383,7 @@ class VectorSettingsSecurityPrivacyFragment : mCrossSigningStatePreference.summary = getString(R.string.encryption_information_dg_xsigning_trusted) } xSigningIsEnableInAccount -> { - mCrossSigningStatePreference.setIcon(R.drawable.ic_shield_black) + mCrossSigningStatePreference.setIcon(R.drawable.ic_tchap_cancel) // Tchpa icon mCrossSigningStatePreference.summary = getString(R.string.encryption_information_dg_xsigning_not_trusted) } else -> { diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt index dde32c1da0..6e8eef6a58 100644 --- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt @@ -50,14 +50,15 @@ class CrossSigningSettingsController @Inject constructor( titleIconResourceId(R.drawable.ic_shield_trusted) title(host.stringProvider.getString(R.string.encryption_information_dg_xsigning_complete).toEpoxyCharSequence()) } - genericButtonItem { - id("Reset") - text(host.stringProvider.getString(R.string.reset_cross_signing)) - textColor(host.colorProvider.getColor(R.color.palette_tchap_coral)) // Tchap - buttonClickAction { - host.interactionListener?.didTapInitializeCrossSigning() - } - } + // Tchap : don't display "Reset cross-signing" button +// genericButtonItem { +// id("Reset") +// text(host.stringProvider.getString(R.string.reset_cross_signing)) +// textColor(host.colorProvider.getColor(R.color.palette_tchap_coral)) // Tchap +// buttonClickAction { +// host.interactionListener?.didTapInitializeCrossSigning() +// } +// } } data.xSigningKeysAreTrusted -> { genericItem { @@ -77,7 +78,7 @@ class CrossSigningSettingsController @Inject constructor( data.xSigningIsEnableInAccount -> { genericItem { id("enable") - titleIconResourceId(R.drawable.ic_shield_black) + titleIconResourceId(R.drawable.ic_tchap_cancel) // Tchap icon title(host.stringProvider.getString(R.string.encryption_information_dg_xsigning_not_trusted).toEpoxyCharSequence()) } genericButtonItem { diff --git a/vector/src/main/res/drawable/ic_tchap_cancel.xml b/vector/src/main/res/drawable/ic_tchap_cancel.xml new file mode 100644 index 0000000000..afde45223d --- /dev/null +++ b/vector/src/main/res/drawable/ic_tchap_cancel.xml @@ -0,0 +1,5 @@ + + + diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml index 46b0c3ee37..5897cd7a12 100644 --- a/vector/src/main/res/xml/vector_settings_security_privacy.xml +++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml @@ -11,6 +11,12 @@ android:focusable="false" android:persistent="false" android:summary="@string/settings_secure_backup_section_info" /> + - - From 271cc6f313c0ef60d3fa58d66f8528aa73082ac0 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Tue, 11 Jul 2023 15:52:23 +0200 Subject: [PATCH 2/2] Add changelog --- changelog.d/940.improvements | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/940.improvements diff --git a/changelog.d/940.improvements b/changelog.d/940.improvements new file mode 100644 index 0000000000..2ecd76d313 --- /dev/null +++ b/changelog.d/940.improvements @@ -0,0 +1 @@ +Amélioration UX, wording et organisation des settings sécurité (partie II, multidevice) (#940) \ No newline at end of file