From 5d5afcbe839de7987c19a0408bead678ae662c85 Mon Sep 17 00:00:00 2001
From: Jamie McDonald <jdamcd@gmail.com>
Date: Sun, 13 Jul 2014 15:50:47 +0200
Subject: [PATCH] Updated error handling

---
 .../soundcloud/android/crop/CropImageActivity.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java b/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
index 5da3e26..5af0904 100644
--- a/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
+++ b/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
@@ -133,10 +133,10 @@ public class CropImageActivity extends MonitoredActivity {
                 option.inSampleSize = sampleSize;
                 rotateBitmap = new RotateBitmap(BitmapFactory.decodeStream(is, null, option), exifRotation);
             } catch (IOException e) {
-                Log.e("Error reading picture: " + e.getMessage(), e);
+                Log.e("Error reading image: " + e.getMessage(), e);
                 setResultException(e);
             } catch (OutOfMemoryError e) {
-                Log.e("OOM while reading picture: " + e.getMessage(), e);
+                Log.e("OOM reading image: " + e.getMessage(), e);
                 setResultException(e);
             } finally {
                 CropUtil.closeSilently(is);
@@ -358,8 +358,11 @@ public class CropImageActivity extends MonitoredActivity {
             }
 
         } catch (IOException e) {
-            Log.e("Error cropping picture: " + e.getMessage(), e);
+            Log.e("Error cropping image: " + e.getMessage(), e);
             finish();
+        } catch (OutOfMemoryError e) {
+            Log.e("OOM cropping image: " + e.getMessage(), e);
+            setResultException(e);
         } finally {
             CropUtil.closeSilently(is);
         }
@@ -382,9 +385,9 @@ public class CropImageActivity extends MonitoredActivity {
             m.setRectToRect(new RectF(r), dstRect, Matrix.ScaleToFit.FILL);
             m.preConcat(rotateBitmap.getRotateMatrix());
             canvas.drawBitmap(rotateBitmap.getBitmap(), m, null);
-
         } catch (OutOfMemoryError e) {
-            Log.e("Error cropping picture: " + e.getMessage(), e);
+            Log.e("OOM cropping image: " + e.getMessage(), e);
+            setResultException(e);
             System.gc();
         }
 
@@ -409,7 +412,6 @@ public class CropImageActivity extends MonitoredActivity {
                 if (outputStream != null) {
                     croppedImage.compress(Bitmap.CompressFormat.JPEG, 90, outputStream);
                 }
-
             } catch (IOException e) {
                 setResultException(e);
                 Log.e("Cannot open file: " + saveUri, e);