Merge pull request #924 from owncloud/add_user_agent_support

[pub/Android/ownCloud.git] / src / com / owncloud / android / MainApp.java

diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index aeaf8b3..4d13f8b 100644 (file)
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -36,7 +36,9 @@ import com.owncloud.android.lib.common.utils.Log_OC;
  * classes
  */
 public class MainApp extends Application {
  * classes
  */
 public class MainApp extends Application {

-    
+
+    private static final String TAG = MainApp.class.getSimpleName();
+

     private static final String AUTH_ON = "on";
     
     @SuppressWarnings("unused")
     private static final String AUTH_ON = "on";
     
     @SuppressWarnings("unused")


@@ -51,7 +53,8 @@ public class MainApp extends Application {
         MainApp.mContext = getApplicationContext();
         
         boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
         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);
             
         if (isSamlAuth) {   
             OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);
             


@@ -123,19 +126,20 @@ public class MainApp extends Application {
     public static String getUserAgent() {
         String appString = getAppContext().getResources().getString(R.string.user_agent);
         String packageName = getAppContext().getPackageName();
     public static String getUserAgent() {
         String appString = getAppContext().getResources().getString(R.string.user_agent);
         String packageName = getAppContext().getPackageName();

+        String version = "";
+

         PackageInfo pInfo = null;
         try {
             pInfo = getAppContext().getPackageManager().getPackageInfo(packageName, 0);
         PackageInfo pInfo = null;
         try {
             pInfo = getAppContext().getPackageManager().getPackageInfo(packageName, 0);

+            if (pInfo != null) {
+                version = "/" + pInfo.versionName;
+            }

         } catch (PackageManager.NameNotFoundException e) {
         } catch (PackageManager.NameNotFoundException e) {

-
-        }
-        String version = "";
-        if (pInfo != null) {
-            version = pInfo.versionName;
+            Log_OC.e(TAG, "Trying to get packageName", e.getCause());

         }
 
         }
 

-        // Mozilla/5.0 (Android) ownCloud /1.7.0
-        String userAgent = "Mozilla/5.0 "+ appString + "/" + version;
+       // Mozilla/5.0 (Android) ownCloud /1.7.0
+        String userAgent = appString + version;

 
         return userAgent;
     }
 
         return userAgent;
     }