- Made sure barcode scanning always restarts when the activity is resumed.

[zxing.git] / android / src / com / google / zxing / client / android / CaptureActivityHandler.java

diff --git a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
index 34780f2..46ee8a8 100755 (executable)
--- a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
@@ -16,22 +16,33 @@
 
 package com.google.zxing.client.android;
 
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.Result;
+import com.google.zxing.client.android.camera.CameraManager;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import com.google.zxing.Result;
+import android.util.Log;
+
+import java.util.Vector;
 
 /**
  * This class handles all the messaging which comprises the state machine for capture.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
  */
 public final class CaptureActivityHandler extends Handler {
 
-  private final CaptureActivity mActivity;
-  private final DecodeThread mDecodeThread;
-  private State mState;
+  private static final String TAG = CaptureActivityHandler.class.getSimpleName();
+
+  private final CaptureActivity activity;
+  private final DecodeThread decodeThread;
+  private State state;
 
   private enum State {
     PREVIEW,
@@ -39,59 +50,69 @@ public final class CaptureActivityHandler extends Handler {
     DONE
   }
 
-  CaptureActivityHandler(CaptureActivity activity, String decodeMode,
-                                 boolean beginScanning) {
-    mActivity = activity;
-    mDecodeThread = new DecodeThread(activity, decodeMode);
-    mDecodeThread.start();
-    mState = State.SUCCESS;
+  CaptureActivityHandler(CaptureActivity activity, Vector<BarcodeFormat> decodeFormats,
+      String characterSet) {
+    this.activity = activity;
+    decodeThread = new DecodeThread(activity, decodeFormats, characterSet,
+        new ViewfinderResultPointCallback(activity.getViewfinderView()));
+    decodeThread.start();
+    state = State.SUCCESS;
 
     // Start ourselves capturing previews and decoding.
     CameraManager.get().startPreview();
-    if (beginScanning) {
-      restartPreviewAndDecode();
-    }
+    restartPreviewAndDecode();
   }
 
   @Override
   public void handleMessage(Message message) {
     switch (message.what) {
       case R.id.auto_focus:
+        //Log.d(TAG, "Got auto-focus message");
         // When one auto focus pass finishes, start another. This is the closest thing to
         // continuous AF. It does seem to hunt a bit, but I'm not sure what else to do.
-        if (mState == State.PREVIEW) {
+        if (state == State.PREVIEW) {
           CameraManager.get().requestAutoFocus(this, R.id.auto_focus);
         }
         break;
       case R.id.restart_preview:
+        Log.d(TAG, "Got restart preview message");
         restartPreviewAndDecode();
         break;
       case R.id.decode_succeeded:
-        mState = State.SUCCESS;
+        Log.d(TAG, "Got decode succeeded message");
+        state = State.SUCCESS;
         Bundle bundle = message.getData();
-        Bitmap barcode = bundle.getParcelable(DecodeThread.BARCODE_BITMAP);
-        int duration = message.arg1;
-        mActivity.handleDecode((Result) message.obj, barcode, duration);
+        Bitmap barcode = bundle == null ? null :
+            (Bitmap) bundle.getParcelable(DecodeThread.BARCODE_BITMAP);
+        activity.handleDecode((Result) message.obj, barcode);
         break;
       case R.id.decode_failed:
         // We're decoding as fast as possible, so when one decode fails, start another.
-        mState = State.PREVIEW;
-        CameraManager.get().requestPreviewFrame(mDecodeThread.mHandler, R.id.decode);
+        state = State.PREVIEW;
+        CameraManager.get().requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
         break;
       case R.id.return_scan_result:
-        mActivity.setResult(Activity.RESULT_OK, (Intent) message.obj);
-        mActivity.finish();
+        Log.d(TAG, "Got return scan result message");
+        activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
+        activity.finish();
+        break;
+      case R.id.launch_product_query:
+        Log.d(TAG, "Got product query message");
+        String url = (String) message.obj;
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+        activity.startActivity(intent);
         break;
     }
   }
 
   public void quitSynchronously() {
-    mState = State.DONE;
+    state = State.DONE;
     CameraManager.get().stopPreview();
-    Message quit = Message.obtain(mDecodeThread.mHandler, R.id.quit);
+    Message quit = Message.obtain(decodeThread.getHandler(), R.id.quit);
     quit.sendToTarget();
     try {
-      mDecodeThread.join();
+      decodeThread.join();
     } catch (InterruptedException e) {
     }
 
@@ -101,11 +122,11 @@ public final class CaptureActivityHandler extends Handler {
   }
 
   private void restartPreviewAndDecode() {
-    if (mState == State.SUCCESS) {
-      mState = State.PREVIEW;
-      CameraManager.get().requestPreviewFrame(mDecodeThread.mHandler, R.id.decode);
+    if (state == State.SUCCESS) {
+      state = State.PREVIEW;
+      CameraManager.get().requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
       CameraManager.get().requestAutoFocus(this, R.id.auto_focus);
-      mActivity.drawViewfinder();
+      activity.drawViewfinder();
     }
   }