From 4e7742572e5567f8996ac0dabc7690dfa2ed8db4 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Wed, 2 Apr 2025 09:41:02 +0100
Subject: [PATCH] Allow overriding the bug report app ID and analytics cookies
 URL. (#3969)

---
 ElementX/Sources/Application/AppSettings.swift | 7 ++++++-
 Enterprise                                     | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ElementX/Sources/Application/AppSettings.swift b/ElementX/Sources/Application/AppSettings.swift
index 0e1e71dbe..13a0e7e97 100644
--- a/ElementX/Sources/Application/AppSettings.swift
+++ b/ElementX/Sources/Application/AppSettings.swift
@@ -90,6 +90,7 @@ final class AppSettings {
     
     // MARK: - Hooks
     
+    // swiftlint:disable:next function_parameter_count
     func override(defaultHomeserverAddress: String,
                   oidcRedirectURL: URL,
                   websiteURL: URL,
@@ -98,6 +99,8 @@ final class AppSettings {
                   acceptableUseURL: URL,
                   privacyURL: URL,
                   supportEmailAddress: String,
+                  bugReportApplicationID: String,
+                  analyticsTermsURL: URL?,
                   mapTilerConfiguration: MapTilerConfiguration) {
         self.defaultHomeserverAddress = defaultHomeserverAddress
         self.oidcRedirectURL = oidcRedirectURL
@@ -107,6 +110,8 @@ final class AppSettings {
         self.acceptableUseURL = acceptableUseURL
         self.privacyURL = privacyURL
         self.supportEmailAddress = supportEmailAddress
+        self.bugReportApplicationID = bugReportApplicationID
+        self.analyticsTermsURL = analyticsTermsURL
         self.mapTilerConfiguration = mapTilerConfiguration
     }
     
@@ -226,7 +231,7 @@ final class AppSettings {
     let bugReportServiceBaseURL: URL? = Secrets.rageshakeServerURL.map { URL(string: $0)! } // swiftlint:disable:this force_unwrapping
     let bugReportSentryURL: URL? = Secrets.sentryDSN.map { URL(string: $0)! } // swiftlint:disable:this force_unwrapping
     /// The name allocated by the bug report server
-    let bugReportApplicationID = "element-x-ios"
+    private(set) var bugReportApplicationID = "element-x-ios"
     /// The maximum size of the upload request. Default value is just below CloudFlare's max request size.
     let bugReportMaxUploadSize = 50 * 1024 * 1024
     
diff --git a/Enterprise b/Enterprise
index d7e62932e..422a836e9 160000
--- a/Enterprise
+++ b/Enterprise
@@ -1 +1 @@
-Subproject commit d7e62932e75cf9309948f868fd75e0f24697241c
+Subproject commit 422a836e93f1434d3cfd8e39a7d0623cbc1f0f72