From 1d1109d6654f5f67fbeb6f17f0c0ee81ce32e75a Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 18 Jan 2021 19:45:45 +0100
Subject: [PATCH] Fix crash in edit view

---
 CHANGELOG.md                                              | 8 +++++++-
 app/build.gradle                                          | 4 ++--
 .../java/protect/card_locker/LoyaltyCardEditActivity.java | 7 ++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3c5070e6..0c3241ffe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
-## Unreleased
+## v1.7.1 (2021-01-18)
+
+Changes:
+
+- Fix crash on switching to barcode tab in edit view if there is no barcode
+
+## v1.7.0 (2021-01-18)
 
 Changes:
 
diff --git a/app/build.gradle b/app/build.gradle
index 4565d7be7..0a7af1bde 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 55
-        versionName "1.7.0"
+        versionCode 56
+        versionName "1.7.1"
 
         vectorDrawables.useSupportLibrary true
     }
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index 1a7a5251d..3e3689113 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -774,7 +774,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             barcodePart.setVisibility(View.VISIBLE);
 
             // Redraw barcode due to size change (Visibility.GONE sets it to 0)
-            generateBarcode(cardIdFieldView.getText().toString(), BarcodeFormat.valueOf(barcodeTypeField.getText().toString()));
+            String formatString = barcodeTypeField.getText().toString();
+            if (formatString.isEmpty() || formatString.equals(getString(R.string.noBarcode))) {
+                hideBarcode();
+            } else {
+                generateBarcode(cardIdFieldView.getText().toString(), BarcodeFormat.valueOf(formatString));
+            }
         } else {
             throw new UnsupportedOperationException();
         }