Merge branch 'develop'

# Conflicts: # TCHAP_CHANGES.md # Tchap/Config/BuildSettings.swift
tchapgouv · Nov 26, 2024 · ef8d49b · ef8d49b
2 parents 4b924b0 + 7361073
commit ef8d49b
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 15 deletions.
diff --git 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/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/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift b/Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift
@@ -150,18 +150,25 @@ 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
+
                 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: noBackup, icon: UIImage(systemName: "xmark.circle.fill"), tint: .systemGray),
+                    .createSecureBackupAction
                 ]
             }
         case .secureBackup(let keyBackupState):
             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
 

diff --git 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];

diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,8 +1,12 @@
-## Changes in 2.8.2 (2024-11-26)
+## 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)

diff --git 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/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,11 +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.dinum.tchap.gouv.fr",
-            "agent.education.tchap.gouv.fr",
+            "agent.externe.tchap.gouv.fr",
+            "agent.collectivites.tchap.gouv.fr",
             "agent.tchap.gouv.fr",
-            "agent.intradef.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.culture.tchap.gouv.fr",
+            "agent.dev-durable.tchap.gouv.fr",
+            "agent.education.tchap.gouv.fr"
         ],
         tchapFeatureGeolocationSharing: [
             tchapFeatureAnyHomeServer

diff --git 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"

diff --git a/changelog.d/1109.change b/changelog.d/1109.change
diff --git 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"