Merge pull request #532 from BranchMetrics/revert-lifecyle-change

Revert lifecycle change in 0.12.18

Author: aaustin

Branch-SDK/Branch-SDK/Branch.m

@@ -73,6 +73,7 @@ @interface Branch() <BranchDeepLinkingControllerCompletionDelegate, FABKit>
 
 @property (strong, nonatomic) BNCServerInterface *bServerInterface;
 @property (strong, nonatomic) BNCServerRequestQueue *requestQueue;
+@property (strong, nonatomic) NSTimer *sessionTimer;
 @property (strong, nonatomic) dispatch_semaphore_t processing_sema;
 @property (copy,   nonatomic) callbackWithParams sessionInitWithParamsCallback;
 @property (copy,   nonatomic) callbackWithBranchUniversalObject sessionInitWithBranchUniversalObjectCallback;
@@ -93,7 +94,6 @@ @interface Branch() <BranchDeepLinkingControllerCompletionDelegate, FABKit>
 @property (assign, nonatomic) BOOL delayForAppleAds;
 @property (assign, nonatomic) BOOL searchAdsDebugMode;
 @property (strong, nonatomic) NSMutableArray *whiteListedSchemeList;
-@property (assign, nonatomic) BOOL appIsInBackground;
 @end
 
 @implementation Branch
@@ -1181,15 +1181,15 @@ - (void)registerViewWithParams:(NSDictionary *)params andCallback:(callbackWithP
 #pragma mark - Application State Change methods
 
 - (void)applicationDidBecomeActive {
-    self.appIsInBackground = NO;
+    [self clearTimer];
     if (!self.isInitialized && !self.preferenceHelper.shouldWaitForInit && ![self.requestQueue containsInstallOrOpen]) {
         [self initUserSessionAndCallCallback:YES];
     }
 }
 
 - (void)applicationWillResignActive {
-    self.appIsInBackground = YES;
-    [self callClose];
+    [self clearTimer];
+    self.sessionTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(callClose) userInfo:nil repeats:NO];
     [self.requestQueue persistImmediately];
 }
 
@@ -1211,6 +1211,9 @@ - (void)callClose {
     }
 }
 
+- (void)clearTimer {
+    [self.sessionTimer invalidate];
+}
 
 #pragma mark - Queue management
 
@@ -1282,6 +1285,10 @@ - (void)processNextQueueItem {
                 return;
             }
 
+            if (![req isKindOfClass:[BranchCloseRequest class]]) {
+                [self clearTimer];
+            }
+
             dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0);
             dispatch_async(queue, ^ {
                 [req makeRequest:self.bServerInterface key:self.branchKey callback:callback];
@@ -1359,8 +1366,7 @@ - (void)registerInstallOrOpen:(Class)clazz {
 }
 
 - (void)handleInitSuccess {
-    if (!self.appIsInBackground)
-        self.isInitialized = YES;
+    self.isInitialized = YES;
 
     NSDictionary *latestReferringParams = [self getLatestReferringParams];
     if (self.shouldCallSessionInitCallback) {