Release 1.10

Translations update from Weblate

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v1.10 (2021-03-07)
+
+Changes:
+
+- Support importing [Voucher Vault](https://github.com/tim-smart/vouchervault/) exports
+- Option to keep the screen on while viewing a loyalty card
+- Option to suspend the lock screen while viewing a loyalty card
+
 ## v1.9.2 (2021-02-24)
 
 Changes:

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 62
-        versionName "1.9.2"
+        versionCode 63
+        versionName "1.10"
 
         vectorDrawables.useSupportLibrary true
     }

app/src/main/java/protect/card_locker/DBHelper.java

@@ -20,14 +20,14 @@ public class DBHelper extends SQLiteOpenHelper
     public static final int ORIGINAL_DATABASE_VERSION = 1;
     public static final int DATABASE_VERSION = 8;
 
-    static class LoyaltyCardDbGroups
+    public static class LoyaltyCardDbGroups
     {
         public static final String TABLE = "groups";
         public static final String ID = "_id";
         public static final String ORDER = "orderId";
     }
 
-    static class LoyaltyCardDbIds
+    public static class LoyaltyCardDbIds
     {
         public static final String TABLE = "cards";
         public static final String ID = "_id";
@@ -43,7 +43,7 @@ public class DBHelper extends SQLiteOpenHelper
         public static final String STAR_STATUS = "starstatus";
     }
 
-    static class LoyaltyCardDbIdsGroups
+    public static class LoyaltyCardDbIdsGroups
     {
         public static final String TABLE = "cardsGroups";
         public static final String cardID = "cardId";

app/src/main/java/protect/card_locker/DataFormat.java

@@ -2,7 +2,7 @@ package protect.card_locker;
 
 public enum DataFormat
 {
-    CSV,
-
+    Catima,
+    VoucherVault
     ;
 }

app/src/main/java/protect/card_locker/ImportExportActivity.java

@@ -35,10 +35,12 @@ public class ImportExportActivity extends AppCompatActivity
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
     private static final int CHOOSE_EXPORT_LOCATION = 2;
-    private static final int CHOOSE_EXPORTED_FILE = 3;
+    private static final int IMPORT = 3;
 
     private ImportExportTask importExporter;
 
+    private DataFormat importDataFormat;
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -93,7 +95,7 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentGetContentAction, CHOOSE_EXPORTED_FILE);
+                chooseImportType(intentGetContentAction);
             }
         });
 
@@ -106,12 +108,35 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentPickAction, CHOOSE_EXPORTED_FILE);
+                chooseImportType(intentPickAction);
             }
         });
     }
 
-    private void startImport(final InputStream target, final Uri targetUri)
+    private void chooseImportType(Intent baseIntent) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.chooseImportType)
+                .setItems(R.array.import_types_array, (dialog, which) -> {
+                    switch (which) {
+                        // Catima
+                        case 0:
+                        // Loyalty Card Keychain
+                        case 1:
+                            importDataFormat = DataFormat.Catima;
+                            break;
+                        // Voucher Vault
+                        case 2:
+                            importDataFormat = DataFormat.VoucherVault;
+                            break;
+                        default:
+                            throw new IllegalArgumentException("Unknown DataFormat");
+                    }
+                    chooseFileWithIntent(baseIntent, IMPORT);
+                });
+        builder.show();
+    }
+
+    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat)
     {
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
@@ -123,7 +148,7 @@ public class ImportExportActivity extends AppCompatActivity
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.CSV, target, listener);
+                dataFormat, target, listener);
         importExporter.execute();
     }
 
@@ -139,7 +164,7 @@ public class ImportExportActivity extends AppCompatActivity
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.CSV, target, listener);
+                DataFormat.Catima, target, listener);
         importExporter.execute();
     }
 
@@ -294,7 +319,7 @@ public class ImportExportActivity extends AppCompatActivity
     {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (resultCode != RESULT_OK || (requestCode != CHOOSE_EXPORT_LOCATION && requestCode != CHOOSE_EXPORTED_FILE))
+        if (resultCode != RESULT_OK)
         {
             Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
             return;
@@ -336,8 +361,9 @@ public class ImportExportActivity extends AppCompatActivity
                     reader = new FileInputStream(new File(uri.toString()));
                 }
 
-                Log.e(TAG, "Starting file export with: " + uri.toString());
-                startImport(reader, uri);
+                Log.e(TAG, "Starting file import with: " + uri.toString());
+
+                startImport(reader, uri, importDataFormat);
             }
         }
         catch(FileNotFoundException e)

app/src/main/java/protect/card_locker/ImportExportTask.java

