[Yanel-commits] rev 59221 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2011-07-06 23:34:35 +0200 (Wed, 06 Jul 2011)
New Revision: 59221

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
check global configuration whether mobile devices should be detected per request

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-07-06 21:33:42 UTC (rev 59220)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-07-06 21:34:35 UTC (rev 59221)
@@ -138,6 +138,7 @@
     private YanelHTMLUI yanelUI;
 
     private boolean logAccessEnabled = false;
+    private boolean detectMobilePerRequest = false;
     
     public static final String DEFAULT_ENCODING = "UTF-8";
 
@@ -188,6 +189,11 @@
             // TODO: Make this value configurable also per realm or per individual user!
             logAccessEnabled = new Boolean(config.getInitParameter("log-access")).booleanValue();
 
+            // TODO: Make this value configurable also per realm or per individual user!
+            if (config.getInitParameter("detect-mobile-per-request") != null) {
+                detectMobilePerRequest = new Boolean(config.getInitParameter("detect-mobile-per-request")).booleanValue();
+            }
+
             if (yanelInstance.isSchedulerEnabled()) {
                 log.warn("Startup scheduler ...");
                 scheduler = StdSchedulerFactory.getDefaultScheduler();
@@ -2718,7 +2724,7 @@
     private void doMobile(HttpServletRequest request) {
         HttpSession session = request.getSession(true);
         String mobileDevice = (String) session.getAttribute(MOBILE_KEY);
-        if (mobileDevice == null) {
+        if (detectMobilePerRequest || mobileDevice == null) {
             String userAgent = request.getHeader("User-Agent");
             log.warn("DEBUG: User agent: " + userAgent);
             if (userAgent != null && userAgent.indexOf("iPhone") > 0) { // TODO: Use http://wurfl.sourceforge.net/njava/, http://www.cloudfour.com/comparative-speed-of-wurfl-and-device-atlas/, http://www.id.uzh.ch/zinfo/mobileview.html