fix: onCancelled seems to be called while doInBackground is running. …

…Adding stupid guards against that.
tuksik · Jul 10, 2015 · e5e8997 · e5e8997
1 parent c192df9
commit e5e8997
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/src/main/java/com/renard/ocr/cropimage/PreparePixForCropTask.java b/app/src/main/java/com/renard/ocr/cropimage/PreparePixForCropTask.java
@@ -48,7 +48,7 @@ public class PreparePixForCropTask extends AsyncTask<Void, Void, CropData> {
     private final int mHeight;
 
     public PreparePixForCropTask(Pix pix, int width, int height) {
-        if(width==0 || height==0) {
+        if (width == 0 || height == 0) {
             Log.e(TAG, "scaling to 0 value: (" + width + "," + height + ")");
         }
         mPix = pix;
@@ -81,8 +81,16 @@ protected CropData doInBackground(Void... params) {
             return null;
         }
         scaleResult = scaler.scale(mPix, mWidth, mHeight);
+        if (isCancelled()) {
+            return null;
+        }
         Bitmap bitmap = WriteFile.writeBitmap(scaleResult.getPix());
-        Log.d(TAG, "scaling result (" + bitmap.getWidth() + "," + bitmap.getHeight() + ")");
+        if (isCancelled()) {
+            return null;
+        }
+        if (bitmap != null) {
+            Log.d(TAG, "scaling result (" + bitmap.getWidth() + "," + bitmap.getHeight() + ")");
+        }
         return new CropData(bitmap, scaleResult, blurDetectionResult);
 
     }