Skip to content

Commit

Permalink
Merge branch 'feat/GA-SR' of https://github.com/getsentry/sentry-cocoa
Browse files Browse the repository at this point in the history
…into feat/GA-SR
  • Loading branch information
brustolin committed Dec 23, 2024
2 parents 9ad51e4 + b22713d commit 9bf30ed
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Sources/Sentry/Public/SentryOptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ NS_SWIFT_NAME(Options)
/**
* Settings to configure the session replay.
*/
@property (nonatomic, strong) SentryReplayOptions* sessionReplay;
@property (nonatomic, strong) SentryReplayOptions *sessionReplay;

#endif // SENTRY_TARGET_REPLAY_SUPPORTED

Expand Down
11 changes: 6 additions & 5 deletions Sources/Sentry/SentryOptions.m
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ - (instancetype)init
self.enableAppHangTrackingV2 = NO;
self.enableReportNonFullyBlockingAppHangs = YES;
#endif // SENTRY_HAS_UIKIT

#if SENTRY_TARGET_REPLAY_SUPPORTED
self.sessionReplay = [[SentryReplayOptions alloc] init];
#endif

self.enableAppHangTracking = YES;
self.appHangTimeoutInterval = 2.0;
self.enableAutoBreadcrumbTracking = YES;
Expand Down Expand Up @@ -475,10 +475,11 @@ - (BOOL)validateOptions:(NSDictionary<NSString *, id> *)options

#if SENTRY_TARGET_REPLAY_SUPPORTED
if ([options[@"sessionReplay"] isKindOfClass:NSDictionary.class]) {
self.sessionReplay = [[SentryReplayOptions alloc] initWithDictionary:options[@"sessionReplay"]];
self.sessionReplay =
[[SentryReplayOptions alloc] initWithDictionary:options[@"sessionReplay"]];
}
#endif //SENTRY_TARGET_REPLAY_SUPPORTED
#endif // SENTRY_TARGET_REPLAY_SUPPORTED

[self setBool:options[@"enableAppHangTracking"]
block:^(BOOL value) { self->_enableAppHangTracking = value; }];

Expand Down
3 changes: 1 addition & 2 deletions Sources/Sentry/SentrySessionReplayIntegration.m
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ - (instancetype)init
- (instancetype)initForManualUse:(nonnull SentryOptions *)options
{
if (self = [super init]) {
[self setupWith:options.sessionReplay
enableTouchTracker:options.enableSwizzling];
[self setupWith:options.sessionReplay enableTouchTracker:options.enableSwizzling];
[self startWithOptions:options.sessionReplay fullSession:YES];
}
return self;
Expand Down

0 comments on commit 9bf30ed

Please sign in to comment.