From a384547838f63bf910b72eda2a116452d2146ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Spie=C3=9F?= <lspiess@microsoft.com>
Date: Tue, 22 Mar 2016 15:56:33 +0100
Subject: [PATCH] Cleanup serverURL initialization in MetricsManager

---
 Classes/BITMetricsManager.m        | 23 +++++++++++------------
 Classes/BITMetricsManagerPrivate.h |  2 ++
 Classes/BITTelemetryContext.h      |  2 --
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Classes/BITMetricsManager.m b/Classes/BITMetricsManager.m
index a8d4d94a42..57db1b4513 100644
--- a/Classes/BITMetricsManager.m
+++ b/Classes/BITMetricsManager.m
@@ -16,14 +16,15 @@
 #import "BITHockeyBaseManagerPrivate.h"
 #import "BITSender.h"
 
-static char *const kBITMetricsEventQueue = "net.hockeyapp.telemetryEventQueue";
-
-NSString *const kBITSessionFileType = @"plist";
-NSString *const kBITApplicationDidEnterBackgroundTime = @"BITApplicationDidEnterBackgroundTime";
 NSString *const kBITApplicationWasLaunched = @"BITApplicationWasLaunched";
 
-NSString *const BITMetricsBaseURL = @"https://gate.hockeyapp.net/";
-NSString *const BITMetricsEndpointPath = @"v2/track";
+static char *const kBITMetricsEventQueue = "net.hockeyapp.telemetryEventQueue";
+
+static NSString *const kBITSessionFileType = @"plist";
+static NSString *const kBITApplicationDidEnterBackgroundTime = @"BITApplicationDidEnterBackgroundTime";
+
+static NSString *const BITMetricsBaseURLString = @"https://gate.hockeyapp.net/";
+static NSString *const BITMetricsURLPathString = @"v2/track";
 
 @interface BITMetricsManager ()
 
@@ -37,6 +38,7 @@ NSString *const BITMetricsEndpointPath = @"v2/track";
 @synthesize channel = _channel;
 @synthesize telemetryContext = _telemetryContext;
 @synthesize persistence = _persistence;
+@synthesize serverURL = _serverURL;
 @synthesize userDefaults = _userDefaults;
 
 #pragma mark - Create & start instance
@@ -46,6 +48,7 @@ NSString *const BITMetricsEndpointPath = @"v2/track";
     _disabled = NO;
     _metricsEventQueue = dispatch_queue_create(kBITMetricsEventQueue, DISPATCH_QUEUE_CONCURRENT);
     _appBackgroundTimeBeforeSessionExpires = 20;
+    _serverURL = [NSString stringWithFormat:@"%@%@", BITMetricsBaseURLString, BITMetricsURLPathString];
   }
   self.serverURL = nil;
   return self;
@@ -62,12 +65,8 @@ NSString *const BITMetricsEndpointPath = @"v2/track";
 }
 
 - (void)startManager {
-  if (!self.serverURL) {
-    self.serverURL = BITMetricsBaseURL;
-  }
-  self.serverURL = [NSString stringWithFormat:@"%@%@", self.serverURL, BITMetricsEndpointPath];
-  _sender = [[BITSender alloc] initWithPersistence:self.persistence serverURL:[NSURL URLWithString:self.serverURL]];
-  [_sender sendSavedDataAsync];
+  self.sender = [[BITSender alloc] initWithPersistence:self.persistence serverURL:[NSURL URLWithString:self.serverURL]];
+  [self.sender sendSavedDataAsync];
   [self startNewSessionWithId:bit_UUID()];
   [self registerObservers];
 }
diff --git a/Classes/BITMetricsManagerPrivate.h b/Classes/BITMetricsManagerPrivate.h
index 476eaddaa7..cee0f9ae76 100644
--- a/Classes/BITMetricsManagerPrivate.h
+++ b/Classes/BITMetricsManagerPrivate.h
@@ -14,6 +14,8 @@
 #import "HockeySDKNullability.h"
 NS_ASSUME_NONNULL_BEGIN
 
+FOUNDATION_EXPORT NSString *const kBITApplicationWasLaunched;
+
 @interface BITMetricsManager()
 
 /**
diff --git a/Classes/BITTelemetryContext.h b/Classes/BITTelemetryContext.h
index 83322dcbc9..21abb709eb 100644
--- a/Classes/BITTelemetryContext.h
+++ b/Classes/BITTelemetryContext.h
@@ -15,8 +15,6 @@
 #import "HockeySDKNullability.h"
 NS_ASSUME_NONNULL_BEGIN
 
-FOUNDATION_EXPORT NSString *const kBITApplicationWasLaunched;
-
 /**
  *  Context object which contains information about the device, user, session etc.
  */