Revert to pre-Cupcake preview callback system since seems to be some collision between the new one and auto-focus callback that stops scanning in some cases. Also, remove a bad version number from search activity?

git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1042 59b500cc-1b3d-0410-9834-0bbf25fbcc57

2 files changed, 3 insertions, 2 deletions

diff --git a/src/com/google/zxing/client/android/CameraManager.java b/src/com/google/zxing/client/android/CameraManager.java
index 4da37467..76115558 100755
--- a/src/com/google/zxing/client/android/CameraManager.java
+++ b/src/com/google/zxing/client/android/CameraManager.java
@@ -119,7 +119,7 @@ final class CameraManager {
     if (mCamera != null && mPreviewing) {
       mPreviewHandler = handler;
       mPreviewMessage = message;
-      mCamera.setOneShotPreviewCallback(previewCallback);
+      mCamera.setPreviewCallback(previewCallback);
     }
   }
 
@@ -176,6 +176,7 @@ final class CameraManager {
    */
   private final Camera.PreviewCallback previewCallback = new Camera.PreviewCallback() {
     public void onPreviewFrame(byte[] data, Camera camera) {
+      camera.setPreviewCallback(null);
       if (mPreviewHandler != null) {
         Message message = mPreviewHandler.obtainMessage(mPreviewMessage, mScreenResolution.x,
             mScreenResolution.y, data);
diff --git a/src/com/google/zxing/client/android/SearchBookContentsActivity.java b/src/com/google/zxing/client/android/SearchBookContentsActivity.java
index 77a285ed..9ebe61e3 100644
--- a/src/com/google/zxing/client/android/SearchBookContentsActivity.java
+++ b/src/com/google/zxing/client/android/SearchBookContentsActivity.java
@@ -51,7 +51,7 @@ import java.util.List;
 public final class SearchBookContentsActivity extends Activity {
 
   private static final String TAG = "SearchBookContents";
-  private static final String USER_AGENT = "ZXing/1.5 (Android)";
+  private static final String USER_AGENT = "ZXing (Android)";
 
   private NetworkThread mNetworkThread;
   private String mISBN;