From f43c74d59bb38f888e042630d5c5d2e0288939a4 Mon Sep 17 00:00:00 2001
From: Diego Waxemberg <diego.waxemberg@gmail.com>
Date: Sun, 5 Apr 2015 20:30:13 -0700
Subject: [PATCH] trim whitespace from server info responses

---
 Limelight/Network/ServerInfoResponse.m | 10 +++++-----
 Limelight/Utility/Utils.h              |  6 ++++++
 Limelight/Utility/Utils.m              |  7 +++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Limelight/Network/ServerInfoResponse.m b/Limelight/Network/ServerInfoResponse.m
index 7095b52..72623b0 100644
--- a/Limelight/Network/ServerInfoResponse.m
+++ b/Limelight/Network/ServerInfoResponse.m
@@ -18,11 +18,11 @@
 }
 
 - (void) populateHost:(Host*)host {
-    host.name = [self getStringTag:TAG_HOSTNAME];
-    host.externalAddress = [self getStringTag:TAG_EXTERNAL_IP];
-    host.localAddress = [self getStringTag:TAG_LOCAL_IP];
-    host.uuid = [self getStringTag:TAG_UNIQUE_ID];
-    host.mac = [self getStringTag:TAG_MAC_ADDRESS];
+    host.name = [[self getStringTag:TAG_HOSTNAME] trim];
+    host.externalAddress = [[self getStringTag:TAG_EXTERNAL_IP] trim];
+    host.localAddress = [[self getStringTag:TAG_LOCAL_IP] trim];
+    host.uuid = [[self getStringTag:TAG_UNIQUE_ID] trim];
+    host.mac = [[self getStringTag:TAG_MAC_ADDRESS] trim];
     
     NSInteger pairStatus;
     if ([self getIntTag:TAG_PAIR_STATUS value:&pairStatus]) {
diff --git a/Limelight/Utility/Utils.h b/Limelight/Utility/Utils.h
index 41e1e97..7489b81 100644
--- a/Limelight/Utility/Utils.h
+++ b/Limelight/Utility/Utils.h
@@ -24,3 +24,9 @@ FOUNDATION_EXPORT NSString *const deviceName;
 + (int) resolveHost:(NSString*)host;
 
 @end
+
+@interface NSString (NSStringWithTrim)
+
+- (NSString*) trim;
+
+@end
\ No newline at end of file
diff --git a/Limelight/Utility/Utils.m b/Limelight/Utility/Utils.m
index 0fac5b6..1f385ff 100644
--- a/Limelight/Utility/Utils.m
+++ b/Limelight/Utility/Utils.m
@@ -73,5 +73,12 @@ NSString *const deviceName = @"roth";
     }
 }
 
+@end
+
+@implementation NSString (NSStringWithTrim)
+
+- (NSString *)trim {
+    return [self stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+}
 
 @end