Merge branch 'staging' into Content-Discovery-2

sojanpr · sojanpr · commit 3b2fab70d94a · 2016-09-13T11:34:04.000-07:00
diff --git a/Branch-SDK/Branch-SDK/Branch.m b/Branch-SDK/Branch-SDK/Branch.m
@@ -1095,6 +1095,7 @@ - (void)registerViewWithParams:(NSDictionary *)params andCallback:(callbackWithP
 #pragma mark - Application State Change methods
 
 - (void)applicationDidBecomeActive {
+    [self clearTimer];
     if (!self.isInitialized && !self.preferenceHelper.shouldWaitForInit && ![self.requestQueue containsInstallOrOpen]) {
         [self initUserSessionAndCallCallback:YES];
     }

Original file line number	Diff line number	Diff line change
`@@ -1095,6 +1095,7 @@ - (void)registerViewWithParams:(NSDictionary *)params andCallback:(callbackWithP`
`1095`	`1095`	`#pragma mark - Application State Change methods`
`1096`	`1096`
`1097`	`1097`	`- (void)applicationDidBecomeActive {`
	`1098`	`+ [self clearTimer];`
`1098`	`1099`	`if (!self.isInitialized && !self.preferenceHelper.shouldWaitForInit && ![self.requestQueue containsInstallOrOpen]) {`
`1099`	`1100`	`[self initUserSessionAndCallCallback:YES];`
`1100`	`1101`	`}`