@@ -13,6 +13,9 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 
+import protect.card_locker.importexport.MultiFormatExporter;
+import protect.card_locker.importexport.MultiFormatImporter;
+
 class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 {
     private static final String TAG = "Catima";

app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java

@@ -236,10 +236,24 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         // '1' is the brightest. We attempt to maximize the brightness
         // to help barcode readers scan the barcode.
         Window window = getWindow();
-        if(window != null && settings.useMaxBrightnessDisplayingBarcode())
+        if(window != null)
         {
             WindowManager.LayoutParams attributes = window.getAttributes();
-            attributes.screenBrightness = 1F;
+
+            if (settings.useMaxBrightnessDisplayingBarcode())
+            {
+                attributes.screenBrightness = 1F;
+            }
+
+            if (settings.getKeepScreenOn()) {
+                window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+            }
+
+            if (settings.getDisableLockscreenWhileViewingCard()) {
+                window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD|
+                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+            }
+
             window.setAttributes(attributes);
         }
 

app/src/main/java/protect/card_locker/importexport/CsvDatabaseExporter.java

@@ -1,4 +1,4 @@
-package protect.card_locker;
+package protect.card_locker.importexport;
 
 import android.database.Cursor;
 
@@ -8,6 +8,10 @@ import org.apache.commons.csv.CSVPrinter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
+import protect.card_locker.DBHelper;
+import protect.card_locker.Group;
+import protect.card_locker.LoyaltyCard;
+
 /**
  * Class for exporting the database into CSV (Comma Separate Values)
  * format.

app/src/main/java/protect/card_locker/importexport/CsvDatabaseImporter.java

@@ -1,4 +1,4 @@
-package protect.card_locker;
+package protect.card_locker.importexport;
 
 import android.database.sqlite.SQLiteDatabase;
 
@@ -15,6 +15,10 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.List;
 
+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
+import protect.card_locker.Group;
+
 /**
  * Class for importing a database from CSV (Comma Separate Values)
  * formatted data.

app/src/main/java/protect/card_locker/importexport/DatabaseExporter.java

@@ -1,8 +1,10 @@
-package protect.card_locker;
+package protect.card_locker.importexport;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
+import protect.card_locker.DBHelper;
+
 /**
  * Interface for a class which can export the contents of the database
  * in a given format.

app/src/main/java/protect/card_locker/importexport/DatabaseImporter.java

@@ -1,7 +1,13 @@
-package protect.card_locker;
+package protect.card_locker.importexport;
+
+import org.json.JSONException;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.text.ParseException;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
 
 /**
  * Interface for a class which can import the contents of a stream
@@ -15,5 +21,5 @@ public interface DatabaseImporter
      * @throws IOException
      * @throws FormatException
      */
-    void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException;
+    void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
 }

app/src/main/java/protect/card_locker/importexport/MultiFormatExporter.java

@@ -1,10 +1,15 @@
-package protect.card_locker;
+package protect.card_locker.importexport;
 
 import android.util.Log;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
+import protect.card_locker.DBHelper;
+import protect.card_locker.DataFormat;
+import protect.card_locker.importexport.CsvDatabaseExporter;
+import protect.card_locker.importexport.DatabaseExporter;
+
 public class MultiFormatExporter
 {
     private static final String TAG = "Catima";
@@ -25,9 +30,12 @@ public class MultiFormatExporter
 
         switch(format)
         {
-            case CSV:
+            case Catima:
                 exporter = new CsvDatabaseExporter();
                 break;
+            default:
+                Log.e(TAG, "Failed to export data, unknown format " + format.name());
+                break;
         }
 
         if(exporter != null)

app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java

@@ -1,9 +1,18 @@
-package protect.card_locker;
+package protect.card_locker.importexport;
 
 import android.util.Log;
 
+import org.json.JSONException;
+
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.text.ParseException;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.DataFormat;
+import protect.card_locker.FormatException;
+import protect.card_locker.importexport.CsvDatabaseImporter;
+import protect.card_locker.importexport.DatabaseImporter;
 
 public class MultiFormatImporter
 {
@@ -26,9 +35,12 @@ public class MultiFormatImporter
 
         switch(format)
         {
-            case CSV:
+            case Catima:
                 importer = new CsvDatabaseImporter();
                 break;
+            case VoucherVault:
+                importer = new VoucherVaultImporter();
+                break;
         }
 
         if (importer != null)
@@ -38,7 +50,7 @@ public class MultiFormatImporter
                 importer.importData(db, input);
                 return true;
             }
-            catch(IOException | FormatException | InterruptedException e)
+            catch(IOException | FormatException | InterruptedException | JSONException | ParseException e)
             {
                 Log.e(TAG, "Failed to import data", e);
             }

app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java

@@ -0,0 +1,132 @@
+package protect.card_locker.importexport;
+
+import android.annotation.SuppressLint;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Color;
+
+import com.google.zxing.BarcodeFormat;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Currency;
+import java.util.Date;
+import java.util.TimeZone;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
+
+/**
+ * Class for importing a database from CSV (Comma Separate Values)
+ * formatted data.
+ *
+ * The database's loyalty cards are expected to appear in the CSV data.
+ * A header is expected for the each table showing the names of the columns.
+ */
+public class VoucherVaultImporter implements DatabaseImporter
+{
+    public void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, JSONException, ParseException {
+        BufferedReader bufferedReader = new BufferedReader(input);
+
+        StringBuilder sb = new StringBuilder();
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            sb.append(line);
+        }
+        JSONArray jsonArray = new JSONArray(sb.toString());
+
+        SQLiteDatabase database = db.getWritableDatabase();
+        database.beginTransaction();
+
+        // See https://github.com/tim-smart/vouchervault/issues/4#issuecomment-788226503 for more info
+        for (int i = 0; i < jsonArray.length(); i++) {
+            JSONObject jsonCard = jsonArray.getJSONObject(i);
+
+            String store = jsonCard.getString("description");
+
+            Date expiry = null;
+            if (!jsonCard.isNull("expires")) {
+                @SuppressLint("SimpleDateFormat") SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+                dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+                expiry = dateFormat.parse(jsonCard.getString("expires"));
+            }
+
+            BigDecimal balance;
+            if (!jsonCard.isNull("balance")) {
+                balance = new BigDecimal(String.valueOf(jsonCard.getDouble("balance")));
+            } else {
+                balance = new BigDecimal("0");
+            }
+
+            Currency balanceType = Currency.getInstance("USD");
+
+            String cardId = jsonCard.getString("code");
+
+            String barcodeType = null;
+
+            String codeTypeFromJSON = jsonCard.getString("codeType");
+            switch (codeTypeFromJSON) {
+                case "CODE128":
+                    barcodeType = BarcodeFormat.CODE_128.name();
+                    break;
+                case "CODE39":
+                    barcodeType = BarcodeFormat.CODE_39.name();
+                    break;
+                case "EAN13":
+                    barcodeType = BarcodeFormat.EAN_13.name();
+                    break;
+                case "QR":
+                    barcodeType = BarcodeFormat.QR_CODE.name();
+                    break;
+                case "TEXT":
+                    break;
+                default:
+                    throw new FormatException("Unknown barcode type found: " + codeTypeFromJSON);
+            }
+
+            int headerColor;
+
+            String colorFromJSON = jsonCard.getString("color");
+            switch (colorFromJSON) {
+                case "GREY":
+                    headerColor = Color.GRAY;
+                    break;
+                case "BLUE":
+                    headerColor = Color.BLUE;
+                    break;
+                case "GREEN":
+                    headerColor = Color.GREEN;
+                    break;
+                case "ORANGE":
+                    headerColor = Color.rgb(255, 165, 0);
+                    break;
+                case "PURPLE":
+                    headerColor = Color.rgb(128, 0, 128);
+                    break;
+                case "RED":
+                    headerColor = Color.RED;
+                    break;
+                case "YELLOW":
+                    headerColor = Color.YELLOW;
+                    break;
+                default:
+                    throw new FormatException("Unknown colour type foun: " + colorFromJSON);
+            }
+
+            db.insertLoyaltyCard(store, "", expiry, balance, balanceType, cardId, barcodeType, headerColor, 0);
+        }
+
+        database.setTransactionSuccessful();
+        database.endTransaction();
+        database.close();
+
+        bufferedReader.close();
+    }
+}

