From e570f79439d419432654ac88b15ca66c80f894da Mon Sep 17 00:00:00 2001
From: Delisa <kattrali@users.noreply.github.com>
Date: Thu, 3 Oct 2019 16:54:01 +0200
Subject: [PATCH] fix: Properly retain object properties (#416)

Several object properties were not explicitly marked as retained due to
missing a property retention qualifier. This patch resolves that by
bringing the codebase into conformance with ARC.

ref: https://developer.apple.com/library/archive/releasenotes/ObjectiveC/RN-TransitioningToARC/Introduction/Introduction.html

Fixes #411
---
 CHANGELOG.md                 |  3 +++
 Source/BugsnagApiClient.m    |  2 +-
 Source/BugsnagHandledState.h |  4 ++--
 Source/BugsnagNotifier.h     | 10 +++++-----
 Source/BugsnagNotifier.m     |  6 +++---
 Source/BugsnagSink.h         |  2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dc2ad0ae..b71ea3df2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ Changelog
 * Show correct value for `app.inForeground` when an app launches and crashes in
   the background without ever coming to the foreground.
   [#415](https://github.com/bugsnag/bugsnag-cocoa/pull/415)
+* Fix improperly retained properties which could result in a crash due to
+  premature deallocation
+  [#416](https://github.com/bugsnag/bugsnag-cocoa/pull/416)
 
 ## 5.22.6 (2019-09-18)
 
diff --git a/Source/BugsnagApiClient.m b/Source/BugsnagApiClient.m
index b1015b275..0176ae787 100644
--- a/Source/BugsnagApiClient.m
+++ b/Source/BugsnagApiClient.m
@@ -13,7 +13,7 @@ @interface BSGDelayOperation : NSOperation
 @end
 
 @interface BugsnagApiClient()
-@property (nonatomic) NSURLSession *generatedSession;
+@property (nonatomic, strong) NSURLSession *generatedSession;
 @end
 
 @implementation BugsnagApiClient
diff --git a/Source/BugsnagHandledState.h b/Source/BugsnagHandledState.h
index 756bba357..bb1376b24 100644
--- a/Source/BugsnagHandledState.h
+++ b/Source/BugsnagHandledState.h
@@ -28,8 +28,8 @@ typedef NS_ENUM(NSUInteger, SeverityReasonType) {
 @property(nonatomic, readonly) BSGSeverity originalSeverity;
 @property(nonatomic) BSGSeverity currentSeverity;
 @property(nonatomic, readonly) SeverityReasonType calculateSeverityReasonType;
-@property(nonatomic, readonly) NSString *attrValue;
-@property(nonatomic, readonly) NSString *attrKey;
+@property(nonatomic, readonly, strong) NSString *attrValue;
+@property(nonatomic, readonly, strong) NSString *attrKey;
 
 + (NSString *)stringFromSeverityReason:(SeverityReasonType)severityReason;
 + (SeverityReasonType)severityReasonFromString:(NSString *)string;
diff --git a/Source/BugsnagNotifier.h b/Source/BugsnagNotifier.h
index e892015ab..bd01fc0ff 100644
--- a/Source/BugsnagNotifier.h
+++ b/Source/BugsnagNotifier.h
@@ -35,12 +35,12 @@
 
 @property(nonatomic, readwrite, retain)
     BugsnagConfiguration *_Nullable configuration;
-@property(nonatomic, readwrite, retain) BugsnagMetaData *_Nonnull state;
-@property(nonatomic, readwrite, retain) NSDictionary *_Nonnull details;
-@property(nonatomic, readwrite, retain) NSLock *_Nonnull metaDataLock;
-@property(nonatomic, readonly) BugsnagSessionTracker *_Nonnull sessionTracker;
+@property(nonatomic, readwrite, strong) BugsnagMetaData *_Nonnull state;
+@property(nonatomic, readwrite, strong) NSDictionary *_Nonnull details;
+@property(nonatomic, readwrite, strong) NSLock *_Nonnull metaDataLock;
+@property(nonatomic, readonly, strong) BugsnagSessionTracker *_Nonnull sessionTracker;
 
-@property(nonatomic) BSGConnectivity *_Nonnull networkReachable;
+@property(nonatomic, strong) BSGConnectivity *_Nonnull networkReachable;
 @property(readonly) BOOL started;
 
 - (instancetype _Nonnull)initWithConfiguration:
diff --git a/Source/BugsnagNotifier.m b/Source/BugsnagNotifier.m
index be2186088..eaaef9f00 100644
--- a/Source/BugsnagNotifier.m
+++ b/Source/BugsnagNotifier.m
@@ -201,9 +201,9 @@ void BSGWriteSessionCrashData(BugsnagSession *session) {
 }
 
 @interface BugsnagNotifier ()
-@property(nonatomic) BugsnagCrashSentry *crashSentry;
-@property(nonatomic) BugsnagErrorReportApiClient *errorReportApiClient;
-@property(nonatomic, readwrite) BugsnagSessionTracker *sessionTracker;
+@property(nonatomic, strong) BugsnagCrashSentry *crashSentry;
+@property(nonatomic, strong) BugsnagErrorReportApiClient *errorReportApiClient;
+@property(nonatomic, strong, readwrite) BugsnagSessionTracker *sessionTracker;
 @property (nonatomic, strong) BSGOutOfMemoryWatchdog *oomWatchdog;
 @property (nonatomic) BOOL appCrashedLastLaunch;
 @end
diff --git a/Source/BugsnagSink.h b/Source/BugsnagSink.h
index b2b568110..c67aba771 100644
--- a/Source/BugsnagSink.h
+++ b/Source/BugsnagSink.h
@@ -33,6 +33,6 @@
 @interface BugsnagSink : NSObject <BSG_KSCrashReportFilter>
 
 - (instancetype)initWithApiClient:(BugsnagErrorReportApiClient *)apiClient;
-@property(nonatomic) BugsnagErrorReportApiClient *apiClient;
+@property(nonatomic, strong) BugsnagErrorReportApiClient *apiClient;
 
 @end