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 7ebf281..9c9f5a3 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
+++ b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
@@ -17,9 +17,11 @@
 package com.google.zxing.client.j2me;
 
 import com.google.zxing.client.result.BookmarkDoCoMoResult;
+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;
@@ -59,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");
@@ -78,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 {
@@ -110,16 +129,18 @@ public final class ZXingMIDlet extends MIDlet {
 
   // Convenience methods to show dialogs
 
-  private void showOpenURL(final String text) {
-    Alert alert = new Alert("Open web page?", text, null, AlertType.CONFIRMATION);
+  private void showOpenURL(String title, final String display, final String uri) {
+    Alert alert = new Alert(title, display, null, AlertType.CONFIRMATION);
     alert.setTimeout(Alert.FOREVER);
-    final Command cancel = new Command("Cancel", Command.CANCEL, 1);
-    alert.addCommand(cancel);
+         Command yes = new Command("Yes", Command.OK, 1);
+    alert.addCommand(yes);
+    Command no = new Command("No", Command.CANCEL, 1);
+    alert.addCommand(no);
     CommandListener listener = new CommandListener() {
       public void commandAction(Command command, Displayable displayable) {
         if (command.getCommandType() == Command.OK) {
           try {
-            platformRequest(text);
+            platformRequest(uri);
           } catch (ConnectionNotFoundException cnfe) {
             showError(cnfe);
           } finally {
@@ -142,9 +163,18 @@ public final class ZXingMIDlet extends MIDlet {
   }
 
   void showError(Throwable t) {
-    showAlert(new Alert("Error", t.getMessage(), null, AlertType.ERROR));
+    String message = t.getMessage();
+    if (message != null && message.length() > 0) {
+      showError(message);
+    } else {
+      showError(t.toString());
+    }
   }
 
+       void showError(String message) {
+               showAlert(new Alert("Error", message, null, AlertType.ERROR));
+       }
+
   private void showAlert(Alert alert) {
     Display display = Display.getDisplay(this);
     display.setCurrent(alert, canvas);
@@ -154,11 +184,21 @@ public final class ZXingMIDlet extends MIDlet {
     ParsedReaderResult result = ParsedReaderResult.parseReaderResult(text);
     ParsedReaderResultType type = result.getType();
     if (type.equals(ParsedReaderResultType.URI)) {
-      showOpenURL(((URIParsedResult) result).getURI());
+      String uri = ((URIParsedResult) result).getURI();
+      showOpenURL("Open web page?", uri, uri);
     } else if (type.equals(ParsedReaderResultType.BOOKMARK)) {
-      showOpenURL(((BookmarkDoCoMoResult) result).getURI());
+      String uri = ((BookmarkDoCoMoResult) result).getURI();
+      showOpenURL("Open web page?", uri, uri);
     } else if (type.equals(ParsedReaderResultType.EMAIL)) {
-      showOpenURL(((EmailDoCoMoResult) result).getMailtoURI());
+      String email = ((EmailDoCoMoResult) result).getTo();
+      showOpenURL("Compose e-mail?", email, "mailto:" + email);
+    } 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());
     }