Resolve conflicts on Rebase/Element-v1.11.9 into Tchap

tchapgouv · Apr 4, 2024 · ab53add · ab53add
1 parent 3cf84c4
commit ab53add
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 23 deletions.
diff --git a/BroadcastUploadExtension/SupportingFiles/PrivacyInfo.xcprivacy b/BroadcastUploadExtension/SupportingFiles/PrivacyInfo.xcprivacy
@@ -38,8 +38,4 @@
 		</dict>
 	</array>
 </dict>
-<<<<<<< HEAD
 </plist>
-=======
-</plist>
->>>>>>> v1.11.9
diff --git a/Btchap/Generated/InfoPlist.swift b/Btchap/Generated/InfoPlist.swift
@@ -30,6 +30,8 @@ internal enum InfoPlist {
   internal static let nsCameraUsageDescription: String = _document["NSCameraUsageDescription"]
   internal static let nsContactsUsageDescription: String = _document["NSContactsUsageDescription"]
   internal static let nsFaceIDUsageDescription: String = _document["NSFaceIDUsageDescription"]
+  internal static let nsLocationAlwaysAndWhenInUseUsageDescription: String = _document["NSLocationAlwaysAndWhenInUseUsageDescription"]
+  internal static let nsLocationWhenInUseUsageDescription: String = _document["NSLocationWhenInUseUsageDescription"]
   internal static let nsMicrophoneUsageDescription: String = _document["NSMicrophoneUsageDescription"]
   internal static let nsPhotoLibraryUsageDescription: String = _document["NSPhotoLibraryUsageDescription"]
   internal static let uiBackgroundModes: [String] = _document["UIBackgroundModes"]

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,10 +15,5 @@
 //
 
 // Version
-<<<<<<< HEAD
 MARKETING_VERSION = 2.7.4
 CURRENT_PROJECT_VERSION = 1
-=======
-MARKETING_VERSION = 1.11.9
-CURRENT_PROJECT_VERSION = 1.11.9
->>>>>>> v1.11.9
diff --git a/DevTchap/Generated/InfoPlist.swift b/DevTchap/Generated/InfoPlist.swift
@@ -29,6 +29,8 @@ internal enum InfoPlist {
   internal static let nsCameraUsageDescription: String = _document["NSCameraUsageDescription"]
   internal static let nsContactsUsageDescription: String = _document["NSContactsUsageDescription"]
   internal static let nsFaceIDUsageDescription: String = _document["NSFaceIDUsageDescription"]
+  internal static let nsLocationAlwaysAndWhenInUseUsageDescription: String = _document["NSLocationAlwaysAndWhenInUseUsageDescription"]
+  internal static let nsLocationWhenInUseUsageDescription: String = _document["NSLocationWhenInUseUsageDescription"]
   internal static let nsMicrophoneUsageDescription: String = _document["NSMicrophoneUsageDescription"]
   internal static let nsPhotoLibraryUsageDescription: String = _document["NSPhotoLibraryUsageDescription"]
   internal static let uiBackgroundModes: [String] = _document["UIBackgroundModes"]

diff --git a/Riot/SupportingFiles/PrivacyInfo.xcprivacy b/Riot/SupportingFiles/PrivacyInfo.xcprivacy
@@ -38,8 +38,4 @@
 		</dict>
 	</array>
 </dict>
-<<<<<<< HEAD
 </plist>
-=======
-</plist>
->>>>>>> v1.11.9
diff --git a/RiotNSE/BuildSettings.swift b/RiotNSE/BuildSettings.swift
@@ -270,7 +270,7 @@ final class BuildSettings: NSObject {
     static let tchapFeatureGeolocationSharing = "tchapFeatureGeolocationSharing" // linked to `locationSharingEnabled` property (see above)
     static var tchapFeaturesAllowedHomeServersForFeature: [String: [String]] = [
         tchapFeatureNotificationByEmail: [
-            "agent.dinum.tchap.gouv.fr"
+            tchapFeatureAnyHomeServer
         ],
         tchapFeatureVoiceOverIP: [
             "agent.dinum.tchap.gouv.fr"
@@ -456,7 +456,12 @@ final class BuildSettings: NSObject {
     // MARK: - Location Sharing
 
     /// Overwritten by the home server's .well-known configuration (if any exists)
-    static let defaultTileServerMapStyleURL = URL(string: "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json")!
+    // Tchap: handle different map providers.
+    private enum TchapMapProvider: String {
+        case geoDataGouv = "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json"
+        case ign = "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json"
+    }
+    static let defaultTileServerMapStyleURL = URL(string: TchapMapProvider.geoDataGouv.rawValue)!
 
     static let locationSharingEnabled = true
 

diff --git a/RiotNSE/SupportingFiles/PrivacyInfo.xcprivacy b/RiotNSE/SupportingFiles/PrivacyInfo.xcprivacy
@@ -38,8 +38,4 @@
 		</dict>
 	</array>
 </dict>
-<<<<<<< HEAD
 </plist>
-=======
-</plist>
->>>>>>> v1.11.9
diff --git a/RiotShareExtension/BuildSettings.swift b/RiotShareExtension/BuildSettings.swift
@@ -270,7 +270,7 @@ final class BuildSettings: NSObject {
     static let tchapFeatureGeolocationSharing = "tchapFeatureGeolocationSharing" // linked to `locationSharingEnabled` property (see above)
     static var tchapFeaturesAllowedHomeServersForFeature: [String: [String]] = [
         tchapFeatureNotificationByEmail: [
-            "agent.dinum.tchap.gouv.fr"
+            tchapFeatureAnyHomeServer
         ],
         tchapFeatureVoiceOverIP: [
             "agent.dinum.tchap.gouv.fr"
@@ -456,7 +456,12 @@ final class BuildSettings: NSObject {
     // MARK: - Location Sharing
 
     /// Overwritten by the home server's .well-known configuration (if any exists)
-    static let defaultTileServerMapStyleURL = URL(string: "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json")!
+    // Tchap: handle different map providers.
+    private enum TchapMapProvider: String {
+        case geoDataGouv = "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json"
+        case ign = "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json"
+    }
+    static let defaultTileServerMapStyleURL = URL(string: TchapMapProvider.geoDataGouv.rawValue)!
 
     static let locationSharingEnabled = true
 

diff --git a/Tchap/Generated/InfoPlist.swift b/Tchap/Generated/InfoPlist.swift
@@ -30,6 +30,8 @@ internal enum InfoPlist {
   internal static let nsCameraUsageDescription: String = _document["NSCameraUsageDescription"]
   internal static let nsContactsUsageDescription: String = _document["NSContactsUsageDescription"]
   internal static let nsFaceIDUsageDescription: String = _document["NSFaceIDUsageDescription"]
+  internal static let nsLocationAlwaysAndWhenInUseUsageDescription: String = _document["NSLocationAlwaysAndWhenInUseUsageDescription"]
+  internal static let nsLocationWhenInUseUsageDescription: String = _document["NSLocationWhenInUseUsageDescription"]
   internal static let nsMicrophoneUsageDescription: String = _document["NSMicrophoneUsageDescription"]
   internal static let nsPhotoLibraryUsageDescription: String = _document["NSPhotoLibraryUsageDescription"]
   internal static let uiBackgroundModes: [String] = _document["UIBackgroundModes"]

diff --git a/Tchap/Generated/Strings.swift b/Tchap/Generated/Strings.swift
@@ -271,6 +271,10 @@ public class TchapL10n: NSObject {
   public static var errorTitleDefault: String { 
     return TchapL10n.tr("Tchap", "error_title_default") 
   }
+  /// Signaler un problème
+  public static var eventFormatterReportIncident: String { 
+    return TchapL10n.tr("Tchap", "event_formatter_report_incident") 
+  }
   /// La durée de validité de votre compte a expiré. Un email vous a été envoyé pour la renouveler. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.
   public static var expiredAccountAlertMessage: String { 
     return TchapL10n.tr("Tchap", "expired_account_alert_message") 
@@ -563,7 +567,7 @@ public class TchapL10n: NSObject {
   public static var roomCreationTitle: String { 
     return TchapL10n.tr("Tchap", "room_creation_title") 
   }
-  /// Sinon, consulter cet article de FAQ.
+  /// En savoir plus.
   public static var roomDecryptionErrorFaqLinkMessage: String { 
     return TchapL10n.tr("Tchap", "room_decryption_error_faq_link_message") 
   }
@@ -743,7 +747,7 @@ public class TchapL10n: NSObject {
   public static var securityCrossSigningResetMessage: String { 
     return TchapL10n.tr("Tchap", "security_cross_signing_reset_message") 
   }
-  /// Êtes-vous sur ?
+  /// Êtes-vous sûr ?
   public static var securityCrossSigningResetTitle: String { 
     return TchapL10n.tr("Tchap", "security_cross_signing_reset_title") 
   }
@@ -791,6 +795,10 @@ public class TchapL10n: NSObject {
   public static var settingsCryptoImportInvalidFile: String { 
     return TchapL10n.tr("Tchap", "settings_crypto_import_invalid_file") 
   }
+  /// Sans cette autorisation, les appels entrants ne seront pas notifiés.
+  public static var settingsEnablePushNotifText: String { 
+    return TchapL10n.tr("Tchap", "settings_enable_push_notif_text") 
+  }
   /// Les autres utilisateurs ne pourront pas découvrir mon compte lors de leurs recherches
   public static var settingsHideFromUsersDirectorySummary: String { 
     return TchapL10n.tr("Tchap", "settings_hide_from_users_directory_summary") 
@@ -855,6 +863,14 @@ public class TchapL10n: NSObject {
   public static var tchapRoomInvalidLink: String { 
     return TchapL10n.tr("Tchap", "tchap_room_invalid_link") 
   }
+  /// Vous avez rencontré un souci durant votre appel VoIP. Dites-nous ce qui s'est passé :
+  public static var voidReportIncidentDescription: String { 
+    return TchapL10n.tr("Tchap", "void_report_incident_description") 
+  }
+  /// Signaler un problème VoIP
+  public static var voidReportIncidentTitle: String { 
+    return TchapL10n.tr("Tchap", "void_report_incident_title") 
+  }
   /// Attention
   public static var warningTitle: String { 
     return TchapL10n.tr("Tchap", "warning_title")