From b6b765242ee30553d3ba600c6b590ad52388834a Mon Sep 17 00:00:00 2001
From: Valere <bill.carson@valrsoft.com>
Date: Wed, 27 Mar 2024 15:13:05 +0100
Subject: [PATCH] Bump analytics event to v0.15.0

---
 .../xcshareddata/swiftpm/Package.resolved          |  4 ++--
 Riot/Modules/Analytics/Analytics.swift             | 14 ++++++++++++--
 project.yml                                        |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 2f19e2ddc5..511ea29a7b 100644
--- a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-analytics-events",
       "state" : {
-        "revision" : "2f5fa5f1e2f6c6ae1a47c33d953a3ce289167eb0",
-        "version" : "0.5.0"
+        "revision" : "44d5a0e898a71f8abbbe12afe9d73e82d370a9a1",
+        "version" : "0.15.0"
       }
     },
     {
diff --git a/Riot/Modules/Analytics/Analytics.swift b/Riot/Modules/Analytics/Analytics.swift
index 1a30841b98..c04a291de3 100644
--- a/Riot/Modules/Analytics/Analytics.swift
+++ b/Riot/Modules/Analytics/Analytics.swift
@@ -275,8 +275,16 @@ extension Analytics {
         let event = AnalyticsEvent.Error(
             context: context,
             cryptoModule: .Rust,
+            cryptoSDK: AnalyticsEvent.Error.CryptoSDK.Rust,
             domain: .E2EE,
-            name: reason.errorName
+            // XXX not yet supported.
+            eventLocalAgeMillis: nil,
+            isFederated: nil,
+            isMatrixDotOrg: nil,
+            name: reason.errorName,
+            timeToDecryptMillis: nil,
+            userTrustsOwnIdentity: nil,
+            wasVisibleToUser: nil
         )
         capture(event: event)
     }
@@ -355,7 +363,8 @@ extension Analytics: MXAnalyticsDelegate {
     
     func trackCallError(with reason: __MXCallHangupReason, video isVideo: Bool, numberOfParticipants: Int, incoming isIncoming: Bool) {
         let callEvent = AnalyticsEvent.CallError(isVideo: isVideo, numParticipants: numberOfParticipants, placed: !isIncoming)
-        let event = AnalyticsEvent.Error(context: nil, cryptoModule: nil, domain: .VOIP, name: reason.errorName)
+        let event = AnalyticsEvent.Error(context: nil, cryptoModule: nil, cryptoSDK: nil, domain: .VOIP, eventLocalAgeMillis: nil,
+                                         isFederated: nil, isMatrixDotOrg: nil, name: reason.errorName, timeToDecryptMillis: nil, userTrustsOwnIdentity: nil, wasVisibleToUser: nil)
         capture(event: callEvent)
         capture(event: event)
     }
@@ -386,6 +395,7 @@ extension Analytics: MXAnalyticsDelegate {
         let event = AnalyticsEvent.Composer(inThread: inThread,
                                             isEditing: isEditing,
                                             isReply: isReply,
+                                            messageType: AnalyticsEvent.Composer.MessageType.Text,
                                             startsThread: startsThread)
         capture(event: event)
     }
diff --git a/project.yml b/project.yml
index 3d410864a3..72c0ff8d41 100644
--- a/project.yml
+++ b/project.yml
@@ -45,7 +45,7 @@ include:
 packages:
   AnalyticsEvents:
     url: https://github.com/matrix-org/matrix-analytics-events
-    exactVersion: 0.5.0
+    exactVersion: 0.15.0
   Mapbox:
     url: https://github.com/maplibre/maplibre-gl-native-distribution
     minVersion: 5.12.2