app/src/main/java/protect/card_locker/preferences/Settings.java

@@ -90,4 +90,14 @@ public class Settings
     {
         return getBoolean(R.string.settings_key_lock_barcode_orientation, false);
     }
+
+    public boolean getKeepScreenOn()
+    {
+        return getBoolean(R.string.settings_key_keep_screen_on, true);
+    }
+
+    public boolean getDisableLockscreenWhileViewingCard()
+    {
+        return getBoolean(R.string.settings_key_disable_lockscreen_while_viewing_card, true);
+    }
 }

app/src/main/res/values-it/strings.xml

@@ -103,4 +103,24 @@
         <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> carta</item>
         <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> carte</item>
     </plurals>
-</resources>
+    <string name="parsingBalanceFailed">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%s&lt;/xliff:g&gt; non sembra un saldo corretto.</string>
+    <string name="points">Punti</string>
+    <string name="currency">Valuta</string>
+    <string name="balance">Saldo</string>
+    <string name="moveBarcodeToCenterOfScreen">Centra il codice a barre sullo schermo</string>
+    <string name="moveBarcodeToTopOfScreen">Sposta il codice a barre in cima allo schermo</string>
+    <string name="chooseExpiryDate">Scegli data di scadenza</string>
+    <string name="never">Mai</string>
+    <string name="expiryDate">Data di scadenza</string>
+    <string name="editBarcode">Modifica il codice a barre</string>
+    <string name="barcode">Codice a barre</string>
+    <string name="card">Carta</string>
+    <string name="balancePoints"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> punti</string>
+    <string name="balanceSentence">Saldo: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Scaduta: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="expiryStateSentence">Scade: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="settings_keep_screen_on">Mantieni schermo acceso durante la visualizzazione di una carta</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="chooseImportType">Da quale app vuoi importare i dati\?</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Mantieni schermo attivo mentre visualizzi una carta</string>
+</resources>

app/src/main/res/values-nb-rNO/strings.xml

@@ -119,4 +119,8 @@
     <string name="balance">Saldo</string>
     <string name="balancePoints"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> poeng</string>
     <string name="balanceSentence">Saldo: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-</resources>
+    <string name="chooseImportType">Hvilket program vil du importere data fra\?</string>
+    <string name="app_loyalty_card_keychain">Kundekortsknippe</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Skru av låseskjerm under kortvisning</string>
+    <string name="settings_keep_screen_on">Behold skjerm påslått under kortvisning</string>
+</resources>

app/src/main/res/values-nl/strings.xml

@@ -119,4 +119,8 @@
     <string name="balance">Saldo</string>
     <string name="balancePoints"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> punten</string>
     <string name="balanceSentence">Saldo: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-</resources>
+    <string name="chooseImportType">Uit welke app wil je gegevens importeren\?</string>
+    <string name="app_loyalty_card_keychain">Klantenkaartkluis</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Vergrendelscherm uitschakelen tijdens tonen van kaart</string>
+    <string name="settings_keep_screen_on">Scherm niet uitschakelen tijdens tonen van kaart</string>
+</resources>

