projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e18de54
)
Changes from comments in PR#924
author
masensio
<masensio@solidgear.es>
Wed, 25 Mar 2015 08:10:32 +0000
(09:10 +0100)
committer
masensio
<masensio@solidgear.es>
Wed, 25 Mar 2015 08:10:32 +0000
(09:10 +0100)
src/com/owncloud/android/MainApp.java
patch
|
blob
|
blame
|
history
diff --git
a/src/com/owncloud/android/MainApp.java
b/src/com/owncloud/android/MainApp.java
index
173ec55
..
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")
@@
-124,18
+126,19
@@
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
+ // Mozilla/5.0 (Android) ownCloud /1.7.0
String userAgent = appString + version;
return userAgent;
String userAgent = appString + version;
return userAgent;