X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=androidtest%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fandroidtest%2FSaveThread.java;h=698d6eff5abfa839b0b798033737d0caf0737dad;hb=48d997590d0f30ac79f467b82e1e92d822a257dc;hp=583db578e9f897801e85d319fc90c1b91c02068c;hpb=04a9820548080f89444f758af0e4d838c9d49716;p=zxing.git

diff --git a/androidtest/src/com/google/zxing/client/androidtest/SaveThread.java b/androidtest/src/com/google/zxing/client/androidtest/SaveThread.java
index 583db578..698d6eff 100755
--- a/androidtest/src/com/google/zxing/client/androidtest/SaveThread.java
+++ b/androidtest/src/com/google/zxing/client/androidtest/SaveThread.java
@@ -36,8 +36,8 @@ final class SaveThread extends Thread {
 
   public Handler mHandler;
 
-  private CameraTestActivity mActivity;
-  private Rect mFramingRect;
+  private final CameraTestActivity mActivity;
+  private final Rect mFramingRect;
 
   SaveThread(CameraTestActivity activity, Rect framingRect) {
     mActivity = activity;
@@ -48,6 +48,7 @@ final class SaveThread extends Thread {
   public void run() {
     Looper.prepare();
     mHandler = new Handler() {
+      @Override
       public void handleMessage(Message message) {
         switch (message.what) {
           case R.id.save:
@@ -66,8 +67,9 @@ final class SaveThread extends Thread {
   private void save(byte[] data, int width, int height) {
     int framingWidth = mFramingRect.width();
     int framingHeight = mFramingRect.height();
-    assert (framingWidth <= width);
-    assert (framingHeight <= height);
+    if (framingWidth > width || framingHeight > height) {
+      throw new IllegalArgumentException();
+    }
 
     int leftOffset = mFramingRect.left;
     int topOffset = mFramingRect.top;
@@ -101,7 +103,7 @@ final class SaveThread extends Thread {
     message.sendToTarget();
   }
 
-  private OutputStream getNewPhotoOutputStream() {
+  private static OutputStream getNewPhotoOutputStream() {
     File sdcard = new File("/sdcard");
     if (sdcard.exists()) {
       File barcodes = new File(sdcard, "barcodes");