app/src/main/res/values/arrays.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="import_types_array">
+        <item>Catima</item>
+        <item>@string/app_loyalty_card_keychain</item>
+        <item>Voucher Vault</item>
+    </string-array>
+</resources>

app/src/main/res/values/strings.xml

@@ -104,6 +104,10 @@
     <string name="settings_key_display_barcode_max_brightness" translatable="false">pref_display_card_max_brightness</string>
     <string name="settings_lock_barcode_orientation">Lock barcode orientation</string>
     <string name="settings_key_lock_barcode_orientation" translatable="false">pref_lock_barcode_orientation</string>
+    <string name="settings_keep_screen_on">Keep screen on while viewing a card</string>
+    <string name="settings_key_keep_screen_on" translatable="false">pref_keep_screen_on</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Disable lock screen while viewing a card</string>
+    <string name="settings_key_disable_lockscreen_while_viewing_card" translatable="false">pref_disable_lockscreen_while_viewing_card</string>
 
     <string name="sharedpreference_active_tab" translatable="false">sharedpreference_active_tab</string>
 
@@ -151,4 +155,6 @@
     <string name="points">Points</string>
 
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> does not seem to be a valid balance.</string>
+    <string name="chooseImportType">Import data from which app?</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -58,6 +58,18 @@
             android:key="@string/settings_key_lock_barcode_orientation"
             android:title="@string/settings_lock_barcode_orientation"
             app:iconSpaceReserved="false" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="@string/settings_key_keep_screen_on"
+            android:title="@string/settings_keep_screen_on"
+            app:iconSpaceReserved="false" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="@string/settings_key_disable_lockscreen_while_viewing_card"
+            android:title="@string/settings_disable_lockscreen_while_viewing_card"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 
 </PreferenceScreen>

app/src/test/java/protect/card_locker/ImportExportTest.java

@@ -3,10 +3,12 @@ package protect.card_locker;
 import android.app.Activity;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Color;
 import android.os.Environment;
 
 import com.google.zxing.BarcodeFormat;
 
+import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,11 +28,16 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Currency;
 import java.util.Date;
 import java.util.List;
 
+import protect.card_locker.importexport.MultiFormatExporter;
+import protect.card_locker.importexport.MultiFormatImporter;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -112,20 +119,65 @@ public class ImportExportTest
         boolean result = (id != -1);
         assertTrue(result);
 
+        LoyaltyCard card = db.getLoyaltyCard((int) id);
+        assertEquals("No Expiry", card.store);
+        assertEquals("", card.note);
+        assertEquals(null, card.expiry);
+        assertEquals(new BigDecimal("0"), card.balance);
+        assertEquals(null, card.balanceType);
+        assertEquals(BARCODE_DATA, card.cardId);
+        assertEquals(BARCODE_TYPE, card.barcodeType);
+        assertEquals(Integer.valueOf(0), card.headerColor);
+        assertEquals(0, card.starStatus);
+
         id = db.insertLoyaltyCard("Past", "", new Date((long) 1), new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, 0, 0);
         result = (id != -1);
         assertTrue(result);
 
+        card = db.getLoyaltyCard((int) id);
+        assertEquals("Past", card.store);
+        assertEquals("", card.note);
+        assertTrue(card.expiry.before(new Date()));
+        assertEquals(new BigDecimal("0"), card.balance);
+        assertEquals(null, card.balanceType);
+        assertEquals(BARCODE_DATA, card.cardId);
+        assertEquals(BARCODE_TYPE, card.barcodeType);
+        assertEquals(Integer.valueOf(0), card.headerColor);
+        assertEquals(0, card.starStatus);
+
         id = db.insertLoyaltyCard("Today", "", new Date(), new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, 0, 0);
         result = (id != -1);
         assertTrue(result);
 
+        card = db.getLoyaltyCard((int) id);
+        assertEquals("Today", card.store);
+        assertEquals("", card.note);
+        assertTrue(card.expiry.before(new Date(new Date().getTime()+86400)));
+        assertTrue(card.expiry.after(new Date(new Date().getTime()-86400)));
+        assertEquals(new BigDecimal("0"), card.balance);
+        assertEquals(null, card.balanceType);
+        assertEquals(BARCODE_DATA, card.cardId);
+        assertEquals(BARCODE_TYPE, card.barcodeType);
+        assertEquals(Integer.valueOf(0), card.headerColor);
+        assertEquals(0, card.starStatus);
+
         // This will break after 19 January 2038
         // If someone is still maintaining this code base by then: I love you
-        id = db.insertLoyaltyCard("Future", "", new Date(2147483648L), new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, 0, 0);
+        id = db.insertLoyaltyCard("Future", "", new Date(2147483648000L), new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, 0, 0);
         result = (id != -1);
         assertTrue(result);
 
+        card = db.getLoyaltyCard((int) id);
+        assertEquals("Future", card.store);
+        assertEquals("", card.note);
+        assertTrue(card.expiry.after(new Date(new Date().getTime()+86400)));
+        assertEquals(new BigDecimal("0"), card.balance);
+        assertEquals(null, card.balanceType);
+        assertEquals(BARCODE_DATA, card.cardId);
+        assertEquals(BARCODE_TYPE, card.barcodeType);
+        assertEquals(Integer.valueOf(0), card.headerColor);
+        assertEquals(0, card.starStatus);
+
         assertEquals(4, db.getLoyaltyCardCount());
     }
 
