Merge branch 'develop' into feat/wire-cells-auth-token

# Conflicts:
#	wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift

Author: samwyndham

.github/workflows/beta_app_release.yml

@@ -20,5 +20,5 @@ jobs:
       countly_enabled: true
       datadog_enabled: true
       fastlane_action: testflight_beta
-      distribute_externals: ${{ inputs.distribute_externals }}
+      distribute_externals: ${{ inputs.distribute_externals || false }}
     secrets: inherit

.github/workflows/test_develop.yml

@@ -14,7 +14,7 @@ jobs:
   trigger_tests:
     strategy:
       matrix:
-        branch: [develop, release/cycle-3.120, release/cycle-4.1]  # List other branches here
+        branch: [develop, release/cycle-3.120, release/cycle-4.1, release/cycle-4.2]  # List other branches here
       fail-fast: false # avoid to fail one job
     uses: ./.github/workflows/_reusable_run_tests.yml
     with:

.github/workflows/test_pr_changes.yml

@@ -71,8 +71,6 @@ jobs:
               - 'wire-ios-cryptobox/**'
             wire-ios-mocktransport:
               - 'wire-ios-mocktransport/**'
-            wire-ios-protos:
-              -  'wire-ios-protos/**'
             wire-ios-images:
               - 'wire-ios-images/**'
             wire-ios-link-preview:

.swiftformat

@@ -7,7 +7,6 @@
     **.generated.swift, \
     **+Generated.swift, \
     **AutoMockable**, \
-    wire-ios-protos/Protos/**, \
     wire-ios/Templates/**, \
     WireUI/Sources/WireDesign/Icons/Autogenerated/**, \
     wire-ios-automation/**

.swiftlint.yml

@@ -92,10 +92,6 @@ excluded:
   - sourcery
   - vendor
   - wire-ios/Templates
-  - wire-ios-protos/Protos/messages.pb.swift
-  - wire-ios-protos/Protos/mls.pb.swift
-  - wire-ios-protos/Protos/otr.pb.swift
-  - wire-ios-protos/Scripts/generate_header.swift
   - wire-ios-sync-engine/Support/Sourcery/generated/AutoMockable.manual.swift
   - wire-ios/Wire-iOS Share Extension/Generated/Strings+Generated.swift
   - wire-ios/Wire-iOS/Generated/Assets+Generated.swift

Cartfile.private

@@ -1,5 +1,4 @@
 github "wireapp/ZipArchive" "v2.4.2"
 github "wireapp/cryptobox-ios" "v1.1.0_xcframework_arm64simulator"
-github "wireapp/generic-message-proto" "v1.52.0"
 github "wireapp/libPhoneNumber-iOS" "1.1"
 github "wireapp/ocmock" "v3.4.3_Xcode14.3.1"

Cartfile.resolved

@@ -16,13 +16,15 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
+public import Foundation
+
 /// The subject of analytics tracking.
 
 public struct AnalyticsUser: Equatable, Sendable {
 
     /// A unique id.
 
-    public let analyticsIdentifier: String
+    public let trackingID: UUID
 
     /// The user's team information.
 
@@ -31,14 +33,14 @@ public struct AnalyticsUser: Equatable, Sendable {
     /// Create a new `AnalyticsUser`.
     ///
     /// - Parameters:
-    ///   - analyticsIdentifier: A uniqe id.
+    ///   - trackingID: A uniqe id.
     ///   - teamInfo: The user's team information.
 
     public init(
-        analyticsIdentifier: String,
+        trackingID: UUID,
         teamInfo: TeamInfo? = nil
     ) {
-        self.analyticsIdentifier = analyticsIdentifier
+        self.trackingID = trackingID
         self.teamInfo = teamInfo
     }
 

WireAnalytics/Sources/WireAnalytics/AnalyticsUser/AnalyticsUser.swift

@@ -159,9 +159,9 @@ public final class AnalyticsService: AnalyticsServiceProtocol {
     ) throws {
         guard let countly else { return }
 
-        if let id = user?.analyticsIdentifier {
+        if let id = user?.trackingID {
             countly.changeDeviceID(
-                id,
+                id.uuidString.lowercased(),
                 mergeData: mergeData
             )
         }

WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift

@@ -146,7 +146,7 @@ final class AnalyticsServiceTests: XCTestCase {
             return
         }
 
-        XCTAssertEqual(deviceChangeInvocations[0].id, Scaffolding.userWithTeam.analyticsIdentifier)
+        XCTAssertEqual(deviceChangeInvocations[0].id, Scaffolding.userWithTeam.trackingID.uuidString.lowercased())
         XCTAssertEqual(deviceChangeInvocations[0].mergeData, false)
 
         // Then the user details were set.
@@ -219,7 +219,7 @@ final class AnalyticsServiceTests: XCTestCase {
             return
         }
 
-        XCTAssertEqual(deviceChangeInvocations[0].id, Scaffolding.userWithTeam.analyticsIdentifier)
+        XCTAssertEqual(deviceChangeInvocations[0].id, Scaffolding.userWithTeam.trackingID.uuidString.lowercased())
         XCTAssertEqual(deviceChangeInvocations[0].mergeData, true)
 
         // Then the user details were set.
@@ -297,10 +297,10 @@ private enum Scaffolding {
         host: URL(string: "www.example.com")!
     )
 
-    static let user = AnalyticsUser(analyticsIdentifier: "user1")
+    static let user = AnalyticsUser(trackingID: UUID())
 
     static let userWithTeam = AnalyticsUser(
-        analyticsIdentifier: "user2",
+        trackingID: UUID(),
         teamInfo: TeamInfo(
             id: "teamID",
             role: "admin",