From 531ec657cf773133539b24f73d4567efbf8853a5 Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Wed, 3 Aug 2022 17:14:20 +0200 Subject: [PATCH 01/11] Version++ --- towncrier.toml | 2 +- vector/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/towncrier.toml b/towncrier.toml index b2139e1663..5f5203cacf 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,5 +1,5 @@ [tool.towncrier] - version = "2.4.0" + version = "2.4.1" directory = "changelog.d" filename = "TCHAP_CHANGES.md" name = "Changes in Tchap" diff --git a/vector/build.gradle b/vector/build.gradle index b861cbee44..a90bde4d6c 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -35,7 +35,7 @@ ext.versionMinor = 4 // Note: even values are reserved for regular release, odd values for hotfix release. // When creating a hotfix, you should decrease the value, since the current value // is the value for the next regular release. -ext.versionPatch = 0 +ext.versionPatch = 1 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' From 2350e533a446f030ecb772f3e634b60d05bc1d43 Mon Sep 17 00:00:00 2001 From: ClaireG Date: Thu, 11 Aug 2022 14:58:31 +0200 Subject: [PATCH 02/11] [Menu - Report Bug] Disable by default Send Screenshot (#700) --- changelog.d/686.misc | 1 + .../src/main/java/im/vector/app/features/home/HomeActivity.kt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelog.d/686.misc diff --git a/changelog.d/686.misc b/changelog.d/686.misc new file mode 100644 index 0000000000..a0640a3d84 --- /dev/null +++ b/changelog.d/686.misc @@ -0,0 +1 @@ +[Menu - Report Bug] Disable by default Send Screenshot diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt index b67f9279a7..649dd8de26 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt @@ -577,7 +577,8 @@ class HomeActivity : return true } R.id.menu_home_report_bug -> { - bugReporter.openBugReportScreen(this, ReportType.BUG_REPORT) + // Tchap: Disable default value for screenshot + bugReporter.openBugReportScreen(this, ReportType.BUG_REPORT, withScreenshot = false) return true } R.id.menu_home_init_sync_legacy -> { From ab8099bcf637310922066abaa8a012a1b5e5ad06 Mon Sep 17 00:00:00 2001 From: ClaireG Date: Thu, 11 Aug 2022 16:52:43 +0200 Subject: [PATCH 03/11] Enable auto-capitalization for Room creation Title field (#699) --- changelog.d/687.misc | 1 + .../src/main/res/layout/item_tchap_editable_avatar_with_name.xml | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelog.d/687.misc diff --git a/changelog.d/687.misc b/changelog.d/687.misc new file mode 100644 index 0000000000..b24655879d --- /dev/null +++ b/changelog.d/687.misc @@ -0,0 +1 @@ +Enable auto-capitalization for Room creation Title field diff --git a/vector/src/main/res/layout/item_tchap_editable_avatar_with_name.xml b/vector/src/main/res/layout/item_tchap_editable_avatar_with_name.xml index 140de5039d..1e9c0f648d 100644 --- a/vector/src/main/res/layout/item_tchap_editable_avatar_with_name.xml +++ b/vector/src/main/res/layout/item_tchap_editable_avatar_with_name.xml @@ -82,6 +82,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:imeOptions="actionDone" + android:inputType="textCapSentences" tools:hint="@string/create_room_name_hint" /> From d3cacc4d54799c1faf38198c3363e45fac9fb646 Mon Sep 17 00:00:00 2001 From: Claire G Date: Tue, 9 Aug 2022 14:48:39 +0200 Subject: [PATCH 04/11] Rename tchap_room_settings_remove_from_directory --- changelog.d/669.misc | 1 + vector/src/main/res/values-fr/strings_tchap.xml | 2 +- vector/src/main/res/values/strings_tchap.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/669.misc diff --git a/changelog.d/669.misc b/changelog.d/669.misc new file mode 100644 index 0000000000..9d6d6df624 --- /dev/null +++ b/changelog.d/669.misc @@ -0,0 +1 @@ +Rename the option "Retirer ce salon de la liste des forums" diff --git a/vector/src/main/res/values-fr/strings_tchap.xml b/vector/src/main/res/values-fr/strings_tchap.xml index 63480935cd..c2b3b4c31e 100644 --- a/vector/src/main/res/values-fr/strings_tchap.xml +++ b/vector/src/main/res/values-fr/strings_tchap.xml @@ -52,7 +52,7 @@ Le fichier est infecté, impossible de le télécharger. - Retirer ce salon de la liste des forums + Convertir en salon privé (irréversible) Cette action est irréversible.\nVoulez-vous vraiment retirer ce salon de la liste des forums ? Gestion des comptes externes Les externes ne sont pas autorisés à rejoindre ce salon diff --git a/vector/src/main/res/values/strings_tchap.xml b/vector/src/main/res/values/strings_tchap.xml index f5bb8c2cbc..c05489437c 100644 --- a/vector/src/main/res/values/strings_tchap.xml +++ b/vector/src/main/res/values/strings_tchap.xml @@ -52,7 +52,7 @@ We have detected that this file is infected, so it cannot be downloaded. - Remove this room from the forums directory + Convert to private room (irreversible) This action is irreversible.\nAre you sure you want to remove this room from the forums directory? External accounts handling The externals are not allowed to join this room From fce1049b1d16b51e0e799cd7416a0e3a087bc3b6 Mon Sep 17 00:00:00 2001 From: Claire G Date: Thu, 11 Aug 2022 10:17:01 +0200 Subject: [PATCH 05/11] update tchap_room_settings_remove_from_directory_prompt_msg --- vector/src/main/res/values-fr/strings_tchap.xml | 4 ++-- vector/src/main/res/values/strings_tchap.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vector/src/main/res/values-fr/strings_tchap.xml b/vector/src/main/res/values-fr/strings_tchap.xml index c2b3b4c31e..3c910b3c21 100644 --- a/vector/src/main/res/values-fr/strings_tchap.xml +++ b/vector/src/main/res/values-fr/strings_tchap.xml @@ -53,7 +53,7 @@ Convertir en salon privé (irréversible) - Cette action est irréversible.\nVoulez-vous vraiment retirer ce salon de la liste des forums ? + Cette action est irréversible.\nVoulez vous vraiment convertir ce forum en salon privé ? Gestion des comptes externes Les externes ne sont pas autorisés à rejoindre ce salon Les externes sont autorisés à rejoindre ce salon @@ -118,4 +118,4 @@ La vérification de votre nouvelle session a échoué. - \ No newline at end of file + diff --git a/vector/src/main/res/values/strings_tchap.xml b/vector/src/main/res/values/strings_tchap.xml index c05489437c..e863f0abca 100644 --- a/vector/src/main/res/values/strings_tchap.xml +++ b/vector/src/main/res/values/strings_tchap.xml @@ -53,7 +53,7 @@ Convert to private room (irreversible) - This action is irreversible.\nAre you sure you want to remove this room from the forums directory? + This action is irreversible.\nDo you really want to convert this forum into a private room? External accounts handling The externals are not allowed to join this room The externals are allowed to join this room @@ -118,4 +118,4 @@ Failed to verify your new session. - \ No newline at end of file + From e5e1c71c133c559bf084d2d6701ede587e979cd3 Mon Sep 17 00:00:00 2001 From: Claire G Date: Thu, 11 Aug 2022 10:22:54 +0200 Subject: [PATCH 06/11] revert update --- vector/src/main/res/values-fr/strings_tchap.xml | 2 +- vector/src/main/res/values/strings_tchap.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/res/values-fr/strings_tchap.xml b/vector/src/main/res/values-fr/strings_tchap.xml index 3c910b3c21..befe0d8372 100644 --- a/vector/src/main/res/values-fr/strings_tchap.xml +++ b/vector/src/main/res/values-fr/strings_tchap.xml @@ -118,4 +118,4 @@ La vérification de votre nouvelle session a échoué. - + \ No newline at end of file diff --git a/vector/src/main/res/values/strings_tchap.xml b/vector/src/main/res/values/strings_tchap.xml index e863f0abca..c47acd966a 100644 --- a/vector/src/main/res/values/strings_tchap.xml +++ b/vector/src/main/res/values/strings_tchap.xml @@ -118,4 +118,4 @@ Failed to verify your new session. - + \ No newline at end of file From 3a9ce15d429fdb48c0e589fcc3273f0ac63f0f28 Mon Sep 17 00:00:00 2001 From: Claire G Date: Thu, 11 Aug 2022 11:15:22 +0200 Subject: [PATCH 07/11] rename string --- .../features/roomprofile/settings/RoomSettingsController.kt | 2 +- .../features/roomprofile/settings/RoomSettingsFragment.kt | 2 +- vector/src/main/res/values-fr/strings_tchap.xml | 6 +++--- vector/src/main/res/values/strings_tchap.xml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt index d5b4a235e8..899b9f2a76 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt @@ -181,7 +181,7 @@ class RoomSettingsController @Inject constructor( val host = this buildProfileAction( id = "removeFromRoomsDirectory", - title = stringProvider.getString(R.string.tchap_room_settings_remove_from_directory), + title = stringProvider.getString(R.string.tchap_room_settings_convert_to_private), divider = true, destructive = true, editable = false, diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt index 13278feb11..abc656411a 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt @@ -203,7 +203,7 @@ class RoomSettingsFragment @Inject constructor( override fun onRemoveFromRoomsDirectory() { MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive) .setTitle(R.string.dialog_title_warning) - .setMessage(getString(R.string.tchap_room_settings_remove_from_directory_prompt_msg)) + .setMessage(getString(R.string.tchap_room_settings_convert_to_private_prompt_msg)) .setPositiveButton(R.string.yes) { _, _ -> viewModel.handle(RoomSettingsAction.RemoveFromRoomsDirectory) } diff --git a/vector/src/main/res/values-fr/strings_tchap.xml b/vector/src/main/res/values-fr/strings_tchap.xml index befe0d8372..7bf1db4c72 100644 --- a/vector/src/main/res/values-fr/strings_tchap.xml +++ b/vector/src/main/res/values-fr/strings_tchap.xml @@ -52,8 +52,8 @@ Le fichier est infecté, impossible de le télécharger. - Convertir en salon privé (irréversible) - Cette action est irréversible.\nVoulez vous vraiment convertir ce forum en salon privé ? + Retirer ce salon de la liste des forums + Cette action est irréversible.\nVoulez-vous vraiment retirer ce salon de la liste des forums ? Gestion des comptes externes Les externes ne sont pas autorisés à rejoindre ce salon Les externes sont autorisés à rejoindre ce salon @@ -118,4 +118,4 @@ La vérification de votre nouvelle session a échoué. - \ No newline at end of file + diff --git a/vector/src/main/res/values/strings_tchap.xml b/vector/src/main/res/values/strings_tchap.xml index c47acd966a..35cd5a1586 100644 --- a/vector/src/main/res/values/strings_tchap.xml +++ b/vector/src/main/res/values/strings_tchap.xml @@ -52,8 +52,8 @@ We have detected that this file is infected, so it cannot be downloaded. - Convert to private room (irreversible) - This action is irreversible.\nDo you really want to convert this forum into a private room? + Remove this room from the forums directory + This action is irreversible.\nAre you sure you want to remove this room from the forums directory? External accounts handling The externals are not allowed to join this room The externals are allowed to join this room @@ -118,4 +118,4 @@ Failed to verify your new session. - \ No newline at end of file + From d0dc8b38426bcc760755205100835aaefa04253f Mon Sep 17 00:00:00 2001 From: Claire G Date: Thu, 11 Aug 2022 11:18:43 +0200 Subject: [PATCH 08/11] revert modif --- vector/src/main/res/values-fr/strings_tchap.xml | 2 +- vector/src/main/res/values/strings_tchap.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/res/values-fr/strings_tchap.xml b/vector/src/main/res/values-fr/strings_tchap.xml index 7bf1db4c72..5f3121895e 100644 --- a/vector/src/main/res/values-fr/strings_tchap.xml +++ b/vector/src/main/res/values-fr/strings_tchap.xml @@ -118,4 +118,4 @@ La vérification de votre nouvelle session a échoué. - + \ No newline at end of file diff --git a/vector/src/main/res/values/strings_tchap.xml b/vector/src/main/res/values/strings_tchap.xml index 35cd5a1586..1bd38f9d67 100644 --- a/vector/src/main/res/values/strings_tchap.xml +++ b/vector/src/main/res/values/strings_tchap.xml @@ -118,4 +118,4 @@ Failed to verify your new session. - + \ No newline at end of file From 31daf10940423a62a2cc77b791819303a86c0c73 Mon Sep 17 00:00:00 2001 From: Claire G Date: Thu, 11 Aug 2022 11:25:03 +0200 Subject: [PATCH 09/11] Fix --- vector/src/main/res/values-fr/strings_tchap.xml | 4 ++-- vector/src/main/res/values/strings_tchap.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vector/src/main/res/values-fr/strings_tchap.xml b/vector/src/main/res/values-fr/strings_tchap.xml index 5f3121895e..c548d8d878 100644 --- a/vector/src/main/res/values-fr/strings_tchap.xml +++ b/vector/src/main/res/values-fr/strings_tchap.xml @@ -52,8 +52,8 @@ Le fichier est infecté, impossible de le télécharger. - Retirer ce salon de la liste des forums - Cette action est irréversible.\nVoulez-vous vraiment retirer ce salon de la liste des forums ? + Convert to private room (irreversible) + Cette action est irréversible.\nVoulez-vous vraiment convertir ce forum en salon privé ? Gestion des comptes externes Les externes ne sont pas autorisés à rejoindre ce salon Les externes sont autorisés à rejoindre ce salon diff --git a/vector/src/main/res/values/strings_tchap.xml b/vector/src/main/res/values/strings_tchap.xml index 1bd38f9d67..154c4fc145 100644 --- a/vector/src/main/res/values/strings_tchap.xml +++ b/vector/src/main/res/values/strings_tchap.xml @@ -53,7 +53,7 @@ Remove this room from the forums directory - This action is irreversible.\nAre you sure you want to remove this room from the forums directory? + This action is irreversible.\nAre you sure you want to convert this forum into a private room? External accounts handling The externals are not allowed to join this room The externals are allowed to join this room From e1b7f4e91d1335596647aa5797da4978666083d8 Mon Sep 17 00:00:00 2001 From: Claire G Date: Thu, 11 Aug 2022 11:31:23 +0200 Subject: [PATCH 10/11] small fix --- vector/src/main/res/values-fr/strings_tchap.xml | 2 +- vector/src/main/res/values/strings_tchap.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/res/values-fr/strings_tchap.xml b/vector/src/main/res/values-fr/strings_tchap.xml index c548d8d878..9a1424efa7 100644 --- a/vector/src/main/res/values-fr/strings_tchap.xml +++ b/vector/src/main/res/values-fr/strings_tchap.xml @@ -52,7 +52,7 @@ Le fichier est infecté, impossible de le télécharger. - Convert to private room (irreversible) + Convertir en salon privé (irréversible) Cette action est irréversible.\nVoulez-vous vraiment convertir ce forum en salon privé ? Gestion des comptes externes Les externes ne sont pas autorisés à rejoindre ce salon diff --git a/vector/src/main/res/values/strings_tchap.xml b/vector/src/main/res/values/strings_tchap.xml index 154c4fc145..d375686497 100644 --- a/vector/src/main/res/values/strings_tchap.xml +++ b/vector/src/main/res/values/strings_tchap.xml @@ -52,7 +52,7 @@ We have detected that this file is infected, so it cannot be downloaded. - Remove this room from the forums directory + Convert to private room (irreversible) This action is irreversible.\nAre you sure you want to convert this forum into a private room? External accounts handling The externals are not allowed to join this room From c254f2339a98c0e0e34a9a2eeb281bee4988809a Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Tue, 16 Aug 2022 10:07:12 +0200 Subject: [PATCH 11/11] Changelog --- TCHAP_CHANGES.md | 13 +++++++++++++ changelog.d/669.misc | 1 - changelog.d/686.misc | 1 - changelog.d/687.misc | 1 - 4 files changed, 13 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/669.misc delete mode 100644 changelog.d/686.misc delete mode 100644 changelog.d/687.misc diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md index c4de7466da..b54d196a9c 100644 --- a/TCHAP_CHANGES.md +++ b/TCHAP_CHANGES.md @@ -1,3 +1,16 @@ +Changes in Tchap 2.4.1 (2022-08-16) +=================================== + +Improvements 🙌 +-------------- + - Auto-capitalize the room creation title field ([#687](https://github.com/tchapgouv/tchap-android-v2/issues/687)) + +Other changes +------------- + - Rename the action "Remove this room from the forums directory" to "Convert to private room (irreversible)" ([#669](https://github.com/tchapgouv/tchap-android-v2/issues/669)) + - [Menu - Report Bug] Do not select "send screenshot" by default ([#686](https://github.com/tchapgouv/tchap-android-v2/issues/686)) + - Remove Android Auto support ([#703](https://github.com/tchapgouv/tchap-android-v2/issues/703)) + Changes in Tchap 2.4.0 (2022-08-03) =================================== diff --git a/changelog.d/669.misc b/changelog.d/669.misc deleted file mode 100644 index 9d6d6df624..0000000000 --- a/changelog.d/669.misc +++ /dev/null @@ -1 +0,0 @@ -Rename the option "Retirer ce salon de la liste des forums" diff --git a/changelog.d/686.misc b/changelog.d/686.misc deleted file mode 100644 index a0640a3d84..0000000000 --- a/changelog.d/686.misc +++ /dev/null @@ -1 +0,0 @@ -[Menu - Report Bug] Disable by default Send Screenshot diff --git a/changelog.d/687.misc b/changelog.d/687.misc deleted file mode 100644 index b24655879d..0000000000 --- a/changelog.d/687.misc +++ /dev/null @@ -1 +0,0 @@ -Enable auto-capitalization for Room creation Title field