@@ -269,34 +321,31 @@ public class ImportExportTest
     {
         final int NUM_CARDS = 10;
 
-        for(DataFormat format : DataFormat.values())
-        {
-            addLoyaltyCards(NUM_CARDS);
+        addLoyaltyCards(NUM_CARDS);
 
-            ByteArrayOutputStream outData = new ByteArrayOutputStream();
-            OutputStreamWriter outStream = new OutputStreamWriter(outData);
+        ByteArrayOutputStream outData = new ByteArrayOutputStream();
+        OutputStreamWriter outStream = new OutputStreamWriter(outData);
 
-            // Export data to CSV format
-            boolean result = MultiFormatExporter.exportData(db, outStream, format);
-            assertTrue(result);
-            outStream.close();
+        // Export data to CSV format
+        boolean result = MultiFormatExporter.exportData(db, outStream, DataFormat.Catima);
+        assertTrue(result);
+        outStream.close();
 
-            clearDatabase();
+        clearDatabase();
 
-            ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
-            InputStreamReader inStream = new InputStreamReader(inData);
+        ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
+        InputStreamReader inStream = new InputStreamReader(inData);
 
-            // Import the CSV data
-            result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
-            assertTrue(result);
+        // Import the CSV data
+        result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        assertTrue(result);
 
-            assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
+        assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
 
-            checkLoyaltyCards();
+        checkLoyaltyCards();
 
-            // Clear the database for the next format under test
-            clearDatabase();
-        }
+        // Clear the database for the next format under test
+        clearDatabase();
     }
 
     @Test
@@ -304,34 +353,31 @@ public class ImportExportTest
     {
         final int NUM_CARDS = 9;
 
-        for(DataFormat format : DataFormat.values())
-        {
-            addLoyaltyCardsFiveStarred();
+        addLoyaltyCardsFiveStarred();
 
-            ByteArrayOutputStream outData = new ByteArrayOutputStream();
-            OutputStreamWriter outStream = new OutputStreamWriter(outData);
+        ByteArrayOutputStream outData = new ByteArrayOutputStream();
+        OutputStreamWriter outStream = new OutputStreamWriter(outData);
 
-            // Export data to CSV format
-            boolean result = MultiFormatExporter.exportData(db, outStream, format);
-            assertTrue(result);
-            outStream.close();
+        // Export data to CSV format
+        boolean result = MultiFormatExporter.exportData(db, outStream, DataFormat.Catima);
+        assertTrue(result);
+        outStream.close();
 
-            clearDatabase();
+        clearDatabase();
 
-            ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
-            InputStreamReader inStream = new InputStreamReader(inData);
+        ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
+        InputStreamReader inStream = new InputStreamReader(inData);
 
-            // Import the CSV data
-            result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
-            assertTrue(result);
+        // Import the CSV data
+        result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        assertTrue(result);
 
-            assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
+        assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
 
-            checkLoyaltyCardsFiveStarred();
+        checkLoyaltyCardsFiveStarred();
 
-            // Clear the database for the next format under test
-            clearDatabase();
-        }
+        // Clear the database for the next format under test
+        clearDatabase();
     }
 
     private List<String> groupsToGroupNames(List<Group> groups)
@@ -351,77 +397,74 @@ public class ImportExportTest
         final int NUM_CARDS = 10;
         final int NUM_GROUPS = 3;
 
