Index: src/Info/Version.java =================================================================== --- src/Info/Version.java (revision 1384) +++ src/Info/Version.java (working copy) @@ -44,62 +44,9 @@ public final static String NAME="Bombus"; public final static String BOMBUS_SITE_URL="http://bombus-im.org"; - - private static String platformName; public static String getPlatformName() { - if (platformName==null) { - platformName=System.getProperty("microedition.platform"); - - String sonyJava=System.getProperty("com.sonyericsson.java.platform"); - if (sonyJava!=null) platformName=platformName+"/"+sonyJava; - - String device=System.getProperty("device.model"); - String firmware=System.getProperty("device.software.version"); - - if (platformName==null) platformName="Motorola"; - - if (platformName.startsWith("j2me")) { - if (device!=null) if (device.startsWith("wtk-emulator")) { - platformName=device; - return platformName; - } - - if (device!=null && firmware!=null) - platformName="Motorola"; // buggy v360 - else { - // Motorola EZX phones - String hostname=System.getProperty("microedition.hostname"); - if (hostname!=null) { - platformName="Motorola-EZX"; - if (device!=null) { - // Motorola EZX ROKR - hostname=device; - } - - if (hostname.indexOf("(none)")<0) - platformName+="/"+hostname; - return platformName; - } - } - } - //else - if (platformName.startsWith("Moto")) { - if (device==null) device=System.getProperty("funlights.product"); - if (device!=null) platformName="Motorola-"+device; - String devicesoftware=System.getProperty("device.software.version"); - if (devicesoftware!=null) platformName=platformName+"//"+devicesoftware; - } - -//#if (!MIDP1) - if (platformName.indexOf("SIE") > -1) { - platformName=System.getProperty("microedition.platform")+" (NSG)"; - } else if (System.getProperty("com.siemens.OSVersion")!=null) { - platformName="SIE-"+System.getProperty("microedition.platform")+"/"+System.getProperty("com.siemens.OSVersion"); - } -//#endif - } - return platformName; + return System.getProperty("microedition.platform"); } public static String getOs() {