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 fa10cb5..02ec677 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
+++ b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
@@ -30,7 +30,6 @@ import javax.microedition.media.Player;
 import javax.microedition.media.control.VideoControl;
 import javax.microedition.midlet.MIDlet;
 import javax.microedition.midlet.MIDletStateChangeException;
-import javax.microedition.amms.control.camera.ZoomControl;
 import java.io.IOException;
 
 /**
@@ -40,9 +39,6 @@ import java.io.IOException;
  */
 public final class ZXingMIDlet extends MIDlet {
 
-  private static final int NO_ZOOM = 100;
-  private static final int MAX_ZOOM = 250;
-
   private Canvas canvas;
   private Player player;
   private VideoControl videoControl;
@@ -59,7 +55,7 @@ public final class ZXingMIDlet extends MIDlet {
     try {
       player = Manager.createPlayer("capture://video");
       player.realize();
-      setZoom(player);
+      AdvancedMultimediaManager.setZoom(player);
       videoControl = (VideoControl) player.getControl("VideoControl");
       canvas = new VideoCanvas(this);
       canvas.setFullScreenMode(true);
@@ -76,24 +72,6 @@ public final class ZXingMIDlet extends MIDlet {
     }
   }
 
-  private static void setZoom(Player player) {
-    ZoomControl zoomControl = (ZoomControl) player.getControl("javax.microedition.amms.control.camera.ZoomControl");
-    if (zoomControl != null) {
-      // We zoom in if possible to encourage the viewer to take a snapshot from a greater distance.
-      // This is a crude way of dealing with the fact that many phone cameras will not focus at a
-      // very close range.
-      int maxZoom = zoomControl.getMaxOpticalZoom();
-      if (maxZoom > NO_ZOOM) {
-        zoomControl.setOpticalZoom(maxZoom > MAX_ZOOM ? MAX_ZOOM : maxZoom);
-      } else {
-        int maxDigitalZoom = zoomControl.getMaxDigitalZoom();
-        if (maxDigitalZoom > NO_ZOOM) {
-          zoomControl.setDigitalZoom(maxDigitalZoom > MAX_ZOOM ? MAX_ZOOM : maxDigitalZoom);
-        }
-      }
-    }
-  }
-
   protected void pauseApp() {
     if (player != null) {
       try {
@@ -126,8 +104,8 @@ 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.CONFIRMATION);
+  private void showOpenURL(final String text) {
+    Alert alert = new Alert("Open web page?", text, null, AlertType.CONFIRMATION);
     alert.setTimeout(Alert.FOREVER);
     final Command cancel = new Command("Cancel", Command.CANCEL, 1);
     alert.addCommand(cancel);
@@ -151,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);
@@ -166,18 +144,50 @@ public final class ZXingMIDlet extends MIDlet {
     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 web page?", 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;
   }