diff options
| author | Sergey Budkin <sergey@vaadin.com> | 2014-11-07 15:22:24 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-12-11 08:59:52 +0000 |
| commit | 862a2f74d9f137560fe62a33a5b23e4dd31aeeae (patch) | |
| tree | 1c686e238362a57919d2aaba302fed373740dc6f /shared | |
| parent | 5eaf32a1404399f7b39f3b60060ed3d101ec08f8 (diff) | |
| download | vaadin-framework-862a2f74d9f137560fe62a33a5b23e4dd31aeeae.tar.gz vaadin-framework-862a2f74d9f137560fe62a33a5b23e4dd31aeeae.zip | |
VBrowserDetails fails to detect Android when using Firefox (#15183)
Changed detection logic.
Change-Id: I9cb8e94fe6bb5be587fa73ed6a71d2c7c1d91733
Diffstat (limited to 'shared')
| -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")) { |