diff options
| author | Sergey Budkin <sergey@vaadin.com> | 2014-11-07 15:22:24 +0200 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-12-16 22:59:02 +0200 |
| commit | 444533838a64aaeb1b9c77e534b166440546fe87 (patch) | |
| tree | a520c08d5360b5f0104441558f8bae88a9425e88 /shared/src/com | |
| parent | 8b58a7e6b4e4ded405de8698d6dba0884affa3f1 (diff) | |
| download | vaadin-framework-444533838a64aaeb1b9c77e534b166440546fe87.tar.gz vaadin-framework-444533838a64aaeb1b9c77e534b166440546fe87.zip | |
VBrowserDetails fails to detect Android when using Firefox (#15183)
Changed detection logic.
Change-Id: I9cb8e94fe6bb5be587fa73ed6a71d2c7c1d91733
Diffstat (limited to 'shared/src/com')
| -rw-r--r-- | shared/src/com/vaadin/shared/VBrowserDetails.java | 11 |
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")) { |