Merge pull request owncloud#814 from owncloud/update_user_agent

Update user agent with appversion in the middle

Author: nasli

Owncloud iOs Client/Branding/Customization.h

@@ -130,8 +130,8 @@
 #define k_is_shown_help_link_on_login NO
 #define k_url_link_on_login @"https://owncloud.com/mobile/new"
 
-//User-Agent
-#define k_user_agent @"Mozilla/5.0 (iOS) ownCloud-iOS/"
+//User-Agent, Mozilla/5.0 (iOS) ownCloud-iOS/<appVersion> <ob_customUserAgent>
+#define k_user_agent @"Mozilla/5.0 (iOS) ownCloud-iOS/$appVersion"
 
 //Enable/Disable Background uploads and download (NSURLSession or NSOperation)
 #define k_is_background_active YES

Owncloud iOs Client/Utils/UtilsUrls.m

@@ -559,7 +559,7 @@ + (NSString *)getFullRemoteServerParentPathByFile:(FileDto *) file andUser:(User
 
 + (NSString *) getUserAgent {
     NSString *appVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
-    NSString *userAgentWithAppVersion = [NSString stringWithFormat:@"%@%@",k_user_agent,appVersion];
+    NSString *userAgentWithAppVersion = [NSString stringWithFormat:@"%@",[k_user_agent stringByReplacingOccurrencesOfString:@"$appVersion" withString:appVersion]];
 
     return userAgentWithAppVersion;