SDK-777 add connectivity check to BranchEvent with callback

Author: echo-branch

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -29,8 +29,6 @@
 
 @interface BNCDeviceInfo()
 
-@property (nonatomic, strong, readwrite) BNCReachability *reachability;
-
 @property (nonatomic, copy, readwrite) NSString *randomId;
 
 @end
@@ -66,9 +64,7 @@ - (void)loadDeviceInfo {
     BNCLocale *locale = [BNCLocale new];
     BNCTelephony *telephony = [BNCTelephony new];
     BNCDeviceSystem *deviceSystem = [BNCDeviceSystem new];
-    
-    self.reachability = [BNCReachability new];
-    
+        
     // The random id is regenerated per app launch.  This maintains existing behavior.
     self.randomId = [[NSUUID UUID] UUIDString];
     self.vendorId = [BNCSystemObserver getVendorId];
@@ -114,7 +110,7 @@ - (NSString *)localIPAddress {
 }
 
 - (NSString *)connectionType {
-    return [self.reachability reachabilityStatus];
+    return [[BNCReachability shared] reachabilityStatus];
 }
 
 - (NSString *)userAgentString {
@@ -160,7 +156,7 @@ - (NSDictionary *)v2dictionary {
             [dictionary bnc_safeSetObject:self.vendorId forKey:@"idfv"];
             [dictionary bnc_safeSetObject:self.advertiserId forKey:@"idfa"];
         }
-        [dictionary bnc_safeSetObject:[BNCNetworkInterface localIPAddress] forKey:@"local_ip"];
+        [dictionary bnc_safeSetObject:[self localIPAddress] forKey:@"local_ip"];
 
         if (!self.isAdTrackingEnabled) {
             dictionary[@"limit_ad_tracking"] = @(YES);
@@ -184,7 +180,7 @@ - (NSDictionary *)v2dictionary {
         [dictionary bnc_safeSetObject:self.language forKey:@"language"];
         [dictionary bnc_safeSetObject:self.carrierName forKey:@"device_carrier"];
         [dictionary bnc_safeSetObject:[self connectionType] forKey:@"connection_type"];
-        [dictionary bnc_safeSetObject:[BNCUserAgentCollector instance].userAgent forKey:@"user_agent"];
+        [dictionary bnc_safeSetObject:[self userAgentString] forKey:@"user_agent"];
 
         [dictionary bnc_safeSetObject:[BNCPreferenceHelper preferenceHelper].userIdentity forKey:@"developer_identity"];
         [dictionary bnc_safeSetObject:[BNCPreferenceHelper preferenceHelper].deviceFingerprintID forKey:@"device_fingerprint_id"];

Branch-SDK/Branch-SDK/BNCReachability.h

@@ -13,6 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
 // Handles network connectivity and type information
 @interface BNCReachability : NSObject
 
++ (BNCReachability *)shared;
+
 - (nullable NSString *)reachabilityStatus;
 
 @end

Branch-SDK/Branch-SDK/BNCReachability.m

@@ -27,6 +27,15 @@ @interface BNCReachability()
  */
 @implementation BNCReachability
 
++ (BNCReachability *)shared {
+    static BNCReachability *reachability;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        reachability = [BNCReachability new];
+    });
+    return reachability;
+}
+
 - (instancetype)init {
     self = [super init];
     if (self) {

Branch-SDK/Branch-SDK/BranchEvent.m

@@ -9,6 +9,7 @@
 #import "BranchEvent.h"
 #import "BNCLog.h"
 #import "BNCCallbackMap.h"
+#import "BNCReachability.h"
 
 #pragma mark BranchStandardEvents
 
@@ -224,17 +225,22 @@ - (NSDictionary*) dictionary {
 - (void)logEventWithCompletion:(void (^_Nullable)(NSString *statusMessage))completion {
     if (![_eventName isKindOfClass:[NSString class]] || _eventName.length == 0) {
         BNCLogError(@"Invalid event type '%@' or empty string.", NSStringFromClass(_eventName.class));
-        
         if (completion) {
             completion(@"Error: Invalid event type");
         }
-        
+        return;
+    }
+    
+    // logEvent requests without a completion are automatically retried later
+    if (completion != nil && [[BNCReachability shared] reachabilityStatus] == nil) {
+        if (completion) {
+            completion(@"Error: No connectivity");
+        }
         return;
     }
 
     NSDictionary *eventDictionary = [self buildEventDictionary];
     BranchEventRequest *request = [self buildRequestWithEventDictionary:eventDictionary];
-    
     [[BNCCallbackMap shared] storeRequest:request withCompletion:completion];
 
     [[Branch getInstance] sendServerRequest:request];