PR feedback

Author: noahsmartin

Sources/Sentry/SentrySessionInternal.m

@@ -36,7 +36,7 @@ - (instancetype)initDefault:(NSString *)distinctId
     if (self = [super init]) {
         _sessionId = [NSUUID UUID];
         _started = [SentryDependencyContainer.sharedInstance.dateProvider date];
-        _status = SentrySessionStatusOk;
+        _status = kSentrySessionStatusOk;
         _sequence = 1;
         _errors = 0;
         _distinctId = distinctId;
@@ -79,13 +79,13 @@ - (nullable instancetype)initWithJSONObject:(NSDictionary *)jsonObject
         if (status == nil || ![status isKindOfClass:[NSString class]])
             return nil;
         if ([@"ok" isEqualToString:status]) {
-            _status = SentrySessionStatusOk;
+            _status = kSentrySessionStatusOk;
         } else if ([@"exited" isEqualToString:status]) {
-            _status = SentrySessionStatusExited;
+            _status = kSentrySessionStatusExited;
         } else if ([@"crashed" isEqualToString:status]) {
-            _status = SentrySessionStatusCrashed;
+            _status = kSentrySessionStatusCrashed;
         } else if ([@"abnormal" isEqualToString:status]) {
-            _status = SentrySessionStatusAbnormal;
+            _status = kSentrySessionStatusAbnormal;
         } else {
             return nil;
         }
@@ -151,7 +151,7 @@ - (void)endSessionExitedWithTimestamp:(NSDate *)timestamp
 {
     @synchronized(self) {
         [self changed];
-        _status = SentrySessionStatusExited;
+        _status = kSentrySessionStatusExited;
         [self endSessionWithTimestamp:timestamp];
     }
 }
@@ -160,7 +160,7 @@ - (void)endSessionCrashedWithTimestamp:(NSDate *)timestamp
 {
     @synchronized(self) {
         [self changed];
-        _status = SentrySessionStatusCrashed;
+        _status = kSentrySessionStatusCrashed;
         [self endSessionWithTimestamp:timestamp];
     }
 }
@@ -169,7 +169,7 @@ - (void)endSessionAbnormalWithTimestamp:(NSDate *)timestamp
 {
     @synchronized(self) {
         [self changed];
-        _status = SentrySessionStatusAbnormal;
+        _status = kSentrySessionStatusAbnormal;
         [self endSessionWithTimestamp:timestamp];
     }
 }
@@ -251,7 +251,7 @@ - (void)incrementErrors
     }
 }
 
-- (id)copyWithZone:(nullable NSZone *)zone
+- (SentrySessionInternal *)safeCopyWithZone:(nullable NSZone *)zone
 {
     SentrySessionInternal *copy = [[[self class] allocWithZone:zone] init];
 

Sources/Sentry/include/SentrySessionInternal.h

@@ -6,10 +6,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 NSString *nameForSentrySessionStatus(NSUInteger status);
 
+typedef NS_ENUM(NSUInteger, InternalSentrySessionStatus) {
+    kSentrySessionStatusOk = 0,
+    kSentrySessionStatusExited = 1,
+    kSentrySessionStatusCrashed = 2,
+    kSentrySessionStatusAbnormal = 3,
+};
+
 /**
  * The SDK uses SentrySession to inform Sentry about release and project associated project health.
  */
-@interface SentrySessionInternal : NSObject <NSCopying>
+@interface SentrySessionInternal : NSObject
 SENTRY_NO_INIT
 
 - (instancetype)initWithReleaseName:(NSString *)releaseName distinctId:(NSString *)distinctId;
@@ -31,7 +38,7 @@ SENTRY_NO_INIT
 
 @property (nonatomic, readonly, strong) NSUUID *sessionId;
 @property (nonatomic, readonly, strong) NSDate *started;
-@property (nonatomic, readonly) NSUInteger status;
+@property (nonatomic, readonly) InternalSentrySessionStatus status;
 @property (nonatomic) NSUInteger errors;
 @property (nonatomic, readonly) NSUInteger sequence;
 @property (nonatomic, readonly, strong) NSString *distinctId;
@@ -53,6 +60,8 @@ SENTRY_NO_INIT
 
 - (NSDictionary<NSString *, id> *)serialize;
 
+- (SentrySessionInternal *)safeCopyWithZone:(nullable NSZone *)zone;
+
 @end
 
 NS_ASSUME_NONNULL_END

Sources/Swift/SentrySession.swift

@@ -2,6 +2,21 @@
 import Foundation
 
 @objc @_spi(Private) public enum SentrySessionStatus: UInt {
+    init(internalStatus: InternalSentrySessionStatus) {
+        switch internalStatus {
+        case .sentrySessionStatusOk:
+            self = .ok
+        case .sentrySessionStatusExited:
+            self = .exited
+        case .sentrySessionStatusCrashed:
+            self = .crashed
+        case .sentrySessionStatusAbnormal:
+            fallthrough
+        @unknown default:
+            self = .abnormal
+        }
+    }
+
     case ok       = 0
     case exited   = 1
     case crashed  = 2
@@ -69,7 +84,7 @@ import Foundation
         session.started
     }
     @objc public var status: SentrySessionStatus {
-        SentrySessionStatus(rawValue: session.status) ?? .abnormal
+        SentrySessionStatus(internalStatus: session.status)
     }
     @objc public var errors: UInt {
         get { session.errors }
@@ -118,10 +133,7 @@ import Foundation
     }
 
     public func copy(with zone: NSZone? = nil) -> Any {
-        let copy = session.copy(with: zone)
-        guard let newSession = copy as? SentrySessionInternal else {
-            return copy
-        }
-        return SentrySession(session: newSession)
+        let copy = session.safeCopy(with: zone)
+        return SentrySession(session: copy)
     }
 }