浏览代码

Changes from comments in PR#924

masensio 10 年之前
父节点
当前提交
90d84ca927
共有 1 个文件被更改,包括 10 次插入7 次删除
  1. 10 7
      src/com/owncloud/android/MainApp.java

+ 10 - 7
src/com/owncloud/android/MainApp.java

@@ -36,7 +36,9 @@ import com.owncloud.android.lib.common.utils.Log_OC;
  * classes
  * classes
  */
  */
 public class MainApp extends Application {
 public class MainApp extends Application {
-    
+
+    private static final String TAG = MainApp.class.getSimpleName();
+
     private static final String AUTH_ON = "on";
     private static final String AUTH_ON = "on";
     
     
     @SuppressWarnings("unused")
     @SuppressWarnings("unused")
@@ -124,18 +126,19 @@ public class MainApp extends Application {
     public static String getUserAgent() {
     public static String getUserAgent() {
         String appString = getAppContext().getResources().getString(R.string.user_agent);
         String appString = getAppContext().getResources().getString(R.string.user_agent);
         String packageName = getAppContext().getPackageName();
         String packageName = getAppContext().getPackageName();
+        String version = "";
+
         PackageInfo pInfo = null;
         PackageInfo pInfo = null;
         try {
         try {
             pInfo = getAppContext().getPackageManager().getPackageInfo(packageName, 0);
             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
+       // Mozilla/5.0 (Android) ownCloud /1.7.0
         String userAgent = appString + version;
         String userAgent = appString + version;
 
 
         return userAgent;
         return userAgent;