[Yanel-commits] rev 59215 - public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources

michi at wyona.com michi at wyona.com
Wed Jul 6 16:18:44 CEST 2011


Author: michi
Date: 2011-07-06 16:18:44 +0200 (Wed, 06 Jul 2011)
New Revision: 59215

Modified:
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
Log:
use mobile device check from session instead on every request

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2011-07-06 14:18:01 UTC (rev 59214)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2011-07-06 14:18:44 UTC (rev 59215)
@@ -452,7 +452,10 @@
         if (os != null) transformer.setParameter("os", os);
         String client = getClient(userAgent);
         if (client != null) transformer.setParameter("client", client);
-        if (isMobileDevice(userAgent)) {
+
+        String mobileDevice = (String) getEnvironment().getRequest().getSession(true).getAttribute(org.wyona.yanel.servlet.YanelServlet.MOBILE_KEY);
+        if (mobileDevice != null && !mobileDevice.equals("false")) {
+        //if (isMobileDevice(userAgent)) {
             transformer.setParameter("is-mobile-device", "true");
         } else {
             transformer.setParameter("is-mobile-device", "false");
@@ -494,6 +497,7 @@
      * Check whether user agent is a mobile device
      * @param userAgent User agent identifier, e.g. "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:2.0.1) Gecko/20100101 Firefox/4.0.1" or "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3 like Mac OS X; fr-fr) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F190 Safari/6533.18.5" (also see for example http://deviceatlas.com/node/1826129)
      */
+/*
     private boolean isMobileDevice(String userAgent) {
         //log.debug("Check user agent: " + userAgent);
         if (userAgent.indexOf("iPhone") > 0) {
@@ -503,6 +507,7 @@
             return false;
         }
     }
+*/
 
     /**
      * Get operating system



More information about the Yanel-commits mailing list