X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/6af93bfddeb2e2c5918846d3abb142c1ee2e7d4d..aa9abc55b4195e3dadd8f0985322e4f49b88c4b9:/src/com/owncloud/android/MainApp.java diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java index bf82c57d..76ecc5e0 100644 --- 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 { - + + private static final String TAG = MainApp.class.getSimpleName(); + private static final String AUTH_ON = "on"; @SuppressWarnings("unused") @@ -53,9 +55,8 @@ public class MainApp extends Application { boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso)); OwnCloudClientManagerFactory.setUserAgent(getUserAgent()); - if (isSamlAuth) { + if (isSamlAuth) { OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT); - } else { OwnCloudClientManagerFactory.setDefaultPolicy(Policy.ALWAYS_NEW_CLIENT); } @@ -124,19 +125,20 @@ public class MainApp extends Application { 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); + if (pInfo != null) { + version = "/" + pInfo.versionName; + } } 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; }