-        for(DataFormat format : DataFormat.values())
-        {
-            addLoyaltyCards(NUM_CARDS);
-            addGroups(NUM_GROUPS);
+        addLoyaltyCards(NUM_CARDS);
+        addGroups(NUM_GROUPS);
 
-            List<Group> emptyGroup = new ArrayList<>();
+        List<Group> emptyGroup = new ArrayList<>();
 
-            List<Group> groupsForOne = new ArrayList<>();
-            groupsForOne.add(db.getGroup("group, \"   1"));
+        List<Group> groupsForOne = new ArrayList<>();
+        groupsForOne.add(db.getGroup("group, \"   1"));
 
-            List<Group> groupsForTwo = new ArrayList<>();
-            groupsForTwo.add(db.getGroup("group, \"   1"));
-            groupsForTwo.add(db.getGroup("group, \"   2"));
+        List<Group> groupsForTwo = new ArrayList<>();
+        groupsForTwo.add(db.getGroup("group, \"   1"));
+        groupsForTwo.add(db.getGroup("group, \"   2"));
 
-            List<Group> groupsForThree = new ArrayList<>();
-            groupsForThree.add(db.getGroup("group, \"   1"));
-            groupsForThree.add(db.getGroup("group, \"   2"));
-            groupsForThree.add(db.getGroup("group, \"   3"));
+        List<Group> groupsForThree = new ArrayList<>();
+        groupsForThree.add(db.getGroup("group, \"   1"));
+        groupsForThree.add(db.getGroup("group, \"   2"));
+        groupsForThree.add(db.getGroup("group, \"   3"));
 
-            List<Group> groupsForFour = new ArrayList<>();
-            groupsForFour.add(db.getGroup("group, \"   1"));
-            groupsForFour.add(db.getGroup("group, \"   2"));
-            groupsForFour.add(db.getGroup("group, \"   3"));
+        List<Group> groupsForFour = new ArrayList<>();
+        groupsForFour.add(db.getGroup("group, \"   1"));
+        groupsForFour.add(db.getGroup("group, \"   2"));
+        groupsForFour.add(db.getGroup("group, \"   3"));
 
-            List<Group> groupsForFive = new ArrayList<>();
-            groupsForFive.add(db.getGroup("group, \"   1"));
-            groupsForFive.add(db.getGroup("group, \"   3"));
+        List<Group> groupsForFive = new ArrayList<>();
+        groupsForFive.add(db.getGroup("group, \"   1"));
+        groupsForFive.add(db.getGroup("group, \"   3"));
 
-            db.setLoyaltyCardGroups(1, groupsForOne);
-            db.setLoyaltyCardGroups(2, groupsForTwo);
-            db.setLoyaltyCardGroups(3, groupsForThree);
-            db.setLoyaltyCardGroups(4, groupsForFour);
-            db.setLoyaltyCardGroups(5, groupsForFive);
+        db.setLoyaltyCardGroups(1, groupsForOne);
+        db.setLoyaltyCardGroups(2, groupsForTwo);
+        db.setLoyaltyCardGroups(3, groupsForThree);
+        db.setLoyaltyCardGroups(4, groupsForFour);
+        db.setLoyaltyCardGroups(5, groupsForFive);
 
-            ByteArrayOutputStream outData = new ByteArrayOutputStream();
-            OutputStreamWriter outStream = new OutputStreamWriter(outData);
+        ByteArrayOutputStream outData = new ByteArrayOutputStream();
+        OutputStreamWriter outStream = new OutputStreamWriter(outData);
 
-            // Export data to CSV format
-            boolean result = MultiFormatExporter.exportData(db, outStream, format);
-            assertTrue(result);
-            outStream.close();
+        // Export data to CSV format
+        boolean result = MultiFormatExporter.exportData(db, outStream, DataFormat.Catima);
+        assertTrue(result);
+        outStream.close();
 
-            clearDatabase();
+        clearDatabase();
 
-            ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
-            InputStreamReader inStream = new InputStreamReader(inData);
+        ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
+        InputStreamReader inStream = new InputStreamReader(inData);
 
-            // Import the CSV data
-            result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
-            assertTrue(result);
+        // Import the CSV data
+        result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        assertTrue(result);
 
-            assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
-            assertEquals(NUM_GROUPS, db.getGroupCount());
+        assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
+        assertEquals(NUM_GROUPS, db.getGroupCount());
 
-            checkLoyaltyCards();
-            checkGroups();
+        checkLoyaltyCards();
+        checkGroups();
 
-            assertEquals(groupsToGroupNames(groupsForOne), groupsToGroupNames(db.getLoyaltyCardGroups(1)));
-            assertEquals(groupsToGroupNames(groupsForTwo), groupsToGroupNames(db.getLoyaltyCardGroups(2)));
-            assertEquals(groupsToGroupNames(groupsForThree), groupsToGroupNames(db.getLoyaltyCardGroups(3)));
-            assertEquals(groupsToGroupNames(groupsForFour), groupsToGroupNames(db.getLoyaltyCardGroups(4)));
-            assertEquals(groupsToGroupNames(groupsForFive), groupsToGroupNames(db.getLoyaltyCardGroups(5)));
-            assertEquals(emptyGroup, db.getLoyaltyCardGroups(6));
-            assertEquals(emptyGroup, db.getLoyaltyCardGroups(7));
-            assertEquals(emptyGroup, db.getLoyaltyCardGroups(8));
-            assertEquals(emptyGroup, db.getLoyaltyCardGroups(9));
-            assertEquals(emptyGroup, db.getLoyaltyCardGroups(10));
+        assertEquals(groupsToGroupNames(groupsForOne), groupsToGroupNames(db.getLoyaltyCardGroups(1)));
+        assertEquals(groupsToGroupNames(groupsForTwo), groupsToGroupNames(db.getLoyaltyCardGroups(2)));
+        assertEquals(groupsToGroupNames(groupsForThree), groupsToGroupNames(db.getLoyaltyCardGroups(3)));
+        assertEquals(groupsToGroupNames(groupsForFour), groupsToGroupNames(db.getLoyaltyCardGroups(4)));
+        assertEquals(groupsToGroupNames(groupsForFive), groupsToGroupNames(db.getLoyaltyCardGroups(5)));
+        assertEquals(emptyGroup, db.getLoyaltyCardGroups(6));
+        assertEquals(emptyGroup, db.getLoyaltyCardGroups(7));
+        assertEquals(emptyGroup, db.getLoyaltyCardGroups(8));
+        assertEquals(emptyGroup, db.getLoyaltyCardGroups(9));
+        assertEquals(emptyGroup, db.getLoyaltyCardGroups(10));
 
-            // Clear the database for the next format under test
-            clearDatabase();
-        }
+        // Clear the database for the next format under test
+        clearDatabase();
     }
 
     @Test
