vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 22:27:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE on Firefox mobile.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-09-18 10:47:14 -03:00
parent 7246260220
commit 029bfa809a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java
View File

@ -44,14 +44,15 @@ public class SupportedUserAgent implements Serializable {
final Version version = userAgent.getBrowserVersion(); final Version version = userAgent.getBrowserVersion();
final OperatingSystem os = userAgent.getOperatingSystem(); final OperatingSystem os = userAgent.getOperatingSystem();
boolean result = browser == Browser.FIREFOX && Integer.parseInt(version.getMajorVersion()) >= 10; final String majorVersion = version.getMajorVersion();
boolean result = browser == Browser.FIREFOX && Integer.parseInt(majorVersion) >= 10;
result = result || browser == Browser.IE8 || browser == Browser.IE9; result = result || browser == Browser.IE8 || browser == Browser.IE9;
result = result || browser == Browser.IE && Integer.parseInt(version.getMajorVersion()) >= 8; result = result || browser == Browser.IE && Integer.parseInt(majorVersion) >= 8;
result = result || browser == Browser.OPERA && Integer.parseInt(version.getMajorVersion()) >= 11; result = result || browser == Browser.OPERA && Integer.parseInt(majorVersion) >= 11;
result = result || browser == Browser.CHROME && Integer.parseInt(version.getMajorVersion()) >= 18; result = result || browser == Browser.CHROME && Integer.parseInt(majorVersion) >= 18;
result = result || browser == Browser.SAFARI5; result = result || browser == Browser.SAFARI5;
result = result || browser == Browser.SAFARI && Integer.parseInt(version.getMajorVersion()) >= 5; result = result || browser == Browser.SAFARI && Integer.parseInt(majorVersion) >= 5;
result = result || browser == Browser.MOBILE_SAFARI && Integer.parseInt(version.getMajorVersion()) >= 5; result = result || browser == Browser.MOBILE_SAFARI;
result = result || os.isMobileDevice() && (os == OperatingSystem.ANDROID || os == OperatingSystem.iOS4_IPHONE); result = result || os.isMobileDevice() && (os == OperatingSystem.ANDROID || os == OperatingSystem.iOS4_IPHONE);
result = result || browser.getBrowserType() == BrowserType.ROBOT; result = result || browser.getBrowserType() == BrowserType.ROBOT;