Merge pull request #983 from BranchMetrics/INTENG-7730-fix-logEvent-e…

…rror SDK-713 fix log event error
BranchMetrics · Dec 18, 2019 · d5630a5 · d5630a5
2 parents a9d8c47 + 093e9a2
commit d5630a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Branch-SDK/Branch-SDK/Branch.h b/Branch-SDK/Branch-SDK/Branch.h
@@ -1697,7 +1697,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
     __attribute__((deprecated(("This API is deprecated. Please use BranchEvent:BranchStandardEventViewItem instead."))));
 
 - (void) sendServerRequest:(BNCServerRequest*)request;
-- (void) sendServerRequestWithoutSession:(BNCServerRequest*)request;
+- (void) sendServerRequestWithoutSession:(BNCServerRequest*)request __attribute__((deprecated(("This API is deprecated. Please use sendServerRequest instead."))));
 
 /**
  This is the block that is called each time a new Branch session is started. It is automatically set

diff --git a/Branch-SDK/Branch-SDK/Branch.m b/Branch-SDK/Branch-SDK/Branch.m
@@ -229,6 +229,7 @@ - (id)initWithInterface:(BNCServerInterface *)interface
 
     // Initialize instance variables
     self.isolationQueue = dispatch_queue_create([@"branchIsolationQueue" UTF8String], DISPATCH_QUEUE_SERIAL);
+
     _serverInterface = interface;
     _serverInterface.preferenceHelper = preferenceHelper;
     _requestQueue = queue;
@@ -603,7 +604,6 @@ - (void)initSessionWithLaunchOptions:(NSDictionary *)options
       automaticallyDisplayController:(BOOL)automaticallyDisplayController {
 
     [self.class addBranchSDKVersionToCrashlyticsReport];
-
     self.shouldAutomaticallyDeepLink = automaticallyDisplayController;
 
     // If the SDK is already initialized, this means that initSession was called after other lifecycle calls.
@@ -1052,9 +1052,9 @@ - (void)sendServerRequest:(BNCServerRequest*)request {
     });
 }
 
+// deprecated, use sendServerRequest
 - (void)sendServerRequestWithoutSession:(BNCServerRequest*)request {
-    [self.requestQueue enqueue:request];
-    [self processNextQueueItem];
+    [self sendServerRequest:request];
 }
 
 - (void)sendCommerceEvent:(BNCCommerceEvent *)commerceEvent metadata:(NSDictionary*)metadata withCompletion:(void (^)(NSDictionary *, NSError *))completion {
@@ -1964,7 +1964,7 @@ - (void)clearNetworkQueue {
 // There is a follow up ticket to improve this.  SDK-633
 - (void)initSafetyCheck {
     if (self.initializationStatus == BNCInitStatusUninitialized) {
-        BNCLogWarning(@"Branch avoided an error by preemptively initializing.");
+        BNCLogDebug(@"Branch avoided an error by preemptively initializing.");
         [self initUserSessionAndCallCallback:NO];
     }
 }

diff --git a/Branch-SDK/Branch-SDK/BranchEvent.m b/Branch-SDK/Branch-SDK/BranchEvent.m
@@ -229,7 +229,7 @@ - (void) logEvent {
 
     NSDictionary *eventDictionary = [self buildEventDictionary];
     BranchEventRequest *request = [self buildRequestWithEventDictionary:eventDictionary];
-    [[Branch getInstance] sendServerRequestWithoutSession:request];
+    [[Branch getInstance] sendServerRequest:request];
 }
 
 - (BranchEventRequest *)buildRequestWithEventDictionary:(NSDictionary *)eventDictionary {