From 58a9520398348393378a0b98ae12a2c74c3463bb Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 3 Oct 2019 14:46:33 +0200 Subject: Make sure Firefox for iOS isn't detected as too old to function. (#11739) Change-Id: Iea13b958356b0246586bcb7e9969bc26db43bb96 --- shared/src/main/java/com/vaadin/shared/VBrowserDetails.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'shared') diff --git a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java index 38c64fef34..e8b36305d4 100644 --- a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java +++ b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java @@ -681,10 +681,14 @@ public class VBrowserDetails implements Serializable { return true; } // Webkit 533 in Safari 4.1+, Android 2.2+, iOS 4+ - if (isSafari() && getBrowserEngineVersion() < 533) { + // All iOS browsers use Safari as their engine. + if ((isSafari() || isIOS()) && getBrowserEngineVersion() < 533) { return true; } - if (isFirefox() && getBrowserMajorVersion() < 45) { + // Firefox for iOS uses a different versioning scheme and will + // fail the test. Since it is already covered by the iOS test + // above, ignore it here. + if (isFirefox() && !isIOS() && getBrowserMajorVersion() < 45) { return true; } if (isOpera() && getBrowserMajorVersion() < 11) { -- cgit v1.2.3