From c83b151c08b0f7ab5d452db8a739b8609096b7d8 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 15 Dec 2019 12:54:51 +0100
Subject: [PATCH] Revert "Check for empty cardId in BarcodeSelectorActivity
 instead"

This reverts commit 62f7241bca1ec71cae6276946ab9acf819df6014.
---
 .../java/protect/card_locker/BarcodeImageWriterTask.java    | 5 +++++
 .../java/protect/card_locker/BarcodeSelectorActivity.java   | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
index a03a52994..9ef6b7115 100644
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -90,6 +90,11 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
     public Bitmap doInBackground(Void... params)
     {
+        if (cardId.isEmpty())
+        {
+            return null;
+        }
+
         MultiFormatWriter writer = new MultiFormatWriter();
         BitMatrix bitMatrix;
         try
diff --git a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
index 43193647a..86c647c3b 100644
--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
@@ -177,12 +177,6 @@ public class BarcodeSelectorActivity extends AppCompatActivity
             }
         });
 
-        if (cardId.isEmpty())
-        {
-            image.setVisibility(View.GONE);
-            return;
-        }
-
         if(image.getHeight() == 0)
         {
             // The size of the ImageView is not yet available as it has not