summaryrefslogtreecommitdiffstats
path: root/shared/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'shared/src/com')
-rw-r--r--shared/src/com/vaadin/shared/VBrowserDetails.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java
index fa21bddc96..6e45d33e16 100644
--- a/shared/src/com/vaadin/shared/VBrowserDetails.java
+++ b/shared/src/com/vaadin/shared/VBrowserDetails.java
@@ -167,14 +167,11 @@ public class VBrowserDetails implements Serializable {
if (userAgent.contains("windows ")) {
os = OperatingSystem.WINDOWS;
isWindowsPhone = userAgent.contains("windows phone");
+ } else if (userAgent.contains("android")) {
+ os = OperatingSystem.ANDROID;
+ parseAndroidVersion(userAgent);
} else if (userAgent.contains("linux")) {
- if (userAgent.contains("android")) {
- os = OperatingSystem.ANDROID;
- parseAndroidVersion(userAgent);
- } else {
- os = OperatingSystem.LINUX;
-
- }
+ os = OperatingSystem.LINUX;
} else if (userAgent.contains("macintosh")
|| userAgent.contains("mac osx")
|| userAgent.contains("mac os x")) {