Return-Path: X-Original-To: apmail-roller-commits-archive@www.apache.org Delivered-To: apmail-roller-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3E58E116B8 for ; Wed, 3 Sep 2014 07:13:46 +0000 (UTC) Received: (qmail 73831 invoked by uid 500); 3 Sep 2014 07:13:46 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 73803 invoked by uid 500); 3 Sep 2014 07:13:46 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 73794 invoked by uid 99); 3 Sep 2014 07:13:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2014 07:13:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2014 07:13:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D8089238883D; Wed, 3 Sep 2014 07:13:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1622172 - in /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering: filters/ util/mobile/ Date: Wed, 03 Sep 2014 07:13:17 -0000 To: commits@roller.apache.org From: ghuber@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140903071317.D8089238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ghuber Date: Wed Sep 3 07:13:17 2014 New Revision: 1622172 URL: http://svn.apache.org/r1622172 Log: Alternate device type resolution for mobile themes Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/DeviceResolverRequestFilter.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/Device.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceResolver.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceType.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceUtils.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDevice.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/MobileDeviceRepository.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/version.txt Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/DeviceResolverRequestFilter.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/DeviceResolverRequestFilter.java?rev=1622172&view=auto ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/DeviceResolverRequestFilter.java (added) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/DeviceResolverRequestFilter.java Wed Sep 3 07:13:17 2014 @@ -0,0 +1,83 @@ +/* + * Copyright 2010-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.roller.weblogger.ui.rendering.filters; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.roller.weblogger.ui.rendering.util.mobile.Device; +import org.apache.roller.weblogger.ui.rendering.util.mobile.DeviceResolver; +import org.apache.roller.weblogger.ui.rendering.util.mobile.DeviceUtils; +import org.apache.roller.weblogger.ui.rendering.util.mobile.LiteDeviceResolver; +import org.springframework.web.filter.OncePerRequestFilter; + +/** + * A Servlet 2.3 Filter that resolves the Device that originated the web + * request. The resolved Device is exported as a request attribute under the + * well-known name of {@link DeviceUtils#CURRENT_DEVICE_ATTRIBUTE}. Request + * handlers such as @Controllers and views may then access the currentDevice to + * vary their control and rendering logic, respectively. + * + * + * DeviceResolverRequestFilter + * org.apache + * .roller.weblogger.ui.rendering.filters.DeviceResolverRequestFilter + * + * + * + * DeviceResolverRequestFilter + * /* REQUEST + * + * + * @author Roy Clarkson + */ +public class DeviceResolverRequestFilter extends OncePerRequestFilter { + + private final DeviceResolver deviceResolver; + + /** + * Create a device resolving {@link Filter} that defaults to a + * {@link LiteDeviceResolver} implementation. + */ + public DeviceResolverRequestFilter() { + this(new LiteDeviceResolver()); + } + + /** + * Create a device resolving {@link Filter}. + * + * @param deviceResolver + * the device resolver to delegate to. + */ + public DeviceResolverRequestFilter(DeviceResolver deviceResolver) { + this.deviceResolver = deviceResolver; + } + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + Device device = deviceResolver.resolveDevice(request); + request.setAttribute(DeviceUtils.CURRENT_DEVICE_ATTRIBUTE, device); + filterChain.doFilter(request, response); + } + +} Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/Device.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/Device.java?rev=1622172&view=auto ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/Device.java (added) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/Device.java Wed Sep 3 07:13:17 2014 @@ -0,0 +1,50 @@ +/* + * Copyright 2010-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.roller.weblogger.ui.rendering.util.mobile; + +/** + * A model for the user agent or device that submitted the current request. + * Callers may introspect this model to vary UI control or rendering logic by + * device type. + * + * @author Keith Donald + * @author Roy Clarkson + * @author Scott Rossillo + */ +public interface Device { + + /** + * True if this device is not a mobile or tablet device. + */ + boolean isNormal(); + + /** + * True if this device is a mobile device such as an Apple iPhone or an + * Nexus One Android. Could be used by a pre-handle interceptor to redirect + * the user to a dedicated mobile web site. Could be used to apply a + * different page layout or stylesheet when the device is a mobile device. + */ + boolean isMobile(); + + /** + * True if this device is a tablet device such as an Apple iPad or a + * Motorola Xoom. Could be used by a pre-handle interceptor to redirect the + * user to a dedicated tablet web site. Could be used to apply a different + * page layout or stylesheet when the device is a tablet device. + */ + boolean isTablet(); + +} \ No newline at end of file Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceResolver.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceResolver.java?rev=1622172&view=auto ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceResolver.java (added) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceResolver.java Wed Sep 3 07:13:17 2014 @@ -0,0 +1,33 @@ +/* + * Copyright 2010-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.roller.weblogger.ui.rendering.util.mobile; + +import javax.servlet.http.HttpServletRequest; + +/** + * Service interface for resolving Devices that originate web requests with the + * application. + * + * @author Keith Donald + */ +public interface DeviceResolver { + + /** + * Resolve the device that originated the web request. + */ + Device resolveDevice(HttpServletRequest request); + +} Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceType.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceType.java?rev=1622172&view=auto ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceType.java (added) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceType.java Wed Sep 3 07:13:17 2014 @@ -0,0 +1,40 @@ +/* + * Copyright 2010-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.roller.weblogger.ui.rendering.util.mobile; + +/** + * Enumeration for the type of device that has been resolved + * + * @author Roy Clarkson + */ +public enum DeviceType { + + /** + * Represents a normal device. i.e. a browser on a desktop or laptop + * computer. DO NOT USE FOR COMPARISON. + */ + NORMAL, + + /** + * Represents a mobile device, such as an iPhone. DO NOT USE FOR COMPARISON. + */ + MOBILE, + + /** + * Represents a tablet device, such as an iPad. DO NOT USE FOR COMPARISON. + */ + TABLET +} Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceUtils.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceUtils.java?rev=1622172&view=auto ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceUtils.java (added) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceUtils.java Wed Sep 3 07:13:17 2014 @@ -0,0 +1,83 @@ +/* + * Copyright 2010-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.roller.weblogger.ui.rendering.util.mobile; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.web.context.request.RequestAttributes; + +/** + * Static helper for accessing request-scoped Device values. + * + * @author Keith Donald + */ +public class DeviceUtils { + + /** + * The name of the request attribute the current Device is indexed by. The + * attribute name is 'currentDevice'. + */ + public static final String CURRENT_DEVICE_ATTRIBUTE = "currentDevice"; + + /** + * Static utility method that extracts the current device from the web + * request. Encapsulates the {@link HttpServletRequest#getAttribute(String)} + * lookup. + * + * @param request + * the servlet request + * @return the current device, or null if no device has been resolved for + * the request + */ + public static Device getCurrentDevice(HttpServletRequest request) { + return (Device) request.getAttribute(CURRENT_DEVICE_ATTRIBUTE); + } + + /** + * Static utility method that extracts the current device from the web + * request. Encapsulates the {@link HttpServletRequest#getAttribute(String)} + * lookup. Throws a runtime exception if the current device has not been + * resolved. + * + * @param request + * the servlet request + * @return the current device + */ + public static Device getRequiredCurrentDevice(HttpServletRequest request) { + Device device = getCurrentDevice(request); + if (device == null) { + throw new IllegalStateException( + "No currenet device is set in this request and one is required - have you configured a DeviceResolvingHandlerInterceptor?"); + } + return device; + } + + /** + * Static utility method that extracts the current device from the request + * attributes map. Encapsulates the + * {@link HttpServletRequest#getAttribute(String)} lookup. + * + * @param attributes + * the request attributes + * @return the current device, or null if no device has been resolved for + * the request + */ + public static Device getCurrentDevice(RequestAttributes attributes) { + return (Device) attributes.getAttribute(CURRENT_DEVICE_ATTRIBUTE, + RequestAttributes.SCOPE_REQUEST); + } + +} Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDevice.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDevice.java?rev=1622172&view=auto ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDevice.java (added) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDevice.java Wed Sep 3 07:13:17 2014 @@ -0,0 +1,70 @@ +/* + * Copyright 2010-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.roller.weblogger.ui.rendering.util.mobile; + +/** + * A lightweight Device implementation suitable for use as support code. + * Typically used to hold the output of a device resolution invocation. + * + * @author Keith Donald + * @author Roy Clarkson + * @author Scott Rossillo + */ +class LiteDevice implements Device { + + public static final LiteDevice NORMAL_INSTANCE = new LiteDevice( + DeviceType.NORMAL); + + public static final LiteDevice MOBILE_INSTANCE = new LiteDevice( + DeviceType.MOBILE); + + public static final LiteDevice TABLET_INSTANCE = new LiteDevice( + DeviceType.TABLET); + + public boolean isNormal() { + return this.deviceType == DeviceType.NORMAL; + } + + public boolean isMobile() { + return this.deviceType == DeviceType.MOBILE; + } + + public boolean isTablet() { + return this.deviceType == DeviceType.TABLET; + } + + public DeviceType getDeviceType() { + return this.deviceType; + } + + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("[LiteDevice "); + builder.append("type").append("=").append(this.deviceType); + builder.append("]"); + return builder.toString(); + } + + private final DeviceType deviceType; + + /** + * Creates a LiteDevice. + */ + private LiteDevice(DeviceType deviceType) { + this.deviceType = deviceType; + } + +} \ No newline at end of file Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java?rev=1622172&view=auto ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java (added) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java Wed Sep 3 07:13:17 2014 @@ -0,0 +1,205 @@ +/* + * Copyright 2010-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.roller.weblogger.ui.rendering.util.mobile; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.List; +import javax.servlet.http.HttpServletRequest; + +/** + * A "lightweight" device resolver algorithm based on Wordpress's Mobile pack. + * Detects the presence of a mobile device and works for a large percentage of + * mobile browsers. Does not perform any device capability mapping, if you need + * that consider WURFL. + * + * The code is based primarily on a list of approximately 90 well-known mobile + * browser UA string snippets, with a couple of special cases for Opera Mini, + * the W3C default delivery context and certain other Windows browsers. The code + * also looks to see if the browser advertises WAP capabilities as a hint. + * + * Tablet resolution is also performed based on known tablet browser UA strings. + * Android tablets are detected based on Google's recommendations. + * + * @author Keith Donald + * @author Roy Clarkson + * @author Scott Rossillo + * @author Yuri Mednikov + */ +public class LiteDeviceResolver implements DeviceResolver { + private final List mobileUserAgentPrefixes = new ArrayList(); + private final List mobileUserAgentKeywords = new ArrayList(); + private final List tabletUserAgentKeywords = new ArrayList(); + private final List normalUserAgentKeywords = new ArrayList(); + + public LiteDeviceResolver() { + init(); + } + + public LiteDeviceResolver(List normalUserAgentKeywords) { + init(); + this.normalUserAgentKeywords.addAll(normalUserAgentKeywords); + } + + public Device resolveDevice(HttpServletRequest request) { + String userAgent = request.getHeader("User-Agent"); + // UserAgent keyword detection of Normal devices + if (userAgent != null) { + userAgent = userAgent.toLowerCase(); + for (String keyword : normalUserAgentKeywords) { + if (userAgent.contains(keyword)) { + return resolveFallback(request); + } + } + } + // UserAgent keyword detection of Tablet devices + if (userAgent != null) { + userAgent = userAgent.toLowerCase(); + // Android special case + if (userAgent.contains("android") && !userAgent.contains("mobile")) { + return LiteDevice.TABLET_INSTANCE; + } + // Kindle Fire special case + if (userAgent.contains("silk") && !userAgent.contains("mobile")) { + return LiteDevice.TABLET_INSTANCE; + } + for (String keyword : tabletUserAgentKeywords) { + if (userAgent.contains(keyword)) { + return LiteDevice.TABLET_INSTANCE; + } + } + } + // UAProf detection + if (request.getHeader("x-wap-profile") != null + || request.getHeader("Profile") != null) { + return LiteDevice.MOBILE_INSTANCE; + } + // User-Agent prefix detection + if (userAgent != null && userAgent.length() >= 4) { + String prefix = userAgent.substring(0, 4).toLowerCase(); + if (mobileUserAgentPrefixes.contains(prefix)) { + return LiteDevice.MOBILE_INSTANCE; + } + } + // Accept-header based detection + String accept = request.getHeader("Accept"); + if (accept != null && accept.contains("wap")) { + return LiteDevice.MOBILE_INSTANCE; + } + // UserAgent keyword detection for Mobile devices + if (userAgent != null) { + for (String keyword : mobileUserAgentKeywords) { + if (userAgent.contains(keyword)) { + return LiteDevice.MOBILE_INSTANCE; + } + } + } + // OperaMini special case + @SuppressWarnings("rawtypes") + Enumeration headers = request.getHeaderNames(); + while (headers.hasMoreElements()) { + String header = (String) headers.nextElement(); + if (header.contains("OperaMini")) { + return LiteDevice.MOBILE_INSTANCE; + } + } + return resolveFallback(request); + } + + // subclassing hooks + /** + * List of user agent prefixes that identify mobile devices. Used primarily + * to match by operator or handset manufacturer. + */ + protected List getMobileUserAgentPrefixes() { + return mobileUserAgentPrefixes; + } + + /** + * List of user agent keywords that identify mobile devices. Used primarily + * to match by mobile platform or operating system. + */ + protected List getMobileUserAgentKeywords() { + return mobileUserAgentKeywords; + } + + /** + * List of user agent keywords that identify tablet devices. Used primarily + * to match by tablet platform or operating system. + */ + protected List getTabletUserAgentKeywords() { + return tabletUserAgentKeywords; + } + + /** + * List of user agent keywords that identify normal devices. Any items in + * this list take precedence over the mobile and tablet user agent keywords, + * effectively overriding those. + */ + protected List getNormalUserAgentKeywords() { + return normalUserAgentKeywords; + } + + /** + * Initialize this device resolver implementation. Registers the known set + * of device signature strings. Subclasses may override to register + * additional strings. + */ + protected void init() { + getMobileUserAgentPrefixes().addAll( + Arrays.asList(KNOWN_MOBILE_USER_AGENT_PREFIXES)); + getMobileUserAgentKeywords().addAll( + Arrays.asList(KNOWN_MOBILE_USER_AGENT_KEYWORDS)); + getTabletUserAgentKeywords().addAll( + Arrays.asList(KNOWN_TABLET_USER_AGENT_KEYWORDS)); + } + + /** + * Fallback called if no mobile device is matched by this resolver. The + * default implementation of this method returns a "normal" {@link Device} + * that is neither mobile or a tablet. Subclasses may override to try + * additional mobile or tablet device matching before falling back to a + * "normal" device. + */ + protected Device resolveFallback(HttpServletRequest request) { + return LiteDevice.NORMAL_INSTANCE; + } + + // internal helpers + private static final String[] KNOWN_MOBILE_USER_AGENT_PREFIXES = new String[] { + "w3c ", "w3c-", "acs-", "alav", "alca", "amoi", "audi", "avan", + "benq", "bird", "blac", "blaz", "brew", "cell", "cldc", "cmd-", + "dang", "doco", "eric", "hipt", "htc_", "inno", "ipaq", "ipod", + "jigs", "kddi", "keji", "leno", "lg-c", "lg-d", "lg-g", "lge-", + "lg/u", "maui", "maxo", "midp", "mits", "mmef", "mobi", "mot-", + "moto", "mwbp", "nec-", "newt", "noki", "palm", "pana", "pant", + "phil", "play", "port", "prox", "qwap", "sage", "sams", "sany", + "sch-", "sec-", "send", "seri", "sgh-", "shar", "sie-", "siem", + "smal", "smar", "sony", "sph-", "symb", "t-mo", "teli", "tim-", + "tosh", "tsm-", "upg1", "upsi", "vk-v", "voda", "wap-", "wapa", + "wapi", "wapp", "wapr", "webc", "winw", "winw", "xda ", "xda-" }; + private static final String[] KNOWN_MOBILE_USER_AGENT_KEYWORDS = new String[] { + "blackberry", "webos", "ipod", "lge vx", "midp", "maemo", "mmp", + "mobile", "netfront", "hiptop", "nintendo DS", "novarra", + "openweb", "opera mobi", "opera mini", "palm", "psp", "phone", + "smartphone", "symbian", "up.browser", "up.link", "wap", + "windows ce" }; + private static final String[] KNOWN_TABLET_USER_AGENT_KEYWORDS = new String[] { + "ipad", "playbook", "hp-tablet", "kindle" }; +} \ No newline at end of file Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/MobileDeviceRepository.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/MobileDeviceRepository.java?rev=1622172&view=auto ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/MobileDeviceRepository.java (added) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/MobileDeviceRepository.java Wed Sep 3 07:13:17 2014 @@ -0,0 +1,87 @@ +/* + * Copyright 2010-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.roller.weblogger.ui.rendering.util.mobile; + +import javax.servlet.http.HttpServletRequest; + +/** + * The Class MobileDeviceRepository. + */ +public class MobileDeviceRepository { + + /** + * The Enum DeviceType. + * + * eg use deviceType.equals(DeviceType.mobile) for camparison. + */ + public enum DeviceType { + standard, mobile + } + + /** + * Check if device in request is a mobile device. + * + * @param request + * the request + * + * @return boolean + */ + public static boolean isMobileDevice(HttpServletRequest request) { + + // String userAgent = request.getHeader("User-Agent"); + // System.out.println(userAgent); + + Device device = DeviceUtils.getCurrentDevice(request); + + if (device == null) { + // log.info("no device detected"); + return false; + } else if (device.isNormal()) { + // log.info("Device is normal"); + return false; + } else if (device.isMobile()) { + // log.info("Device is mobile"); + // System.out.println(userAgent); + return true; + } else if (device.isTablet()) { + // log.info("Device is tablet"); + // System.out.println(userAgent); + return true; + } else { + return false; + } + + } + + /** + * Gets the request device type. + * + * @param request + * the request + * + * @return the request type + */ + public static DeviceType getRequestType(HttpServletRequest request) { + + DeviceType type = DeviceType.standard; + + if (isMobileDevice(request)) { + type = DeviceType.mobile; + } + return type; + } + +} Added: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/version.txt URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/version.txt?rev=1622172&view=auto ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/version.txt (added) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/version.txt Wed Sep 3 07:13:17 2014 @@ -0,0 +1,6 @@ + +Version Notes + +https://github.com/spring-projects/spring-mobile + +master > LiteDeviceResolver 11 Feb 2014