add null check code #19

naver · Jan 6, 2017 · c393e73 · c393e73
1 parent 79ee6fa
commit c393e73
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/app/src/main/java/com/naver/android/helloyako/imagecropsample/CropActivity.java b/app/src/main/java/com/naver/android/helloyako/imagecropsample/CropActivity.java
@@ -128,15 +128,23 @@ public void onClick(View v) {
             public void onClick(View v) {
                 if (!imageCropView.isChangingScale()) {
                     Bitmap b = imageCropView.getCroppedImage();
-                    bitmapConvertToFile(b);
+                    if (b != null) {
+                        bitmapConvertToFile(b);
+                    } else {
+                        Toast.makeText(CropActivity.this, R.string.fail_to_crop, Toast.LENGTH_SHORT).show();
+                    }
                 }
             }
         });
     }
 
     private boolean isPossibleCrop(int widthRatio, int heightRatio) {
-        int bitmapWidth = imageCropView.getViewBitmap().getWidth();
-        int bitmapHeight = imageCropView.getViewBitmap().getHeight();
+        Bitmap bitmap = imageCropView.getViewBitmap();
+        if (bitmap == null) {
+            return false;
+        }
+        int bitmapWidth = bitmap.getWidth();
+        int bitmapHeight = bitmap.getHeight();
         if (bitmapWidth < widthRatio && bitmapHeight < heightRatio) {
             return false;
         } else {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">ImageCropSample</string>
     <string name="can_not_crop">Can not crop</string>
+    <string name="fail_to_crop">Fail to crop</string>
 </resources>
diff --git a/imagecropview/src/main/java/com/naver/android/helloyako/imagecrop/view/ImageCropView.java b/imagecropview/src/main/java/com/naver/android/helloyako/imagecrop/view/ImageCropView.java
@@ -919,24 +919,40 @@ public void run() {
 
     public Bitmap getCroppedImage() {
         CropInfo cropInfo = getCropInfo();
-
+        if (cropInfo == null) {
+            return null;
+        }
+        Bitmap bitmap;
         if (imageFilePath != null) {
-            return cropInfo.getCroppedImage(imageFilePath);
+            bitmap = cropInfo.getCroppedImage(imageFilePath);
         } else {
-            return cropInfo.getCroppedImage(getViewBitmap());
+            bitmap = getViewBitmap();
+            if (bitmap != null) {
+                bitmap = cropInfo.getCroppedImage(bitmap);
+            }
         }
+        return bitmap;
     }
 
     public CropInfo getCropInfo() {
         Bitmap viewBitmap = getViewBitmap();
+        if (viewBitmap == null) {
+            return null;
+        }
         float scale = baseScale * getScale();
         RectF viewImageRect = getBitmapRect();
 
         return new CropInfo(scale, viewBitmap.getWidth(), viewImageRect.top, viewImageRect.left, mCropRect.top, mCropRect.left, mCropRect.width(), mCropRect.height());
     }
 
     public Bitmap getViewBitmap() {
-        return ((FastBitmapDrawable) getDrawable()).getBitmap();
+        Drawable drawable = getDrawable();
+        if (drawable != null) {
+            return ((FastBitmapDrawable) drawable).getBitmap();
+        } else {
+            Log.e(LOG_TAG, "drawable is null");
+            return null;
+        }
     }
 
     public void setGridInnerMode(int gridInnerMode) {