From 6b2cb1d3526237cacab3b52957cfe5a5e93c2a3f Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Wed, 6 Nov 2024 17:25:59 +0100 Subject: [PATCH 01/10] Update version to 2.8.4 --- Config/AppVersion.xcconfig | 2 +- towncrier.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index f19a72c66..be6ad511d 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 2.8.2 +MARKETING_VERSION = 2.8.4 CURRENT_PROJECT_VERSION = 1 diff --git a/towncrier.toml b/towncrier.toml index 6d0b78b55..946c92f59 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,6 +1,6 @@ [tool.towncrier] name = "Changes in" -version = "2.8.2" +version = "2.8.4" filename = "TCHAP_CHANGES.md" directory = "changelog.d" template = "changelog.d/_template.md.jinja" From d4f8156ae6d8c7c642602d5b13eb62200f89d2fe Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Thu, 7 Nov 2024 15:36:42 +0100 Subject: [PATCH 02/10] Exclude EmojiJSONStore from Tchap project --- Tchap/target.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Tchap/target.yml b/Tchap/target.yml index 63080dfe3..3009261f8 100644 --- a/Tchap/target.yml +++ b/Tchap/target.yml @@ -260,6 +260,7 @@ targetTemplates: - path: ../Riot/Modules/Rendezvous - path: ../Riot/Modules/Room excludes: + - "EmojiPicker/Data/EmojiMart/EmojiJSONStore.swift" # - "Location" # - "RoomViewController+LocationSharing.swift" # - "TimelineCells/LocationView" From d44be813cf60f72977e943a246f8e93ed646467a Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Wed, 13 Nov 2024 15:54:38 +0100 Subject: [PATCH 03/10] =?UTF-8?q?Tchap=20=C3=A9choue=20=C3=A0=20la=20compi?= =?UTF-8?q?lation=20avec=20Xcode=2016.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile | 2 +- changelog.d/1118.change | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/1118.change diff --git a/Podfile b/Podfile index 2966e5b2c..742cc1179 100644 --- a/Podfile +++ b/Podfile @@ -51,7 +51,7 @@ abstract_target 'TchapPods' do # PostHog for analytics pod 'PostHog', '~> 2.0.0' - pod 'Sentry', '~> 7.15.0' + pod 'Sentry', '~> 8.40.1' pod 'RxSwift', '~> 5.1.1' diff --git a/changelog.d/1118.change b/changelog.d/1118.change new file mode 100644 index 000000000..69824d161 --- /dev/null +++ b/changelog.d/1118.change @@ -0,0 +1 @@ +Update Sentry pod dependency to compile with Xcode 16.1 \ No newline at end of file From 4e947edcd51957ce7bb6f685b232dddf42a00452 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Thu, 14 Nov 2024 16:39:04 +0100 Subject: [PATCH 04/10] =?UTF-8?q?Modifier=20le=20commentaire=20lorsqu'on?= =?UTF-8?q?=20active=20l'acc=C3=A8s=20=C3=A0=20un=20salon=20par=20lien=20(?= =?UTF-8?q?alignement=20sur=20Android)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tchap/Assets/Localizations/fr.lproj/Tchap.strings | 2 +- changelog.d/1120.change | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/1120.change diff --git a/Tchap/Assets/Localizations/fr.lproj/Tchap.strings b/Tchap/Assets/Localizations/fr.lproj/Tchap.strings index 5e48a6ba1..6b9f02806 100644 --- a/Tchap/Assets/Localizations/fr.lproj/Tchap.strings +++ b/Tchap/Assets/Localizations/fr.lproj/Tchap.strings @@ -209,7 +209,7 @@ "room_settings_room_access_by_link_disabled" = "Ce salon n’est pas accessible par lien"; "room_settings_room_access_by_link_enabled" = "Ce salon est accessible par lien"; "room_settings_enable_room_access_by_link" = "Activer l’accès au salon par lien"; -"room_settings_enable_room_access_by_link_info_off" = "Les utilisateurs pourront rejoindre ce salon à partir d'un lien puis le partager à d'autres utilisateurs."; +"room_settings_enable_room_access_by_link_info_off" = "Tous les agents disposant du lien peuvent rejoindre ce salon et inviter d'autres agents"; "room_settings_enable_room_access_by_link_info_on" = "Les autres utilisateurs peuvent rejoindre ce salon à partir du lien suivant\U00A0:"; "room_settings_enable_room_access_by_link_info_on_with_limitation" = "Les autres utilisateurs peuvent rejoindre ce salon à partir du lien suivant (une invitation reste nécessaire pour les externes)\U00A0:"; "room_settings_room_access_by_link_share" = "Partager le lien"; diff --git a/changelog.d/1120.change b/changelog.d/1120.change new file mode 100644 index 000000000..312f369a9 --- /dev/null +++ b/changelog.d/1120.change @@ -0,0 +1 @@ +Modifier le commentaire lorsqu'on active l'accès à un salon par lien \ No newline at end of file From 31db49d137f8324f641da02c9cf47f935e4e8f94 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Thu, 21 Nov 2024 11:32:47 +0100 Subject: [PATCH 05/10] =?UTF-8?q?Afficher=20une=20information=20plus=20pr?= =?UTF-8?q?=C3=A9cise=20si=20un=20keyBackup=20existe=20mais=20n'est=20pas?= =?UTF-8?q?=20de=20confiance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettingsSecureBackupTableViewSection.swift | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift b/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift index 95066ef0b..3ec494faa 100644 --- a/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift +++ b/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift @@ -150,10 +150,22 @@ private enum BackupRows { ] } case .keyBackupNotTrusted(let keyBackupVersion, _): + // Tchap: if backup is not trusted, treats it as if no backup is present (like on Android) +// backupRows = [ +// .info(text: VectorL10n.securitySettingsSecureBackupInfoValid, icon: UIImage(systemName: "checkmark.circle.fill"), tint: .systemGreen), +// .restoreFromKeyBackupAction(keyBackupVersion: keyBackupVersion, title: VectorL10n.securitySettingsSecureBackupRestore), +// .deleteKeyBackupAction(keyBackupVersion: keyBackupVersion) +// ] + let noBackup = VectorL10n.settingsKeyBackupInfoNotValid +// let signoutWarning = VectorL10n.settingsKeyBackupInfoSignoutWarning + // Tchap +// let infoText = [noBackup, signoutWarning].joined(separator: "\n") + let infoText = noBackup + + let backupInfoText = noBackup backupRows = [ - .info(text: VectorL10n.securitySettingsSecureBackupInfoValid, icon: UIImage(systemName: "checkmark.circle.fill"), tint: .systemGreen), - .restoreFromKeyBackupAction(keyBackupVersion: keyBackupVersion, title: VectorL10n.securitySettingsSecureBackupRestore), -// .deleteKeyBackupAction(keyBackupVersion: keyBackupVersion) // Tchap : no more "Delete backup" button + .info(text: infoText, icon: UIImage(systemName: "xmark.circle.fill"), tint: .systemGray), + .createSecureBackupAction ] } case .secureBackup(let keyBackupState): From 909cdf60380456ff1f806d6a5481972f905c6242 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Thu, 21 Nov 2024 11:33:35 +0100 Subject: [PATCH 06/10] =?UTF-8?q?Afficher=20une=20info=20plus=20pr=C3=A9ci?= =?UTF-8?q?se=20si=20la=20signature=20crois=C3=A9e=20existe=20mais=20n'est?= =?UTF-8?q?=20pas=20de=20confiance=20et=20ajouter=20un=20bouton=20Reset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Riot/Modules/Settings/Security/SecurityViewController.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Riot/Modules/Settings/Security/SecurityViewController.m b/Riot/Modules/Settings/Security/SecurityViewController.m index 5b5673a5b..784e29817 100644 --- a/Riot/Modules/Settings/Security/SecurityViewController.m +++ b/Riot/Modules/Settings/Security/SecurityViewController.m @@ -688,6 +688,8 @@ - (NSInteger)numberOfRowsInCrossSigningSection numberOfRowsInCrossSigningSection = CROSSSIGNING_FIRST_ACTION + 1; break; case MXCrossSigningStateCrossSigningExists: // Actions: Verify this session, Reset + numberOfRowsInCrossSigningSection = CROSSSIGNING_FIRST_ACTION + 2; + break; case MXCrossSigningStateTrustCrossSigning: // Actions: Request keys, Reset numberOfRowsInCrossSigningSection = CROSSSIGNING_FIRST_ACTION + 1; break; @@ -707,7 +709,7 @@ - (NSAttributedString*)crossSigningInformation crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoNotBootstrapped]; break; case MXCrossSigningStateCrossSigningExists: - crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoNotBootstrapped]; // Tchap : simply tell user cross-signing is not configured. + crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoExists]; // Tchap : tell user cross-signing exists on the account but is not trusted. break; case MXCrossSigningStateTrustCrossSigning: crossSigningInformation = [VectorL10n securitySettingsCrosssigningInfoTrusted]; From 97c48d614b345555f0795c238c08363518e631cb Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Mon, 25 Nov 2024 11:15:22 +0100 Subject: [PATCH 07/10] Remove unused intermediate variables --- .../SettingsSecureBackupTableViewSection.swift | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift b/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift index 3ec494faa..64c48ee1a 100644 --- a/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift +++ b/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift @@ -157,14 +157,9 @@ private enum BackupRows { // .deleteKeyBackupAction(keyBackupVersion: keyBackupVersion) // ] let noBackup = VectorL10n.settingsKeyBackupInfoNotValid -// let signoutWarning = VectorL10n.settingsKeyBackupInfoSignoutWarning - // Tchap -// let infoText = [noBackup, signoutWarning].joined(separator: "\n") - let infoText = noBackup - let backupInfoText = noBackup backupRows = [ - .info(text: infoText, icon: UIImage(systemName: "xmark.circle.fill"), tint: .systemGray), + .info(text: noBackup, icon: UIImage(systemName: "xmark.circle.fill"), tint: .systemGray), .createSecureBackupAction ] } @@ -172,8 +167,8 @@ private enum BackupRows { switch keyBackupState { case .noKeyBackup: let noBackup = VectorL10n.settingsKeyBackupInfoNone - let signoutWarning = VectorL10n.settingsKeyBackupInfoSignoutWarning // Tchap +// let signoutWarning = VectorL10n.settingsKeyBackupInfoSignoutWarning // let infoText = [noBackup, signoutWarning].joined(separator: "\n") let infoText = noBackup From 1e264ceeb796d893f4fc5246cfce1a6fad554a1a Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Mon, 25 Nov 2024 11:15:44 +0100 Subject: [PATCH 08/10] Add Changelog file --- changelog.d/1125.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/1125.change diff --git a/changelog.d/1125.change b/changelog.d/1125.change new file mode 100644 index 000000000..4ff59dbfb --- /dev/null +++ b/changelog.d/1125.change @@ -0,0 +1 @@ +Amélioration de la description de l'état de la signature croisée et des actions possibles (pour être au même niveau que le client Tchap Android). \ No newline at end of file From 2610af6da55d1982810cc68f7e42cbe861ff7843 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Mon, 25 Nov 2024 11:29:28 +0100 Subject: [PATCH 09/10] =?UTF-8?q?Activation=20des=20appels=20vid=C3=A9o=20?= =?UTF-8?q?pour=20toutes=20les=20instances=20en=20Production?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tchap/Config/BuildSettings.swift | 21 ++++++++++++++++++--- changelog.d/1126.change | 1 + 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 changelog.d/1126.change diff --git a/Tchap/Config/BuildSettings.swift b/Tchap/Config/BuildSettings.swift index 2283dbb5b..6b12e99f4 100644 --- a/Tchap/Config/BuildSettings.swift +++ b/Tchap/Config/BuildSettings.swift @@ -272,7 +272,7 @@ final class BuildSettings: NSObject { tchapFeatureNotificationByEmail: [ tchapFeatureAnyHomeServer ], - // Audio calls for all in Tchap Production. + // Audio calls for all instances in Tchap Production. tchapFeatureVoiceOverIP: [ "agent.externe.tchap.gouv.fr", "agent.collectivites.tchap.gouv.fr", @@ -292,10 +292,25 @@ final class BuildSettings: NSObject { "agent.dev-durable.tchap.gouv.fr", "agent.education.tchap.gouv.fr" ], + // Video calls for all instances in Tchap Production. tchapFeatureVideoOverIP: [ + "agent.externe.tchap.gouv.fr", + "agent.collectivites.tchap.gouv.fr", + "agent.tchap.gouv.fr", + "agent.elysee.tchap.gouv.fr", + "agent.pm.tchap.gouv.fr", + "agent.ssi.tchap.gouv.fr", + "agent.finances.tchap.gouv.fr", + "agent.social.tchap.gouv.fr", + "agent.interieur.tchap.gouv.fr", + "agent.agriculture.tchap.gouv.fr", + "agent.justice.tchap.gouv.fr", + "agent.diplomatie.tchap.gouv.fr", + "agent.intradef.tchap.gouv.fr", "agent.dinum.tchap.gouv.fr", - "agent.education.tchap.gouv.fr", - "agent.tchap.gouv.fr" + "agent.culture.tchap.gouv.fr", + "agent.dev-durable.tchap.gouv.fr", + "agent.education.tchap.gouv.fr" ], tchapFeatureGeolocationSharing: [ tchapFeatureAnyHomeServer diff --git a/changelog.d/1126.change b/changelog.d/1126.change new file mode 100644 index 000000000..051c2e432 --- /dev/null +++ b/changelog.d/1126.change @@ -0,0 +1 @@ +Activation des appels vidéo pour toutes les instances en Production. \ No newline at end of file From 7361073fc97da722a3cd9caedb1a1e6af45795b4 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Tue, 26 Nov 2024 16:10:43 +0100 Subject: [PATCH 10/10] Execute towncrier --- TCHAP_CHANGES.md | 11 +++++++++++ changelog.d/1109.change | 1 - changelog.d/1118.change | 1 - changelog.d/1120.change | 1 - changelog.d/1125.change | 1 - changelog.d/1126.change | 1 - 6 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 changelog.d/1109.change delete mode 100644 changelog.d/1118.change delete mode 100644 changelog.d/1120.change delete mode 100644 changelog.d/1125.change delete mode 100644 changelog.d/1126.change diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md index b1a58dfd2..b1ce709b7 100644 --- a/TCHAP_CHANGES.md +++ b/TCHAP_CHANGES.md @@ -1,3 +1,14 @@ +## Changes in 2.8.4 (2024-11-26) + +🙌 Improvements + +- Permettre les appels vidéos sur Education et Agent. ([#1109](https://github.com/tchapgouv/tchap-ios/issues/1109)) +- Update Sentry pod dependency to compile with Xcode 16.1 ([#1118](https://github.com/tchapgouv/tchap-ios/issues/1118)) +- Modifier le commentaire lorsqu'on active l'accès à un salon par lien ([#1120](https://github.com/tchapgouv/tchap-ios/issues/1120)) +- Amélioration de la description de l'état de la signature croisée et des actions possibles (pour être au même niveau que le client Tchap Android). ([#1125](https://github.com/tchapgouv/tchap-ios/issues/1125)) +- Activation des appels vidéo pour toutes les instances en Production. ([#1126](https://github.com/tchapgouv/tchap-ios/issues/1126)) + + ## Changes in 2.8.2 (2024-11-06) ✨ Features diff --git a/changelog.d/1109.change b/changelog.d/1109.change deleted file mode 100644 index be87637d5..000000000 --- a/changelog.d/1109.change +++ /dev/null @@ -1 +0,0 @@ -Permettre les appels vidéos sur Education et Agent. \ No newline at end of file diff --git a/changelog.d/1118.change b/changelog.d/1118.change deleted file mode 100644 index 69824d161..000000000 --- a/changelog.d/1118.change +++ /dev/null @@ -1 +0,0 @@ -Update Sentry pod dependency to compile with Xcode 16.1 \ No newline at end of file diff --git a/changelog.d/1120.change b/changelog.d/1120.change deleted file mode 100644 index 312f369a9..000000000 --- a/changelog.d/1120.change +++ /dev/null @@ -1 +0,0 @@ -Modifier le commentaire lorsqu'on active l'accès à un salon par lien \ No newline at end of file diff --git a/changelog.d/1125.change b/changelog.d/1125.change deleted file mode 100644 index 4ff59dbfb..000000000 --- a/changelog.d/1125.change +++ /dev/null @@ -1 +0,0 @@ -Amélioration de la description de l'état de la signature croisée et des actions possibles (pour être au même niveau que le client Tchap Android). \ No newline at end of file diff --git a/changelog.d/1126.change b/changelog.d/1126.change deleted file mode 100644 index 051c2e432..000000000 --- a/changelog.d/1126.change +++ /dev/null @@ -1 +0,0 @@ -Activation des appels vidéo pour toutes les instances en Production. \ No newline at end of file