Small improvement to display of unexpected errors

[zxing.git] / javame / src / com / google / zxing / client / j2me / ZXingMIDlet.java

diff --git a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
index 299bc61..9c9f5a3 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
+++ b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
@@ -21,6 +21,7 @@ import com.google.zxing.client.result.EmailAddressResult;
 import com.google.zxing.client.result.EmailDoCoMoResult;
 import com.google.zxing.client.result.ParsedReaderResult;
 import com.google.zxing.client.result.ParsedReaderResultType;
+import com.google.zxing.client.result.UPCParsedResult;
 import com.google.zxing.client.result.URIParsedResult;
 
 import javax.microedition.io.ConnectionNotFoundException;
@@ -60,7 +61,7 @@ public final class ZXingMIDlet extends MIDlet {
 
   protected void startApp() throws MIDletStateChangeException {
     try {
-      player = Manager.createPlayer("capture://video");
+      player = createPlayer();
       player.realize();
       AdvancedMultimediaManager.setZoom(player);
       videoControl = (VideoControl) player.getControl("VideoControl");
@@ -79,6 +80,23 @@ public final class ZXingMIDlet extends MIDlet {
     }
   }
 
+       private static Player createPlayer() throws IOException, MediaException {
+               // Try a workaround for Nokias, which want to use capture://image in some cases
+               Player player = null;
+               String platform = System.getProperty("microedition.platform");
+               if (platform != null && platform.indexOf("Nokia") >= 0) {
+                       try {
+                               player = Manager.createPlayer("capture://image");
+                       } catch (MediaException me) {
+                               // if this fails, just continue with capture://video
+                       }
+               }
+               if (player == null) {
+                       player = Manager.createPlayer("capture://video");
+               }
+               return player;
+       }
+
   protected void pauseApp() {
     if (player != null) {
       try {
@@ -145,7 +163,12 @@ public final class ZXingMIDlet extends MIDlet {
   }
 
   void showError(Throwable t) {
-         showError(t.getMessage());
+    String message = t.getMessage();
+    if (message != null && message.length() > 0) {
+      showError(message);
+    } else {
+      showError(t.toString());
+    }
   }
 
        void showError(String message) {
@@ -172,6 +195,10 @@ public final class ZXingMIDlet extends MIDlet {
     } else if (type.equals(ParsedReaderResultType.EMAIL_ADDRESS)) {
       String email = ((EmailAddressResult) result).getEmailAddress();
       showOpenURL("Compose e-mail?", email, "mailto:" + email);
+    } else if (type.equals(ParsedReaderResultType.UPC)) {
+           String upc = ((UPCParsedResult) result).getUPC();
+           String uri = "http://www.upcdatabase.com/item.asp?upc=" + upc;
+           showOpenURL("Look up UPC?", upc, uri);
     } else {
       showAlert("Barcode detected", result.getDisplayResult());
     }