Various improvements to handling and detection of URLs in codes

[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 4428c02..02ec677 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
+++ b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
@@ -39,6 +39,7 @@ import java.io.IOException;
  */
 public final class ZXingMIDlet extends MIDlet {
 
+  private Canvas canvas;
   private Player player;
   private VideoControl videoControl;
 
@@ -54,29 +55,16 @@ public final class ZXingMIDlet extends MIDlet {
     try {
       player = Manager.createPlayer("capture://video");
       player.realize();
+      AdvancedMultimediaManager.setZoom(player);
       videoControl = (VideoControl) player.getControl("VideoControl");
-      Canvas canvas = new VideoCanvas(this);
+      canvas = new VideoCanvas(this);
       canvas.setFullScreenMode(true);
       videoControl.initDisplayMode(VideoControl.USE_DIRECT_VIDEO, canvas);
       videoControl.setDisplayLocation(0, 0);
       videoControl.setDisplaySize(canvas.getWidth(), canvas.getHeight());
       videoControl.setVisible(true);
-      /*
-      FocusControl focusControl = (FocusControl)
-          player.getControl("javax.microedition.amms.control.FocusControl");
-      if (focusControl != null) {
-        if (focusControl.isAutoFocusSupported()) {
-          focusControl.setFocus(FocusControl.AUTO);
-        }
-        if (focusControl.isMacroSupported()) {
-          focusControl.setMacro(true);
-        }
-      } else {
-        System.out.println("FocusControl not supported");
-      }
-       */
-      Display.getDisplay(this).setCurrent(canvas);
       player.start();
+      Display.getDisplay(this).setCurrent(canvas);
     } catch (IOException ioe) {
       throw new MIDletStateChangeException(ioe.toString());
     } catch (MediaException me) {
@@ -116,24 +104,24 @@ public final class ZXingMIDlet extends MIDlet {
 
   // Convenience methods to show dialogs
 
-  void showYesNo(String title, final String text) {
-    Alert alert = new Alert(title, text, null, AlertType.INFO);
+  private void showOpenURL(final String text) {
+    Alert alert = new Alert("Open web page?", text, null, AlertType.CONFIRMATION);
     alert.setTimeout(Alert.FOREVER);
-    final Command yes = new Command("Yes", Command.OK, 0);
-    final Command no = new Command("No", Command.CANCEL, 0);
-    alert.addCommand(yes);
-    alert.addCommand(no);
+    final Command cancel = new Command("Cancel", Command.CANCEL, 1);
+    alert.addCommand(cancel);
     CommandListener listener = new CommandListener() {
       public void commandAction(Command command, Displayable displayable) {
-        if (command.equals(yes)) {
+        if (command.getCommandType() == Command.OK) {
           try {
-            if (platformRequest(text)) {
-              // Successfully opened URL; exit
-              stop();
-            }
+            platformRequest(text);
           } catch (ConnectionNotFoundException cnfe) {
             showError(cnfe);
+          } finally {
+            stop();
           }
+        } else {
+          // cancel
+          Display.getDisplay(ZXingMIDlet.this).setCurrent(canvas);
         }
       }
     };
@@ -141,7 +129,7 @@ public final class ZXingMIDlet extends MIDlet {
     showAlert(alert);
   }
 
-  void showAlert(String title, String text) {
+  private void showAlert(String title, String text) {
     Alert alert = new Alert(title, text, null, AlertType.INFO);
     alert.setTimeout(Alert.FOREVER);
     showAlert(alert);
@@ -153,21 +141,53 @@ public final class ZXingMIDlet extends MIDlet {
 
   private void showAlert(Alert alert) {
     Display display = Display.getDisplay(this);
-    display.setCurrent(alert, display.getCurrent());
+    display.setCurrent(alert, canvas);
   }
 
+  /// TODO this whole bit needs to be merged with the code in core-ext -- this is messy and duplicative
+
   void handleDecodedText(String text) {
     // This is a crude imitation of the code found in module core-ext, which handles the contents
     // in a more sophisticated way. It can't be accessed from JavaME just yet because it relies
     // on URL parsing routines in java.net. This should be somehow worked around: TODO
     // For now, detect URLs in a simple way, and treat everything else as text
-    if (text.startsWith("http://") || text.startsWith("https://") || maybeURLWithoutScheme(text)) {
-      showYesNo("Open URL?", text);
+    if (text.startsWith("http://") || text.startsWith("https://")) {
+      showOpenURL(text);
+    } else if (text.startsWith("HTTP://") || text.startsWith("HTTPS://")) {
+      showOpenURL(decapitalizeProtocol(text));
+    } else if (text.startsWith("URL:")) {
+      showOpenURL(decapitalizeProtocol(text.substring(4)));
+    } else if (text.startsWith("MEBKM:")) {
+      int urlIndex = text.indexOf("URL:", 6);
+      if (urlIndex >= 6) {
+        String url = text.substring( urlIndex + 4);
+        int semicolon = url.indexOf((int) ';');
+        if (semicolon >= 0) {
+          url = url.substring(0, semicolon);
+        }
+        showOpenURL(decapitalizeProtocol(url));
+      } else {
+        showAlert("Barcode detected", text);
+      }
+    } else if (maybeURLWithoutScheme(text)) {
+      showOpenURL("http://" + text);
     } else {
       showAlert("Barcode detected", text);
     }
   }
 
+  private static String decapitalizeProtocol(String url) {
+    int protocolEnd = url.indexOf("://");
+    if (protocolEnd >= 0) {
+      return url.substring(0, protocolEnd).toLowerCase() + url.substring(protocolEnd);
+    } else {
+      return url;
+    }
+  }
+
+  /**
+   * Crudely guesses that a string may represent a URL if it has a '.' and no spaces.
+   */
   private static boolean maybeURLWithoutScheme(String text) {
     return text.indexOf((int) '.') >= 0 && text.indexOf((int) ' ') < 0;
   }