[Swingme-svn] SF.net SVN: swingme:[2312] SwingME/src/net/yura/mobile/gui/Midlet.java

[<yu...@us...>]

Revision: 2312
          http://sourceforge.net/p/swingme/code/2312
Author:   yuranet
Date:     2014-03-27 19:23:26 +0000 (Thu, 27 Mar 2014)
Log Message:
-----------
fix for Nokia X

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/Midlet.java

Modified: SwingME/src/net/yura/mobile/gui/Midlet.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Midlet.java	2014-03-06 23:22:51 UTC (rev 2311)
+++ SwingME/src/net/yura/mobile/gui/Midlet.java	2014-03-27 19:23:26 UTC (rev 2312)
@@ -136,6 +136,11 @@
             currentPlatform = ""; // Avoid null pointer exceptions
         }
 
+        // detecting Android BEFORE Nokia platform as Nokia X is both android+nokia
+        if (hasClass("android.app.Activity")) {
+            return PLATFORM_ANDROID;
+        }
+
         // detecting NOKIA
         if (currentPlatform.indexOf("Nokia") >= 0) {
             // detecting S40 vs S60
@@ -183,11 +188,6 @@
             return PLATFORM_WTK;
         }
 
-        // detecting Android
-        if (hasClass("android.app.Activity")) {
-            return PLATFORM_ANDROID;
-        }
-
         return PLATFORM_NOT_DEFINED;
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.