@@ -429,32 +472,29 @@ public class ImportExportTest
     {
         final int NUM_CARDS = 10;
 
-        for(DataFormat format : DataFormat.values())
-        {
-            addLoyaltyCards(NUM_CARDS);
+        addLoyaltyCards(NUM_CARDS);
 
-            ByteArrayOutputStream outData = new ByteArrayOutputStream();
-            OutputStreamWriter outStream = new OutputStreamWriter(outData);
+        ByteArrayOutputStream outData = new ByteArrayOutputStream();
+        OutputStreamWriter outStream = new OutputStreamWriter(outData);
 
-            // Export into CSV data
-            boolean result = MultiFormatExporter.exportData(db, outStream, format);
-            assertTrue(result);
-            outStream.close();
+        // Export into CSV data
+        boolean result = MultiFormatExporter.exportData(db, outStream, DataFormat.Catima);
+        assertTrue(result);
+        outStream.close();
 
-            ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
-            InputStreamReader inStream = new InputStreamReader(inData);
+        ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
+        InputStreamReader inStream = new InputStreamReader(inData);
 
-            // Import the CSV data on top of the existing database
-            result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
-            assertTrue(result);
+        // Import the CSV data on top of the existing database
+        result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        assertTrue(result);
 
-            assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
+        assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
 
-            checkLoyaltyCards();
+        checkLoyaltyCards();
 
-            // Clear the database for the next format under test
-            clearDatabase();
-        }
+        // Clear the database for the next format under test
+        clearDatabase();
     }
 
     @Test
@@ -470,7 +510,7 @@ public class ImportExportTest
             OutputStreamWriter outStream = new OutputStreamWriter(outData);
 
             // Export data to CSV format
-            boolean result = MultiFormatExporter.exportData(db, outStream, format);
+            boolean result = MultiFormatExporter.exportData(db, outStream, DataFormat.Catima);
             assertTrue(result);
 
             clearDatabase();
@@ -484,8 +524,8 @@ public class ImportExportTest
             ByteArrayInputStream inData = new ByteArrayInputStream((outData.toString() + corruptEntry).getBytes());
             InputStreamReader inStream = new InputStreamReader(inData);
 
-            // Attempt to import the CSV data
-            result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+            // Attempt to import the data
+            result = MultiFormatImporter.importData(db, inStream, format);
             assertEquals(false, result);
 
             assertEquals(0, db.getLoyaltyCardCount());
@@ -513,49 +553,46 @@ public class ImportExportTest
         final File sdcardDir = Environment.getExternalStorageDirectory();
         final File exportFile = new File(sdcardDir, "Catima.csv");
 
-        for(DataFormat format : DataFormat.values())
-        {
-            addLoyaltyCards(NUM_CARDS);
+        addLoyaltyCards(NUM_CARDS);
 
-            TestTaskCompleteListener listener = new TestTaskCompleteListener();
+        TestTaskCompleteListener listener = new TestTaskCompleteListener();
 
-            // Export to the file
-            FileOutputStream fileOutputStream = new FileOutputStream(exportFile);
-            ImportExportTask task = new ImportExportTask(activity, format, fileOutputStream, listener);
-            task.execute();
+        // Export to the file
+        FileOutputStream fileOutputStream = new FileOutputStream(exportFile);
+        ImportExportTask task = new ImportExportTask(activity, DataFormat.Catima, fileOutputStream, listener);
+        task.execute();
 
-            // Actually run the task to completion
-            Robolectric.flushBackgroundThreadScheduler();
+        // Actually run the task to completion
+        Robolectric.flushBackgroundThreadScheduler();
 
-            // Check that the listener was executed
-            assertNotNull(listener.success);
-            assertEquals(true, listener.success);
+        // Check that the listener was executed
+        assertNotNull(listener.success);
+        assertEquals(true, listener.success);
 
-            clearDatabase();
+        clearDatabase();
 
-            // Import everything back from the default location
+        // Import everything back from the default location
 
-            listener = new TestTaskCompleteListener();
+        listener = new TestTaskCompleteListener();
 
-            FileInputStream fileStream = new FileInputStream(exportFile);
+        FileInputStream fileStream = new FileInputStream(exportFile);
 
-            task = new ImportExportTask(activity, format, fileStream, listener);
-            task.execute();
+        task = new ImportExportTask(activity, DataFormat.Catima, fileStream, listener);
+        task.execute();
 
-            // Actually run the task to completion
-            Robolectric.flushBackgroundThreadScheduler();
+        // Actually run the task to completion
+        Robolectric.flushBackgroundThreadScheduler();
 
-            // Check that the listener was executed
-            assertNotNull(listener.success);
-            assertEquals(true, listener.success);
+        // Check that the listener was executed
+        assertNotNull(listener.success);
+        assertEquals(true, listener.success);
 
-            assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
+        assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
 
-            checkLoyaltyCards();
+        checkLoyaltyCards();
 
-            // Clear the database for the next format under test
-            clearDatabase();
-        }
+        // Clear the database for the next format under test
+        clearDatabase();
     }
 
     @Test
@@ -575,7 +612,7 @@ public class ImportExportTest
         InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -613,7 +650,7 @@ public class ImportExportTest
         InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -651,7 +688,7 @@ public class ImportExportTest
         InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
         assertEquals(false, result);
         assertEquals(0, db.getLoyaltyCardCount());
 
