Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile

Riot/Modules/Analytics/Analytics.swift

@@ -324,6 +324,11 @@ extension Analytics {
         viewRoomTrigger = .unknown
         capture(event: event)
     }
+    
+    func trackCryptoSDKEnabled() {
+        let event = AnalyticsEvent.CryptoSDKEnabled()
+        capture(event: event)
+    }
 }
 
 // MARK: - MXAnalyticsDelegate
@@ -393,3 +398,14 @@ extension Analytics: MXAnalyticsDelegate {
         monitoringClient.trackNonFatalIssue(issue, details: details)
     }
 }
+
+/// iOS-specific analytics event triggered when users select the Crypto SDK labs option
+///
+/// Due to this event being iOS only, and temporary during gradual rollout of Crypto SDK,
+/// this event is not added into the shared analytics schema
+extension AnalyticsEvent {
+    struct CryptoSDKEnabled: AnalyticsEventProtocol {
+        let eventName = "CryptoSDKEnabled"
+        let properties: [String: Any] = [:]
+    }
+}

Riot/Modules/Analytics/DecryptionFailure.swift

@@ -16,12 +16,10 @@
 
 import AnalyticsEvents
 
-/// Failure reasons as defined in https://docs.google.com/document/d/1es7cTCeJEXXfRCTRgZerAM2Wg5ZerHjvlpfTW-gsOfI.
 @objc enum DecryptionFailureReason: Int {
     case unspecified
     case olmKeysNotSent
     case olmIndexError
-    case unexpected
     
     var errorName: AnalyticsEvent.Error.Name {
         switch self {
@@ -31,8 +29,6 @@ import AnalyticsEvents
             return .OlmKeysNotSentError
         case .olmIndexError:
             return .OlmIndexError
-        case .unexpected:
-            return .UnknownError
         }
     }
 }

Riot/Modules/Analytics/DecryptionFailureTracker.m

@@ -106,12 +106,9 @@ NSString *const kDecryptionFailureTrackerAnalyticsCategory = @"e2e.failure";
             reason = DecryptionFailureReasonOlmIndexError;
             break;
 
-        case MXDecryptingErrorEncryptionNotEnabledCode:
-        case MXDecryptingErrorUnableToDecryptCode:
-            reason = DecryptionFailureReasonUnexpected;
-            break;
-
         default:
+            // All other error codes will be tracked as `OlmUnspecifiedError` and will include `context` containing
+            // the actual error code and localized description
             reason = DecryptionFailureReasonUnspecified;
             break;
     }

Riot/Modules/Analytics/Helpers/MXCallHangupReason+Analytics.swift

@@ -21,6 +21,9 @@ extension __MXCallHangupReason {
         switch self {
         case .userHangup:
             return .VoipUserHangup
+        case .userBusy:
+            // There is no dedicated analytics event for `userBusy` error
+            return .UnknownError
         case .inviteTimeout:
             return .VoipInviteTimeout
         case .iceFailed:
@@ -32,6 +35,9 @@ extension __MXCallHangupReason {
         case .unknownError:
             return .UnknownError
         default:
+            MXLog.failure("Unknown or unhandled hangup reason", context: [
+                "reason": rawValue
+            ])
             return .UnknownError
         }
     }