Strip whitespace and newlines from access token and style URL

Just in case browser weirdness or a tendency to triple-click-select is causing some cases of #2012.
mapbox · Nov 3, 2015 · 1e27092 · 1e27092
1 parent 2b5b6fa
commit 1e27092
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/platform/ios/MGLAccountManager.m b/platform/ios/MGLAccountManager.m
@@ -60,6 +60,8 @@ + (BOOL) mapboxMetricsEnabledSettingShownInApp {
 }
 
 + (void) setAccessToken:(NSString *) accessToken {
+    accessToken = [accessToken stringByTrimmingCharactersInSet:
+                   [NSCharacterSet whitespaceAndNewlineCharacterSet]];
     if ( ! [accessToken length]) return;
 
     [MGLAccountManager sharedManager].accessToken = accessToken;

diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
@@ -3303,6 +3303,8 @@ - (nullable NSString *)styleURL__
 
 - (void)setStyleURL__:(nullable NSString *)URLString
 {
+    URLString = [URLString stringByTrimmingCharactersInSet:
+                 [NSCharacterSet whitespaceAndNewlineCharacterSet]];
     NSURL *url = URLString.length ? [NSURL URLWithString:URLString] : nil;
     if (URLString.length && !url)
     {