zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add Safari 6 to the supported matrix.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-09-16 20:47:13 -03:00
parent 46f3ec96c5
commit 7b1574150a
4 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java
View File

@@ -41,14 +41,14 @@ public class BrowserSupportInterceptor extends HandlerInterceptorAdapter {
final HttpSession session = request.getSession(false);
// Try to loaded from the request ...
WiseUserAgent userAgent = null;
SupportedUserAgent userAgent = null;
if (session != null) {
userAgent = (WiseUserAgent) session.getAttribute(USER_AGENT);
userAgent = (SupportedUserAgent) session.getAttribute(USER_AGENT);
}
// I could not loaded. I will create a new one...
if (userAgent == null) {
userAgent = WiseUserAgent.create(request);
userAgent = SupportedUserAgent.create(request);
if (session != null) {
session.setAttribute(USER_AGENT, userAgent);
}

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

@@ -24,17 +24,17 @@ import org.jetbrains.annotations.NotNull;
import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
public class WiseUserAgent implements Serializable {
public class SupportedUserAgent implements Serializable {
public static final String USER_AGENT_HEADER = "User-Agent";
transient private UserAgent userAgent;
private String header;
private WiseUserAgent(@NotNull final String header) {
private SupportedUserAgent(@NotNull final String header) {
this.header = header;
}
public static WiseUserAgent create(@NotNull final HttpServletRequest request) {
return new WiseUserAgent(request.getHeader(USER_AGENT_HEADER));
public static SupportedUserAgent create(@NotNull final HttpServletRequest request) {
return new SupportedUserAgent(request.getHeader(USER_AGENT_HEADER));
}
public boolean isBrowserSupported() {
@@ -50,6 +50,7 @@ public class WiseUserAgent implements Serializable {
result = result || browser == Browser.OPERA && Integer.parseInt(version.getMajorVersion()) >= 11;
result = result || browser == Browser.CHROME && Integer.parseInt(version.getMajorVersion()) >= 18;
result = result || browser == Browser.SAFARI5;
result = result || browser == Browser.SAFARI && Integer.parseInt(version.getMajorVersion()) >= 5;
result = result || browser == Browser.MOBILE_SAFARI && Integer.parseInt(version.getMajorVersion()) >= 5;
result = result || os.isMobileDevice() && (os == OperatingSystem.ANDROID || os == OperatingSystem.iOS4_IPHONE);
result = result || browser.getBrowserType() == BrowserType.ROBOT;
@@ -76,8 +77,8 @@ public class WiseUserAgent implements Serializable {
return browser == Browser.IE && Integer.parseInt(version.getMajorVersion()) >= 8 && os == OperatingSystem.WINDOWS && header.contains("chromeframe");
}
public static WiseUserAgent create(@NotNull final String userAgent) {
return new WiseUserAgent(userAgent);
public static SupportedUserAgent create(@NotNull final String userAgent) {
return new SupportedUserAgent(userAgent);
}

4
wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
View File

@@ -18,7 +18,7 @@
package com.wisemapping.mail;
import com.wisemapping.filter.WiseUserAgent;
import com.wisemapping.filter.SupportedUserAgent;
import com.wisemapping.model.Collaboration;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User;
@@ -175,7 +175,7 @@ final public class NotificationService {
final String userEmail = user != null ? user.getEmail() : "'anonymous'";
model.put("email", userEmail);
model.put("userAgent", request.getHeader(WiseUserAgent.USER_AGENT_HEADER));
model.put("userAgent", request.getHeader(SupportedUserAgent.USER_AGENT_HEADER));
model.put("server", request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort());
model.put("requestURI", request.getRequestURI());
model.put("method", request.getMethod());