@@ -677,7 +714,7 @@ public class ImportExportTest
         InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
         assertEquals(true, result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -715,7 +752,7 @@ public class ImportExportTest
         InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
         assertEquals(true, result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -753,7 +790,7 @@ public class ImportExportTest
         InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
         assertEquals(true, result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -791,7 +828,7 @@ public class ImportExportTest
         InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -811,7 +848,7 @@ public class ImportExportTest
         inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -830,59 +867,63 @@ public class ImportExportTest
         clearDatabase();
     }
 
+    @Test
+    public void importVoucherVault() throws IOException, FormatException, JSONException, ParseException {
+        String jsonText = "[\n" +
+                "  {\n" +
+                "    \"uuid\": \"ae1ae525-3f27-481e-853a-8c30b7fa12d8\",\n" +
+                "    \"description\": \"Clothes Store\",\n" +
+                "    \"code\": \"123456\",\n" +
+                "    \"codeType\": \"CODE128\",\n" +
+                "    \"expires\": null,\n" +
+                "    \"removeOnceExpired\": true,\n" +
+                "    \"balance\": null,\n" +
+                "    \"color\": \"GREY\"\n" +
+                "  },\n" +
+                "  {\n" +
+                "    \"uuid\": \"29a5d3b3-eace-4311-a15c-4c7e6a010531\",\n" +
+                "    \"description\": \"Department Store\",\n" +
+                "    \"code\": \"26846363\",\n" +
+                "    \"codeType\": \"CODE39\",\n" +
+                "    \"expires\": \"2021-03-26T00:00:00.000\",\n" +
+                "    \"removeOnceExpired\": true,\n" +
+                "    \"balance\": 3.5,\n" +
+                "    \"color\": \"PURPLE\"\n" +
+                "  }\n" +
+                "]";
 
-    private void checkLoyaltyCardsExpiry()
-    {
-        Cursor cursor = db.getLoyaltyCardCursor();
-        cursor.moveToNext();
-        LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cursor);
-        assertEquals("Never", card.store);
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(jsonText.getBytes(StandardCharsets.UTF_8));
+        InputStreamReader inStream = new InputStreamReader(inputStream);
+
+        // Import the Voucher Vault data
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.VoucherVault);
+        assertTrue(result);
+        assertEquals(2, db.getLoyaltyCardCount());
+
+        LoyaltyCard card = db.getLoyaltyCard(1);
+
+        assertEquals("Clothes Store", card.store);
         assertEquals("", card.note);
         assertEquals(null, card.expiry);
         assertEquals(new BigDecimal("0"), card.balance);
-        assertEquals(null, card.balanceType);
-        assertEquals(BARCODE_DATA, card.cardId);
-        assertEquals(BARCODE_TYPE, card.barcodeType);
-        assertEquals(Integer.valueOf(0), card.headerColor);
+        assertEquals(Currency.getInstance("USD"), card.balanceType);
+        assertEquals("123456", card.cardId);
+        assertEquals(BarcodeFormat.CODE_128.name(), card.barcodeType);
         assertEquals(0, card.starStatus);
+        assertEquals(Color.GRAY, (long) card.headerColor);
 
-        cursor.moveToNext();
-        card = LoyaltyCard.toLoyaltyCard(cursor);
-        assertEquals("Past", card.store);
+        card = db.getLoyaltyCard(2);
+
+        assertEquals("Department Store", card.store);
         assertEquals("", card.note);
-        assertTrue(card.expiry.before(new Date()));
-        assertEquals(new BigDecimal("0"), card.balance);
-        assertEquals(null, card.balanceType);
-        assertEquals(BARCODE_DATA, card.cardId);
-        assertEquals(BARCODE_TYPE, card.barcodeType);
-        assertEquals(Integer.valueOf(0), card.headerColor);
+        assertEquals(new Date(1616716800000L), card.expiry);
+        assertEquals(new BigDecimal("3.5"), card.balance);
+        assertEquals(Currency.getInstance("USD"), card.balanceType);
+        assertEquals("26846363", card.cardId);
+        assertEquals(BarcodeFormat.CODE_39.name(), card.barcodeType);
         assertEquals(0, card.starStatus);
+        assertEquals(Color.rgb(128, 0, 128), (long) card.headerColor);
 
-        cursor.moveToNext();
-        card = LoyaltyCard.toLoyaltyCard(cursor);
-        assertEquals("Today", card.store);
-        assertEquals("", card.note);
-        assertTrue(card.expiry.before(new Date(new Date().getTime()+86400)));
-        assertTrue(card.expiry.after(new Date(new Date().getTime()-86400)));
-        assertEquals(new BigDecimal("0"), card.balance);
-        assertEquals(null, card.balanceType);
-        assertEquals(BARCODE_DATA, card.cardId);
-        assertEquals(BARCODE_TYPE, card.barcodeType);
-        assertEquals(Integer.valueOf(0), card.headerColor);
-        assertEquals(0, card.starStatus);
-
-        cursor.moveToNext();
-        card = LoyaltyCard.toLoyaltyCard(cursor);
-        assertEquals("Future", card.store);
-        assertEquals("", card.note);
-        assertTrue(card.expiry.after(new Date(new Date().getTime()+86400)));
-        assertEquals(new BigDecimal("0"), card.balance);
-        assertEquals(null, card.balanceType);
-        assertEquals(BARCODE_DATA, card.cardId);
-        assertEquals(BARCODE_TYPE, card.barcodeType);
-        assertEquals(Integer.valueOf(0), card.headerColor);
-        assertEquals(0, card.starStatus);
-
-        cursor.close();
+        clearDatabase();
     }
 }