From fe4dc868aad55f9aa59dc98984fd416a3622a868 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sat, 22 Feb 2020 15:00:58 +0100
Subject: [PATCH] Fix bad merge

---
 .../java/protect/card_locker/LoyaltyCardViewActivityTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index 925d0dfae..a9f9f15f9 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -731,13 +731,13 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void checkBarcodeFullscreenWorkflow()
+    public void checkBarcodeFullscreenWorkflow() throws JSONException
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
 
         activityController.start();
         activityController.visible();