From 3cec0a380dd88950d2d161600236d04534f6b61a Mon Sep 17 00:00:00 2001
From: "Benjamin Scholtysik (Reimold)" <bereimol@microsoft.com>
Date: Tue, 6 Sep 2016 21:31:33 -0700
Subject: [PATCH] Adding a safeguard to startNewSessionIfNeeded and removing
 safeguard that never helped anyone as appBackgroundTimeBeforeSessionExpires
 is always 20!

---
 Classes/BITMetricsManager.m | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Classes/BITMetricsManager.m b/Classes/BITMetricsManager.m
index 8e4798fe0b..406da4380d 100644
--- a/Classes/BITMetricsManager.m
+++ b/Classes/BITMetricsManager.m
@@ -122,15 +122,12 @@ static NSString *const BITMetricsURLPathString = @"v2/track";
 }
 
 - (void)startNewSessionIfNeeded {
-  if (self.appBackgroundTimeBeforeSessionExpires == 0) {
-    __weak typeof(self) weakSelf = self;
-    dispatch_async(_metricsEventQueue, ^{
-      typeof(self) strongSelf = weakSelf;
-      [strongSelf startNewSessionWithId:bit_UUID()];
-    });
-  }
-
   double appDidEnterBackgroundTime = [self.userDefaults doubleForKey:kBITApplicationDidEnterBackgroundTime];
+  // Add safeguard in case this returns a negative value
+  if(appDidEnterBackgroundTime < 0) {
+    appDidEnterBackgroundTime = 0;
+    [self.userDefaults setDouble:0 forKey:kBITApplicationDidEnterBackgroundTime];
+  }
   double timeSinceLastBackground = [[NSDate date] timeIntervalSince1970] - appDidEnterBackgroundTime;
   if (timeSinceLastBackground > self.appBackgroundTimeBeforeSessionExpires) {
     [self startNewSessionWithId:bit_UUID()];