From a744c19cce5f4041295ee5b884094df8e7049446 Mon Sep 17 00:00:00 2001
From: Katharine <kwchuiaa@connect.ust.hk>
Date: Sat, 30 Oct 2021 18:53:19 +0800
Subject: [PATCH] handle null intent from ucrop for when user just exits
 without finish cropping

---
 .../java/protect/card_locker/LoyaltyCardEditActivity.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index d8bf503bb..d43b448f4 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -528,7 +528,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                     public void onActivityResult(ActivityResult result) {
                         Intent intent = result.getData();
                         if (intent == null){
-                            throw(new RuntimeException("ucrop returned a null intent"));
+                            Log.d("cropper", "ucrop returned a null intent");
+                            return;
                         }
                         if (result.getResultCode() == Activity.RESULT_OK) {
                             Uri debugUri = UCrop.getOutput(intent);
@@ -578,7 +579,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
     private void setCropperOptions(){
         mCropperOptions.setCompressionFormat(Bitmap.CompressFormat.JPEG);
-        mCropperOptions.setFreeStyleCropEnabled(false);
+        mCropperOptions.setFreeStyleCropEnabled(true);
     }
 
     private void setCropperTheme(){