mobileesp_converted 0.2.2 → 0.2.3

data/java_source/UAgentInfo.java

@@ -1,35 +1,26 @@
 /* *******************************************
-// Copyright 2010-2012, Anthony Hand
+// Copyright 2010-2013, Anthony Hand
 //
-// File version date: April 23, 2012
-//		Update:
-//		- Updated DetectAmazonSilk(): Fixed an issue in the detection logic.  
+// File version 2013.08.01 (August 1, 2013)
+//	Updates:
+//	- Updated DetectMobileQuick(). Moved the 'Exclude Tablets' logic to the top of the method to fix a logic bug.
 //
-// File version date: April 22, 2012 - Second update
-//		Update: To address additional Kindle issues...
-//		- Updated DetectRichCSS(): Excluded e-Ink Kindle devices. 
-//		- Created DetectAmazonSilk(): Created to detect Kindle Fire devices in Silk mode. 
-//		- Updated DetectMobileQuick(): Updated to include e-Ink Kindle devices and the Kindle Fire in Silk mode.  
+// File version 2013.07.13 (July 13, 2013)
+//	Updates:
+//	- Added support for Tizen: variable and DetectTizen().
+//	- Added support for Meego: variable and DetectMeego().
+//	- Added support for Windows Phone 8: variable and DetectWindowsPhone8().
+//	- Added a generic Windows Phone method: DetectWindowsPhone().
+//	- Added support for BlackBerry 10 OS: variable and DetectBlackBerry10Phone().
+//	- Added support for PlayStation Vita handheld: variable and DetectGamingHandheld().
+//	- Updated DetectTierIphone(). Added Tizen; updated the Windows Phone, BB10, and PS Vita support. 
+//	- Updated DetectWindowsMobile(). Uses generic DetectWindowsPhone() method rather than WP7.
+//	- Updated DetectSmartphone(). Uses the detectTierIphone() method.
+//	- Updated DetectSonyMylo() with more efficient code.
+//	- Removed DetectGarminNuvifone() from DetectTierIphone(). How many are left in market in 2013? It is detected as a RichCSS Tier device.
+//	- Removed the deviceXoom variable. It was unused.
+//	- Added detection support for the Obigo mobile browser to DetectMobileQuick().
 //
-// File version date: April 11, 2012
-//		Update: 
-//		- Added a new variable for the new BlackBerry Curve Touch (9380): deviceBBCurveTouch. 
-//		- Updated DetectBlackBerryTouch() to support the new BlackBerry Curve Touch (9380).
-//
-// File version date: January 21, 2012
-//		Update: 
-//		- Moved Windows Phone 7 to the iPhone Tier. WP7.5's IE 9-based browser is good enough now.  
-//		- Added a new variable for 2 versions of the new BlackBerry Bold Touch (9900 and 9930): deviceBBBoldTouch. 
-//		- Updated DetectBlackBerryTouch() to support the 2 versions of the new BlackBerry Bold Touch (9900 and 9930). 
-//		- Updated DetectKindle() to focus on eInk devices only. The Kindle Fire should be detected as a regular Android device.
-//
-// File version date: August 22, 2011
-//		Update: 
-//		- Updated DetectAndroidTablet() to fix a bug I introduced in the last fix!
-//
-// File version date: August 16, 2011
-//		Update: 
-//		- Updated DetectAndroidTablet() to exclude Opera Mini, which was falsely reporting as running on a tablet device when on a phone.
 //
 //
 // LICENSE INFORMATION
@@ -74,12 +65,16 @@ public class UAgentInfo {
     private String httpAccept = "";
     
     // Let's store values for quickly accessing the same info multiple times.
-    public boolean isIphone = false;
-    public boolean isAndroidPhone = false;
-    public boolean isTierTablet = false;
-    public boolean isTierIphone = false;
-    public boolean isTierRichCss = false;
-    public boolean isTierGenericMobile = false;
+    public boolean initCompleted = false;
+    public boolean isWebkit = false; //Stores the result of DetectWebkit()
+    public boolean isMobilePhone = false; //Stores the result of DetectMobileQuick()
+    public boolean isIphone = false; //Stores the result of DetectIphone()
+    public boolean isAndroid = false; //Stores the result of DetectAndroid()
+    public boolean isAndroidPhone = false; //Stores the result of DetectAndroidPhone()
+    public boolean isTierTablet = false; //Stores the result of DetectTierTablet()
+    public boolean isTierIphone = false; //Stores the result of DetectTierIphone()
+    public boolean isTierRichCss = false; //Stores the result of DetectTierRichCss()
+    public boolean isTierGenericMobile = false; //Stores the result of DetectTierOtherPhones()
     
     // Initialize some initial smartphone string variables.
     public static final String engineWebKit = "webkit";
@@ -91,16 +86,10 @@ public class UAgentInfo {
     
     public static final String deviceAndroid = "android";
     public static final String deviceGoogleTV = "googletv";
-    public static final String deviceXoom = "xoom"; //Motorola Xoom
     public static final String deviceHtcFlyer = "htc_flyer"; //HTC Flyer
     
-    public static final String deviceSymbian = "symbian";
-    public static final String deviceS60 = "series60";
-    public static final String deviceS70 = "series70";
-    public static final String deviceS80 = "series80";
-    public static final String deviceS90 = "series90";
-    
     public static final String deviceWinPhone7 = "windows phone os 7";
+    public static final String deviceWinPhone8 = "windows phone 8";
     public static final String deviceWinMob = "windows ce";
     public static final String deviceWindows = "windows";
     public static final String deviceIeMob = "iemobile";
@@ -108,6 +97,7 @@ public class UAgentInfo {
     public static final String enginePie = "wm5 pie"; //An old Windows Mobile
     
     public static final String deviceBB = "blackberry";
+    public static final String deviceBB10 = "bb10"; //For the new BB 10 OS
     public static final String vndRIM = "vnd.rim"; //Detectable when BB devices emulate IE or Firefox
     public static final String deviceBBStorm = "blackberry95";  //Storm 1 and 2
     public static final String deviceBBBold = "blackberry97";  //Bold 97x0 (non-touch)
@@ -118,17 +108,25 @@ public class UAgentInfo {
     public static final String deviceBBTorch = "blackberry 98";  //Torch
     public static final String deviceBBPlaybook = "playbook"; //PlayBook tablet
     
+    public static final String deviceSymbian = "symbian";
+    public static final String deviceS60 = "series60";
+    public static final String deviceS70 = "series70";
+    public static final String deviceS80 = "series80";
+    public static final String deviceS90 = "series90";
+    
     public static final String devicePalm = "palm";
     public static final String deviceWebOS = "webos"; //For Palm's line of WebOS devices
     public static final String deviceWebOShp = "hpwos"; //For HP's line of WebOS devices
-    
     public static final String engineBlazer = "blazer"; //Old Palm
     public static final String engineXiino = "xiino"; //Another old Palm
     
-    public static final String deviceKindle = "kindle";  //Amazon Kindle, eInk one
-    public static final String engineSilk = "silk";  //Amazon's accelerated Silk browser for Kindle Fire
-    
     public static final String deviceNuvifone = "nuvifone";  //Garmin Nuvifone
+    public static final String deviceBada = "bada";  //Samsung's Bada OS
+    public static final String deviceTizen = "tizen";  //Tizen OS
+    public static final String deviceMeego = "meego";  //Meego OS
+
+    public static final String deviceKindle = "kindle";  //Amazon Kindle, eInk one
+    public static final String engineSilk = "silk-accelerated";  //Amazon's accelerated Silk browser for Kindle Fire
     
     //Initialize variables for mobile-specific content.
     public static final String vndwap = "vnd.wap";
@@ -140,6 +138,7 @@ public class UAgentInfo {
     public static final String deviceDanger = "danger";
     public static final String deviceHiptop = "hiptop";
     public static final String devicePlaystation = "playstation";
+    public static final String devicePlaystationVita = "vita";
     public static final String deviceNintendoDs = "nitro";
     public static final String deviceNintendo = "nintendo";
     public static final String deviceWii = "wii";
@@ -153,6 +152,8 @@ public class UAgentInfo {
     public static final String deviceMidp = "midp"; //a mobile Java technology
     public static final String uplink = "up.link";
     public static final String engineTelecaQ = "teleca q"; //a modern feature phone browser
+    public static final String engineObigo = "obigo"; //W 10 is a modern feature phone browser
+
     public static final String devicePda = "pda"; //some devices report themselves as PDAs
     public static final String mini = "mini";  //Some mobile browsers put "mini" in their names.
     public static final String mobile = "mobile"; //Some mobile browsers put "mobile" in their user agent strings.
@@ -169,7 +170,7 @@ public class UAgentInfo {
     public static final String manuericsson = "ericsson";
     public static final String manuSamsung1 = "sec-sgh";
     public static final String manuSony = "sony";
-    public static final String manuHtc = "htc"; //Popular Android and WinMo manufacturer
+    public static final String manuHtc = "htc";
     
     //In some UserAgents, the only clue is the operator.
     public static final String svcDocomo = "docomo";
@@ -258,12 +259,22 @@ public class UAgentInfo {
      * Initialize Key Stored Values.
      */
     public void initDeviceScan() {
-        this.isIphone = detectIphoneOrIpod();
+        //Save these properties to speed processing
+        this.isWebkit = detectWebkit();
+        this.isIphone = detectIphone();
+        this.isAndroid = detectAndroid();
         this.isAndroidPhone = detectAndroidPhone();
+        
+        //Generally, these tiers are the most useful for web development
+        this.isMobilePhone = detectMobileQuick();
         this.isTierTablet = detectTierTablet();
         this.isTierIphone = detectTierIphone();
+        
+        //Optional: Comment these out if you NEVER use them
         this.isTierRichCss = detectTierRichCss();
         this.isTierGenericMobile = detectTierOtherPhones();
+        
+        this.initCompleted = true;
     }
 
     /**
@@ -271,6 +282,10 @@ public class UAgentInfo {
      * @return detection of an iPhone
      */
     public boolean detectIphone() {
+		if ((this.initCompleted == true) ||
+			(this.isIphone == true))
+			return this.isIphone;
+
         // The iPad and iPod touch say they're an iPhone! So let's disambiguate.
         if (userAgent.indexOf(deviceIphone) != -1 && 
                 !detectIpad() && 
@@ -334,6 +349,10 @@ public class UAgentInfo {
      * @return detection of an Android device
      */
     public boolean detectAndroid() {
+		if ((this.initCompleted == true) ||
+			(this.isAndroid == true))
+			return this.isAndroid;
+
         if ((userAgent.indexOf(deviceAndroid) != -1) ||
           detectGoogleTV()) 
             return true;
@@ -351,6 +370,10 @@ public class UAgentInfo {
      * @return  detection of an Android phone
      */
     public boolean detectAndroidPhone() {
+		if ((this.initCompleted == true) ||
+			(this.isAndroidPhone == true))
+			return this.isAndroidPhone;
+
         if (detectAndroid() && (userAgent.indexOf(mobile) != -1)) 
             return true;
         //Special check for Android phones with Opera Mobile. They should report here.
@@ -414,51 +437,45 @@ public class UAgentInfo {
      * @return detection of a WebKit browser
      */
     public boolean detectWebkit() {
+		if ((this.initCompleted == true) ||
+			(this.isWebkit == true))
+			return this.isWebkit;
+
         if (userAgent.indexOf(engineWebKit) != -1) {
             return true;
         }
         return false;
     }
 
+
     /**
-     * Detects if the current browser is the Symbian S60 Open Source Browser.
-     * @return detection of Symbian S60 Browser
+     * Detects if the current browser is EITHER a Windows Phone 7.x OR 8 device
+     * @return detection of Windows Phone 7.x OR 8
      */
-    public boolean detectS60OssBrowser() {
-        //First, test for WebKit, then make sure it's either Symbian or S60.
-        if (detectWebkit()
-                && (userAgent.indexOf(deviceSymbian) != -1
-                || userAgent.indexOf(deviceS60) != -1)) {
+    public boolean detectWindowsPhone() {
+        if (detectWindowsPhone7() || detectWindowsPhone8()) {
             return true;
         }
         return false;
     }
 
     /**
-     *
-     * Detects if the current device is any Symbian OS-based device,
-     *   including older S60, Series 70, Series 80, Series 90, and UIQ,
-     *   or other browsers running on these devices.
-     * @return detection of SymbianOS
+     * Detects a Windows Phone 7.x device (in mobile browsing mode).
+     * @return detection of Windows Phone 7
      */
-    public boolean detectSymbianOS() {
-        if (userAgent.indexOf(deviceSymbian) != -1
-                || userAgent.indexOf(deviceS60) != -1
-                || userAgent.indexOf(deviceS70) != -1
-                || userAgent.indexOf(deviceS80) != -1
-                || userAgent.indexOf(deviceS90) != -1) {
+    public boolean detectWindowsPhone7() {
+        if (userAgent.indexOf(deviceWinPhone7) != -1) {
             return true;
         }
         return false;
     }
-    
+
     /**
-     * Detects if the current browser is a 
-     * Windows Phone 7 device.
-     * @return detection of Windows Phone 7
+     * Detects a Windows Phone 8 device (in mobile browsing mode).
+     * @return detection of Windows Phone 8
      */
-    public boolean detectWindowsPhone7() {
-        if (userAgent.indexOf(deviceWinPhone7) != -1) {
+    public boolean detectWindowsPhone8() {
+        if (userAgent.indexOf(deviceWinPhone8) != -1) {
             return true;
         }
         return false;
@@ -466,13 +483,12 @@ public class UAgentInfo {
 
     /**
      * Detects if the current browser is a Windows Mobile device.
-     * Excludes Windows Phone 7 devices.
+     * Excludes Windows Phone 7.x and 8 devices.
      * Focuses on Windows Mobile 6.xx and earlier.
      * @return detection of Windows Mobile
      */
     public boolean detectWindowsMobile() {
-        //Exclude new Windows Phone 7.
-        if (detectWindowsPhone7()) {
+        if (detectWindowsPhone()) {
             return false;
         }
         //Most devices use 'Windows CE', but some report 'iemobile'
@@ -495,14 +511,31 @@ public class UAgentInfo {
         return false;
     }
 
+
     /**
      * Detects if the current browser is any BlackBerry.
-     * Includes the PlayBook.
+     * Includes BB10 OS, but excludes the PlayBook.
      * @return detection of Blackberry
      */
     public boolean detectBlackBerry() {
         if (userAgent.indexOf(deviceBB) != -1 || 
-			httpAccept.indexOf(vndRIM) != -1) {
+			httpAccept.indexOf(vndRIM) != -1) 
+            return true;
+        
+        if (detectBlackBerry10Phone())
+            return true;
+        
+        return false;
+    }
+
+    /**
+     * Detects if the current browser is a BlackBerry 10 OS phone.
+     * Excludes tablets.
+     * @return detection of a Blackberry 10 device
+     */
+    public boolean detectBlackBerry10Phone() {
+        if (userAgent.indexOf(deviceBB10) != -1 && 
+			userAgent.indexOf(mobile) != -1) {
             return true;
         }
         return false;
@@ -527,10 +560,8 @@ public class UAgentInfo {
      * @return detection of a Blackberry device with WebKit browser
      */
     public boolean detectBlackBerryWebKit() {
-        if (detectBlackBerry() &&
-			userAgent.indexOf(engineWebKit) != -1) {
+        if (detectBlackBerry() && detectWebkit())
             return true;
-        }
         return false;
     }
 
@@ -544,8 +575,8 @@ public class UAgentInfo {
 			(userAgent.indexOf(deviceBBStorm) != -1 ||
 			userAgent.indexOf(deviceBBTorch) != -1 ||
 			userAgent.indexOf(deviceBBBoldTouch) != -1 ||
-                        userAgent.indexOf(deviceBBCurveTouch) != -1 )) {
-            return true;
+            userAgent.indexOf(deviceBBCurveTouch) != -1 )) {
+				return true;
         }
         return false;
     }
@@ -595,21 +626,54 @@ public class UAgentInfo {
         }
     }
 
+
+    /**
+     * Detects if the current browser is the Symbian S60 Open Source Browser.
+     * @return detection of Symbian S60 Browser
+     */
+    public boolean detectS60OssBrowser() {
+        //First, test for WebKit, then make sure it's either Symbian or S60.
+        if (detectWebkit()
+                && (userAgent.indexOf(deviceSymbian) != -1
+                || userAgent.indexOf(deviceS60) != -1)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *
+     * Detects if the current device is any Symbian OS-based device,
+     *   including older S60, Series 70, Series 80, Series 90, and UIQ,
+     *   or other browsers running on these devices.
+     * @return detection of SymbianOS
+     */
+    public boolean detectSymbianOS() {
+        if (userAgent.indexOf(deviceSymbian) != -1
+                || userAgent.indexOf(deviceS60) != -1
+                || userAgent.indexOf(deviceS70) != -1
+                || userAgent.indexOf(deviceS80) != -1
+                || userAgent.indexOf(deviceS90) != -1) {
+            return true;
+        }
+        return false;
+    }
+    
+
     /**
      * Detects if the current browser is on a PalmOS device.
      * @return detection of a PalmOS device
      */
     public boolean detectPalmOS() {
+        //Make sure it's not WebOS first
+        if (detectPalmWebOS())
+            return false;
+
         //Most devices nowadays report as 'Palm', but some older ones reported as Blazer or Xiino.
         if (userAgent.indexOf(devicePalm) != -1
                 || userAgent.indexOf(engineBlazer) != -1
                 || userAgent.indexOf(engineXiino) != -1) {
-            //Make sure it's not WebOS first
-            if (detectPalmWebOS()) {
-                return false;
-            } else {
                 return true;
-            }
         }
         return false;
     }
@@ -638,60 +702,6 @@ public class UAgentInfo {
         return false;
     }
 
-    /**
-     * Detects if the current browser is a
-     *    Garmin Nuvifone.
-     * @return detection of a Garmin Nuvifone
-     */
-    public boolean detectGarminNuvifone() {
-        if (userAgent.indexOf(deviceNuvifone) != -1) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Check to see whether the device is any device
-     *   in the 'smartphone' category.
-     * @return detection of a general smartphone device
-     */
-    public boolean detectSmartphone() {
-        return (isIphone 
-				|| isAndroidPhone
-				|| isTierIphone 
-                || detectS60OssBrowser()
-                || detectSymbianOS()
-                || detectWindowsMobile()
-                || detectWindowsPhone7()
-                || detectBlackBerry()
-                || detectPalmWebOS()
-                || detectPalmOS()
-                || detectGarminNuvifone());
-    }
-
-    /**
-     * Detects whether the device is a Brew-powered device.
-     * @return detection of a Brew device
-     */
-    public boolean detectBrewDevice() {
-        if (userAgent.indexOf(deviceBrew) != -1) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Detects the Danger Hiptop device.
-     * @return detection of a Danger Hiptop
-     */
-    public boolean detectDangerHiptop() {
-        if (userAgent.indexOf(deviceDanger) != -1
-                || userAgent.indexOf(deviceHiptop) != -1) {
-            return true;
-        }
-        return false;
-    }
-
     /**
      * Detects Opera Mobile or Opera Mini.
      * @return detection of an Opera browser for a mobile device
@@ -731,18 +741,6 @@ public class UAgentInfo {
         return false;
     }
 
-    /**
-     * Detects whether the device supports WAP or WML.
-     * @return detection of a WAP- or WML-capable device
-     */
-    public boolean detectWapWml() {
-        if (httpAccept.indexOf(vndwap) != -1
-                || httpAccept.indexOf(wml) != -1) {
-            return true;
-        }
-        return false;
-    }
-
     /**
      * Detects if the current device is an Amazon Kindle (eInk devices only).
      * Note: For the Kindle Fire, use the normal Android methods.
@@ -769,55 +767,113 @@ public class UAgentInfo {
     }
 
     /**
-     *	Detects if the current device is a mobile device.
-     *  This method catches most of the popular modern devices. 
-     *  Excludes Apple iPads and other modern tablets.
-     * @return detection of any mobile device using the quicker method
+     * Detects if the current browser is a
+     *    Garmin Nuvifone.
+     * @return detection of a Garmin Nuvifone
      */
-    public boolean detectMobileQuick() {
-        //Let's exclude tablets
-        if (isTierTablet) {
-            return false;
+    public boolean detectGarminNuvifone() {
+        if (userAgent.indexOf(deviceNuvifone) != -1) {
+            return true;
         }
-        //Most mobile browsing is done on smartphones
-        if (detectSmartphone()) {
+        return false;
+    }
+
+    /**
+     * Detects a device running the Bada smartphone OS from Samsung.
+     * @return detection of a Bada device
+     */
+    public boolean detectBada() {
+        if (userAgent.indexOf(deviceBada) != -1) {
             return true;
         }
+        return false;
+    }
 
-        if (detectWapWml()
-			|| detectBrewDevice()
-			|| detectOperaMobile()) {
+    /**
+     * Detects a device running the Tizen smartphone OS.
+     * @return detection of a Tizen device
+     */
+    public boolean detectTizen() {
+        if (userAgent.indexOf(deviceTizen) != -1) {
             return true;
         }
+        return false;
+    }
 
-        if ((userAgent.indexOf(engineNetfront) != -1) 
-			|| (userAgent.indexOf(engineUpBrowser) != -1) 
-			|| (userAgent.indexOf(engineOpenWeb) != -1)) {
+    /**
+     * Detects a device running the Meego OS.
+     * @return detection of a Meego device
+     */
+    public boolean detectMeego() {
+        if (userAgent.indexOf(deviceMeego) != -1) {
             return true;
         }
+        return false;
+    }
 
-        if (detectDangerHiptop()
-			|| detectMidpCapable()
-			|| detectMaemoTablet()
-			|| detectArchos()) {
+    /**
+     * Detects the Danger Hiptop device.
+     * @return detection of a Danger Hiptop
+     */
+    public boolean detectDangerHiptop() {
+        if (userAgent.indexOf(deviceDanger) != -1
+                || userAgent.indexOf(deviceHiptop) != -1) {
             return true;
         }
+        return false;
+    }
 
-        if ((userAgent.indexOf(devicePda) != -1) &&
-			(userAgent.indexOf(disUpdate) < 0)) //no index found
-        {
+    /**
+     * Detects if the current browser is a Sony Mylo device.
+     * @return detection of a Sony Mylo device
+     */
+    public boolean detectSonyMylo() {
+        if (userAgent.indexOf(manuSony) != -1
+                && (userAgent.indexOf(qtembedded) != -1
+                || userAgent.indexOf(mylocom2) != -1)) {
             return true;
         }
-        if (userAgent.indexOf(mobile) != -1) {
+        return false;
+    }
+
+    /**
+     * Detects if the current device is on one of the Maemo-based Nokia Internet Tablets.
+     * @return detection of a Maemo OS tablet
+     */
+    public boolean detectMaemoTablet() {
+        if (userAgent.indexOf(maemo) != -1) {
+            return true;
+        } else if (userAgent.indexOf(linux) != -1
+                && userAgent.indexOf(deviceTablet) != -1
+                && !detectWebOSTablet()
+                && !detectAndroid()) {
             return true;
         }
+        return false;
+    }
 
-        //We also look for Kindle devices
-        if (detectKindle()
-                        || detectAmazonSilk()) {
+    /**
+     * Detects if the current device is an Archos media player/Internet tablet.
+     * @return detection of an Archos media player
+     */
+    public boolean detectArchos() {
+        if (userAgent.indexOf(deviceArchos) != -1) {
             return true;
         }
+        return false;
+    }
 
+    /**
+     * Detects if the current device is an Internet-capable game console.
+     * Includes many handheld consoles.
+     * @return detection of any Game Console
+     */
+    public boolean detectGameConsole() {
+        if (detectSonyPlaystation()
+                || detectNintendo()
+                || detectXbox()) {
+            return true;
+        }
         return false;
     }
 
@@ -832,6 +888,19 @@ public class UAgentInfo {
         return false;
     }
 
+    /**
+     * Detects if the current device is a handheld gaming device with
+     * a touchscreen and modern iPhone-class browser. Includes the Playstation Vita.
+     * @return detection of a handheld gaming device
+     */
+    public boolean detectGamingHandheld() {
+        if ((userAgent.indexOf(devicePlaystation) != -1) &&
+            (userAgent.indexOf(devicePlaystationVita) != -1)) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Detects if the current device is a Nintendo game device.
      * @return detection of Nintendo
@@ -857,67 +926,109 @@ public class UAgentInfo {
     }
 
     /**
-     * Detects if the current device is an Internet-capable game console.
-     * @return detection of any Game Console
+     * Detects whether the device is a Brew-powered device.
+     * @return detection of a Brew device
      */
-    public boolean detectGameConsole() {
-        if (detectSonyPlaystation()
-                || detectNintendo()
-                || detectXbox()) {
+    public boolean detectBrewDevice() {
+        if (userAgent.indexOf(deviceBrew) != -1) {
             return true;
         }
         return false;
     }
 
     /**
-     * Detects if the current device supports MIDP, a mobile Java technology.
-     * @return detection of a MIDP mobile Java-capable device
+     * Detects whether the device supports WAP or WML.
+     * @return detection of a WAP- or WML-capable device
      */
-    public boolean detectMidpCapable() {
-        if (userAgent.indexOf(deviceMidp) != -1
-                || httpAccept.indexOf(deviceMidp) != -1) {
+    public boolean detectWapWml() {
+        if (httpAccept.indexOf(vndwap) != -1
+                || httpAccept.indexOf(wml) != -1) {
             return true;
         }
         return false;
     }
 
     /**
-     * Detects if the current device is on one of the Maemo-based Nokia Internet Tablets.
-     * @return detection of a Maemo OS tablet
+     * Detects if the current device supports MIDP, a mobile Java technology.
+     * @return detection of a MIDP mobile Java-capable device
      */
-    public boolean detectMaemoTablet() {
-        if (userAgent.indexOf(maemo) != -1) {
-            return true;
-        } else if (userAgent.indexOf(linux) != -1
-                && userAgent.indexOf(deviceTablet) != -1
-                && !detectWebOSTablet()
-                && !detectAndroid()) {
+    public boolean detectMidpCapable() {
+        if (userAgent.indexOf(deviceMidp) != -1
+                || httpAccept.indexOf(deviceMidp) != -1) {
             return true;
         }
         return false;
     }
 
+
+
+  //*****************************
+  // Device Classes
+  //*****************************
+
     /**
-     * Detects if the current device is an Archos media player/Internet tablet.
-     * @return detection of an Archos media player
+     * Check to see whether the device is any device
+     *   in the 'smartphone' category.
+     * @return detection of a general smartphone device
      */
-    public boolean detectArchos() {
-        if (userAgent.indexOf(deviceArchos) != -1) {
-            return true;
-        }
-        return false;
+    public boolean detectSmartphone() {
+        //Exclude duplicates from TierIphone
+        return (detectTierIphone() 
+                || detectS60OssBrowser()
+                || detectSymbianOS()
+                || detectWindowsMobile()
+                || detectBlackBerry()
+                || detectPalmOS());
     }
 
     /**
-     * Detects if the current browser is a Sony Mylo device.
-     * @return detection of a Sony Mylo device
+     *	Detects if the current device is a mobile device.
+     *  This method catches most of the popular modern devices. 
+     *  Excludes Apple iPads and other modern tablets.
+     * @return detection of any mobile device using the quicker method
      */
-    public boolean detectSonyMylo() {
-        if (userAgent.indexOf(manuSony) != -1
-                && (userAgent.indexOf(qtembedded) != -1
-                || userAgent.indexOf(mylocom2) != -1)) {
+    public boolean detectMobileQuick() {
+        //Let's exclude tablets
+        if (detectTierTablet()) 
+            return false;
+        
+		if ((initCompleted == true) ||
+			(isMobilePhone == true))
+			return isMobilePhone;
+
+        //Most mobile browsing is done on smartphones
+        if (detectSmartphone()) 
             return true;
-        }
+
+        if (detectWapWml()
+			|| detectBrewDevice()
+			|| detectOperaMobile()) 
+            return true;
+
+        if ((userAgent.indexOf(engineObigo) != -1) 
+			|| (userAgent.indexOf(engineNetfront) != -1) 
+			|| (userAgent.indexOf(engineUpBrowser) != -1) 
+			|| (userAgent.indexOf(engineOpenWeb) != -1)) 
+            return true;
+
+        if (detectDangerHiptop()
+			|| detectMidpCapable()
+			|| detectMaemoTablet()
+			|| detectArchos()) 
+            return true;
+
+        if ((userAgent.indexOf(devicePda) != -1) &&
+			(userAgent.indexOf(disUpdate) < 0)) //no index found
+            return true;
+        
+        if (userAgent.indexOf(mobile) != -1) 
+            return true;
+
+        //We also look for Kindle devices
+        if (detectKindle()
+                || detectAmazonSilk()) 
+            return true;
+
         return false;
     }
 
@@ -938,28 +1049,21 @@ public class UAgentInfo {
         }
 
         //detect older phones from certain manufacturers and operators.
-        if (userAgent.indexOf(uplink) != -1) {
+        if (userAgent.indexOf(uplink) != -1)
             return true;
-        }
-        if (userAgent.indexOf(manuSonyEricsson) != -1) {
+        if (userAgent.indexOf(manuSonyEricsson) != -1)
             return true;
-        }
-        if (userAgent.indexOf(manuericsson) != -1) {
+        if (userAgent.indexOf(manuericsson) != -1)
             return true;
-        }
-        if (userAgent.indexOf(manuSamsung1) != -1) {
+        if (userAgent.indexOf(manuSamsung1) != -1)
             return true;
-        }
 
-        if (userAgent.indexOf(svcDocomo) != -1) {
+        if (userAgent.indexOf(svcDocomo) != -1) 
             return true;
-        }
-        if (userAgent.indexOf(svcKddi) != -1) {
+        if (userAgent.indexOf(svcKddi) != -1)
             return true;
-        }
-        if (userAgent.indexOf(svcVodafone) != -1) {
+        if (userAgent.indexOf(svcVodafone) != -1)
             return true;
-        }
 
         return false;
     }
@@ -976,6 +1080,10 @@ public class UAgentInfo {
      * @return detection of any device in the Tablet Tier
      */
     public boolean detectTierTablet() {
+		if ((this.initCompleted == true) ||
+			(this.isTierTablet == true))
+			return this.isTierTablet;
+
         if (detectIpad()
                 || detectAndroidTablet()
                 || detectBlackBerryTablet()
@@ -989,17 +1097,24 @@ public class UAgentInfo {
      * The quick way to detect for a tier of devices.
      *   This method detects for devices which can
      *   display iPhone-optimized web content.
-     *   Includes iPhone, iPod Touch, Android, Windows Phone 7, Palm WebOS, etc.
-     * @return detection of any device in the iPhone/Android/WP7/WebOS Tier
+     *   Includes iPhone, iPod Touch, Android, Windows Phone 7 and 8, BB10, WebOS, Playstation Vita, etc.
+     * @return detection of any device in the iPhone/Android/Windows Phone/BlackBerry/WebOS Tier
      */
     public boolean detectTierIphone() {
-        if (isIphone
-                || isAndroidPhone
+		if ((this.initCompleted == true) ||
+			(this.isTierIphone == true))
+			return this.isTierIphone;
+
+        if (detectIphoneOrIpod()
+                || detectAndroidPhone()
+                || detectWindowsPhone()
+                || detectBlackBerry10Phone()
                 || (detectBlackBerryWebKit() 
 					&& detectBlackBerryTouch())
-		|| detectWindowsPhone7()
                 || detectPalmWebOS()
-                || detectGarminNuvifone()) {
+                || detectBada()
+                || detectTizen()
+                || detectGamingHandheld()) {
             return true;
         }
         return false;
@@ -1014,12 +1129,17 @@ public class UAgentInfo {
      * @return detection of any device in the 'Rich CSS' Tier
      */
     public boolean detectTierRichCss() {
+		if ((this.initCompleted == true) ||
+			(this.isTierRichCss == true))
+			return this.isTierRichCss;
+
 		boolean result = false;
+
 		//The following devices are explicitly ok.
 		//Note: 'High' BlackBerry devices ONLY
 		if (detectMobileQuick()) {
 
-                        //Exclude iPhone Tier and e-Ink Kindle devices.
+            //Exclude iPhone Tier and e-Ink Kindle devices.
 			if (!detectTierIphone() && !detectKindle()) {
 
 				//The following devices are explicitly ok.
@@ -1029,12 +1149,11 @@ public class UAgentInfo {
 					|| detectS60OssBrowser()
 					|| detectBlackBerryHigh()
 					|| detectWindowsMobile()
-					|| userAgent.indexOf(engineTelecaQ) !=
-					-1) {
+					|| userAgent.indexOf(engineTelecaQ) != -1) {
 					   result= true;
-				} // if detectWebkit()
-			} //if !detectTierIphone()
-		} //if detectMobileQuick()
+				} 
+			}
+		} 
 		return result;
     }
 
@@ -1045,12 +1164,16 @@ public class UAgentInfo {
      * @return detection of a mobile device in the less capable tier 
      */
     public boolean detectTierOtherPhones() {
+		if ((this.initCompleted == true) ||
+			(this.isTierGenericMobile == true))
+			return this.isTierGenericMobile;
+
         //Exclude devices in the other 2 categories
         if (detectMobileLong() 
 			&& !detectTierIphone() 
-			&& !detectTierRichCss()) {
+			&& !detectTierRichCss())
             return true;
-        }
+
         return false;
     }
 }