Trim in different place

SUPLA · Jan 3, 2020 · 22f230c · 22f230c
1 parent af68674
commit 22f230c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/SUPLA/SuplaClient.m b/SUPLA/SuplaClient.m
@@ -270,12 +270,9 @@ - (char*) getServerHostName {
 
     NSString *host = [SAApp getServerHostName];
     if ( [host isEqualToString:@""] == YES && [SAApp getAdvancedConfig] == NO && ![[SAApp getEmailAddress] isEqualToString:@""] ) {
-
-        NSString *email = [SAApp getEmailAddress];
-        email = [email stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-
+
         NSMutableURLRequest *request =
-        [NSMutableURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://autodiscover.supla.org/users/%@", email]] cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:5];
+        [NSMutableURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://autodiscover.supla.org/users/%@", [SAApp getEmailAddress]]] cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:5];
 
         [request setHTTPMethod: @"GET"];
 
@@ -298,7 +295,6 @@ - (char*) getServerHostName {
         }
     }
 
-    host = [host stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     return (char*)[host UTF8String];
 
 }

diff --git a/SuplaApp.m b/SuplaApp.m
@@ -253,7 +253,7 @@ +(NSString*) getAccessIDpwd {
 }
 
 +(void) setAccessIDpwd:(NSString *)pwd {
-
+    pwd = [pwd stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     @synchronized(self) {
         [[NSUserDefaults standardUserDefaults] setValue:pwd forKey:@"access_id_pwd"];
     }
@@ -277,7 +277,7 @@ +(NSString*) getServerHostName {
 }
 
 -(void) setServerHostName:(NSString *)hostname {
-
+    hostname = [hostname stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     @synchronized(self) {
         [[NSUserDefaults standardUserDefaults] setValue:hostname forKey:@"server_host"];
         _current_server = hostname;
@@ -309,7 +309,7 @@ +(NSString*) getEmailAddress {
 }
 
 -(void) setEmailAddress:(NSString *)email {
-
+    email = [email stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     @synchronized(self) {
         [[NSUserDefaults standardUserDefaults] setValue:email forKey:@"email_address"];
         _current_email = email;