X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/06d5cc94778ee4fe5ec49cd9061c039283ea7cdc..6af93bfddeb2e2c5918846d3abb142c1ee2e7d4d:/src/com/owncloud/android/MainApp.java

diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index 67a15987..bf82c57d 100644
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -22,6 +22,8 @@ package com.owncloud.android;
 
 import android.app.Application;
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
@@ -49,7 +51,8 @@ public class MainApp extends Application {
         MainApp.mContext = getApplicationContext();
         
         boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
-        
+
+        OwnCloudClientManagerFactory.setUserAgent(getUserAgent());
         if (isSamlAuth) {   
             OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);
             
@@ -118,8 +121,23 @@ public class MainApp extends Application {
     }
 
     // user agent
-    // TODO: decide if it use account_type or another string for user_agent
     public static String getUserAgent() {
-        return getAppContext().getResources().getString(R.string.account_type);
+        String appString = getAppContext().getResources().getString(R.string.user_agent);
+        String packageName = getAppContext().getPackageName();
+        PackageInfo pInfo = null;
+        try {
+            pInfo = getAppContext().getPackageManager().getPackageInfo(packageName, 0);
+        } catch (PackageManager.NameNotFoundException e) {
+
+        }
+        String version = "";
+        if (pInfo != null) {
+            version = pInfo.versionName;
+        }
+
+        // Mozilla/5.0 (Android) ownCloud /1.7.0
+        String userAgent = "Mozilla/5.0 "+ appString + "/" + version;
+
+        return userAgent;
     }
 }