From 0c2be8ccbce3b67249148d8bfd20552acad28b2c Mon Sep 17 00:00:00 2001 From: Anna Zakharova Date: Wed, 10 Apr 2024 17:05:08 +0100 Subject: [PATCH 1/4] IOS-2651 Update Sentry to the latest version --- Anytype.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- Anytype/Sources/CoreLayer/Sentry/SentryConfiguration.swift | 2 +- Anytype/Sources/ServiceLayer/Auth/AuthService.swift | 4 ++-- .../Configuration/AnytypeErrorLoggerConfiguration.swift | 4 ++++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Anytype.xcodeproj/project.pbxproj b/Anytype.xcodeproj/project.pbxproj index 1f908370fb..3c210eab89 100644 --- a/Anytype.xcodeproj/project.pbxproj +++ b/Anytype.xcodeproj/project.pbxproj @@ -13059,7 +13059,7 @@ repositoryURL = "https://github.com/getsentry/sentry-cocoa"; requirement = { kind = exactVersion; - version = 8.8.0; + version = 8.23.0; }; }; 2AC1262B2B90F65F003A4A8D /* XCRemoteSwiftPackageReference "Factory" */ = { diff --git a/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f58f2ed6af..764e9135c5 100644 --- a/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -86,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/getsentry/sentry-cocoa", "state" : { - "revision" : "d277532e1c8af813981ba01f591b15bbdd735615", - "version" : "8.8.0" + "revision" : "937dce13c2600cc42112c480d04f84899e08e9cc", + "version" : "8.23.0" } }, { diff --git a/Anytype/Sources/CoreLayer/Sentry/SentryConfiguration.swift b/Anytype/Sources/CoreLayer/Sentry/SentryConfiguration.swift index e53bf8f19f..663c9ccd8f 100644 --- a/Anytype/Sources/CoreLayer/Sentry/SentryConfiguration.swift +++ b/Anytype/Sources/CoreLayer/Sentry/SentryConfiguration.swift @@ -22,7 +22,7 @@ final class SentryConfigurator: AppConfiguratorProtocol { #if DEBUG options.attachViewHierarchy = true - options.enableTimeToFullDisplay = true + options.enableTimeToFullDisplayTracing = true #endif options.environment = env diff --git a/Anytype/Sources/ServiceLayer/Auth/AuthService.swift b/Anytype/Sources/ServiceLayer/Auth/AuthService.swift index ecba98550c..a5011c94a2 100644 --- a/Anytype/Sources/ServiceLayer/Auth/AuthService.swift +++ b/Anytype/Sources/ServiceLayer/Auth/AuthService.swift @@ -51,7 +51,7 @@ final class AuthService: AuthServiceProtocol { AnytypeAnalytics.instance().setNetworkId(account.info.networkId) AnytypeAnalytics.instance().logAccountCreate(analyticsId: analyticsId, middleTime: middleTime) AnytypeAnalytics.instance().logCreateSpace(route: .navigation) - appErrorLoggerConfiguration.setUserId(analyticsId) + await appErrorLoggerConfiguration.setUserId(analyticsId) UserDefaultsConfig.usersId = account.id @@ -82,7 +82,7 @@ final class AuthService: AuthServiceProtocol { AnytypeAnalytics.instance().setUserId(analyticsId) AnytypeAnalytics.instance().setNetworkId(account.info.networkId) AnytypeAnalytics.instance().logAccountOpen(analyticsId: analyticsId) - appErrorLoggerConfiguration.setUserId(analyticsId) + await appErrorLoggerConfiguration.setUserId(analyticsId) switch account.status { case .active, .pendingDeletion: diff --git a/Anytype/Sources/ServiceLayer/Configuration/AnytypeErrorLoggerConfiguration.swift b/Anytype/Sources/ServiceLayer/Configuration/AnytypeErrorLoggerConfiguration.swift index 167ae7e37f..9e35eecbfe 100644 --- a/Anytype/Sources/ServiceLayer/Configuration/AnytypeErrorLoggerConfiguration.swift +++ b/Anytype/Sources/ServiceLayer/Configuration/AnytypeErrorLoggerConfiguration.swift @@ -1,12 +1,16 @@ import Foundation import Sentry +@MainActor protocol AppErrorLoggerConfigurationProtocol: AnyObject { func setUserId(_ userId: String) } +@MainActor final class AppErrorLoggerConfiguration: AppErrorLoggerConfigurationProtocol { + nonisolated init() {} + // MARK: - AppErrorLoggerConfigurationProtocol func setUserId(_ userId: String) { From c2c5f436bba7d2cdef1ea1ea74b29ab1cff1bd0e Mon Sep 17 00:00:00 2001 From: Anna Zakharova Date: Wed, 10 Apr 2024 17:20:45 +0100 Subject: [PATCH 2/4] IOS-2651 Decrease to 8.22.4 --- Anytype.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Anytype.xcodeproj/project.pbxproj b/Anytype.xcodeproj/project.pbxproj index 3c210eab89..366cb6823e 100644 --- a/Anytype.xcodeproj/project.pbxproj +++ b/Anytype.xcodeproj/project.pbxproj @@ -13059,7 +13059,7 @@ repositoryURL = "https://github.com/getsentry/sentry-cocoa"; requirement = { kind = exactVersion; - version = 8.23.0; + version = 8.22.4; }; }; 2AC1262B2B90F65F003A4A8D /* XCRemoteSwiftPackageReference "Factory" */ = { diff --git a/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 764e9135c5..231efaf3ad 100644 --- a/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -86,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/getsentry/sentry-cocoa", "state" : { - "revision" : "937dce13c2600cc42112c480d04f84899e08e9cc", - "version" : "8.23.0" + "revision" : "bf7bdd75e25556d0f97ad54fb804b4287863e106", + "version" : "8.22.4" } }, { From 78ea096262f7b932302bf0270241037ec6b7491a Mon Sep 17 00:00:00 2001 From: Anna Zakharova Date: Wed, 10 Apr 2024 17:22:34 +0100 Subject: [PATCH 3/4] Revert "IOS-2651 Decrease to 8.22.4" This reverts commit c2c5f436bba7d2cdef1ea1ea74b29ab1cff1bd0e. --- Anytype.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Anytype.xcodeproj/project.pbxproj b/Anytype.xcodeproj/project.pbxproj index 366cb6823e..3c210eab89 100644 --- a/Anytype.xcodeproj/project.pbxproj +++ b/Anytype.xcodeproj/project.pbxproj @@ -13059,7 +13059,7 @@ repositoryURL = "https://github.com/getsentry/sentry-cocoa"; requirement = { kind = exactVersion; - version = 8.22.4; + version = 8.23.0; }; }; 2AC1262B2B90F65F003A4A8D /* XCRemoteSwiftPackageReference "Factory" */ = { diff --git a/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 231efaf3ad..764e9135c5 100644 --- a/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -86,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/getsentry/sentry-cocoa", "state" : { - "revision" : "bf7bdd75e25556d0f97ad54fb804b4287863e106", - "version" : "8.22.4" + "revision" : "937dce13c2600cc42112c480d04f84899e08e9cc", + "version" : "8.23.0" } }, { From aec81ec230fc90ffc25386dc3c641b33f193d997 Mon Sep 17 00:00:00 2001 From: Anna Zakharova Date: Wed, 10 Apr 2024 17:26:44 +0100 Subject: [PATCH 4/4] IOS-2651 Try 8.21.0 --- Anytype.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Anytype.xcodeproj/project.pbxproj b/Anytype.xcodeproj/project.pbxproj index 3c210eab89..e549a02e6c 100644 --- a/Anytype.xcodeproj/project.pbxproj +++ b/Anytype.xcodeproj/project.pbxproj @@ -13059,7 +13059,7 @@ repositoryURL = "https://github.com/getsentry/sentry-cocoa"; requirement = { kind = exactVersion; - version = 8.23.0; + version = 8.21.0; }; }; 2AC1262B2B90F65F003A4A8D /* XCRemoteSwiftPackageReference "Factory" */ = { diff --git a/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 764e9135c5..2ab55af1cc 100644 --- a/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Anytype.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -86,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/getsentry/sentry-cocoa", "state" : { - "revision" : "937dce13c2600cc42112c480d04f84899e08e9cc", - "version" : "8.23.0" + "revision" : "38f4f70d07117b9f958a76b1bff278c2f29ffe0e", + "version" : "8.21.0" } }, {