Fix comment

.github/dependabot.yml

@@ -1,11 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "gradle" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "daily"

.github/workflows/android.yml

@@ -13,25 +13,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Fail on bad translations
-      run: if grep -ri "<xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
-    - uses: gradle/wrapper-validation-action@v1
-    - name: set up JDK 11
-      uses: actions/setup-java@v2
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
       with:
-        distribution: 'adopt'
-        java-version: '11'
+        java-version: 1.8
     - name: Build
       run: ./gradlew assembleRelease
     - name: Check lint
       run: ./gradlew lintRelease
     - name: Run unit tests
-      run: ./gradlew testReleaseUnitTest || ./gradlew testReleaseUnitTest
-    - name: SpotBugs
-      run: ./gradlew spotbugsRelease
-    - name: Archive test results
-      if: always()
-      uses: actions/upload-artifact@v2
-      with:
-        name: test-results
-        path: app/build/reports
+      run: ./gradlew testReleaseUnitTest
+    - name: FindBugs
+      run: ./gradlew findbugs

.github/workflows/autoclose-needs-info.yml

@@ -1,23 +0,0 @@
-name: 'Close issues and PRs needing info for too long'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-    
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v4
-        with:
-          days-before-stale: -1
-          days-before-close: 90
-          close-issue-message: 'This issue is missing necessary information and cannot be worked on in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
-          close-pr-message: 'This PR is missing necessary information and cannot be merged in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
-          only-labels: 'needs info'
-          stale-issue-label: 'needs info'
-          stale-pr-label: 'needs info'
-          remove-stale-when-updated: false

.github/workflows/calibreapp-image-actions.yml

@@ -1,34 +0,0 @@
-name: Compress Images on Push to Master
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '**.jpg'
-      - '**.jpeg'
-      - '**.png'
-      - '**.webp'
-jobs:
-  build:
-    # Only run on Pull Requests within the same repository, and not from forks.
-    if: github.event.pull_request.head.repo.full_name == github.repository
-    name: calibreapp/image-actions
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-      - name: Compress Images
-        id: calibre
-        uses: calibreapp/image-actions@1.1.0
-        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
-          ignorePaths: 'app/src/test'
-          compressOnly: true
-      - name: Create New Pull Request If Needed
-        if: steps.calibre.outputs.markdown != ''
-        uses: peter-evans/create-pull-request@v3
-        with:
-          title: Compressed Images
-          branch-suffix: timestamp
-          commit-message: Compressed Images
-          body: ${{ steps.calibre.outputs.markdown }}

.github/workflows/changelog-to-fastlane.yml

@@ -1,25 +0,0 @@
-name: Convert CHANGELOG to Fastlane
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  convert_changelog_to_fastlane:
-    runs-on: ubuntu-latest
-    name: Convert CHANGELOG to Fastlane
-    steps:
-    - name: Checkout repo
-      id: checkout
-      uses: actions/checkout@v2
-    - name: Setup Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - name: Run converter script
-      run: python .scripts/changelog_to_fastlane.py
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3
-      with:
-        title: "Update Fastlane changelogs"
-        commit-message: "Update Fastlane changelogs"
-        branch-suffix: timestamp

.github/workflows/codeql-analysis.yml

@@ -1,71 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '33 1 * * 4'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.github/workflows/contributors-to-file.yml

@@ -1,25 +0,0 @@
-name: Write contributors to file
-on:
-  schedule:
-    - cron: '3 4 * * 0'
-
-jobs:
-  contributors_to_file:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
-    name: Write contributors to file
-    steps:
-    - name: Checkout repo
-      id: checkout
-      uses: actions/checkout@v2
-    - name: Update contributors
-      id: update_contributors
-      uses: TheLastProject/contributors-to-file-action@v2
-      with:
-        file_in_repo: app/src/main/res/raw/contributors.txt
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3
-      with:
-        title: "Update contributors"
-        commit-message: "Update contributors"
-        branch-suffix: timestamp

.gitignore

@@ -1,10 +1,8 @@
 *.iml
 .gradle
-local.properties
-.idea/
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
 .DS_Store
-build/
-captures/
-**/release
-**/debug
-app/*.log
+/build
+/captures

.scripts/changelog_to_fastlane.py

@@ -1,28 +0,0 @@
-#!/usr/bin/python3
-
-import os
-import re
-
-changelogs = {}
-
-with open('CHANGELOG.md') as changelog:
-    version_code = None
-    text = []
-
-    for line in changelog:
-        if line.startswith("## "):
-            if version_code != None:
-                changelogs[version_code] = text
-
-            text = []
-            match = re.match("## \S* - (\d*).*", line)
-            if not match:
-                raise ValueError(f"Invalid version line: {line}")
-            version_code = match.group(1)
-        elif line:
-            # Turn Markdown [links](to_url) into links (to_url)
-            text.append(re.sub(r'\[(.*?)\]\((.*?)\)', r'\1 (\2)', line))
-
-for version, description in changelogs.items():
-    with open(os.path.join("fastlane", "metadata", "android", "en-US", "changelogs", f"{version}.txt"), "w") as fastlane_file:
-        fastlane_file.write("".join(description).strip())

.tx/config

@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+
+[loyalty-card-locker.stringsxml]
+file_filter = app/src/main/res/values-<lang>/strings.xml
+minimum_perc = 0
+source_file = app/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+

CHANGELOG.md

@@ -1,275 +1,25 @@
-# Changelog
-
-## v2.7.1 - 86 (2021-10-07)
-
-- Improve search with spaces
-
-## v2.7.0 - 85 (2021-10-05)
-
-Android 4.4 is no longer supported starting with this release. If you want to use Catima on Android 4.4, please use version 2.6.1.
-
-- Improved Android 12 support
-- Improved about screen
-- Search now ignores accents
-
-## v2.6.1 - 84 (2021-09-25)
-
-- Minor bugfixes and improvements
-
-## v2.6.0 - 83 (2021-09-19)
-
-- Support for changing the sorting order
-- Prevent Out Of Memory on scanning large pictures for barcode
-
-## v2.5.0 - 82 (2021-09-10)
-
-- Improved support for screen readers
-- Don't crash when trying to open a video from gallery
-- Swipe support on loyalty card view screen
-- Don't reset group on back button press
-
-## v2.4.0 - 81 (2021-08-29)
-
-- Improve card list for landscape and tablet display
-- Add theming colour support (thanks, Subhashish Anand!)
-- Don't close scan activity on camera error (so manual entry is still possible)
-- Add all contributors to the about dialog
-
-## v2.3.0 - 80 (2021-08-19)
-
-- Fix images not imported from backup
-- Option to override language
-
-## v2.2.3 - 79 (2021-08-13)
-
-- Fix widget creating different-looking shortcut than app shortcuts
-- Replace default Android black screen with splash screen
-
-## v2.2.2 - 78 (2021-08-08)
-
-- Fix crash on rotation in loyalty card edit activity
-
-## v2.2.1 - 77 (2021-08-07)
-
-- Improve Stocard importer
-- Fix importing Catima export with multiline note
-- Scale card title in acceptable range
-- Animation improvements
-
-## v2.2.0 - 76 (2021-08-02)
-
-- Make links in notes clickable
-- Pre-select group the user is currently in when creating a new card
-- Comma-separate group names in loyalty card view
-- Fix maximize button appearing on no barcode
-
-## v2.1.0 - 75 (2021-08-01)
-
-- Fix selected colour in colour changing dialog
-- Support for deleting multiple cards at once
-- Fix possible ArithmeticException when resizing image
-- Fix fullscreen is closed when rotating device
-
-## v2.0.4 - 74 (2021-07-27)
-
-- Fix shortcut creation
-- Generate card-specific shortcut icon
-- Fix ability to change loyalty card colour
-
-## v2.0.3 - 73 (2021-07-25)
-
-- Fix loading photos when editing existing card
-
-## v2.0.2 - 72 (2021-07-25)
-
-- Fix inability to configure photos in new loyalty card
-
-## v2.0.1 - 71 (2021-07-21)
-
-- Several minor translation and UI fixes
-- Fix crash in import/sharing loyalty card on Android 6
-
-## v2.0 - 70 (2021-07-14)
-
-- BREAKING CHANGE: The backup format changed, see https://github.com/TheLastProject/Catima/wiki/Export-format
-- BREAKING CHANGE: The URL sharing format changed, see https://github.com/TheLastProject/Catima/wiki/Card-sharing-URL-format
-- Make it possible to enable or disable the flashlight while scanning
-- Add UPC-E support
-- Support adding a front and back photo to each card
-- Support importing password-protected zip files
-- Support importing from Stocard (Beta)
-- Fix useless whitespace in notes from Fidme import
-- Support new Voucher Vault export format
-- Fix Floating Action Buttons being behind other UI elements on Android 4
-- Fix loyalty card viewer appbar top margin
-
-## v1.14.1 - 69 (2021-06-14)
-
-- Add missing barcode ID to export
-- Don't show update barcode dialog if value is the same as card ID
-- Add Finnish translation
-
-## v1.14 - 68 (2021-06-07)
-
-- Support new PDF417 export from Voucher Vault
-- Support copying multiple barcodes at once
-- Support sharing multiple loyalty cards at once
-- Ask to update barcode value if card ID changes
-
-## v1.13 - 67 (2021-04-10)
-
-- Add option to set a separate barcode value from card ID
-- Simplify font sizing configuration
-- Several small UI fixes
-- Use letter icon for shortcuts too
-- Always show all barcode types in manual entry
-- Remove privacy policy first start dialog
-
-## v1.12 - 66 (2021-03-30)
-
-- Support importing [Fidme](https://play.google.com/store/apps/details?id=fr.snapp.fidme) exports
-- Allow importing a card from a picture stored in the user's Android gallery
-- Fix multiline note cutoff
-- Change "Thank you" text on privacy dialog to "Accept" because Huawei is overly pedantic
-
-## v1.11 - 64 (2021-03-21)
-
-- Add privacy policy dialog on first start (required by Huawei)
-
-## v1.10 - 63 (2021-03-07)
-
-- 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 - 62 (2021-02-24)
-
-- Fix parsing balance for countries using space as separator
-
-## v1.9.1 - 61 (2021-02-23)
-
-- Improve balance parsing logic
-- Fix currency decimal display on main screen
-
-## v1.9 - 59 (2021-02-22)
-
-- Add balance support
-- Reorganize barcode tab of edit view
-
-## v1.8.1 - 58 (2021-02-12)
-
-- Fix Crash on versions before Android 7
-
-## v1.8 - 57 (2021-01-28)
-
-- Add support for scaling the barcode when moving to top to fit even more small scanners
-- Fix bottom sheet jumping after switching to fullscreen
-- Make header in loyalty card view small in landscape mode
-- Fix cards not staying in group when group gets renamed
-
-## v1.7.1 - 56 (2021-01-18)
-
-- Fix crash on switching to barcode tab in edit view if there is no barcode
-
-## v1.7.0 - 55 (2021-01-18)
-
-- Separate edit UI in tabs to make it feel more spacious
-- Add expiry field support
-
-## v1.6.2 - 54 (2021-01-04)
-
-- Fix edit button or more info bottom sheet drawing over barcode ID
-
-## v1.6.1 - 64 (2020-12-16)
-
-- Fix regression causing manual barcode entry to not be saved
-
-## v1.6.0 - 52 (2020-12-15)
-
-- Automatically focus text field when creating or editing a group
-- Fix blurry icons (use SVG everywhere)
-- Always open camera but add manual scan button to camera view
-
-## v1.5.1 - 51 (2020-12-03)
-
-- Fix bottomsheet background being transparent
-
-## v1.5.0 - 50 (2020-12-03)
-
-- Improve contrast by always using white text on red buttons
-- Draggable bottom sheet in loyalty card view
-
-## v1.4.1 - 49 (2020-12-01)
-
-- Improved translations
-- Small UI fixes
-
-## v1.4.0 - 48 (2020-11-28)
-
-- Move About screen into its own activity
-- Ask user if they want to use their camera or manually enter ID on add/edit card
-- Make group ordering manual instead of forced alphabetically
-
-## v1.3.0 - 47 (2020-11-22)
-
-- Always show all import/export options and show a toast on actual issues (improves compat with XPrivacyLua)
-- Ask for confirmation when leaving edit view after making changes without saving
-
-## v1.2.2 - 46 (2020-11-19)
-
-- Remember active group tab between screens and sessions
-
-## v1.2.1 - 45 (2020-11-17)
-
-- Fix home screen swiping triggering during vertical swipes too
-
-## v1.2.0 - 44 (2020-11-17)
-
-- Add swiping between groups on the home screen
-- Fix crash with cards lacking header colour
-
-## v1.1.0 - 43 (2020-11-11)
-
-- Improved edit UI
-- Removed header text colour option (now automatically generated based on brightness)
-- Updated translations
-
-## v1.0.1 - 42 (2020-11-07)
-
-- Fix crash in search with no groups
-
-## v1.0 - 41 (2020-11-06)
-
-- Added rounded edges to card icons on main overview
-- Added support for grouping entries
-
-## v0.29 - 40 (2020-10-29)
-
-- Rebrand to Catima
-- Removed intro
-- Add floating action buttons
-- Fix Android 5 crash when opening About screen
-- Add favourites support
-- Fix disabled auto-rotate being ignored
-
-## v0.28 - 39 (2020-03-09)
+## v0.28 (2020-03-09)
 
+Changes:
 - Fix barcode centering when exiting full screen ([#351](https://github.com/brarcher/loyalty-card-locker/pull/351))
 - Allow backup export location to be selected ([#352](https://github.com/brarcher/loyalty-card-locker/pull/352))
 - Update translations ([#357](https://github.com/brarcher/loyalty-card-locker/pull/357)) & ([#362](https://github.com/brarcher/loyalty-card-locker/pull/362))
 
-## v0.27 - 38 (2020-01-26)
+## v0.27 (2020-01-26)
 
+Changes:
 - Tapping on a barcode now moves it to the top of the screen ([#348](https://github.com/brarcher/loyalty-card-locker/pull/348))
 - Add white space around barcodes to improve scanning in dark mode ([#328](https://github.com/brarcher/loyalty-card-locker/issues/328))
 - Fix swapped import buttons. ([#346](https://github.com/brarcher/loyalty-card-locker/pull/346))
 
-## v0.26.1 - 37 (2020-01-09)
+## v0.26.1 (2020-01-09)
 
+Changes:
 - Fix issue with sharing cards without background color ([#343](https://github.com/brarcher/loyalty-card-locker/pull/343))
 
-## v0.26 - 36 (2020-01-05)
+## v0.26 (2020-01-05)
 
+Changes:
 - Add ability to search for a card ([#320](https://github.com/brarcher/loyalty-card-locker/pull/320))
 - Add ability to share and receive loyalty cards ([#321](https://github.com/brarcher/loyalty-card-locker/pull/321))
 - Dark mode support ([#322](https://github.com/brarcher/loyalty-card-locker/pull/322))
@@ -279,215 +29,254 @@ Android 4.4 is no longer supported starting with this release. If you want to us
 - Improve notification and app icon visibility ([#330](https://github.com/brarcher/loyalty-card-locker/pull/330))
 - Update target SDK to Android 10
 - Improve the following translations:
-  - German
-  - Italian
-  - Dutch
-  - Polish
-  - Russian
+  * German
+  * Italian
+  * Dutch
+  * Polish
+  * Russian
 
-## v0.25.4 - 35 (2019-10-04)
+## v0.25.4 (2019-10-04)
 
+Changes
 - Enable app backups
 - Update French and Slovenian translations
 
-## v0.25.3 - 34 (2019-03-02)
+## v0.25.3 (2019-03-02)
 
+Changes
 - Update Russian translations
 
-## v0.25.2 - 33 (2019-01-05)
-
+## v0.25.2 (2019-01-05)
+  
+Changes
 - Update and add translations
 
-## v0.25.1 - 32 (2018-10-14)
+## v0.25.1 (2018-10-14)
 
-- Fix creating new card by manually entering barcode ([issue #272](https://github.com/brarcher/loyalty-card-locker/issues/272))
+Changes:
+- Fix creating new card by manually entering barcode (https://github.com/brarcher/loyalty-card-locker/issues/272)
 
-## v0.25 - 31 (2018-10-07)
+## v0.25 (2018-10-07)
 
-- Sort card list case insensitive ([pull #266](https://github.com/brarcher/loyalty-card-locker/pull/266))
-- Add setting to lock orientation for all cards ([pull #269](https://github.com/brarcher/loyalty-card-locker/pull/269)
+Changes:
+- Sort card list case insensitive (https://github.com/brarcher/loyalty-card-locker/pull/266)
+- Add setting to lock orientation for all cards (https://github.com/brarcher/loyalty-card-locker/pull/269)
 
-## v0.24 - 30 (2018-07-31)
+## v0.24 (2018-07-31)
 
-- Add a setting to control screen brightness when displaying a barcode ([pull #259](https://github.com/brarcher/loyalty-card-locker/pull/259))
-- Add Greek translations ([pull #252](https://github.com/brarcher/loyalty-card-locker/pull/252))
-- Add Slovenian translations ([pull #260](https://github.com/brarcher/loyalty-card-locker/pull/260))
-- Update translations ([pull #260](https://github.com/brarcher/loyalty-card-locker/pull/260), [pull #254](https://github.com/brarcher/loyalty-card-locker/pull/254))
+Changes:
+- Add a setting to control screen brightness when displaying a barcode (https://github.com/brarcher/loyalty-card-locker/pull/259)
+- Add Greek translations (https://github.com/brarcher/loyalty-card-locker/pull/252)
+- Add Slovenian translations (https://github.com/brarcher/loyalty-card-locker/pull/260)
+- Update translations (https://github.com/brarcher/loyalty-card-locker/pull/260, https://github.com/brarcher/loyalty-card-locker/pull/254)
 
-## v0.23.4 - 29 (2018-05-12)
+## v0.23.4 (2018-05-12)
 
-- Fix Spanish translations ([pull #244](https://github.com/brarcher/loyalty-card-locker/pull/244))
-- Update translations ([pull #244](https://github.com/brarcher/loyalty-card-locker/pull/244))
+Changes: 
+- Fix Spanish translations (https://github.com/brarcher/loyalty-card-locker/pull/244)
+- Update translations (https://github.com/brarcher/loyalty-card-locker/pull/244)
 
-## v0.23.3 - 28 (2018-05-05)
+## v0.23.3 (2018-05-05)
 
+Changes:
 - Added translations
-  - Polish ([pull #232](https://github.com/brarcher/loyalty-card-locker/pull/232))
-  - Spanish ([pull #232](https://github.com/brarcher/loyalty-card-locker/pull/232))
-  - Slovak ([pull #232](https://github.com/brarcher/loyalty-card-locker/pull/232))
-- Updated translations ([pull #239](https://github.com/brarcher/loyalty-card-locker/pull/239))
+  * Polish (https://github.com/brarcher/loyalty-card-locker/pull/232)
+  * Spanish (https://github.com/brarcher/loyalty-card-locker/pull/232)
+  * Slovak (https://github.com/brarcher/loyalty-card-locker/pull/232)
+- Updated translations (https://github.com/brarcher/loyalty-card-locker/pull/239)
 
-## v0.23.2 - 27 (2018-03-11)
+## v0.23.2 (2018-03-11)
 
-- Reduce min SDK from 17 to 15. ([pull #226](https://github.com/brarcher/loyalty-card-locker/pull/226))
-- Remove usage of legacy apache library, used only in unit tests but no longer needed. ([pull #225](https://github.com/brarcher/loyalty-card-locker/pull/225))
+Changes:
+- Reduce min SDK from 17 to 15. (https://github.com/brarcher/loyalty-card-locker/pull/226)
+- Remove usage of legacy apache library, used only in unit tests but no longer needed. (https://github.com/brarcher/loyalty-card-locker/pull/225)
 
-## v0.23.1 - 26 (2018-03-07)
+## v0.23.1 (2018-03-07)
 
-- Prevent crash when rendering a barcode exhausts the application's memory. ([pull #219](https://github.com/brarcher/loyalty-card-locker/pull/219))
+Changes:
+- Prevent crash when rendering a barcode exhausts the application's memory. (https://github.com/brarcher/loyalty-card-locker/pull/219)
 
-## v0.23 - 25 (2018-02-28)
+## v0.23 (2018-02-28)
 
-- Reduce space in header when viewing a card. ([pull #213](https://github.com/brarcher/loyalty-card-locker/pull/213))
-- Disable beep when scanning a barcode. ([pull #216](https://github.com/brarcher/loyalty-card-locker/pull/216))
+Changes:
+- Reduce space in header when viewing a card. (https://github.com/brarcher/loyalty-card-locker/pull/213)
+- Disable beep when scanning a barcode. (https://github.com/brarcher/loyalty-card-locker/pull/216)
 
-## v0.22 - 24 (2018-02-19)
+## v0.22 (2018-02-19)
 
-- Update translations. ([pull #208](https://github.com/brarcher/loyalty-card-locker/pull/208))
-- Barcode rendering updates: ([pull #209](https://github.com/brarcher/loyalty-card-locker/pull/209))
-  - Reload card view activity when screen is rotated, so barcode image is correct size.
-  - Render 1D barcodes in a larger space, allowing them to better fill the screen.
+Changes:
+- Update translations. (https://github.com/brarcher/loyalty-card-locker/pull/208)
+- Barcode rendering updates: (https://github.com/brarcher/loyalty-card-locker/pull/209)
+  * Reload card view activity when screen is rotated, so barcode image is correct size.
+  * Render 1D barcodes in a larger space, allowing them to better fill the screen. 
 
-## v0.21 - 23 (2018-02-17)
+## v0.21 (2018-02-17)
 
-- Add quiet space at the start/end of barcodes. ([pull #200](https://github.com/brarcher/loyalty-card-locker/pull/200))
-- Add options to configure the colors used for the store name font and background. ([pull #203](https://github.com/brarcher/loyalty-card-locker/pull/203))
-- Add options to adjust font sizes on the card listing page and single card page. ([pull #204](https://github.com/brarcher/loyalty-card-locker/pull/204))
+Changes
+- Add quiet space at the start/end of barcodes. (https://github.com/brarcher/loyalty-card-locker/pull/200)
+- Add options to configure the colors used for the store name font and background. (https://github.com/brarcher/loyalty-card-locker/pull/203)
+- Add options to adjust font sizes on the card listing page and single card page. (https://github.com/brarcher/loyalty-card-locker/pull/204)
 
-## v0.20 - 22 (2018-02-10)
+## v0.20 (2018-02-10)
 
-- Changes to Card view to display the note, allow the card ID to take multiple lines, and show the store name. ([pull #197](https://github.com/brarcher/loyalty-card-locker/pull/197))
+Changes:
+- Changes to Card view to display the note, allow the card ID to take multiple lines, and show the store name. (https://github.com/brarcher/loyalty-card-locker/pull/197)
 
-## v0.19 - 21 (2018-02-01)
+## v0.19 (2018-02-01)
 
-- Improved layout for card list. ([pull #188](https://github.com/brarcher/loyalty-card-locker/pull/188))
-- Improved layout when viewing a card. ([pull #190](https://github.com/brarcher/loyalty-card-locker/pull/190))
+Changes:
+- Improved layout for card list. (https://github.com/brarcher/loyalty-card-locker/pull/188)
+- Improved layout when viewing a card. (https://github.com/brarcher/loyalty-card-locker/pull/190)
 
-## v0.18.1 - 20 (2018-01-24)
+## v0.18.1 (2018-01-24)
 
-- Workaround crash during install on some Android versions (likely Android 5 and below). ([pull #184](https://github.com/brarcher/loyalty-card-locker/pull/184))
+Changes:
+- Workaround crash during install on some Android versions (likely Android 5 and below). (https://github.com/brarcher/loyalty-card-locker/pull/184)
 
-## v0.18 - 19 (2018-01-19)
+## v0.18 (2018-01-19)
 
-- Fix crash when importing certain types of corrupted CSV files. ([pull #177](https://github.com/brarcher/loyalty-card-locker/pull/177))
-- Fix importing backups directly from the file system. ([pull #180](https://github.com/brarcher/loyalty-card-locker/pull/180))
-- Fix importing backups from certain types of content providers. ([pull #179](https://github.com/brarcher/loyalty-card-locker/pull/179))
+Changes:
+- Fix crash when importing certain types of corrupted CSV files. (https://github.com/brarcher/loyalty-card-locker/pull/177)
+- Fix importing backups directly from the file system. (https://github.com/brarcher/loyalty-card-locker/pull/180)
+- Fix importing backups from certain types of content providers. (https://github.com/brarcher/loyalty-card-locker/pull/179)
 
-## v0.17 - 18 (2018-01-11)
+## v0.17 (2018-01-11)
 
-- Fix issue on Android SDK 24+ where using the file chooser import option would cause a crash. ([pull #170](https://github.com/brarcher/loyalty-card-locker/pull/170))
-- New icon and color scheme. ([pull #171](https://github.com/brarcher/loyalty-card-locker/pull/171))
+Changes:
+- Fix issue on Android SDK 24+ where using the file chooser import option would cause a crash. (https://github.com/brarcher/loyalty-card-locker/pull/170)
+- New icon and color scheme. (https://github.com/brarcher/loyalty-card-locker/pull/171)
 
-## v0.16 - 17 (2017-11-29)
+## v0.16 (2017-11-29)
 
-- Add support for adding loyalty card shortcuts from the launcher/homescreen. ([pull #161](https://github.com/brarcher/loyalty-card-locker/pull/161))
-- Remove support for adding loyalty card shortcuts from the app itself. This removes the need for the shortcut permission. ([pull #163](https://github.com/brarcher/loyalty-card-locker/pull/163))
+Changes:
+- Add support for adding loyalty card shortcuts from the launcher/homescreen. (https://github.com/brarcher/loyalty-card-locker/pull/161)
+- Remove support for adding loyalty card shortcuts from the app itself. This removes the need for the shortcut permission. (https://github.com/brarcher/loyalty-card-locker/pull/163)
 
-## v0.15 - 16 (2017-11-25)
+## v0.15 (2017-11-25)
 
-- Add support for adding shortcuts to home screen when adding or editing a card. ([pull #155](https://github.com/brarcher/loyalty-card-locker/pull/155))
-- Remove widget, as it was a poor substitute for shortcuts. ([pull #155](https://github.com/brarcher/loyalty-card-locker/pull/155))
-- Fix exporting backups on Android 7+. ([pull #153](https://github.com/brarcher/loyalty-card-locker/pull/153))
-- Report more accurate mime type when exporting backup data. ([pull #156](https://github.com/brarcher/loyalty-card-locker/pull/156))
-- Fix bug where a card could not be edited. ([pull #155](https://github.com/brarcher/loyalty-card-locker/pull/155))
+Changes:
+- Add support for adding shortcuts to home screen when adding or editing a card. (https://github.com/brarcher/loyalty-card-locker/pull/155)
+- Remove widget, as it was a poor substitute for shortcuts. (https://github.com/brarcher/loyalty-card-locker/pull/155)
+- Fix exporting backups on Android 7+. (https://github.com/brarcher/loyalty-card-locker/pull/153)
+- Report more accurate mime type when exporting backup data. (https://github.com/brarcher/loyalty-card-locker/pull/156)
+- Fix bug where a card could not be edited. (https://github.com/brarcher/loyalty-card-locker/pull/155)
 
-## v0.14 - 15 (2017-10-26)
+## v0.14 (2017-10-26)
 
-- Add support for app shortcuts (Android 7.1+), where the most recently used cards will appear as shortcuts. ([pull #145](https://github.com/brarcher/loyalty-card-locker/pull/145))
-- Add a widget which works like a pinned app shortcut, to support devices which run below Android 7.1. ([pull #142](https://github.com/brarcher/loyalty-card-locker/pull/142))
+Changes:
+- Add support for app shortcuts (Android 7.1+), where the most recently used cards will appear as shortcuts. (https://github.com/brarcher/loyalty-card-locker/pull/145)
+- Add a widget which works like a pinned app shortcut, to support devices which run below Android 7.1. (https://github.com/brarcher/loyalty-card-locker/pull/142)
 
-## v0.13 - 14 (2017-07-25)
+## v0.13 (2017-07-25)
 
-- Add screen rotation lock menu option when displaying a card. If locked, the screen will transition to its "natural" orientation and further screen rotation will be blocked. ([pull #128](https://github.com/brarcher/loyalty-card-locker/pull/128))
-- If a card is selected from the main screen but cannot be loaded, the application fails gracefully and posts a message. ([pull #132](https://github.com/brarcher/loyalty-card-locker/pull/132))
-- Fix case where layout IDs for intro wizard could not be found. ([pull #128](https://github.com/brarcher/loyalty-card-locker/pull/128))
+Changes:
+- Add screen rotation lock menu option when displaying a card. If locked, the screen will transition to its "natural" orientation and further screen rotation will be blocked. (https://github.com/brarcher/loyalty-card-locker/pull/128)
+- If a card is selected from the main screen but cannot be loaded, the application fails gracefully and posts a message. (https://github.com/brarcher/loyalty-card-locker/pull/132)
+- Fix case where layout IDs for intro wizard could not be found. (https://github.com/brarcher/loyalty-card-locker/pull/128)
 
-## v0.12 - 13 (2017-07-16)
+## v0.12 (2017-07-16)
 
-- A change in v0.11 reduced the memory usage of barcode drawing, but affected the barcode dimensions. This is now changed to maintain the barcode dimensions while reducing memory usage. ([pull #126](https://github.com/brarcher/loyalty-card-locker/pull/126))
-- Update German and French translations. ([pull #122](https://github.com/brarcher/loyalty-card-locker/pull/122), [pull #124](https://github.com/brarcher/loyalty-card-locker/pull/124), [pull #125](https://github.com/brarcher/loyalty-card-locker/pull/125))
+Changes:
 
-## v0.11.1 - 12 (2017-06-29)
+- A change in v0.11 reduced the memory usage of barcode drawing, but affected the barcode dimensions. This is now changed to maintain the barcode dimensions while reducing memory usage. (https://github.com/brarcher/loyalty-card-locker/pull/126)
+- Update German and French translations. (https://github.com/brarcher/loyalty-card-locker/pull/122, https://github.com/brarcher/loyalty-card-locker/pull/124, https://github.com/brarcher/loyalty-card-locker/pull/125)
 
+## v0.11.1 (2017-06-29)
+
+Changes:
 - Prevent a crash when rotation the screen in the first run intro wizard.
 
-## v0.11 - 11 (2017-06-26)
+## v0.11 (2017-06-26)
 
-- When editing a card ID, pre-populate the existing ID to start. ([pull #94](https://github.com/brarcher/loyalty-card-locker/pull/94))
-- Limit the width of generated barcodes to reduce memory usage and out of memory errors. ([pull #103](https://github.com/brarcher/loyalty-card-locker/pull/103))
-- When editing a card, change the "Enter Card" button to say "Edit Card" if a card ID already exists. ([pull #104](https://github.com/brarcher/loyalty-card-locker/pull/104))
-- Change the color scheme to be softer and compatible with the app icon, and change the layout when viewing a card to be cleaner. ([pull #107](https://github.com/brarcher/loyalty-card-locker/pull/107))
-- Add an intro wizard which launches on the app's first launch. ([pull #108](https://github.com/brarcher/loyalty-card-locker/pull/108))
+Improvements:
+- When editing a card ID, pre-populate the existing ID to start. (https://github.com/brarcher/loyalty-card-locker/pull/94)
+- Limit the width of generated barcodes to reduce memory usage and out of memory errors. (https://github.com/brarcher/loyalty-card-locker/pull/103)
+- When editing a card, change the "Enter Card" button to say "Edit Card" if a card ID already exists. (https://github.com/brarcher/loyalty-card-locker/pull/104)
+- Change the color scheme to be softer and compatible with the app icon, and change the layout when viewing a card to be cleaner. (https://github.com/brarcher/loyalty-card-locker/pull/107)
+- Add an intro wizard which launches on the app's first launch. (https://github.com/brarcher/loyalty-card-locker/pull/108)
 
-## v0.10 - 10 (2017-02-12)
+## v0.10 (2017-02-12)
 
-- Changed the default import/export filename. ([pull #84](https://github.com/brarcher/loyalty-card-locker/pull/84))
-- Correct string on the import/export page. ([pull #87](https://github.com/brarcher/loyalty-card-locker/pull/87))
-- Improve layout of card view page. The text should be easier to read, and is selectable with a long click. ([pull #91](https://github.com/brarcher/loyalty-card-locker/pull/91))
+Improvements:
+- Changed the default import/export filename. (https://github.com/brarcher/loyalty-card-locker/pull/84)
+- Correct string on the import/export page. (https://github.com/brarcher/loyalty-card-locker/pull/87)
+- Improve layout of card view page. The text should be easier to read, and is selectable with a long click. (https://github.com/brarcher/loyalty-card-locker/pull/91)
 
-## v0.9 - 9 (2017-01-17)
+## v0.9 (2017-01-17)
 
 The "Locker" part of the name was not intuitive. To help remedy this a new application icon was created by betsythefc which better represents the purpose of the application: to store loyalty cards which use barcodes. Along with this new icon the name of the application has been changed to "Loyalty Card Keychain".
 
 Additional features/improvements:
 
-- Importing/Exporting cards was changed to be more flexible. ([pull #76](https://github.com/brarcher/loyalty-card-locker/pull/76))
-- Translations for Lithuanian added. ([pull #62](https://github.com/brarcher/loyalty-card-locker/pull/62))
-- Translations for French added. ([pull #80](https://github.com/brarcher/loyalty-card-locker/pull/80))
+- Importing/Exporting cards was changed to be more flexible. (https://github.com/brarcher/loyalty-card-locker/pull/76)
+- Translations for Lithuanian added. (https://github.com/brarcher/loyalty-card-locker/pull/62)
+- Translations for French added. (https://github.com/brarcher/loyalty-card-locker/pull/80)
 
-## v0.8 - 8 (2016-11-22)
+## v0.8 (2016-11-22)
 
-- Screen brightness increased to its maximum when displaying a card, to help barcode scanners successfully capture the barcode. ([pull #54](https://github.com/brarcher/loyalty-card-locker/pull/54))
-- Add a delete confirmation when deleting a card. ([pull #55](https://github.com/brarcher/loyalty-card-locker/pull/55))
-- Add translations for German ([pull #57](https://github.com/brarcher/loyalty-card-locker/pull/57)) and Czech ([pull #58](https://github.com/brarcher/loyalty-card-locker/pull/58)).
-- Clarification change for Italian translation. ([pull #66](https://github.com/brarcher/loyalty-card-locker/pull/66))
+New features/improvements:
+- Screen brightness increased to its maximum when displaying a card, to help barcode scanners successfully capture the barcode. (https://github.com/brarcher/loyalty-card-locker/pull/54)
+- Add a delete confirmation when deleting a card. (https://github.com/brarcher/loyalty-card-locker/pull/55)
+- Add translations for German (https://github.com/brarcher/loyalty-card-locker/pull/57) and Czech (https://github.com/brarcher/loyalty-card-locker/pull/58).
+- Clarification change for Italian translation. (https://github.com/brarcher/loyalty-card-locker/pull/66)
 
-## v0.7 - 7 (2016-07-14)
+## v0.7 (2016-07-14)
 
-- Long-click of a card brings up option to copy card ID to the clipboard. ([pull #49](https://github.com/brarcher/loyalty-card-locker/issues/49))
+New features/improvements:
+- Long-click of a card brings up option to copy card ID to the clipboard. (https://github.com/brarcher/loyalty-card-locker/issues/49)
+
+Bug fixes:
 - Back button on Input/Export view now works, moving user to main view
 
-## v0.6 - 6 (2016-05-23)
+## v0.6 (2016-05-23)
 
-- Allow user to enter barcode manually. If a user elects to enter a barcode manually, a list of all valid and supported barcode images is displayed. The user then may select the barcode image which matches what the user wants. [issue #33](https://github.com/brarcher/loyalty-card-locker/issues/33), [pull #44](https://github.com/brarcher/loyalty-card-locker/pull/44)
-- Resolve issue where some displayed barcodes were blurry. ([issue #37](https://github.com/brarcher/loyalty-card-locker/issues/37))
+New features/improvements:
+- Allow user to enter barcode manually. If a user elects to enter a barcode manually, a list of all valid and supported barcode images is displayed. The user then may select the barcode image which matches what the user wants. https://github.com/brarcher/loyalty-card-locker/issues/33, https://github.com/brarcher/loyalty-card-locker/pull/44 
 
-## v0.5 - 5 (2016-05-16)
+Bug fixes:
+- Resolve issue where some displayed barcodes were blurry. (https://github.com/brarcher/loyalty-card-locker/issues/37)
 
-- An about dialog can be opened from the main screen, which gives details about the application and project on GitHub ([issue #19](https://github.com/brarcher/loyalty-card-locker/issues/19))
-- Allow loyalty card information to be imported from/exported to a CSV file in external storage ([issue #36](https://github.com/brarcher/loyalty-card-locker/issues/36), [issue #20](https://github.com/brarcher/loyalty-card-locker/issues/20))
+## v0.5 (2016-05-16)
 
-## v0.4 - 4 (2016-04-09)
+New features/improvements:
+- An about dialog can be opened from the main screen, which gives details about the application and project on GitHub (https://github.com/brarcher/loyalty-card-locker/issues/19)
+- Allow loyalty card information to be imported from/exported to a CSV file in external storage (https://github.com/brarcher/loyalty-card-locker/issues/36 https://github.com/brarcher/loyalty-card-locker/issues/20)
 
+## v0.4 (2016-04-09)
+
+New features/improvements:
 - Dutch translation
 - Allow name field to be editable after adding loyalty card
 - Add an optional note field
+
+Bug fixes:
+
 - Resolve all issues identified by FindBugs and require all FindBugs issues be resolved prior to pull request acceptance
 
-## v0.3 - 3 (2016-02-11)
+## v0.3 (2016-02-11)
 
 - Now officially supports the following list of 1D and 2D barcodes:
-  - AZTEC
-  - CODABAR
-  - CODE_39
-  - CODE_128
-  - DATA_MATRIX
-  - EAN_8
-  - EAN_13
-  - ITF
-  - PDF_417
-  - QR_CODE
-  - UPC_A
-
+  * AZTEC
+  * CODABAR
+  * CODE_39
+  * CODE_128
+  * DATA_MATRIX
+  * EAN_8
+  * EAN_13
+  * ITF
+  * PDF_417
+  * QR_CODE
+ * UPC_A
 - Generated barcodes are larger, easier to scan from a scanning device
 
-## v0.2 - 2 (2016-02-07)
+## v0.2 (2016-02-07)
 
 - Italian translations
 - Support for all 1D barcode types. (Originally only product 1D barcodes were supported)
 - Add required camera permission, which was initially missing.
 
-## v0.1 - 1 (2016-01-30)
+
+## v0.1 (2016-01-30)
 
 - Ability to create/edit/delete loyalty cards
 - Capture barcode of loyalty card using a camera

CONTRIBUTING.md

@@ -1,9 +1,9 @@
-How to Submit Patches to the Catima Project
+How to Submit Patches to the Loyalty Card Keychain Project
 ===============================================================================
-https://github.com/TheLastProject/Catima
+https://github.com/brarcher/budget-watch
 
 This document is intended to act as a guide to help you contribute to the
-Catima project.  It is not perfect, and there will always be exceptions
+Loyalty Card Keychain project.  It is not perfect, and there will always be exceptions
 to the rules described here, but by following the instructions below you
 should have a much easier time getting your work merged with the upstream
 project.
@@ -21,16 +21,16 @@ These are the Android lint checker, run using:
 
     # ./gradlew lintRelease
 
-and SpotBugs, run using:
+and FindBugs, run using:
 
-    # ./gradlew spotbugsRelease
+    # ./gradlew findbugs
 
 The final check is by testing the application on a live device and verifying
 the basic functionality works as expected.
 
 ## Make Sure Your Code is Tested
 
-The Catima code uses a fair number of unit tests to verify that
+The Loyalty Card Keychain code uses a fair number of unit tests to verify that
 the basic functionality is working. Submissions which add functionality
 or significantly change the existing code should include additional tests
 to verify the proper operation of the proposed changes.
@@ -85,7 +85,7 @@ your real name, saying:
 ## Submit Patch(es) for Review
 
 Finally, you will need to submit your patches so that they can be reviewed
-and potentially merged into the main Catima repository. The preferred
-way to do this is to submit a Pull Request to the Catima project.
+and potentially merged into the main Loyalty Card Keychain repository. The preferred
+way to do this is to submit a Pull Request to the Loyalty Card Keychain project.
 Changes need to apply cleanly onto the master branch and pass all
 unit tests and produce no errors during static analysis.

Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "fastlane"

Gemfile.lock

@@ -1,213 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    artifactory (3.0.15)
-    atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.501.0)
-    aws-sdk-core (3.121.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.102.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-    babosa (1.0.4)
-    claide (1.0.3)
-    colored (1.2)
-    colored2 (3.1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    declarative (0.0.20)
-    digest-crc (0.6.4)
-      rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
-    emoji_regex (3.2.2)
-    excon (0.85.0)
-    faraday (1.7.2)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
-      faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
-      faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.193.1)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
-      artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
-      babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored
-      commander (~> 4.6)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 4.0)
-      excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 1.0)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 1.0)
-      fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.3)
-      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-storage (~> 1.31)
-      highline (~> 2.0)
-      json (< 3.0.0)
-      jwt (>= 2.1.0, < 3)
-      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
-      naturally (~> 2.2)
-      optparse (~> 0.1.1)
-      plist (>= 3.1.0, < 4.0.0)
-      rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
-      simctl (~> 1.6.3)
-      terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
-    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.11.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
-      mini_mime (~> 1.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.5.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.6.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
-      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
-    google-cloud-storage (1.34.1)
-      addressable (~> 2.5)
-      digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
-      google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
-      mini_mime (~> 1.0)
-    googleauth (0.17.1)
-      faraday (>= 0.17.3, < 2.0)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (~> 0.15)
-    highline (2.0.3)
-    http-cookie (1.0.4)
-      domain_name (~> 0.5)
-    httpclient (2.8.3)
-    jmespath (1.4.0)
-    json (2.5.1)
-    jwt (2.2.3)
-    memoist (0.16.2)
-    mini_magick (4.11.0)
-    mini_mime (1.1.1)
-    multi_json (1.15.0)
-    multipart-post (2.0.0)
-    nanaimo (0.3.0)
-    naturally (2.2.1)
-    optparse (0.1.1)
-    os (1.1.1)
-    plist (3.6.0)
-    public_suffix (4.0.6)
-    rake (13.0.6)
-    representable (3.1.1)
-      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.2.5)
-    rouge (2.0.7)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.16.0)
-      addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simctl (1.6.8)
-      CFPropertyList
-      naturally
-    terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    trailblazer-option (0.1.1)
-    tty-cursor (0.7.1)
-    tty-screen (0.8.1)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
-    uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (1.7.0)
-    webrick (1.7.0)
-    word_wrap (1.0.0)
-    xcodeproj (1.21.0)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.1)
-      xcpretty (~> 0.2, >= 0.0.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fastlane
-
-BUNDLED WITH
-   2.1.4

app/.gitignore

@@ -0,0 +1 @@
+/build

app/build.gradle

@@ -1,66 +1,40 @@
-import com.github.spotbugs.snom.SpotBugsTask
-
 apply plugin: 'com.android.application'
-apply plugin: 'com.github.spotbugs'
+apply plugin: 'findbugs'
 
-spotbugs {
+findbugs {
+    sourceSets = []
     ignoreFailures = false
-    effort = 'max'
-    excludeFilter = file("./config/spotbugs/exclude.xml")
-    reportsDir = file("$buildDir/reports/spotbugs/")
 }
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "31.0.0"
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "me.hackerchick.catima"
-        minSdkVersion 21
-        targetSdkVersion 31
-        versionCode 86
-        versionName "2.7.1"
-
-        vectorDrawables.useSupportLibrary true
-        multiDexEnabled true
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 39
+        versionName "0.28"
     }
-
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            resValue "string", "app_name", "Catima"
         }
         debug {
             applicationIdSuffix ".debug"
-            resValue "string", "app_name", "Catima Debug"
         }
     }
-
-    bundle {
-        language {
-            enableSplit = false
-        }
-    }
-
-    compileOptions {
-        encoding "UTF-8"
-
-        // Flag to enable support for the new language APIs
-        coreLibraryDesugaringEnabled true
-
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     lintOptions {
-        disable "GoogleAppIndexingWarning", "ButtonStyle", "AlwaysShowAction",
-                "MissingTranslation", "MissingPrefix"
+        disable "GoogleAppIndexingWarning"
+        disable "ButtonStyle"
+        disable "AlwaysShowAction"
+        disable "MissingTranslation"
+        disable "MissingPrefix"
     }
-
     sourceSets {
         test {
-            resources.srcDirs += ['src/test/res']
+            resources.srcDirs += ['src/test/resources']
         }
     }
 
@@ -68,55 +42,40 @@ android {
     // The following allows it to find the resources.
     testOptions {
         unitTests {
-            all {
-                testLogging {
-                    events 'started', 'passed', 'skipped', 'failed'
-                }
-            }
-            includeAndroidResources true
+            includeAndroidResources = true
         }
     }
 }
 
 dependencies {
-// AndroidX
-    implementation "androidx.multidex:multidex:2.0.1"
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
-    implementation 'androidx.exifinterface:exifinterface:1.3.3'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-
-// Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
-
-// Third-party
-    implementation 'com.journeyapps:zxing-android-embedded:4.2.0@aar'
-    implementation 'com.google.zxing:core:3.4.1'
-    implementation 'org.apache.commons:commons-csv:1.9.0'
-    implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.3'
-    implementation 'net.lingala.zip4j:zip4j:2.9.0'
-
-// SpotBugs
-    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
-
-// Testing
-    testImplementation 'androidx.test:core:1.4.0'
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.6.1'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'androidx.appcompat:appcompat:1.2.0'
+    compile 'com.google.android.material:material:1.2.0-alpha03'
+    compile 'androidx.legacy:legacy-support-v4:1.0.0'
+    compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
+    compile 'com.google.zxing:core:3.3.0'
+    compile 'org.apache.commons:commons-csv:1.5'
+    compile 'androidx.constraintlayout:constraintlayout:1.1.3'
+    compile 'com.jaredrummler:colorpicker:1.0.2'
+    compile group: 'com.google.guava', name: 'guava', version: '20.0'
+    compile 'com.github.apl-devs:appintro:v4.2.0'
+    compile "com.vanniktech:vntnumberpickerpreference:1.0.0"
+    testCompile 'junit:junit:4.12'
+    testCompile "org.robolectric:robolectric:4.0.2"
 }
 
-tasks.withType(SpotBugsTask) {
+task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
 
-    description 'Run spotbugs'
+    description 'Run findbugs'
     group 'verification'
 
-    //classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
-    //source = fileTree('src/main/java')
-    //classpath = files()
+    classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
+    source = fileTree('src/main/java')
+    classpath = files()
+
+    effort = 'max'
+
+    excludeFilter = file("./config/findbugs/exclude.xml")
 
     reports {
         xml.enabled = false

app/src/androidTest/java/protect/card_locker/ApplicationTest.java

@@ -0,0 +1,15 @@
+package protect.card_locker;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application>
+{
+    public ApplicationTest()
+    {
+        super(Application.class);
+    }
+}

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="protect.card_locker"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission
         android:name="android.permission.CAMERA"/>
@@ -17,8 +16,6 @@
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
 
-    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android"/>
-
     <application
         android:name=".LoyaltyCardLockerApplication"
         android:allowBackup="true"
@@ -29,82 +26,71 @@
         <activity
             android:name="protect.card_locker.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/Theme.App.Starting"
-            android:exported="true">
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-
-        <activity
-            android:name=".AboutActivity"
-            android:label="@string/about"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
-        <activity
-            android:name=".ManageGroupsActivity"
-            android:label="@string/groups"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
         <activity
             android:name=".LoyaltyCardViewActivity"
             android:theme="@style/AppTheme.NoActionBar"
+            android:label=""
             android:windowSoftInputMode="stateHidden"
             android:exported="true"/>
         <activity
             android:name=".LoyaltyCardEditActivity"
             android:theme="@style/AppTheme.NoActionBar"
+            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"
             android:exported="true">
-            <intent-filter android:autoVerify="true" android:label="@string/app_name">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Main card sharing URIs -->
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-
-                <data android:host="@string/intent_import_card_from_url_host_catima_app"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_catima_app" />
-            </intent-filter>
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Old card sharing URIs -->
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-
-                <data android:host="@string/intent_import_card_from_url_host_thelastproject"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_thelastproject" />
-                <data android:host="@string/intent_import_card_from_url_host_brarcher"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_brarcher" />
+                <!-- Accepts URIs that begin with "https://thelastproject.github.io/Catima/share" or "https://brarcher.github.io/loyalty-card-locker/share” -->
+                <data android:scheme="https"
+                    android:host="@string/intent_import_card_from_url_host"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix" />
+                <data android:scheme="https"
+                    android:host="@string/intent_import_card_from_url_host_old"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_old" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <!-- Accept pkpass files -->
+                <data android:scheme="content" android:mimeType="application/octet-stream"/>
+                <data android:scheme="content" android:mimeType="application/x-compressed"/>
+                <data android:scheme="content" android:mimeType="application/x-zip-compressed"/>
+                <data android:scheme="content" android:mimeType="application/zip"/>
+                <data android:scheme="content" android:mimeType="application/vnd.apple.pkpass"/>
+                <data android:scheme="content" android:mimeType="application/pkpass"/>
+                <data android:scheme="content" android:mimeType="application/vndapplepkpass"/>
+                <data android:scheme="content" android:mimeType="application/vnd-com.apple.pkpass"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ScanActivity"
-            android:label="@string/scanCardBarcode"
-            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".BarcodeSelectorActivity"
             android:label="@string/selectBarcodeTitle"
             android:theme="@style/AppTheme.NoActionBar"
+            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"/>
         <activity
             android:name=".preferences.SettingsActivity"
             android:label="@string/settings"
-            android:theme="@style/AppTheme.NoActionBar"/>
+            android:configChanges="orientation|screenSize"/>
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
+            android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".CardShortcutConfigure"
             android:label="@string/cardShortcut"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:exported="true">
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>

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

@@ -1,179 +0,0 @@
-package protect.card_locker;
-
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.TextView;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.text.HtmlCompat;
-
-public class AboutActivity extends CatimaAppCompatActivity implements View.OnClickListener
-{
-    private static final String TAG = "Catima";
-    ConstraintLayout version_history, translate, license, repo, privacy, error, credits, rate;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setTitle(R.string.about);
-        setContentView(R.layout.about_activity);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
-        StringBuilder contributors = new StringBuilder().append("<br/>");
-
-        BufferedReader reader = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.contributors), StandardCharsets.UTF_8));
-
-        try {
-            while (true) {
-                String tmp = reader.readLine();
-
-                if (tmp == null || tmp.isEmpty()) {
-                    reader.close();
-                    break;
-                }
-
-                contributors.append("<br/>");
-                contributors.append(tmp);
-            }
-        } catch (IOException ignored) {}
-
-        final List<ThirdPartyInfo> USED_LIBRARIES = new ArrayList<>();
-        USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
-        USED_LIBRARIES.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
-        USED_LIBRARIES.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
-        USED_LIBRARIES.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
-        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
-        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded", "Apache 2.0"));
-
-        final List<ThirdPartyInfo> USED_ASSETS = new ArrayList<>();
-        USED_ASSETS.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
-
-        StringBuilder libs = new StringBuilder().append("<br/>");
-        for (ThirdPartyInfo entry : USED_LIBRARIES)
-        {
-            libs.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")");
-        }
-
-        StringBuilder resources = new StringBuilder().append("<br/>");
-        for (ThirdPartyInfo entry : USED_ASSETS)
-        {
-            resources.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")");
-        }
-
-        String appName = getString(R.string.app_name);
-        int year = Calendar.getInstance().get(Calendar.YEAR);
-
-        String version = "?";
-        try
-        {
-            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
-            version = pi.versionName;
-        }
-        catch (PackageManager.NameNotFoundException e)
-        {
-            Log.w(TAG, "Package name not found", e);
-        }
-
-        TextView copyright = findViewById(R.id.credits_sub);
-        copyright.setText(String.format(getString(R.string.app_copyright_fmt), year));
-        TextView vHistory = findViewById(R.id.version_history_sub);
-        vHistory.setText(String.format(getString(R.string.debug_version_fmt), version));
-
-        setTitle(String.format(getString(R.string.about_title_fmt), appName));
-
-        version_history = findViewById(R.id.version_history);
-        translate = findViewById(R.id.translate);
-        license = findViewById(R.id.license);
-        repo = findViewById(R.id.repo);
-        privacy = findViewById(R.id.privacy);
-        error = findViewById(R.id.report_error);
-        credits = findViewById(R.id.credits);
-        rate = findViewById(R.id.rate);
-
-        version_history.setOnClickListener(this);
-        translate.setOnClickListener(this);
-        license.setOnClickListener(this);
-        repo.setOnClickListener(this);
-        privacy.setOnClickListener(this);
-        error.setOnClickListener(this);
-        rate.setOnClickListener(this);
-
-        StringBuilder contributorInfo = new StringBuilder();
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_contributors), contributors.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(getString(R.string.app_copyright_old));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_libraries), libs.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_resources), resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-
-        credits.setOnClickListener(view -> new AlertDialog.Builder(this)
-                .setTitle(R.string.credits)
-                .setMessage(contributorInfo.toString())
-                .setPositiveButton(R.string.ok, (dialogInterface, i) -> {})
-                .show());
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        int id = item.getItemId();
-        if (id == android.R.id.home) {
-            finish();
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onClick(View view) {
-        int id = view.getId();
-
-        String url;
-        if (id == R.id.version_history) {
-            url = "https://catima.app/changelog/";
-        } else if (id == R.id.translate) {
-            url = "https://hosted.weblate.org/engage/catima/";
-        } else if (id == R.id.license) {
-            url = "https://github.com/TheLastProject/Catima/blob/master/LICENSE";
-        } else if (id == R.id.repo) {
-            url = "https://github.com/TheLastProject/Catima/";
-        } else if (id == R.id.privacy) {
-            url = "https://catima.app/privacy-policy/";
-        } else if (id == R.id.report_error) {
-            url = "https://github.com/TheLastProject/Catima/issues";
-        } else if (id == R.id.rate) {
-            url = "https://play.google.com/store/apps/details?id=me.hackerchick.catima";
-        } else {
-            return;
-        }
-
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(Uri.parse(url));
-        startActivity(intent);
-    }
-
-}

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

@@ -1,9 +1,6 @@
 package protect.card_locker;
 
-import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
 import android.os.AsyncTask;
 import android.util.Log;
 import android.view.View;
@@ -26,10 +23,6 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
     private static final String TAG = "Catima";
 
-    private static final int IS_VALID = 999;
-    private Context mContext;
-    private boolean isSuccesful;
-
     // When drawn in a smaller window 1D barcodes for some reason end up
     // squished, whereas 2D barcodes look fine.
     private static final int MAX_WIDTH_1D = 1500;
@@ -37,22 +30,14 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
     private final WeakReference<ImageView> imageViewReference;
     private final WeakReference<TextView> textViewReference;
-    private String cardId;
-    private final CatimaBarcode format;
+    private final String cardId;
+    private final BarcodeFormat format;
     private final int imageHeight;
     private final int imageWidth;
-    private final boolean showFallback;
-    private final Runnable callback;
 
-    BarcodeImageWriterTask(Context context, ImageView imageView, String cardIdString,
-                           CatimaBarcode barcodeFormat, TextView textView,
-                           boolean showFallback, Runnable callback)
+    BarcodeImageWriterTask(ImageView imageView, String cardIdString,
+                           BarcodeFormat barcodeFormat, TextView textView)
     {
-        mContext = context;
-
-        isSuccesful = true;
-        this.callback = callback;
-
         // Use a WeakReference to ensure the ImageView can be garbage collected
         imageViewReference = new WeakReference<>(imageView);
         textViewReference = new WeakReference<>(textView);
@@ -74,13 +59,16 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             double ratio = (double)MAX_WIDTH / (double)imageView.getWidth();
             imageHeight = (int)(imageView.getHeight() * ratio);
         }
-
-        this.showFallback = showFallback;
     }
 
-    private int getMaxWidth(CatimaBarcode format)
+    BarcodeImageWriterTask(ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat)
     {
-        switch(format.format())
+        this(imageView, cardIdString, barcodeFormat, null);
+    }
+
+    private int getMaxWidth(BarcodeFormat format)
+    {
+        switch(format)
         {
             // 2D barcodes
             case AZTEC:
@@ -108,43 +96,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
-    private String getFallbackString(CatimaBarcode format)
-    {
-        switch(format.format())
-        {
-            // 2D barcodes
-            case AZTEC:
-                return "AZTEC";
-            case DATA_MATRIX:
-                return "DATA_MATRIX";
-            case PDF_417:
-                return "PDF_417";
-            case QR_CODE:
-                return "QR_CODE";
-
-            // 1D barcodes:
-            case CODABAR:
-                return "C0C";
-            case CODE_39:
-                return "CODE_39";
-            case CODE_128:
-                return "CODE_128";
-            case EAN_8:
-                return "32123456";
-            case EAN_13:
-                return "5901234123457";
-            case ITF:
-                return "1003";
-            case UPC_A:
-                return "123456789012";
-            case UPC_E:
-                return "0123456";
-            default:
-                throw new IllegalArgumentException("No fallback known for this barcode type");
-        }
-    }
-
-    private Bitmap generate()
+    public Bitmap doInBackground(Void... params)
     {
         if (cardId.isEmpty())
         {
@@ -157,7 +109,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         {
             try
             {
-                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, null);
+                bitMatrix = writer.encode(cardId, format, imageWidth, imageHeight, null);
             }
             catch(Exception e)
             {
@@ -213,30 +165,13 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         catch(OutOfMemoryError e)
         {
             Log.w(TAG, "Insufficient memory to render barcode, "
-                    + imageWidth + "x" + imageHeight + ", " + format.name()
-                    + ", length=" + cardId.length(), e);
+                + imageWidth + "x" + imageHeight + ", " + format.name()
+                + ", length=" + cardId.length(), e);
         }
 
         return null;
     }
 
-    public Bitmap doInBackground(Void... params)
-    {
-        Bitmap bitmap = generate();
-
-        if (bitmap == null) {
-            isSuccesful = false;
-
-            if (showFallback) {
-                Log.i(TAG, "Barcode generation failed, generating fallback...");
-                cardId = getFallbackString(format);
-                bitmap = generate();
-            }
-        }
-
-        return bitmap;
-    }
-
     protected void onPostExecute(Bitmap result)
     {
         Log.i(TAG, "Finished generating barcode image of type " + format + ": " + cardId);
@@ -247,12 +182,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             return;
         }
 
-        String formatPrettyName = format.prettyName();
-
-        imageView.setTag(isSuccesful);
-
         imageView.setImageBitmap(result);
-        imageView.setContentDescription(mContext.getString(R.string.barcodeImageDescriptionWithType, formatPrettyName));
         TextView textView = textViewReference.get();
 
         if(result != null)
@@ -260,15 +190,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             Log.i(TAG, "Displaying barcode");
             imageView.setVisibility(View.VISIBLE);
 
-            if (isSuccesful) {
-                imageView.setColorFilter(null);
-            } else {
-                imageView.setColorFilter(Color.LTGRAY, PorterDuff.Mode.LIGHTEN);
-            }
-
             if (textView != null) {
                 textView.setVisibility(View.VISIBLE);
-                textView.setText(formatPrettyName);
+                textView.setText(format.name());
             }
         }
         else
@@ -279,9 +203,5 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
                 textView.setVisibility(View.GONE);
             }
         }
-
-        if (callback != null) {
-            callback.run();
-        }
     }
 }

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

@@ -3,7 +3,13 @@ package protect.card_locker;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.util.Pair;
 import android.view.MenuItem;
@@ -12,27 +18,23 @@ import android.view.ViewTreeObserver;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.zxing.BarcodeFormat;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-
 /**
  * This activity is callable and will allow a user to enter
  * barcode data and generate all barcodes possible for
  * the data. The user may then select any barcode, where its
  * data and type will be returned to the caller.
  */
-public class BarcodeSelectorActivity extends CatimaAppCompatActivity
+public class BarcodeSelectorActivity extends AppCompatActivity
 {
     private static final String TAG = "Catima";
 
@@ -40,6 +42,24 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
     public static final String BARCODE_CONTENTS = "contents";
     public static final String BARCODE_FORMAT = "format";
 
+    // These are all the barcode types that the zxing library
+    // is able to generate a barcode for, and thus should be
+    // the only barcodes which we should attempt to scan.
+    public static final Collection<String> SUPPORTED_BARCODE_TYPES = Collections.unmodifiableList(
+        Arrays.asList(
+                BarcodeFormat.AZTEC.name(),
+                BarcodeFormat.CODE_39.name(),
+                BarcodeFormat.CODE_128.name(),
+                BarcodeFormat.CODABAR.name(),
+                BarcodeFormat.DATA_MATRIX.name(),
+                BarcodeFormat.EAN_8.name(),
+                BarcodeFormat.EAN_13.name(),
+                BarcodeFormat.ITF.name(),
+                BarcodeFormat.PDF_417.name(),
+                BarcodeFormat.QR_CODE.name(),
+                BarcodeFormat.UPC_A.name()
+        ));
+
     private Map<String, Pair<Integer, Integer>> barcodeViewMap;
     private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
 
@@ -47,7 +67,7 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        setTitle(R.string.selectBarcodeTitle);
+
         setContentView(R.layout.barcode_selector_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -57,34 +77,59 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        barcodeViewMap = new HashMap<>();
-        barcodeViewMap.put(BarcodeFormat.AZTEC.name(), new Pair<>(R.id.aztecBarcode, R.id.aztecBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.CODE_39.name(), new Pair<>(R.id.code39Barcode, R.id.code39BarcodeText));
-        barcodeViewMap.put(BarcodeFormat.CODE_128.name(), new Pair<>(R.id.code128Barcode, R.id.code128BarcodeText));
-        barcodeViewMap.put(BarcodeFormat.CODABAR.name(), new Pair<>(R.id.codabarBarcode, R.id.codabarBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.DATA_MATRIX.name(), new Pair<>(R.id.datamatrixBarcode, R.id.datamatrixBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.EAN_8.name(), new Pair<>(R.id.ean8Barcode, R.id.ean8BarcodeText));
-        barcodeViewMap.put(BarcodeFormat.EAN_13.name(), new Pair<>(R.id.ean13Barcode, R.id.ean13BarcodeText));
-        barcodeViewMap.put(BarcodeFormat.ITF.name(), new Pair<>(R.id.itfBarcode, R.id.itfBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText));
-        barcodeViewMap.put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.UPC_E.name(), new Pair<>(R.id.upceBarcode, R.id.upceBarcodeText));
+        barcodeViewMap = ImmutableMap.<String, Pair<Integer, Integer>>builder()
+                .put(BarcodeFormat.AZTEC.name(), new Pair<>(R.id.aztecBarcode, R.id.aztecBarcodeText))
+                .put(BarcodeFormat.CODE_39.name(), new Pair<>(R.id.code39Barcode, R.id.code39BarcodeText))
+                .put(BarcodeFormat.CODE_128.name(), new Pair<>(R.id.code128Barcode, R.id.code128BarcodeText))
+                .put(BarcodeFormat.CODABAR.name(), new Pair<>(R.id.codabarBarcode, R.id.codabarBarcodeText))
+                .put(BarcodeFormat.DATA_MATRIX.name(), new Pair<>(R.id.datamatrixBarcode, R.id.datamatrixBarcodeText))
+                .put(BarcodeFormat.EAN_8.name(), new Pair<>(R.id.ean8Barcode, R.id.ean8BarcodeText))
+                .put(BarcodeFormat.EAN_13.name(), new Pair<>(R.id.ean13Barcode, R.id.ean13BarcodeText))
+                .put(BarcodeFormat.ITF.name(), new Pair<>(R.id.itfBarcode, R.id.itfBarcodeText))
+                .put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText))
+                .put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText))
+                .put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText))
+                .build();
 
         EditText cardId = findViewById(R.id.cardId);
-        cardId.addTextChangedListener(new SimpleTextWatcher()
+        cardId.addTextChangedListener(new TextWatcher()
         {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after)
+            {
+                // Noting to do
+            }
+
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count)
             {
                 Log.d(TAG, "Entered text: " + s);
 
-                generateBarcodes(s.toString());
+                // Stop any async tasks which may not have been started yet
+                for(AsyncTask task : barcodeGeneratorTasks)
+                {
+                    task.cancel(false);
+                }
+                barcodeGeneratorTasks.clear();
+
+                // Update barcodes
+                for(String key : barcodeViewMap.keySet())
+                {
+                    ImageView image = findViewById(barcodeViewMap.get(key).first);
+                    TextView text = findViewById(barcodeViewMap.get(key).second);
+                    createBarcodeOption(image, key, s.toString(), text);
+                }
 
                 View noBarcodeButtonView = findViewById(R.id.noBarcode);
                 setButtonListener(noBarcodeButtonView, s.toString());
                 noBarcodeButtonView.setEnabled(s.length() > 0);
             }
+
+            @Override
+            public void afterTextChanged(Editable s)
+            {
+                // Noting to do
+            }
         });
 
         final Bundle b = getIntent().getExtras();
@@ -93,58 +138,46 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
         if(initialCardId != null)
         {
             cardId.setText(initialCardId);
-        } else {
-            generateBarcodes("");
-        }
-    }
-
-    private void generateBarcodes(String value) {
-        // Stop any async tasks which may not have been started yet
-        for(AsyncTask task : barcodeGeneratorTasks)
-        {
-            task.cancel(false);
-        }
-        barcodeGeneratorTasks.clear();
-
-        // Update barcodes
-        for(Map.Entry<String, Pair<Integer, Integer>> entry : barcodeViewMap.entrySet())
-        {
-            ImageView image = findViewById(entry.getValue().first);
-            TextView text = findViewById(entry.getValue().second);
-            createBarcodeOption(image, entry.getKey(), value, text);
         }
     }
 
     private void setButtonListener(final View button, final String cardId)
     {
-        button.setOnClickListener(view -> {
-            Log.d(TAG, "Selected no barcode");
-            Intent result = new Intent();
-            result.putExtra(BARCODE_FORMAT, "");
-            result.putExtra(BARCODE_CONTENTS, cardId);
-            BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
-            finish();
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Log.d(TAG, "Selected no barcode");
+                Intent result = new Intent();
+                result.putExtra(BARCODE_FORMAT, "");
+                result.putExtra(BARCODE_CONTENTS, cardId);
+                BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+                finish();
+            }
         });
     }
 
     private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
     {
-        final CatimaBarcode format = CatimaBarcode.fromName(formatType);
+        final BarcodeFormat format = BarcodeFormat.valueOf(formatType);
+        if(format == null)
+        {
+            Log.w(TAG, "Unsupported barcode format: " + formatType);
+            return;
+        }
 
         image.setImageBitmap(null);
-        image.setOnClickListener(v -> {
-            Log.d(TAG, "Selected barcode type " + formatType);
-
-            if (!((boolean) image.getTag())) {
-                Toast.makeText(BarcodeSelectorActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
-                return;
+        image.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Log.d(TAG, "Selected barcode type " + formatType);
+                Intent result = new Intent();
+                result.putExtra(BARCODE_FORMAT, formatType);
+                result.putExtra(BARCODE_CONTENTS, cardId);
+                BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+                finish();
             }
-
-            Intent result = new Intent();
-            result.putExtra(BARCODE_FORMAT, formatType);
-            result.putExtra(BARCODE_CONTENTS, cardId);
-            BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
-            finish();
         });
 
         if(image.getHeight() == 0)
@@ -158,10 +191,17 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
                     public void onGlobalLayout()
                     {
                         Log.d(TAG, "Global layout finished, type: + " + formatType + ", width: " + image.getWidth());
-                        image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                        if (Build.VERSION.SDK_INT < 16)
+                        {
+                            image.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                        }
+                        else
+                        {
+                            image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                        }
 
                         Log.d(TAG, "Generating barcode for type " + formatType);
-                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(getApplicationContext(), image, cardId, format, text, true, null);
+                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
                         barcodeGeneratorTasks.add(task);
                         task.execute();
                     }
@@ -170,7 +210,7 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
         else
         {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask task = new BarcodeImageWriterTask(getApplicationContext(), image, cardId, format, text, true, null);
+            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
             barcodeGeneratorTasks.add(task);
             task.execute();
         }

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

@@ -1,23 +0,0 @@
-package protect.card_locker;
-
-public class BarcodeValues {
-    private final String mFormat;
-    private final String mContent;
-
-    public BarcodeValues(String format, String content) {
-        mFormat = format;
-        mContent = content;
-    }
-
-    public String format() {
-        return mFormat;
-    }
-
-    public String content() {
-        return mContent;
-    }
-
-    public boolean isEmpty() {
-        return mFormat == null && mContent == null;
-    }
-}

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

@@ -1,87 +0,0 @@
-package protect.card_locker;
-
-import android.database.Cursor;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-public abstract class BaseCursorAdapter<V extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<V>
-{
-    private Cursor mCursor;
-    private boolean mDataValid;
-    private int mRowIDColumn;
-
-    public BaseCursorAdapter(Cursor inputCursor)
-    {
-        setHasStableIds(true);
-        swapCursor(inputCursor);
-    }
-
-    public abstract void onBindViewHolder(V inputHolder, Cursor inputCursor);
-
-    @Override
-    public void onBindViewHolder(V inputHolder, int inputPosition)
-    {
-        if (!mDataValid)
-        {
-            throw new IllegalStateException("Cannot bind view holder when cursor is in invalid state.");
-        }
-
-        if (!mCursor.moveToPosition(inputPosition))
-        {
-            throw new IllegalStateException("Could not move cursor to position " + inputPosition + " when trying to bind view holder");
-        }
-
-        onBindViewHolder(inputHolder, mCursor);
-    }
-
-    @Override
-    public int getItemCount()
-    {
-        if (mDataValid)
-        {
-            return mCursor.getCount();
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    @Override
-    public long getItemId(int inputPosition)
-    {
-        if (!mDataValid)
-        {
-            throw new IllegalStateException("Cannot lookup item id when cursor is in invalid state.");
-        }
-
-        if (!mCursor.moveToPosition(inputPosition))
-        {
-            throw new IllegalStateException("Could not move cursor to position " + inputPosition + " when trying to get an item id");
-        }
-
-        return mCursor.getLong(mRowIDColumn);
-    }
-
-    public void swapCursor(Cursor inputCursor)
-    {
-        if (inputCursor == mCursor)
-        {
-            return;
-        }
-
-        if (inputCursor != null)
-        {
-            mCursor = inputCursor;
-            mDataValid = true;
-            notifyDataSetChanged();
-        }
-        else
-        {
-            notifyItemRangeRemoved(0, getItemCount());
-            mCursor = null;
-            mRowIDColumn = -1;
-            mDataValid = false;
-        }
-    }
-}

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

@@ -1,31 +1,27 @@
 package protect.card_locker;
 
+import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.Toast;
-
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
+import android.os.Parcelable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.pm.ShortcutInfoCompat;
-import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.Toast;
 
 /**
  * The configuration screen for creating a shortcut.
  */
-public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener
+public class CardShortcutConfigure extends AppCompatActivity
 {
     static final String TAG = "Catima";
-    final DBHelper mDb = new DBHelper(this);
 
     @Override
-    public void onCreate(Bundle bundle) {
+    public void onCreate(Bundle bundle)
+    {
         super.onCreate(bundle);
 
         // Set the result to CANCELED.  This will cause nothing to happen if the
@@ -36,54 +32,52 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
         Toolbar toolbar = findViewById(R.id.toolbar);
         toolbar.setVisibility(View.GONE);
 
-        // Hide new button because it won't work here anyway
-        FloatingActionButton newFab = findViewById(R.id.fabAdd);
-        newFab.setVisibility(View.GONE);
-
         final DBHelper db = new DBHelper(this);
 
         // If there are no cards, bail
-        if (db.getLoyaltyCardCount() == 0) {
+        if(db.getLoyaltyCardCount() == 0)
+        {
             Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
             finish();
         }
 
-        final RecyclerView cardList = findViewById(R.id.list);
-
-        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
-        cardList.setLayoutManager(mLayoutManager);
-        cardList.setItemAnimator(new DefaultItemAnimator());
-
+        final ListView cardList = findViewById(R.id.list);
         cardList.setVisibility(View.VISIBLE);
 
         Cursor cardCursor = db.getLoyaltyCardCursor();
 
-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
         cardList.setAdapter(adapter);
-    }
 
-    private void onClickAction(int position) {
-        Cursor selected = mDb.getLoyaltyCardCursor();
-        selected.moveToPosition(position);
-        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
+        {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+            {
+                Cursor selected = (Cursor) parent.getItemAtPosition(position);
+                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 
-        Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
+                Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
 
-        ShortcutInfoCompat shortcut = ShortcutHelper.createShortcutBuilder(CardShortcutConfigure.this, loyaltyCard).build();
+                Intent shortcutIntent = new Intent(CardShortcutConfigure.this, LoyaltyCardViewActivity.class);
+                shortcutIntent.setAction(Intent.ACTION_MAIN);
+                // Prevent instances of the view activity from piling up; if one exists let this
+                // one replace it.
+                shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                Bundle bundle = new Bundle();
+                bundle.putInt("id", loyaltyCard.id);
+                bundle.putBoolean("view", true);
+                shortcutIntent.putExtras(bundle);
 
-        setResult(RESULT_OK, ShortcutManagerCompat.createShortcutResultIntent(CardShortcutConfigure.this, shortcut));
+                Parcelable icon = Intent.ShortcutIconResource.fromContext(CardShortcutConfigure.this, R.mipmap.ic_launcher);
+                Intent intent = new Intent();
+                intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+                intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, loyaltyCard.store);
+                intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
+                setResult(RESULT_OK, intent);
 
-        finish();
-    }
-
-
-    @Override
-    public void onRowClicked(int inputPosition) {
-        onClickAction(inputPosition);
-    }
-
-    @Override
-    public void onRowLongClicked(int inputPosition) {
-        // do nothing
+                finish();
+            }
+        });
     }
 }

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

@@ -1,53 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.util.TypedValue;
-
-import java.util.HashMap;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.preference.PreferenceManager;
-
-public class CatimaAppCompatActivity extends AppCompatActivity {
-
-    SharedPreferences pref;
-    HashMap<String, Integer> supportedThemes;
-
-    @Override
-    protected void attachBaseContext(Context base) {
-        // Apply chosen language
-        super.attachBaseContext(Utils.updateBaseContextLocale(base));
-    }
-
-    @Override
-    public Resources.Theme getTheme() {
-        if (supportedThemes == null) {
-            supportedThemes = new HashMap<>();
-            supportedThemes.put(getString(R.string.settings_key_blue_theme), R.style.AppTheme_blue);
-            supportedThemes.put(getString(R.string.settings_key_brown_theme), R.style.AppTheme_brown);
-            supportedThemes.put(getString(R.string.settings_key_green_theme), R.style.AppTheme_green);
-            supportedThemes.put(getString(R.string.settings_key_grey_theme), R.style.AppTheme_grey);
-            supportedThemes.put(getString(R.string.settings_key_magenta_theme), R.style.AppTheme_magenta);
-            supportedThemes.put(getString(R.string.settings_key_pink_theme), R.style.AppTheme_pink);
-            supportedThemes.put(getString(R.string.settings_key_sky_blue_theme), R.style.AppTheme_sky_blue);
-            supportedThemes.put(getString(R.string.settings_key_violet_theme), R.style.AppTheme_violet);
-        }
-
-        Resources.Theme theme = super.getTheme();
-        pref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        String themeName = pref.getString(getString(R.string.setting_key_theme_color), getString(R.string.settings_key_catima_theme));
-
-        theme.applyStyle(Utils.mapGetOrDefault(supportedThemes, themeName, R.style.AppTheme_NoActionBar), true);
-
-        return theme;
-    }
-
-    public int getThemeColor() {
-        TypedValue typedValue = new TypedValue();
-        Resources.Theme theme = getTheme();
-        theme.resolveAttribute(R.attr.colorPrimary, typedValue, true);
-        return typedValue.data;
-    }
-}

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

@@ -1,83 +0,0 @@
-package protect.card_locker;
-
-import com.google.zxing.BarcodeFormat;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-public class CatimaBarcode {
-    public static final List<BarcodeFormat> barcodeFormats = Collections.unmodifiableList(Arrays.asList(
-        BarcodeFormat.AZTEC,
-        BarcodeFormat.CODE_39,
-        BarcodeFormat.CODE_128,
-        BarcodeFormat.CODABAR,
-        BarcodeFormat.DATA_MATRIX,
-        BarcodeFormat.EAN_8,
-        BarcodeFormat.EAN_13,
-        BarcodeFormat.ITF,
-        BarcodeFormat.PDF_417,
-        BarcodeFormat.QR_CODE,
-        BarcodeFormat.UPC_A,
-        BarcodeFormat.UPC_E
-    ));
-
-    public static final List<String> barcodePrettyNames = Collections.unmodifiableList(Arrays.asList(
-        "Aztec",
-        "Code 39",
-        "Code 128",
-        "Codabar",
-        "Data Matrix",
-        "EAN 8",
-        "EAN 13",
-        "ITF",
-        "PDF 417",
-        "QR Code",
-        "UPC A",
-        "UPC E"
-    ));
-
-    private final BarcodeFormat mBarcodeFormat;
-
-    private CatimaBarcode(BarcodeFormat barcodeFormat) {
-        mBarcodeFormat = barcodeFormat;
-    }
-
-    public static CatimaBarcode fromBarcode(BarcodeFormat barcodeFormat) {
-        return new CatimaBarcode(barcodeFormat);
-    }
-
-    public static CatimaBarcode fromName(String name) {
-        return new CatimaBarcode(BarcodeFormat.valueOf(name));
-    }
-
-    public static CatimaBarcode fromPrettyName(String prettyName) {
-        try {
-            return new CatimaBarcode(barcodeFormats.get(barcodePrettyNames.indexOf(prettyName)));
-        } catch (IndexOutOfBoundsException e) {
-            throw new IllegalArgumentException("No barcode type with pretty name " + prettyName + " known!");
-        }
-    }
-
-    public boolean isSupported() {
-        return barcodeFormats.contains(mBarcodeFormat);
-    }
-
-    public BarcodeFormat format() {
-        return mBarcodeFormat;
-    }
-
-    public String name() {
-        return mBarcodeFormat.name();
-    }
-
-    public String prettyName() {
-        int index = barcodeFormats.indexOf(mBarcodeFormat);
-
-        if (index == -1 || index >= barcodePrettyNames.size()) {
-            return mBarcodeFormat.name();
-        }
-
-        return barcodePrettyNames.get(index);
-    }
-}

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

@@ -1,24 +0,0 @@
-package protect.card_locker;
-
-import android.app.Activity;
-import android.widget.Toast;
-
-import com.journeyapps.barcodescanner.CaptureManager;
-import com.journeyapps.barcodescanner.DecoratedBarcodeView;
-
-public class CatimaCaptureManager extends CaptureManager {
-    private Activity activity;
-
-    public CatimaCaptureManager(Activity activity, DecoratedBarcodeView barcodeView) {
-        super(activity, barcodeView);
-
-        this.activity = activity;
-    }
-
-    @Override
-    protected void displayFrameworkBugMessageAndExit(String message) {
-        // We don't want to exit, as we also have a enter from card image and add manually button here
-        // So we show a toast instead
-        Toast.makeText(activity, message, Toast.LENGTH_LONG).show();
-    }
-}

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

@@ -0,0 +1,66 @@
+package protect.card_locker;
+
+import android.database.Cursor;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVPrinter;
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+
+/**
+ * Class for exporting the database into CSV (Comma Separate Values)
+ * format.
+ */
+public class CsvDatabaseExporter implements DatabaseExporter
+{
+    public void exportData(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException
+    {
+        CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
+
+        // Print the header
+        printer.printRecord(DBHelper.LoyaltyCardDbIds.ID,
+                DBHelper.LoyaltyCardDbIds.STORE,
+                DBHelper.LoyaltyCardDbIds.NOTE,
+                DBHelper.LoyaltyCardDbIds.CARD_ID,
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR,
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
+                DBHelper.LoyaltyCardDbIds.EXTRAS);
+
+        Cursor cursor = db.getLoyaltyCardCursor();
+
+        while(cursor.moveToNext())
+        {
+            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cursor);
+
+            String extras;
+            try {
+                extras = card.extras.toJSON().toString();
+            }
+            catch (JSONException ex)
+            {
+                throw new IOException(ex);
+            }
+
+            printer.printRecord(card.id,
+                    card.store,
+                    card.note,
+                    card.cardId,
+                    card.headerColor,
+                    card.headerTextColor,
+                    card.barcodeType,
+                    extras);
+
+            if(Thread.currentThread().isInterrupted())
+            {
+                throw new InterruptedException();
+            }
+        }
+
+        cursor.close();
+
+        printer.close();
+    }
+}

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

@@ -0,0 +1,168 @@
+package protect.card_locker;
+
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.text.Normalizer;
+
+/**
+ * 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 CsvDatabaseImporter implements DatabaseImporter
+{
+    public void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException
+    {
+        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.withHeader());
+
+        SQLiteDatabase database = db.getWritableDatabase();
+        database.beginTransaction();
+
+        try
+        {
+            for (CSVRecord record : parser)
+            {
+                importLoyaltyCard(database, db, record);
+
+                if(Thread.currentThread().isInterrupted())
+                {
+                    throw new InterruptedException();
+                }
+            }
+
+            parser.close();
+            database.setTransactionSuccessful();
+        }
+        catch(IllegalArgumentException|IllegalStateException e)
+        {
+            throw new FormatException("Issue parsing CSV data", e);
+        }
+        finally
+        {
+            database.endTransaction();
+            database.close();
+        }
+    }
+
+    /**
+     * Extract a string from the items array. The index into the array
+     * is determined by looking up the index in the fields map using the
+     * "key" as the key. If no such key exists, defaultValue is returned
+     * if it is not null. Otherwise, a FormatException is thrown.
+     */
+    private String extractString(String key, CSVRecord record, String defaultValue)
+            throws FormatException
+    {
+        String toReturn = defaultValue;
+
+        if(record.isMapped(key))
+        {
+            toReturn = record.get(key);
+        }
+        else
+        {
+            if(defaultValue == null)
+            {
+                throw new FormatException("Field not used but expected: " + key);
+            }
+        }
+
+        return toReturn;
+    }
+
+    /**
+     * Extract an integer from the items array. The index into the array
+     * is determined by looking up the index in the fields map using the
+     * "key" as the key. If no such key exists, or the data is not a valid
+     * int, a FormatException is thrown.
+     */
+    private Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
+            throws FormatException
+    {
+        if(record.isMapped(key) == false)
+        {
+            throw new FormatException("Field not used but expected: " + key);
+        }
+
+        String value = record.get(key);
+        if(value.isEmpty() && nullIsOk)
+        {
+            return null;
+        }
+
+        try
+        {
+            return Integer.parseInt(record.get(key));
+        }
+        catch(NumberFormatException e)
+        {
+            throw new FormatException("Failed to parse field: " + key, e);
+        }
+    }
+
+    /**
+     * Import a single loyalty card into the database using the given
+     * session.
+     */
+    private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
+            throws IOException, FormatException
+    {
+        int id = extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
+
+        String store = extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
+        if(store.isEmpty())
+        {
+            throw new FormatException("No store listed, but is required");
+        }
+
+        String note = extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
+
+        String cardId = extractString(DBHelper.LoyaltyCardDbIds.CARD_ID, record, "");
+        if(cardId.isEmpty())
+        {
+            throw new FormatException("No card ID listed, but is required");
+        }
+
+        String barcodeType = extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
+
+        Integer headerColor = null;
+        Integer headerTextColor = null;
+
+        if(record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR) &&
+           record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR))
+        {
+            headerColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
+            headerTextColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR, record, true);
+        }
+
+        Bitmap icon = null;
+        String iconData = extractString(DBHelper.LoyaltyCardDbIds.ICON, record, "");
+        if(!iconData.isEmpty())
+        {
+            icon = DBHelper.convertBitmapBlobToBitmap(iconData.getBytes("UTF-8"));
+        }
+
+        ExtrasHelper extras = new ExtrasHelper();
+
+        try
+        {
+            extras.fromJSON(new JSONObject(extractString(DBHelper.LoyaltyCardDbIds.EXTRAS, record, "{}")));
+            helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, headerTextColor, icon, extras);
+        }
+        catch (JSONException ex)
+        {
+            throw new FormatException("Invalid JSON in extras field: " + ex);
+        }
+    }
+}

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

@@ -1,133 +1,85 @@
 package protect.card_locker;
 
+
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.text.TextUtils;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 
-import java.io.FileNotFoundException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Currency;
-import java.util.Date;
-import java.util.List;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
 
 public class DBHelper extends SQLiteOpenHelper
 {
     public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 12;
+    public static final int DATABASE_VERSION = 4;
 
-    public static class LoyaltyCardDbGroups
-    {
-        public static final String TABLE = "groups";
-        public static final String ID = "_id";
-        public static final String ORDER = "orderId";
-    }
-
-    public static class LoyaltyCardDbIds
+    static class LoyaltyCardDbIds
     {
         public static final String TABLE = "cards";
         public static final String ID = "_id";
         public static final String STORE = "store";
-        public static final String EXPIRY = "expiry";
-        public static final String BALANCE = "balance";
-        public static final String BALANCE_TYPE = "balancetype";
         public static final String NOTE = "note";
         public static final String HEADER_COLOR = "headercolor";
         public static final String HEADER_TEXT_COLOR = "headertextcolor";
         public static final String CARD_ID = "cardid";
-        public static final String BARCODE_ID = "barcodeid";
         public static final String BARCODE_TYPE = "barcodetype";
-        public static final String STAR_STATUS = "starstatus";
-        public static final String LAST_USED = "lastused";
+        public static final String ICON = "icon";
+        public static final String EXTRAS = "extras";
     }
 
-    public static class LoyaltyCardDbIdsGroups
-    {
-        public static final String TABLE = "cardsGroups";
-        public static final String cardID = "cardId";
-        public static final String groupID = "groupId";
-    }
-
-    public static class LoyaltyCardDbFTS
-    {
-        public static final String TABLE = "fts";
-        public static final String ID = "rowid"; // This should NEVER be changed
-        public static final String STORE = "store";
-        public static final String NOTE = "note";
-    }
-
-    public enum LoyaltyCardOrder {
-        Alpha,
-        LastUsed,
-        Expiry
-    }
-
-    public enum LoyaltyCardOrderDirection {
-        Ascending,
-        Descending
-    }
-
-    private Context mContext;
-
     public DBHelper(Context context)
     {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
+    }
 
-        mContext = context;
+    public static byte[] convertBitmapToBlob(Bitmap bitmap)
+    {
+        // https://stackoverflow.com/a/7620610
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.PNG, 0, byteArrayOutputStream);
+        return byteArrayOutputStream.toByteArray();
+    }
+
+    public static Bitmap convertBitmapBlobToBitmap(byte[] bytes)
+    {
+        return BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
     }
 
     @Override
     public void onCreate(SQLiteDatabase db)
     {
-        // create table for card groups
-        db.execSQL("CREATE TABLE " + LoyaltyCardDbGroups.TABLE + "(" +
-                LoyaltyCardDbGroups.ID + " TEXT primary key not null," +
-                LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0')");
-
-        // create table for cards
-        // Balance is TEXT and not REAL to be able to store a BigDecimal without precision loss
-        db.execSQL("CREATE TABLE " + LoyaltyCardDbIds.TABLE + "(" +
+        // create table for gift cards
+        db.execSQL("create table " + LoyaltyCardDbIds.TABLE + "(" +
                 LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                 LoyaltyCardDbIds.STORE + " TEXT not null," +
                 LoyaltyCardDbIds.NOTE + " TEXT not null," +
-                LoyaltyCardDbIds.EXPIRY + " INTEGER," +
-                LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
-                LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
                 LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
+                LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER," +
                 LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
-                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
-                LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
-                LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0')");
-
-        // create associative table for cards in groups
-        db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
-                LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
-                LoyaltyCardDbIdsGroups.groupID + " TEXT," +
-                "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
-
-        // create FTS search table
-        db.execSQL("CREATE VIRTUAL TABLE " + LoyaltyCardDbFTS.TABLE + " USING fts4(" +
-                LoyaltyCardDbFTS.STORE + ", " + LoyaltyCardDbFTS.NOTE + ", " +
-                "tokenize=unicode61);");
+                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null," +
+                LoyaltyCardDbIds.ICON + " BLOB," +
+                LoyaltyCardDbIds.EXTRAS + " TEXT)");
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
     {
+        // Upgrade from version 1 to version 2
         if(oldVersion < 2 && newVersion >= 2)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.NOTE + " TEXT not null default ''");
         }
 
+        // Upgrade from version 2 to version 3
         if(oldVersion < 3 && newVersion >= 3)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
@@ -136,364 +88,82 @@ public class DBHelper extends SQLiteOpenHelper
                     + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER");
         }
 
+        // Upgrade from version 3 to version 4
         if(oldVersion < 4 && newVersion >= 4)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'");
-        }
-
-        if(oldVersion < 5 && newVersion >= 5)
-        {
-            db.execSQL("CREATE TABLE " + LoyaltyCardDbGroups.TABLE + "(" +
-                    LoyaltyCardDbGroups.ID + " TEXT primary key not null)");
-
-            db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
-                    LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
-                    LoyaltyCardDbIdsGroups.groupID + " TEXT," +
-                    "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
-        }
-
-        if(oldVersion < 6 && newVersion >= 6)
-        {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbGroups.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0'");
-        }
-
-        if(oldVersion < 7 && newVersion >= 7)
-        {
+                    + " ADD COLUMN " + LoyaltyCardDbIds.ICON + " BLOB");
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.EXPIRY + " INTEGER");
-        }
-
-        if(oldVersion < 8 && newVersion >= 8)
-        {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'");
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.BALANCE_TYPE + " TEXT");
-        }
-
-        if(oldVersion < 9 && newVersion >= 9)
-        {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.BARCODE_ID + " TEXT");
-        }
-
-        if(oldVersion < 10 && newVersion >= 10)
-        {
-            // SQLite doesn't support modify column
-            // So we need to create a temp column to make barcode type nullable
-            // Let's drop header text colour too while we're at it
-            // https://www.sqlite.org/faq.html#q11
-            db.beginTransaction();
-
-            db.execSQL("CREATE TEMPORARY TABLE tmp (" +
-                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
-                    LoyaltyCardDbIds.STORE + " TEXT not null," +
-                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
-                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
-                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
-                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
-
-            db.execSQL("INSERT INTO tmp (" +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS + ")" +
-                    " SELECT " +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    " NULLIF(" + LoyaltyCardDbIds.BARCODE_TYPE + ",'') ," +
-                    LoyaltyCardDbIds.STAR_STATUS +
-                    " FROM " + LoyaltyCardDbIds.TABLE);
-
-            db.execSQL("DROP TABLE " + LoyaltyCardDbIds.TABLE);
-
-            db.execSQL("CREATE TABLE " + LoyaltyCardDbIds.TABLE + "(" +
-                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
-                    LoyaltyCardDbIds.STORE + " TEXT not null," +
-                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
-                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
-                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
-                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
-
-            db.execSQL("INSERT INTO " + LoyaltyCardDbIds.TABLE + "(" +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS + ")" +
-                    " SELECT " +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS +
-                    " FROM tmp");
-
-            db.execSQL("DROP TABLE tmp");
-
-            db.setTransactionSuccessful();
-            db.endTransaction();
-        }
-
-        if(oldVersion < 11 && newVersion >= 11)
-        {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0'");
-        }
-
-        if(oldVersion < 12 && newVersion >= 12)
-        {
-            db.execSQL("CREATE VIRTUAL TABLE " + LoyaltyCardDbFTS.TABLE + " USING fts4(" +
-                    LoyaltyCardDbFTS.STORE + ", " + LoyaltyCardDbFTS.NOTE + ", " +
-                    "tokenize=unicode61);");
-
-            Cursor cursor = db.rawQuery("SELECT * FROM " + LoyaltyCardDbIds.TABLE + ";", null, null);
-
-            cursor.moveToFirst();
-
-            while (cursor.moveToNext()) {
-                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
-                insertFTS(db, loyaltyCard.id, loyaltyCard.store, loyaltyCard.note);
-            }
+                    + " ADD COLUMN " + LoyaltyCardDbIds.EXTRAS + " TEXT");
         }
     }
 
-    private ContentValues generateFTSContentValues(final int id, final String store, final String note) {
-        // FTS on Android is severely limited and can only search for word starting with a certain string
-        // So for each word, we grab every single substring
-        // This makes it possible to find Décathlon by searching both de and cat, for example
-
-        ContentValues ftsContentValues = new ContentValues();
-
-        StringBuilder storeString = new StringBuilder();
-        for (String word : store.split(" ")) {
-            for (int i = 0; i < word.length(); i++) {
-                storeString.append(word);
-                storeString.append(" ");
-                word = word.substring(1);
-            }
-        }
-
-        StringBuilder noteString = new StringBuilder();
-        for (String word : note.split(" ")) {
-            for (int i = 0; i < word.length(); i++) {
-                noteString.append(word);
-                noteString.append(" ");
-                word = word.substring(1);
-            }
-        }
-
-        ftsContentValues.put(LoyaltyCardDbFTS.ID, id);
-        ftsContentValues.put(LoyaltyCardDbFTS.STORE, storeString.toString());
-        ftsContentValues.put(LoyaltyCardDbFTS.NOTE, noteString.toString());
-
-        return ftsContentValues;
-    }
-
-    private void insertFTS(final SQLiteDatabase db, final int id, final String store, final String note) {
-        db.insert(LoyaltyCardDbFTS.TABLE, null, generateFTSContentValues(id, store, note));
-    }
-
-    private void updateFTS(final SQLiteDatabase db, final int id, final String store, final String note) {
-        db.update(LoyaltyCardDbFTS.TABLE, generateFTSContentValues(id, store, note),
-                whereAttrs(LoyaltyCardDbFTS.ID), withArgs(id));
-    }
-
-    public long insertLoyaltyCard(final String store, final String note, final Date expiry,
-                                  final BigDecimal balance, final Currency balanceType,
-                                  final String cardId, final String barcodeId,
-                                  final CatimaBarcode barcodeType, final Integer headerColor,
-                                  final int starStatus, final Long lastUsed)
+    public long insertLoyaltyCard(final String store, final String note, final String cardId,
+                                  final String barcodeType, final Integer headerColor,
+                                  final Integer headerTextColor, final Bitmap icon,
+                                  final ExtrasHelper extras) throws JSONException
     {
         SQLiteDatabase db = getWritableDatabase();
-        db.beginTransaction();
-
-        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
-        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
-        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
-        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
-        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        long id = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
-
-        // FTS
-        insertFTS(db, (int) id, store, note);
-
-        db.setTransactionSuccessful();
-        db.endTransaction();
-
-        return id;
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.ICON, icon != null ? convertBitmapToBlob(icon) : null);
+        contentValues.put(LoyaltyCardDbIds.EXTRAS, extras.toJSON().toString());
+        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+        return newId;
     }
 
-    public long insertLoyaltyCard(final SQLiteDatabase db, final String store,
-                                  final String note, final Date expiry, final BigDecimal balance,
-                                  final Currency balanceType, final String cardId,
-                                  final String barcodeId, final CatimaBarcode barcodeType,
-                                  final Integer headerColor, final int starStatus,
-                                  final Long lastUsed)
+    public boolean insertLoyaltyCard(final SQLiteDatabase db, final int id,
+                                     final String store, final String note, final String cardId,
+                                     final String barcodeType, final Integer headerColor,
+                                     final Integer headerTextColor, final Bitmap icon,
+                                     final ExtrasHelper extras) throws JSONException
     {
-        db.beginTransaction();
-
-        // Card
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbIds.STORE, store);
-        contentValues.put(LoyaltyCardDbIds.NOTE, note);
-        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
-        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
-        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
-        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
-        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
-        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        long id = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
-
-        // FTS
-        insertFTS(db, (int) id, store, note);
-
-        db.setTransactionSuccessful();
-        db.endTransaction();
-
-        return id;
-    }
-
-    public long insertLoyaltyCard(final SQLiteDatabase db, final int id, final String store,
-                                  final String note, final Date expiry, final BigDecimal balance,
-                                  final Currency balanceType, final String cardId,
-                                  final String barcodeId, final CatimaBarcode barcodeType,
-                                  final Integer headerColor, final int starStatus,
-                                  final Long lastUsed)
-    {
-        db.beginTransaction();
-
-        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.ID, id);
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
-        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
-        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
-        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
-        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
-
-        // FTS
-        insertFTS(db, id, store, note);
-
-        db.setTransactionSuccessful();
-        db.endTransaction();
-
-        return id;
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.ICON, icon != null ? convertBitmapToBlob(icon) : null);
+        contentValues.put(LoyaltyCardDbIds.EXTRAS, extras.toJSON().toString());
+        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+        return (newId != -1);
     }
 
+
     public boolean updateLoyaltyCard(final int id, final String store, final String note,
-                                     final Date expiry, final BigDecimal balance,
-                                     final Currency balanceType, final String cardId,
-                                     final String barcodeId, final CatimaBarcode barcodeType,
-                                     final Integer headerColor)
+                                     final String cardId, final String barcodeType,
+                                     final Integer headerColor, final Integer headerTextColor,
+                                     final Bitmap icon, final ExtrasHelper extras) throws JSONException
     {
         SQLiteDatabase db = getWritableDatabase();
-        db.beginTransaction();
-
-        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
-        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
-        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
-        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.ICON, icon != null ? convertBitmapToBlob(icon) : null);
+        contentValues.put(LoyaltyCardDbIds.EXTRAS, extras.toJSON().toString());
         int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
-                whereAttrs(LoyaltyCardDbIds.ID), withArgs(id));
-
-        // FTS
-        updateFTS(db, id, store, note);
-
-        db.setTransactionSuccessful();
-        db.endTransaction();
-
-        return (rowsUpdated == 1);
-    }
-
-    public boolean updateLoyaltyCardStarStatus(final int id, final int starStatus)
-    {
-        SQLiteDatabase db = getWritableDatabase();
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
-        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
-                whereAttrs(LoyaltyCardDbIds.ID),
-                withArgs(id));
-        return (rowsUpdated == 1);
-    }
-
-    public boolean updateLoyaltyCardLastUsed(final int id) {
-        SQLiteDatabase db = getWritableDatabase();
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbIds.LAST_USED, System.currentTimeMillis() / 1000);
-        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
-                whereAttrs(LoyaltyCardDbIds.ID),
-                withArgs(id));
+                LoyaltyCardDbIds.ID + "=?",
+                new String[]{Integer.toString(id)});
         return (rowsUpdated == 1);
     }
 
     public LoyaltyCard getLoyaltyCard(final int id)
     {
         SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.query(LoyaltyCardDbIds.TABLE, null, whereAttrs(LoyaltyCardDbIds.ID), withArgs(id), null, null, null);
+        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
+                " where " + LoyaltyCardDbIds.ID + "=?", new String[]{String.format("%d", id)});
 
         LoyaltyCard card = null;
 
@@ -508,92 +178,12 @@ public class DBHelper extends SQLiteOpenHelper
         return card;
     }
 
-    public List<Group> getLoyaltyCardGroups(final int id)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE + " g " +
-                " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " ig ON ig." + LoyaltyCardDbIdsGroups.groupID + " = g." + LoyaltyCardDbGroups.ID +
-                " where " + LoyaltyCardDbIdsGroups.cardID + "=?" +
-                " ORDER BY " + LoyaltyCardDbIdsGroups.groupID, withArgs(id));
-
-        List<Group> groups = new ArrayList<>();
-
-        if (!data.moveToFirst()) {
-            data.close();
-            return groups;
-        }
-
-        groups.add(Group.toGroup(data));
-
-        while (data.moveToNext()) {
-            groups.add(Group.toGroup(data));
-        }
-
-        data.close();
-
-        return groups;
-    }
-
-    public void setLoyaltyCardGroups(final int id, List<Group> groups)
+    public boolean deleteLoyaltyCard (final int id)
     {
         SQLiteDatabase db = getWritableDatabase();
-
-        // First delete lookup table entries associated with this card
-        db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                whereAttrs(LoyaltyCardDbIdsGroups.cardID),
-                withArgs(id));
-
-        // Then create entries for selected values
-        for (Group group : groups) {
-            ContentValues contentValues = new ContentValues();
-            contentValues.put(LoyaltyCardDbIdsGroups.cardID, id);
-            contentValues.put(LoyaltyCardDbIdsGroups.groupID, group._id);
-            db.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
-        }
-    }
-
-    public void setLoyaltyCardGroups(final SQLiteDatabase db, final int id, List<Group> groups)
-    {
-        // First delete lookup table entries associated with this card
-        db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                whereAttrs(LoyaltyCardDbIdsGroups.cardID),
-                withArgs(id));
-
-        // Then create entries for selected values
-        for (Group group : groups) {
-            ContentValues contentValues = new ContentValues();
-            contentValues.put(LoyaltyCardDbIdsGroups.cardID, id);
-            contentValues.put(LoyaltyCardDbIdsGroups.groupID, group._id);
-            db.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
-        }
-    }
-
-    public boolean deleteLoyaltyCard(final int id)
-    {
-        SQLiteDatabase db = getWritableDatabase();
-        // Delete card
-        int rowsDeleted = db.delete(LoyaltyCardDbIds.TABLE,
-                whereAttrs(LoyaltyCardDbIds.ID),
-                withArgs(id));
-
-        // And delete lookup table entries associated with this card
-        db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                whereAttrs(LoyaltyCardDbIdsGroups.cardID),
-                withArgs(id));
-
-        // Delete FTS table entries
-        db.delete(LoyaltyCardDbFTS.TABLE,
-                whereAttrs(LoyaltyCardDbFTS.ID),
-                withArgs(id));
-
-        // Also wipe card images associated with this card
-        try {
-            Utils.saveCardImage(mContext, null, id, true);
-            Utils.saveCardImage(mContext, null, id, false);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-
+        int rowsDeleted =  db.delete(LoyaltyCardDbIds.TABLE,
+                LoyaltyCardDbIds.ID + " = ? ",
+                new String[]{String.format("%d", id)});
         return (rowsDeleted == 1);
     }
 
@@ -611,308 +201,52 @@ public class DBHelper extends SQLiteOpenHelper
      */
     public Cursor getLoyaltyCardCursor(final String filter)
     {
-        return getLoyaltyCardCursor(filter, null);
-    }
-
-    /**
-     * Returns a cursor to all loyalty cards with the filter text in either the store or note in a certain group.
-     *
-     * @param filter
-     * @param group
-     * @return Cursor
-     */
-    public Cursor getLoyaltyCardCursor(final String filter, Group group)
-    {
-        return getLoyaltyCardCursor(filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending);
-    }
-
-    /**
-     * Returns a cursor to all loyalty cards with the filter text in either the store or note in a certain group sorted as requested.
-     *
-     * @param filter
-     * @param group
-     * @param order
-     * @return Cursor
-     */
-    public Cursor getLoyaltyCardCursor(String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
-        StringBuilder groupFilter = new StringBuilder();
-        String limitString = "";
+        String actualFilter = String.format("%%%s%%", filter);
+        String[] selectionArgs = { actualFilter, actualFilter };
 
         SQLiteDatabase db = getReadableDatabase();
 
-        if (group != null) {
-            List<Integer> allowedIds = getGroupCardIds(group._id);
-
-            // Empty group
-            if (!allowedIds.isEmpty()) {
-                groupFilter.append("AND (");
-
-                for (int i = 0; i < allowedIds.size(); i++) {
-                    groupFilter.append(LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID + " = ").append(allowedIds.get(i));
-                    if (i != allowedIds.size() - 1) {
-                        groupFilter.append(" OR ");
-                    }
-                }
-                groupFilter.append(") ");
-            } else {
-                limitString = "LIMIT 0";
-            }
-        }
-
-        String orderField = getFieldForOrder(order);
-
-        return db.rawQuery("SELECT " + LoyaltyCardDbIds.TABLE + ".* FROM " + LoyaltyCardDbIds.TABLE +
-                " JOIN " + LoyaltyCardDbFTS.TABLE +
-                " ON " + LoyaltyCardDbFTS.TABLE + "." + LoyaltyCardDbFTS.ID + " = " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID +
-                (filter.trim().isEmpty() ? " " : " AND " + LoyaltyCardDbFTS.TABLE + " MATCH ? ") +
-                groupFilter.toString() +
-                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
-                " (CASE WHEN " + LoyaltyCardDbIds.TABLE + "." + orderField + " IS NULL THEN 1 ELSE 0 END), " +
-                LoyaltyCardDbIds.TABLE + "." + orderField + " COLLATE NOCASE " + getDbDirection(order, direction) + ", " +
-                LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +
-                limitString, filter.trim().isEmpty() ? null : new String[] { TextUtils.join("* ", filter.split(" ")) + '*' }, null);
+        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
+                " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
+                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? " +
+                " ORDER BY " + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", selectionArgs, null);
+        return res;
     }
 
-    /**
-     * Returns the amount of loyalty cards.
-     *
-     * @return Integer
-     */
     public int getLoyaltyCardCount()
     {
-        SQLiteDatabase db = getReadableDatabase();
-        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbIds.TABLE);
+        // An empty string will match everything
+        return getLoyaltyCardCount("");
     }
 
     /**
-     * Returns a cursor to all groups.
+     * Returns the amount of loyalty cards with the filter text in either the store or note.
      *
-     * @return Cursor
+     * @param filter
+     * @return Integer
      */
-    public Cursor getGroupCursor()
+    public int getLoyaltyCardCount(String filter)
     {
+        String actualFilter = String.format("%%%s%%", filter);
+        String[] selectionArgs = { actualFilter, actualFilter };
+
         SQLiteDatabase db = getReadableDatabase();
+        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIds.TABLE +
+                " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
+                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? "
+                , selectionArgs, null);
 
-        return db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
-                " ORDER BY " + LoyaltyCardDbGroups.ORDER + " ASC," + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
-    }
+        int numItems = 0;
 
-    public List<Group> getGroups() {
-        try(Cursor data = getGroupCursor()) {
-            List<Group> groups = new ArrayList<>();
-
-            if (!data.moveToFirst()) {
-                return groups;
-            }
-
-            groups.add(Group.toGroup(data));
-            while (data.moveToNext()) {
-                groups.add(Group.toGroup(data));
-            }
-
-            return groups;
-        }
-    }
-
-    public void reorderGroups(final List<Group> groups)
-    {
-        Integer order = 0;
-        SQLiteDatabase db = getWritableDatabase();
-
-        for (Group group : groups)
-        {
-            ContentValues contentValues = new ContentValues();
-            contentValues.put(LoyaltyCardDbGroups.ORDER, order);
-
-            db.update(LoyaltyCardDbGroups.TABLE, contentValues,
-                    whereAttrs(LoyaltyCardDbGroups.ID),
-                    withArgs(group._id));
-
-            order++;
-        }
-    }
-
-    public Group getGroup(final String groupName)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.query(LoyaltyCardDbGroups.TABLE, null,
-                whereAttrs(LoyaltyCardDbGroups.ID), withArgs(groupName), null, null, null);
-
-        Group group = null;
         if(data.getCount() == 1)
         {
             data.moveToFirst();
-            group = Group.toGroup(data);
-        }
-        data.close();
-
-        return group;
-    }
-
-    public int getGroupCount()
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbGroups.TABLE);
-    }
-
-    public List<Integer> getGroupCardIds(final String groupName)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.query(LoyaltyCardDbIdsGroups.TABLE, withArgs(LoyaltyCardDbIdsGroups.cardID),
-                whereAttrs(LoyaltyCardDbIdsGroups.groupID), withArgs(groupName), null, null, null);
-        List<Integer> cardIds = new ArrayList<>();
-
-        if (!data.moveToFirst()) {
-            return cardIds;
-        }
-
-        cardIds.add(data.getInt(0));
-
-        while (data.moveToNext()) {
-            cardIds.add(data.getInt(0));
+            numItems = data.getInt(0);
         }
 
         data.close();
 
-        return cardIds;
-    }
-
-    public long insertGroup(final String name)
-    {
-        if (name.isEmpty()) return -1;
-
-        SQLiteDatabase db = getWritableDatabase();
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbGroups.ID, name);
-        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
-        return db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
-    }
-
-    public boolean insertGroup(final SQLiteDatabase db, final String name)
-    {
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbGroups.ID, name);
-        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
-        final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
-        return newId != -1;
-    }
-
-    public boolean updateGroup(final String groupName, final String newName)
-    {
-        if (newName.isEmpty()) return false;
-
-        boolean success = false;
-
-        SQLiteDatabase db = getWritableDatabase();
-        ContentValues groupContentValues = new ContentValues();
-        groupContentValues.put(LoyaltyCardDbGroups.ID, newName);
-
-        ContentValues lookupContentValues = new ContentValues();
-        lookupContentValues.put(LoyaltyCardDbIdsGroups.groupID, newName);
-
-        db.beginTransaction();
-        try {
-            // Update group name
-            int groupsChanged = db.update(LoyaltyCardDbGroups.TABLE, groupContentValues,
-                    whereAttrs(LoyaltyCardDbGroups.ID),
-                    withArgs(groupName));
-
-            // Also update lookup tables
-            db.update(LoyaltyCardDbIdsGroups.TABLE, lookupContentValues,
-                    whereAttrs(LoyaltyCardDbIdsGroups.groupID),
-                    withArgs(groupName));
-
-            if (groupsChanged == 1) {
-                db.setTransactionSuccessful();
-                success = true;
-            }
-        } catch (SQLiteException e) {
-        } finally {
-            db.endTransaction();
-        }
-
-        return success;
-    }
-
-    public boolean deleteGroup(final String groupName)
-    {
-        boolean success = false;
-
-        SQLiteDatabase db = getWritableDatabase();
-
-        db.beginTransaction();
-        try {
-            // Delete group
-            int groupsDeleted = db.delete(LoyaltyCardDbGroups.TABLE,
-                    whereAttrs(LoyaltyCardDbGroups.ID),
-                    withArgs(groupName));
-
-            // And delete lookup table entries associated with this group
-            db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                    whereAttrs(LoyaltyCardDbIdsGroups.groupID),
-                    withArgs(groupName));
-
-            if (groupsDeleted == 1) {
-                db.setTransactionSuccessful();
-                success = true;
-            }
-        } finally {
-            db.endTransaction();
-        }
-
-        // Reorder after delete to ensure no bad order IDs
-        reorderGroups(getGroups());
-
-        return success;
-    }
-
-    public int getGroupCardCount(final String groupName)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-
-        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbIdsGroups.TABLE,
-                whereAttrs(LoyaltyCardDbIdsGroups.groupID), withArgs(groupName));
-    }
-
-    private String whereAttrs(String... attrs) {
-        if (attrs.length == 0) {
-            return null;
-        }
-        StringBuilder whereClause = new StringBuilder(attrs[0]).append("=?");
-        for (int i = 1; i < attrs.length; i++) {
-            whereClause.append(" AND ").append(attrs[i]).append("=?");
-        }
-        return whereClause.toString();
-    }
-
-    private String[] withArgs(Object... object) {
-        return Arrays.stream(object)
-                .map(String::valueOf)
-                .toArray(String[]::new);
-    }
-
-    private String getFieldForOrder(LoyaltyCardOrder order) {
-        if (order == LoyaltyCardOrder.Alpha) {
-            return LoyaltyCardDbIds.STORE;
-        }
-
-        if (order == LoyaltyCardOrder.LastUsed) {
-            return LoyaltyCardDbIds.LAST_USED;
-        }
-
-        if (order == LoyaltyCardOrder.Expiry) {
-            return LoyaltyCardDbIds.EXPIRY;
-        }
-
-        throw new IllegalArgumentException("Unknown order " + order);
-    }
-
-    private String getDbDirection(LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
-        if (order == LoyaltyCardOrder.LastUsed) {
-            // We want the default sorting to put the most recently used first
-            return direction == LoyaltyCardOrderDirection.Descending ? "ASC" : "DESC";
-        }
-
-        return direction == LoyaltyCardOrderDirection.Ascending ? "ASC" : "DESC";
+        return numItems;
     }
 }
+

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

@@ -0,0 +1,8 @@
+package protect.card_locker;
+
+public enum DataFormat
+{
+    CSV,
+
+    ;
+}

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

@@ -0,0 +1,17 @@
+package protect.card_locker;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+
+/**
+ * Interface for a class which can export the contents of the database
+ * in a given format.
+ */
+public interface DatabaseExporter
+{
+    /**
+     * Export the database to the output stream in a given format.
+     * @throws IOException
+     */
+    void exportData(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException;
+}

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

@@ -0,0 +1,19 @@
+package protect.card_locker;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * Interface for a class which can import the contents of a stream
+ * into the database.
+ */
+public interface DatabaseImporter
+{
+    /**
+     * Import data from the input stream in a given format into
+     * the database.
+     * @throws IOException
+     * @throws FormatException
+     */
+    void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException;
+}

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

@@ -0,0 +1,77 @@
+package protect.card_locker;
+
+import androidx.annotation.NonNull;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+
+public class ExtrasHelper {
+    private HashMap<String, LinkedHashMap<String, String>> extras = new HashMap<>();
+
+    public ExtrasHelper fromJSON(JSONObject json) throws JSONException
+    {
+        Iterator<String> languages = json.keys();
+
+        while(languages.hasNext())
+        {
+            String language = languages.next();
+            Iterator<String> keys = json.getJSONObject(language).keys();
+
+            while(keys.hasNext())
+            {
+                String key = keys.next();
+                addLanguageValue(language, key, json.getJSONObject(language).getString(key));
+            }
+        }
+
+        return this;
+    }
+
+    public JSONObject toJSON() throws JSONException
+    {
+        return new JSONObject(extras);
+    }
+
+    public void addLanguageValue(String language, String key, String value)
+    {
+        if(!extras.containsKey(language))
+        {
+            extras.put(language, new LinkedHashMap<String, String>());
+        }
+
+        LinkedHashMap<String, String> values = extras.get(language);
+        values.put(key, value);
+
+        extras.put(language, values);
+    }
+
+    @NonNull
+    public LinkedHashMap<String, String> getAllValues(String language)
+    {
+        return getAllValues(new String[]{language});
+    }
+
+    @NonNull
+    public LinkedHashMap<String, String> getAllValues(String[] languages)
+    {
+        LinkedHashMap<String, String> values = new LinkedHashMap<>();
+
+        // Get least preferred language (last in list) first
+        // Then go further and further to the start of the list (preferred language)
+        for(int i = (languages.length - 1); i >= 0; i--)
+        {
+            LinkedHashMap<String, String> languageValues = extras.get(languages[i]);
+
+            if(languageValues != null)
+            {
+                values.putAll(languageValues);
+            }
+        }
+
+        return values;
+    }
+}

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

@@ -1,22 +0,0 @@
-package protect.card_locker;
-
-import android.database.Cursor;
-
-public class Group
-{
-    public final String _id;
-    public final int order;
-
-    public Group(final String _id, final int order) {
-        this._id = _id;
-        this.order = order;
-    }
-
-    public static Group toGroup(Cursor cursor)
-    {
-        String _id = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ID));
-        int order = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ORDER));
-
-        return new Group(_id, order);
-    }
-}

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

@@ -1,98 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatImageButton;
-import androidx.recyclerview.widget.RecyclerView;
-import protect.card_locker.preferences.Settings;
-
-class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder>
-{
-    Settings mSettings;
-    private Cursor mCursor;
-    private final Context mContext;
-    private final GroupCursorAdapter.GroupAdapterListener mListener;
-    DBHelper mDb;
-
-    public GroupCursorAdapter(Context inputContext, Cursor inputCursor, GroupCursorAdapter.GroupAdapterListener inputListener) {
-        super(inputCursor);
-        setHasStableIds(true);
-        mSettings = new Settings(inputContext);
-        mContext = inputContext;
-        mListener = inputListener;
-        mDb = new DBHelper(inputContext);
-
-        swapCursor(mCursor);
-    }
-
-    @Override
-    public void swapCursor(Cursor inputCursor) {
-        super.swapCursor(inputCursor);
-        mCursor = inputCursor;
-    }
-
-    @NonNull
-    @Override
-    public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType)
-    {
-        View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.group_layout, inputParent, false);
-        return new GroupCursorAdapter.GroupListItemViewHolder(itemView);
-    }
-
-    public Cursor getCursor()
-    {
-        return mCursor;
-    }
-
-    public void onBindViewHolder(GroupCursorAdapter.GroupListItemViewHolder inputHolder, Cursor inputCursor) {
-        Group group = Group.toGroup(inputCursor);
-
-        inputHolder.mName.setText(group._id);
-
-        int groupCardCount = mDb.getGroupCardCount(group._id);
-        inputHolder.mCardCount.setText(mContext.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
-
-        inputHolder.mName.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
-        inputHolder.mCardCount.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
-
-        applyClickEvents(inputHolder);
-    }
-
-    private void applyClickEvents(GroupListItemViewHolder inputHolder)
-    {
-        inputHolder.mMoveDown.setOnClickListener(view -> mListener.onMoveDownButtonClicked(inputHolder.itemView));
-        inputHolder.mMoveUp.setOnClickListener(view -> mListener.onMoveUpButtonClicked(inputHolder.itemView));
-        inputHolder.mEdit.setOnClickListener(view -> mListener.onEditButtonClicked(inputHolder.itemView));
-        inputHolder.mDelete.setOnClickListener(view -> mListener.onDeleteButtonClicked(inputHolder.itemView));
-    }
-
-    public interface GroupAdapterListener
-    {
-        void onMoveDownButtonClicked(View view);
-        void onMoveUpButtonClicked(View view);
-        void onEditButtonClicked(View view);
-        void onDeleteButtonClicked(View view);
-    }
-
-    public class GroupListItemViewHolder extends RecyclerView.ViewHolder
-    {
-        public TextView mName, mCardCount;
-        public AppCompatImageButton mMoveUp, mMoveDown, mEdit, mDelete;
-
-        public GroupListItemViewHolder(View inputView) {
-            super(inputView);
-            mName = inputView.findViewById(R.id.name);
-            mCardCount = inputView.findViewById(R.id.cardCount);
-            mMoveUp = inputView.findViewById(R.id.moveUp);
-            mMoveDown = inputView.findViewById(R.id.moveDown);
-            mEdit = inputView.findViewById(R.id.edit);
-            mDelete = inputView.findViewById(R.id.delete);
-        }
-    }
-}

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

@@ -2,57 +2,50 @@ package protect.card_locker;
 
 import android.Manifest;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.text.InputType;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.Toast;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.List;
 
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import protect.card_locker.importexport.DataFormat;
-import protect.card_locker.importexport.ImportExportResult;
-
-public class ImportExportActivity extends CatimaAppCompatActivity
+public class ImportExportActivity extends AppCompatActivity
 {
     private static final String TAG = "Catima";
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
     private static final int CHOOSE_EXPORT_LOCATION = 2;
-    private static final int IMPORT = 3;
+    private static final int CHOOSE_EXPORTED_FILE = 3;
 
     private ImportExportTask importExporter;
 
-    private String importAlertTitle;
-    private String importAlertMessage;
-    private DataFormat importDataFormat;
-
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        setTitle(R.string.importExport);
         setContentView(R.layout.import_export_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -79,8 +72,8 @@ public class ImportExportActivity extends CatimaAppCompatActivity
         // Check that there is a file manager available
         final Intent intentCreateDocumentAction = new Intent(Intent.ACTION_CREATE_DOCUMENT);
         intentCreateDocumentAction.addCategory(Intent.CATEGORY_OPENABLE);
-        intentCreateDocumentAction.setType("application/zip");
-        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "catima.zip");
+        intentCreateDocumentAction.setType("text/csv");
+        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "Catima.csv");
 
         Button exportButton = findViewById(R.id.exportButton);
         exportButton.setOnClickListener(new View.OnClickListener()
@@ -103,10 +96,18 @@ public class ImportExportActivity extends CatimaAppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseImportType(intentGetContentAction);
+                chooseFileWithIntent(intentGetContentAction, CHOOSE_EXPORTED_FILE);
             }
         });
 
+        if(isCallable(getApplicationContext(), intentGetContentAction) == false)
+        {
+            findViewById(R.id.dividerImportFilesystem).setVisibility(View.GONE);
+            findViewById(R.id.importOptionFilesystemTitle).setVisibility(View.GONE);
+            findViewById(R.id.importOptionFilesystemExplanation).setVisibility(View.GONE);
+            importFilesystem.setVisibility(View.GONE);
+        }
+
         // Check that there is an app that data can be imported from
         final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
 
@@ -116,91 +117,32 @@ public class ImportExportActivity extends CatimaAppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseImportType(intentPickAction);
+                chooseFileWithIntent(intentPickAction, CHOOSE_EXPORTED_FILE);
             }
         });
-    }
 
-    private void chooseImportType(Intent baseIntent) {
-        List<CharSequence> betaImportOptions = new ArrayList<>();
-        betaImportOptions.add("Fidme");
-        betaImportOptions.add("Stocard");
-        List<CharSequence> importOptions = new ArrayList<>();
-
-        for (String importOption : getResources().getStringArray(R.array.import_types_array)) {
-            if (betaImportOptions.contains(importOption)) {
-                importOption = importOption + " (BETA)";
-            }
-
-            importOptions.add(importOption);
+        if(isCallable(getApplicationContext(), intentPickAction) == false)
+        {
+            findViewById(R.id.dividerImportApplication).setVisibility(View.GONE);
+            findViewById(R.id.importOptionApplicationTitle).setVisibility(View.GONE);
+            findViewById(R.id.importOptionApplicationExplanation).setVisibility(View.GONE);
+            importApplication.setVisibility(View.GONE);
         }
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.chooseImportType)
-                .setItems(importOptions.toArray(new CharSequence[importOptions.size()]), (dialog, which) -> {
-                    switch (which) {
-                        // Catima
-                        case 0:
-                            importAlertTitle = getString(R.string.importCatima);
-                            importAlertMessage = getString(R.string.importCatimaMessage);
-                            importDataFormat = DataFormat.Catima;
-                            break;
-                        // Fidme
-                        case 1:
-                            importAlertTitle = getString(R.string.importFidme);
-                            importAlertMessage = getString(R.string.importFidmeMessage);
-                            importDataFormat = DataFormat.Fidme;
-                            break;
-                        // Loyalty Card Keychain
-                        case 2:
-                            importAlertTitle = getString(R.string.importLoyaltyCardKeychain);
-                            importAlertMessage = getString(R.string.importLoyaltyCardKeychainMessage);
-                            importDataFormat = DataFormat.Catima;
-                            break;
-                        // Stocard
-                        case 3:
-                            importAlertTitle = getString(R.string.importStocard);
-                            importAlertMessage = getString(R.string.importStocardMessage);
-                            importDataFormat = DataFormat.Stocard;
-                            break;
-                        // Voucher Vault
-                        case 4:
-                            importAlertTitle = getString(R.string.importVoucherVault);
-                            importAlertMessage = getString(R.string.importVoucherVaultMessage);
-                            importDataFormat = DataFormat.VoucherVault;
-                            break;
-                        default:
-                            throw new IllegalArgumentException("Unknown DataFormat");
-                    }
-
-                    new AlertDialog.Builder(this)
-                            .setTitle(importAlertTitle)
-                            .setMessage(importAlertMessage)
-                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            chooseFileWithIntent(baseIntent, IMPORT);
-                                        }
-                                    })
-                            .setNegativeButton(R.string.cancel, null)
-                            .show();
-                });
-        builder.show();
     }
 
-    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password)
+    private void startImport(final InputStream target, final Uri targetUri)
     {
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
             @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat)
+            public void onTaskComplete(boolean success)
             {
-                onImportComplete(result, targetUri, dataFormat);
+                onImportComplete(success, targetUri);
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                dataFormat, target, password, listener);
+                DataFormat.CSV, target, listener);
         importExporter.execute();
     }
 
@@ -209,32 +151,35 @@ public class ImportExportActivity extends CatimaAppCompatActivity
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
             @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat)
+            public void onTaskComplete(boolean success)
             {
-                onExportComplete(result, targetUri);
+                onExportComplete(success, targetUri);
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.Catima, target, listener);
+                DataFormat.CSV, target, listener);
         importExporter.execute();
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
-        if (requestCode == PERMISSIONS_EXTERNAL_STORAGE) {
+    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults)
+    {
+        if(requestCode == PERMISSIONS_EXTERNAL_STORAGE)
+        {
             // If request is cancelled, the result arrays are empty.
             boolean success = grantResults.length > 0;
 
-            for (int grant : grantResults) {
-                if (grant != PackageManager.PERMISSION_GRANTED) {
+            for(int grant : grantResults)
+            {
+                if(grant != PackageManager.PERMISSION_GRANTED)
+                {
                     success = false;
                 }
             }
 
-            if (!success) {
+            if(success == false)
+            {
                 // External storage permission rejected, inform user that
                 // import/export is prevented
                 Toast.makeText(getApplicationContext(), R.string.noExternalStoragePermissionError,
@@ -268,43 +213,20 @@ public class ImportExportActivity extends CatimaAppCompatActivity
         return super.onOptionsItemSelected(item);
     }
 
-    private void retryWithPassword(DataFormat dataFormat, Uri uri) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.passwordRequired);
-
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-        builder.setView(input);
-
-        builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
-            activityResultParser(IMPORT, RESULT_OK, uri, input.getText().toString().toCharArray());
-        });
-        builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
-
-        builder.show();
-    }
-
-    private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
-        if (result == ImportExportResult.BadPassword) {
-            retryWithPassword(dataFormat, path);
-            return;
-        }
-
+    private void onImportComplete(boolean success, Uri path)
+    {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
-        int messageId;
-
-        if (result == ImportExportResult.Success)
+        if(success)
         {
             builder.setTitle(R.string.importSuccessfulTitle);
-            messageId = R.string.importSuccessful;
         }
         else
         {
             builder.setTitle(R.string.importFailedTitle);
-            messageId = R.string.importFailed;
         }
 
+        int messageId = success ? R.string.importSuccessful : R.string.importFailed;
         final String message = getResources().getString(messageId);
 
         builder.setMessage(message);
@@ -320,50 +242,84 @@ public class ImportExportActivity extends CatimaAppCompatActivity
         builder.create().show();
     }
 
-    private void onExportComplete(ImportExportResult result, final Uri path)
+    private void onExportComplete(boolean success, final Uri path)
     {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
-        int messageId;
-
-        if(result == ImportExportResult.Success)
+        if(success)
         {
             builder.setTitle(R.string.exportSuccessfulTitle);
-            messageId = R.string.exportSuccessful;
         }
         else
         {
             builder.setTitle(R.string.exportFailedTitle);
-            messageId = R.string.exportFailed;
         }
 
+        int messageId = success ? R.string.exportSuccessful : R.string.exportFailed;
         final String message = getResources().getString(messageId);
 
         builder.setMessage(message);
-        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
+        builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
+        {
+            @Override
+            public void onClick(DialogInterface dialog, int which)
+            {
+                dialog.dismiss();
+            }
+        });
 
-        if(result == ImportExportResult.Success)
+        if(success)
         {
             final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);
 
-            builder.setPositiveButton(sendLabel, (dialog, which) -> {
-                Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                sendIntent.putExtra(Intent.EXTRA_STREAM, path);
-                sendIntent.setType("text/csv");
+            builder.setPositiveButton(sendLabel, new DialogInterface.OnClickListener()
+            {
+                @Override
+                public void onClick(DialogInterface dialog, int which)
+                {
+                    Intent sendIntent = new Intent(Intent.ACTION_SEND);
+                    sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+                    sendIntent.setType("text/csv");
 
-                // set flag to give temporary permission to external app to use the FileProvider
-                sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                    // set flag to give temporary permission to external app to use the FileProvider
+                    sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
-                ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
-                        sendLabel));
+                    ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
+                            sendLabel));
 
-                dialog.dismiss();
+                    dialog.dismiss();
+                }
             });
         }
 
         builder.create().show();
     }
 
+    /**
+     * Determines if there is at least one activity that can perform the given intent
+     */
+    private boolean isCallable(Context context, final Intent intent)
+    {
+        PackageManager manager = context.getPackageManager();
+        if(manager == null)
+        {
+            return false;
+        }
+
+        List<ResolveInfo> list = manager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+
+        for(ResolveInfo info : list)
+        {
+            if(info.activityInfo.exported)
+            {
+                // There is one activity which is available to be called
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private void chooseFileWithIntent(Intent intent, int requestCode)
     {
         try
@@ -372,18 +328,22 @@ public class ImportExportActivity extends CatimaAppCompatActivity
         }
         catch (ActivityNotFoundException e)
         {
-            Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
             Log.e(TAG, "No activity found to handle intent", e);
         }
     }
 
-    private void activityResultParser(int requestCode, int resultCode, Uri uri, char[] password) {
-        if (resultCode != RESULT_OK)
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (resultCode != RESULT_OK || (requestCode != CHOOSE_EXPORT_LOCATION && requestCode != CHOOSE_EXPORTED_FILE))
         {
             Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
             return;
         }
 
+        Uri uri = data.getData();
         if(uri == null)
         {
             Log.e(TAG, "Activity returned a NULL URI");
@@ -406,8 +366,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity
 
                 Log.e(TAG, "Starting file export with: " + uri.toString());
                 startExport(writer, uri);
-
-                writer.close();
             }
             else
             {
@@ -421,38 +379,21 @@ public class ImportExportActivity extends CatimaAppCompatActivity
                     reader = new FileInputStream(new File(uri.toString()));
                 }
 
-                Log.e(TAG, "Starting file import with: " + uri.toString());
-
-                startImport(reader, uri, importDataFormat, password);
-
-                reader.close();
+                Log.e(TAG, "Starting file export with: " + uri.toString());
+                startImport(reader, uri);
             }
         }
-        catch(IOException e)
+        catch(FileNotFoundException e)
         {
             Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
             if (requestCode == CHOOSE_EXPORT_LOCATION)
             {
-                onExportComplete(ImportExportResult.GenericFailure, uri);
+                onExportComplete(false, uri);
             }
             else
             {
-                onImportComplete(ImportExportResult.GenericFailure, uri, importDataFormat);
+                onImportComplete(false, uri);
             }
         }
     }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data)
-    {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if(data == null)
-        {
-            Log.e(TAG, "Activity returned NULL data");
-            return;
-        }
-
-        activityResultParser(requestCode, resultCode, data.getData(), null);
-    }
 }

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

@@ -2,23 +2,18 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.util.Log;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
 
-import protect.card_locker.importexport.DataFormat;
-import protect.card_locker.importexport.ImportExportResult;
-import protect.card_locker.importexport.MultiFormatExporter;
-import protect.card_locker.importexport.MultiFormatImporter;
-
-class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
+class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 {
     private static final String TAG = "Catima";
 
@@ -27,7 +22,6 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
     private DataFormat format;
     private OutputStream outputStream;
     private InputStream inputStream;
-    private char[] password;
     private TaskCompleteListener listener;
 
     private ProgressDialog progress;
@@ -49,7 +43,7 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
     /**
      * Constructor which will setup a task for importing from the given InputStream.
      */
-    ImportExportTask(Activity activity, DataFormat format, InputStream input, char[] password,
+    ImportExportTask(Activity activity, DataFormat format, InputStream input,
                             TaskCompleteListener listener)
     {
         super();
@@ -57,27 +51,37 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
         this.doImport = true;
         this.format = format;
         this.inputStream = input;
-        this.password = password;
         this.listener = listener;
     }
 
-    private ImportExportResult performImport(Context context, InputStream stream, DBHelper db, char[] password)
+    private boolean performImport(InputStream stream, DBHelper db)
     {
-        ImportExportResult importResult = MultiFormatImporter.importData(context, db, stream, format, password);
-
-        Log.i(TAG, "Import result: " + importResult.name());
-
-        return importResult;
-    }
-
-    private ImportExportResult performExport(Context context, OutputStream stream, DBHelper db)
-    {
-        ImportExportResult result = ImportExportResult.GenericFailure;
+        boolean result = false;
 
         try
         {
-            OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
-            result = MultiFormatExporter.exportData(context, db, stream, format);
+            InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"));
+            result = MultiFormatImporter.importData(db, reader, format);
+            reader.close();
+        }
+        catch(IOException e)
+        {
+            Log.e(TAG, "Unable to import file", e);
+        }
+
+        Log.i(TAG, "Import result: " + result);
+
+        return result;
+    }
+
+    private boolean performExport(OutputStream stream, DBHelper db)
+    {
+        boolean result = false;
+
+        try
+        {
+            OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
+            result = MultiFormatExporter.exportData(db, writer, format);
             writer.close();
         }
         catch (IOException e)
@@ -107,26 +111,26 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
         progress.show();
     }
 
-    protected ImportExportResult doInBackground(Void... nothing)
+    protected Boolean doInBackground(Void... nothing)
     {
         final DBHelper db = new DBHelper(activity);
-        ImportExportResult result;
+        boolean result;
 
         if(doImport)
         {
-            result = performImport(activity.getApplicationContext(), inputStream, db, password);
+            result = performImport(inputStream, db);
         }
         else
         {
-            result = performExport(activity.getApplicationContext(), outputStream, db);
+            result = performExport(outputStream, db);
         }
 
         return result;
     }
 
-    protected void onPostExecute(ImportExportResult result)
+    protected void onPostExecute(Boolean result)
     {
-        listener.onTaskComplete(result, format);
+        listener.onTaskComplete(result);
 
         progress.dismiss();
         Log.i(TAG, (doImport ? "Import" : "Export") + " Complete");
@@ -139,7 +143,7 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
     }
     interface TaskCompleteListener
     {
-        void onTaskComplete(ImportExportResult result, DataFormat format);
+        void onTaskComplete(boolean success);
     }
 
 }

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

@@ -2,58 +2,43 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.net.Uri;
+import android.util.Base64;
 
-import com.google.zxing.BarcodeFormat;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.InvalidObjectException;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Currency;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
 
 public class ImportURIHelper {
     private static final String STORE = DBHelper.LoyaltyCardDbIds.STORE;
     private static final String NOTE = DBHelper.LoyaltyCardDbIds.NOTE;
-    private static final String EXPIRY = DBHelper.LoyaltyCardDbIds.EXPIRY;
-    private static final String BALANCE = DBHelper.LoyaltyCardDbIds.BALANCE;
-    private static final String BALANCE_TYPE = DBHelper.LoyaltyCardDbIds.BALANCE_TYPE;
     private static final String CARD_ID = DBHelper.LoyaltyCardDbIds.CARD_ID;
-    private static final String BARCODE_ID = DBHelper.LoyaltyCardDbIds.BARCODE_ID;
     private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
     private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
+    private static final String HEADER_TEXT_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR;
+    private static final String ICON = DBHelper.LoyaltyCardDbIds.ICON;
+    private static final String EXTRAS = DBHelper.LoyaltyCardDbIds.EXTRAS;
 
     private final Context context;
-    private final String[] hosts = new String[3];
-    private final String[] paths = new String[3];
+    private final String host;
+    private final String path;
+    private final String oldHost;
+    private final String oldPath;
     private final String shareText;
-    private final String shareMultipleText;
 
     public ImportURIHelper(Context context) {
         this.context = context;
-        hosts[0] = context.getResources().getString(R.string.intent_import_card_from_url_host_catima_app);
-        paths[0] = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_catima_app);
-        hosts[1] = context.getResources().getString(R.string.intent_import_card_from_url_host_thelastproject);
-        paths[1] = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_thelastproject);
-        hosts[2] = context.getResources().getString(R.string.intent_import_card_from_url_host_brarcher);
-        paths[2] = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_brarcher);
+        host = context.getResources().getString(R.string.intent_import_card_from_url_host);
+        path = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix);
+        oldHost = context.getResources().getString(R.string.intent_import_card_from_url_host_old);
+        oldPath = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_old);
         shareText = context.getResources().getString(R.string.intent_import_card_from_url_share_text);
-        shareMultipleText = context.getResources().getString(R.string.intent_import_card_from_url_share_multiple_text);
     }
 
-    private boolean isImportUri(Uri uri) {
-        for (int i = 0; i < hosts.length; i++) {
-            if (uri.getHost().equals(hosts[i]) && uri.getPath().equals(paths[i])) {
-                return true;
-            }
-        }
-
-        return false;
+    public boolean isImportUri(Uri uri) {
+        return (uri.getHost().equals(host) && uri.getPath().equals(path)) || (uri.getHost().equals(oldHost) && uri.getPath().equals(oldPath));
     }
 
     public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
@@ -63,146 +48,93 @@ public class ImportURIHelper {
 
         try {
             // These values are allowed to be null
-            CatimaBarcode barcodeType = null;
-            Date expiry = null;
-            BigDecimal balance = new BigDecimal("0");
-            Currency balanceType = null;
             Integer headerColor = null;
+            Integer headerTextColor = null;
 
-            // Store everything in a simple key/value hashmap
-            HashMap<String, String> kv = new HashMap<>();
-
-            // First, grab all query parameters (backwards compatibility)
-            for (String key : uri.getQueryParameterNames()) {
-                kv.put(key, uri.getQueryParameter(key));
-            }
-
-            // Then, parse the new and more private fragment part
-            // Overriding old format entries if they exist
-            String fragment = uri.getFragment();
-            if (fragment != null) {
-                for (String fragmentPart : fragment.split("&")) {
-                    String[] fragmentData = fragmentPart.split("=", 2);
-                    kv.put(fragmentData[0], URLDecoder.decode(fragmentData[1], StandardCharsets.UTF_8.name()));
-                }
-            }
-
-            // Then use all values we care about
-            String store = kv.get(STORE);
-            String note = kv.get(NOTE);
-            String cardId = kv.get(CARD_ID);
-            String barcodeId = kv.get(BARCODE_ID);
-            if (store == null || note == null || cardId == null) throw new InvalidObjectException("Not a valid import URI: " + uri.toString());
-
-            String unparsedBarcodeType = kv.get(BARCODE_TYPE);
-            if(unparsedBarcodeType != null && !unparsedBarcodeType.equals(""))
-            {
-                barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
-            }
-
-            String unparsedBalance = kv.get(BALANCE);
-            if(unparsedBalance != null && !unparsedBalance.equals(""))
-            {
-                balance = new BigDecimal(unparsedBalance);
-            }
-            String unparsedBalanceType = kv.get(BALANCE_TYPE);
-            if (unparsedBalanceType != null && !unparsedBalanceType.equals(""))
-            {
-                balanceType = Currency.getInstance(unparsedBalanceType);
-            }
-            String unparsedExpiry = kv.get(EXPIRY);
-            if(unparsedExpiry != null && !unparsedExpiry.equals(""))
-            {
-                expiry = new Date(Long.parseLong(unparsedExpiry));
-            }
-
-            String unparsedHeaderColor = kv.get(HEADER_COLOR);
+            String store = uri.getQueryParameter(STORE);
+            String note = uri.getQueryParameter(NOTE);
+            String cardId = uri.getQueryParameter(CARD_ID);
+            String barcodeType = uri.getQueryParameter(BARCODE_TYPE);
+            String unparsedHeaderColor = uri.getQueryParameter(HEADER_COLOR);
             if(unparsedHeaderColor != null)
             {
                 headerColor = Integer.parseInt(unparsedHeaderColor);
             }
+            String unparsedHeaderTextColor = uri.getQueryParameter(HEADER_TEXT_COLOR);
+            if(unparsedHeaderTextColor != null)
+            {
+                headerTextColor = Integer.parseInt(unparsedHeaderTextColor);
+            }
+            String iconData = uri.getQueryParameter(ICON);
+            Bitmap icon = null;
 
-            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime());
-        } catch (NullPointerException | NumberFormatException | UnsupportedEncodingException ex) {
+            if(iconData != null && !iconData.isEmpty())
+            {
+                byte[] iconBytes = Base64.decode(iconData, Base64.URL_SAFE);
+                icon = DBHelper.convertBitmapBlobToBitmap(iconBytes);
+            }
+
+            String extrasData = uri.getQueryParameter(EXTRAS);
+            ExtrasHelper extras = new ExtrasHelper();
+            if(extrasData != null && !extrasData.isEmpty())
+            {
+                extras.fromJSON(new JSONObject(uri.getQueryParameter(EXTRAS)));
+            }
+
+            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, icon, extras);
+        } catch (NullPointerException | NumberFormatException | JSONException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }
     }
 
-    private StringBuilder appendFragment(StringBuilder fragment, String key, String value) throws UnsupportedEncodingException {
-        if (fragment.length() > 0) {
-            fragment.append("&");
+    // Protected for usage in tests
+    protected Uri toUri(LoyaltyCard loyaltyCard) throws JSONException {
+        String icon = "";
+        if(loyaltyCard.icon != null)
+        {
+            icon = Base64.encodeToString(DBHelper.convertBitmapToBlob(loyaltyCard.icon), Base64.URL_SAFE);
         }
 
-        // Double-encode the value to make sure it can't accidentally contain symbols that'll break the parser
-        fragment.append(key).append("=").append(URLEncoder.encode(value, StandardCharsets.UTF_8.name()));
-
-        return fragment;
-    }
-
-    // Protected for usage in tests
-    protected Uri toUri(LoyaltyCard loyaltyCard) throws UnsupportedEncodingException {
         Uri.Builder uriBuilder = new Uri.Builder();
         uriBuilder.scheme("https");
-        uriBuilder.authority(hosts[0]);
-        uriBuilder.path(paths[0]);
+        uriBuilder.authority(host);
+        uriBuilder.path(path);
+        uriBuilder.appendQueryParameter(STORE, loyaltyCard.store);
+        uriBuilder.appendQueryParameter(NOTE, loyaltyCard.note);
+        uriBuilder.appendQueryParameter(CARD_ID, loyaltyCard.cardId);
+        uriBuilder.appendQueryParameter(BARCODE_TYPE, loyaltyCard.barcodeType);
+        if(loyaltyCard.headerColor != null)
+        {
+            uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
+        }
+        if(loyaltyCard.headerTextColor != null)
+        {
+            uriBuilder.appendQueryParameter(HEADER_TEXT_COLOR, loyaltyCard.headerTextColor.toString());
+        }
+        uriBuilder.appendQueryParameter(ICON, icon);
+        uriBuilder.appendQueryParameter(EXTRAS, loyaltyCard.extras.toJSON().toString());
 
-        // Use fragment instead of QueryParameter to not leak this data to the server
-        StringBuilder fragment = new StringBuilder();
-
-        fragment = appendFragment(fragment, STORE, loyaltyCard.store);
-        fragment = appendFragment(fragment, NOTE, loyaltyCard.note);
-        fragment = appendFragment(fragment, BALANCE, loyaltyCard.balance.toString());
-        if (loyaltyCard.balanceType != null) {
-            fragment = appendFragment(fragment, BALANCE_TYPE, loyaltyCard.balanceType.getCurrencyCode());
-        }
-        if (loyaltyCard.expiry != null) {
-            fragment = appendFragment(fragment, EXPIRY, String.valueOf(loyaltyCard.expiry.getTime()));
-        }
-        fragment = appendFragment(fragment, CARD_ID, loyaltyCard.cardId);
-        if(loyaltyCard.barcodeId != null) {
-            fragment = appendFragment(fragment, BARCODE_ID, loyaltyCard.barcodeId);
-        }
-
-        if(loyaltyCard.barcodeType != null) {
-            fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.name());
-        }
-        if(loyaltyCard.headerColor != null) {
-            fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());
-        }
-        // Star status will not be exported
-        // Front and back pictures are often too big to fit into a message in base64 nicely, not sharing either...
-
-        uriBuilder.fragment(fragment.toString());
         return uriBuilder.build();
     }
 
-    public void startShareIntent(List<LoyaltyCard> loyaltyCards) throws UnsupportedEncodingException {
-        int loyaltyCardCount = loyaltyCards.size();
-
-        StringBuilder text = new StringBuilder();
-        if (loyaltyCardCount == 1) {
-            text.append(shareText);
-        } else {
-            text.append(shareMultipleText);
-        }
-        text.append("\n\n");
-
-        for (int i = 0; i < loyaltyCardCount; i++) {
-            LoyaltyCard loyaltyCard = loyaltyCards.get(i);
-
-            text.append(loyaltyCard.store + ": " + toUri(loyaltyCard));
-
-            if (i < (loyaltyCardCount - 1)) {
-                text.append("\n\n");
-            }
-        }
-
+    private void startShareIntent(Uri uri) {
         Intent sendIntent = new Intent();
         sendIntent.setAction(Intent.ACTION_SEND);
-        sendIntent.putExtra(Intent.EXTRA_TEXT, text.toString());
+        sendIntent.putExtra(Intent.EXTRA_TEXT, shareText + "\n" + uri.toString());
         sendIntent.setType("text/plain");
 
         Intent shareIntent = Intent.createChooser(sendIntent, null);
         context.startActivity(shareIntent);
     }
+
+    public boolean startShareIntent(LoyaltyCard loyaltyCard) {
+        try
+        {
+            startShareIntent(toUri(loyaltyCard));
+            return true;
+        }
+        catch (JSONException ex) {}
+
+        return false;
+    }
 }

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

@@ -1,87 +1,46 @@
 package protect.card_locker;
 
 import android.database.Cursor;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.math.BigDecimal;
-import java.util.Currency;
-import java.util.Date;
-
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import androidx.annotation.Nullable;
 
-public class LoyaltyCard implements Parcelable {
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class LoyaltyCard
+{
     public final int id;
     public final String store;
     public final String note;
-    public final Date expiry;
-    public final BigDecimal balance;
-    public final Currency balanceType;
     public final String cardId;
-
-    @Nullable
-    public final String barcodeId;
-
-    @Nullable
-    public final CatimaBarcode barcodeType;
+    public final String barcodeType;
 
     @Nullable
     public final Integer headerColor;
 
-    public final int starStatus;
-    public final long lastUsed;
+    @Nullable
+    public final Integer headerTextColor;
 
-    public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
-                       final BigDecimal balance, final Currency balanceType, final String cardId,
-                       @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
-                       @Nullable final Integer headerColor, final int starStatus, final long lastUsed)
+    @Nullable
+    public final Bitmap icon;
+
+    @Nullable
+    public final ExtrasHelper extras;
+
+    public LoyaltyCard(final int id, final String store, final String note, final String cardId,
+                       final String barcodeType, final Integer headerColor, final Integer headerTextColor,
+                       final Bitmap icon, final ExtrasHelper extras)
     {
         this.id = id;
         this.store = store;
         this.note = note;
-        this.expiry = expiry;
-        this.balance = balance;
-        this.balanceType = balanceType;
         this.cardId = cardId;
-        this.barcodeId = barcodeId;
         this.barcodeType = barcodeType;
         this.headerColor = headerColor;
-        this.starStatus = starStatus;
-        this.lastUsed = lastUsed;
-    }
-
-    protected LoyaltyCard(Parcel in) {
-        id = in.readInt();
-        store = in.readString();
-        note = in.readString();
-        long tmpExpiry = in.readLong();
-        expiry = tmpExpiry != -1 ? new Date(tmpExpiry) : null;
-        balance = (BigDecimal) in.readValue(BigDecimal.class.getClassLoader());
-        balanceType = (Currency) in.readValue(Currency.class.getClassLoader());
-        cardId = in.readString();
-        barcodeId = in.readString();
-        String tmpBarcodeType = in.readString();
-        barcodeType = !tmpBarcodeType.isEmpty() ? CatimaBarcode.fromName(tmpBarcodeType) : null;
-        int tmpHeaderColor = in.readInt();
-        headerColor = tmpHeaderColor != -1 ? tmpHeaderColor : null;
-        starStatus = in.readInt();
-        lastUsed = in.readLong();
-    }
-
-    @Override
-    public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeInt(id);
-        parcel.writeString(store);
-        parcel.writeString(note);
-        parcel.writeLong(expiry != null ? expiry.getTime() : -1);
-        parcel.writeValue(balance);
-        parcel.writeValue(balanceType);
-        parcel.writeString(cardId);
-        parcel.writeString(barcodeId);
-        parcel.writeString(barcodeType != null ? barcodeType.name() : "");
-        parcel.writeInt(headerColor != null ? headerColor : -1);
-        parcel.writeInt(starStatus);
-        parcel.writeLong(lastUsed);
+        this.headerTextColor = headerTextColor;
+        this.icon = icon;
+        this.extras = extras;
     }
 
     public static LoyaltyCard toLoyaltyCard(Cursor cursor)
@@ -89,59 +48,51 @@ public class LoyaltyCard implements Parcelable {
         int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
         String store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
         String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
-        long expiryLong = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXPIRY));
-        BigDecimal balance = new BigDecimal(cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE)));
         String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
-        String barcodeId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID));
-        int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
-        long lastUsed = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.LAST_USED));
+        String barcodeType = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE));
 
-        int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
-        int balanceTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE);
         int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
+        int headerTextColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR);
 
-        CatimaBarcode barcodeType = null;
-        Currency balanceType = null;
-        Date expiry = null;
         Integer headerColor = null;
-
-        if (cursor.isNull(barcodeTypeColumn) == false)
-        {
-            barcodeType = CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn));
-        }
-
-        if (cursor.isNull(balanceTypeColumn) == false)
-        {
-            balanceType = Currency.getInstance(cursor.getString(balanceTypeColumn));
-        }
-
-        if(expiryLong > 0)
-        {
-            expiry = new Date(expiryLong);
-        }
+        Integer headerTextColor = null;
 
         if(cursor.isNull(headerColorColumn) == false)
         {
             headerColor = cursor.getInt(headerColorColumn);
         }
 
-        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed);
-    }
-
-    @Override
-    public int describeContents() {
-        return id;
-    }
-
-    public static final Creator<LoyaltyCard> CREATOR = new Creator<LoyaltyCard>() {
-        @Override
-        public LoyaltyCard createFromParcel(Parcel in) {
-            return new LoyaltyCard(in);
+        if(cursor.isNull(headerTextColorColumn) == false)
+        {
+            headerTextColor = cursor.getInt(headerTextColorColumn);
         }
 
-        @Override
-        public LoyaltyCard[] newArray(int size) {
-            return new LoyaltyCard[size];
+        int iconColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ICON);
+        Bitmap icon = null;
+
+        if(cursor.isNull(iconColumn) == false)
+        {
+            byte[] iconData = cursor.getBlob(iconColumn);
+            icon = BitmapFactory.decodeByteArray(iconData, 0, iconData.length);
         }
-    };
+
+        int extrasColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXTRAS);
+        ExtrasHelper extras = new ExtrasHelper();
+
+        if(cursor.isNull(extrasColumn) == false)
+        {
+            try
+            {
+                extras = extras.fromJSON(new JSONObject(cursor.getString(extrasColumn)));
+            }
+            catch (JSONException ex)
+            {
+                // That this is actually JSON is an implementation detail
+                // The important part is that the DB is in a bad state
+                throw new IllegalArgumentException(ex);
+            }
+        }
+
+        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor, icon, extras);
+    }
 }

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

@@ -1,37 +0,0 @@
-package protect.card_locker;
-
-import android.animation.AnimatorInflater;
-import android.animation.AnimatorSet;
-import android.content.Context;
-import android.view.View;
-
-public class LoyaltyCardAnimator {
-
-    private static AnimatorSet selectedViewIn, defaultViewOut, selectedViewOut, defaultViewIn;
-
-    public static void flipView(Context inputContext, final View inputSelectedView, final View inputDefaultView, boolean inputItemSelected) {
-
-        selectedViewIn = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_left_in);
-        defaultViewOut = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_right_out);
-        selectedViewOut = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_left_out);
-        defaultViewIn = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_right_in);
-
-        final AnimatorSet showFrontAnim = new AnimatorSet();
-        final AnimatorSet showBackAnim = new AnimatorSet();
-
-        selectedViewIn.setTarget(inputSelectedView);
-        defaultViewOut.setTarget(inputDefaultView);
-        showFrontAnim.playTogether(selectedViewIn, defaultViewOut);
-
-        selectedViewOut.setTarget(inputSelectedView);
-        defaultViewIn.setTarget(inputDefaultView);
-        showBackAnim.playTogether(defaultViewIn, selectedViewOut);
-
-        if (inputItemSelected) {
-            showFrontAnim.start();
-        } else {
-            showBackAnim.start();
-        }
-    }
-
-}

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

@@ -2,278 +2,78 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.util.SparseBooleanArray;
-import android.view.HapticFeedbackConstants;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CursorAdapter;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.google.android.material.card.MaterialCardView;
-
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.util.ArrayList;
-
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.Settings;
 
-public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder>
+class LoyaltyCardCursorAdapter extends CursorAdapter
 {
-    private int mCurrentSelectedIndex = -1;
-    private Cursor mCursor;
-    Settings mSettings;
-    boolean mDarkModeEnabled;
-    private Context mContext;
-    private CardAdapterListener mListener;
-    private SparseBooleanArray mSelectedItems;
-    private SparseBooleanArray mAnimationItemsIndex;
-    private boolean mReverseAllAnimations = false;
+    Settings settings;
 
-    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener)
+    public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
     {
-        super(inputCursor);
-        setHasStableIds(true);
-        mSettings = new Settings(inputContext);
-        mContext = inputContext;
-        mListener = inputListener;
-        mSelectedItems = new SparseBooleanArray();
-        mAnimationItemsIndex = new SparseBooleanArray();
-
-        mDarkModeEnabled = MainActivity.isDarkModeEnabled(inputContext);
-
-        swapCursor(mCursor);
+        super(context, cursor, 0);
+        settings = new Settings(context);
     }
 
+    // The newView method is used to inflate a new view and return it,
+    // you don't bind any data to the view at this point.
     @Override
-    public void swapCursor(Cursor inputCursor) {
-        super.swapCursor(inputCursor);
-        mCursor = inputCursor;
+    public View newView(Context context, Cursor cursor, ViewGroup parent)
+    {
+        return LayoutInflater.from(context).inflate(R.layout.loyalty_card_layout, parent, false);
     }
 
+    // The bindView method is used to bind all data to a given view
+    // such as setting the text on a TextView.
     @Override
-    public LoyaltyCardListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType)
+    public void bindView(View view, Context context, Cursor cursor)
     {
-        View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.loyalty_card_layout, inputParent, false);
-        return new LoyaltyCardListItemViewHolder(itemView);
-    }
+        // Find fields to populate in inflated template
+        ImageView thumbnail = view.findViewById(R.id.thumbnail);
+        TextView storeField = (TextView) view.findViewById(R.id.store);
+        TextView noteField = (TextView) view.findViewById(R.id.note);
 
-    public Cursor getCursor()
-    {
-        return mCursor;
-    }
+        // Extract properties from cursor
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
 
-    public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
-        // Invisible until we want to show something more
-        inputHolder.mDivider.setVisibility(View.GONE);
+        // Populate fields with extracted properties
+        storeField.setText(loyaltyCard.store);
 
-        if (mDarkModeEnabled) {
-            inputHolder.mStarIcon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
-        }
+        storeField.setTextSize(settings.getCardTitleListFontSize());
 
-        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
-
-        inputHolder.mStoreField.setText(loyaltyCard.store);
-        inputHolder.mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
-        if (!loyaltyCard.note.isEmpty()) {
-            inputHolder.mNoteField.setVisibility(View.VISIBLE);
-            inputHolder.mNoteField.setText(loyaltyCard.note);
-            inputHolder.mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
-        } else {
-            inputHolder.mNoteField.setVisibility(View.GONE);
-        }
-
-        if (!loyaltyCard.balance.equals(new BigDecimal("0"))) {
-            inputHolder.mDivider.setVisibility(View.VISIBLE);
-            inputHolder.mBalanceField.setVisibility(View.VISIBLE);
-            if (mDarkModeEnabled) {
-                inputHolder.mBalanceField.getCompoundDrawables()[0].setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
-            }
-            inputHolder.mBalanceField.setText(Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType));
-            inputHolder.mBalanceField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
-        } else {
-            inputHolder.mBalanceField.setVisibility(View.GONE);
-        }
-
-        if (loyaltyCard.expiry != null) {
-            inputHolder.mDivider.setVisibility(View.VISIBLE);
-            inputHolder.mExpiryField.setVisibility(View.VISIBLE);
-            Drawable expiryIcon = inputHolder.mExpiryField.getCompoundDrawables()[0];
-            if (Utils.hasExpired(loyaltyCard.expiry)) {
-                expiryIcon.setColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP);
-                inputHolder.mExpiryField.setTextColor(Color.RED);
-            } else if (mDarkModeEnabled) {
-                expiryIcon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
-            }
-            inputHolder.mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry));
-            inputHolder.mExpiryField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
-        } else {
-            inputHolder.mExpiryField.setVisibility(View.GONE);
-        }
-
-        inputHolder.mStarIcon.setVisibility(loyaltyCard.starStatus != 0 ? View.VISIBLE : View.GONE);
-        inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
-
-        inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
-        applyIconAnimation(inputHolder, inputCursor.getPosition());
-        applyClickEvents(inputHolder, inputCursor.getPosition());
-    }
-
-    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition)
-    {
-        inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
-        inputHolder.mInformationContainer.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
-
-        inputHolder.mRow.setOnLongClickListener(inputView -> {
-            mListener.onRowLongClicked(inputPosition);
-            inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-            return true;
-        });
-
-        inputHolder.mInformationContainer.setOnLongClickListener(inputView -> {
-            mListener.onRowLongClicked(inputPosition);
-            inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-            return true;
-        });
-    }
-
-    private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition)
-    {
-        if (mSelectedItems.get(inputPosition, false))
+        if(loyaltyCard.note.isEmpty() == false)
         {
-            inputHolder.mThumbnailFrontContainer.setVisibility(View.GONE);
-            resetIconYAxis(inputHolder.mThumbnailBackContainer);
-            inputHolder.mThumbnailBackContainer.setVisibility(View.VISIBLE);
-            inputHolder.mThumbnailBackContainer.setAlpha(1);
-            if (mCurrentSelectedIndex == inputPosition)
-            {
-                LoyaltyCardAnimator.flipView(mContext, inputHolder.mThumbnailBackContainer, inputHolder.mThumbnailFrontContainer, true);
-                resetCurrentIndex();
-            }
+            noteField.setVisibility(View.VISIBLE);
+            noteField.setText(loyaltyCard.note);
+            noteField.setTextSize(settings.getCardNoteListFontSize());
         }
         else
         {
-            inputHolder.mThumbnailBackContainer.setVisibility(View.GONE);
-            resetIconYAxis(inputHolder.mThumbnailFrontContainer);
-            inputHolder.mThumbnailFrontContainer.setVisibility(View.VISIBLE);
-            inputHolder.mThumbnailFrontContainer.setAlpha(1);
-            if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition)
-            {
-                LoyaltyCardAnimator.flipView(mContext, inputHolder.mThumbnailBackContainer, inputHolder.mThumbnailFrontContainer, false);
-                resetCurrentIndex();
-            }
+            noteField.setVisibility(View.GONE);
         }
-    }
 
-    private void resetIconYAxis(View inputView)
-    {
-        if (inputView.getRotationY() != 0)
+        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
+        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
+
+
+        if(loyaltyCard.icon == null)
         {
-            inputView.setRotationY(0);
-        }
-    }
-
-    public void resetAnimationIndex()
-    {
-        mReverseAllAnimations = false;
-        mAnimationItemsIndex.clear();
-    }
-
-
-    public void toggleSelection(int inputPosition)
-    {
-        mCurrentSelectedIndex = inputPosition;
-        if (mSelectedItems.get(inputPosition, false))
-        {
-            mSelectedItems.delete(inputPosition);
-            mAnimationItemsIndex.delete(inputPosition);
+            Integer letterBackgroundColor = loyaltyCard.headerColor;
+            Integer letterTextColor = loyaltyCard.headerTextColor;
+            LetterBitmap letterBitmap = new LetterBitmap(context, loyaltyCard.store, loyaltyCard.store,
+                    tileLetterFontSize, pixelSize, pixelSize, letterBackgroundColor, letterTextColor);
+            thumbnail.setImageBitmap(letterBitmap.getLetterTile());
         }
         else
         {
-            mSelectedItems.put(inputPosition, true);
-            mAnimationItemsIndex.put(inputPosition, true);
-        }
-        notifyDataSetChanged();
-    }
-
-    public void clearSelections()
-    {
-        mReverseAllAnimations = true;
-        mSelectedItems.clear();
-        notifyDataSetChanged();
-    }
-
-    public int getSelectedItemCount()
-    {
-        return mSelectedItems.size();
-    }
-
-    public ArrayList<LoyaltyCard> getSelectedItems()
-    {
-
-        ArrayList<LoyaltyCard> result = new ArrayList<>();
-
-        int i;
-        for(i = 0; i < mSelectedItems.size(); i++)
-        {
-            mCursor.moveToPosition(mSelectedItems.keyAt(i));
-            result.add(LoyaltyCard.toLoyaltyCard(mCursor));
-        }
-
-        return result;
-    }
-
-    private void resetCurrentIndex()
-    {
-        mCurrentSelectedIndex = -1;
-    }
-
-    public interface CardAdapterListener
-    {
-        void onRowClicked(int inputPosition);
-        void onRowLongClicked(int inputPosition);
-    }
-
-    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder implements View.OnLongClickListener
-    {
-
-        public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
-        public LinearLayout mInformationContainer;
-        public ImageView mCardIcon, mStarIcon;
-        public MaterialCardView mRow;
-        public View mDivider;
-        public RelativeLayout mThumbnailFrontContainer, mThumbnailBackContainer;
-
-        public LoyaltyCardListItemViewHolder(View inputView)
-        {
-            super(inputView);
-            mRow = inputView.findViewById(R.id.row);
-            mDivider = inputView.findViewById(R.id.info_divider);
-            mThumbnailFrontContainer = inputView.findViewById(R.id.thumbnail_front);
-            mThumbnailBackContainer = inputView.findViewById(R.id.thumbnail_back);
-            mInformationContainer = inputView.findViewById(R.id.information_container);
-            mStoreField = inputView.findViewById(R.id.store);
-            mNoteField = inputView.findViewById(R.id.note);
-            mBalanceField = inputView.findViewById(R.id.balance);
-            mExpiryField = inputView.findViewById(R.id.expiry);
-            mCardIcon = inputView.findViewById(R.id.thumbnail);
-            mStarIcon = inputView.findViewById(R.id.star);
-            inputView.setOnLongClickListener(this);
-        }
-
-        @Override
-        public boolean onLongClick(View inputView)
-        {
-            mListener.onRowLongClicked(getAdapterPosition());
-            inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-            return true;
+            thumbnail.setImageBitmap(loyaltyCard.icon);
         }
     }
-}
+}

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

@@ -1,15 +0,0 @@
-package protect.card_locker;
-
-public enum LoyaltyCardField {
-    id,
-    store,
-    note,
-    expiry,
-    balance,
-    balanceType,
-    cardId,
-    barcodeId,
-    barcodeType,
-    headerColor,
-    starStatus
-}

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

@@ -1,10 +1,11 @@
 package protect.card_locker;
 
+import android.app.Application;
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.multidex.MultiDexApplication;
+
 import protect.card_locker.preferences.Settings;
 
-public class LoyaltyCardLockerApplication extends MultiDexApplication {
+public class LoyaltyCardLockerApplication extends Application {
     public void onCreate() {
         super.onCreate();
 

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

@@ -2,743 +2,386 @@ package protect.card_locker;
 
 import android.app.SearchManager;
 import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.ClipboardManager;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.Cursor;
-import android.net.Uri;
 import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
-import android.view.GestureDetector;
+import android.view.ContextMenu;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
-import android.widget.CheckBox;
+import android.webkit.WebView;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.tabs.TabLayout;
+import com.google.common.collect.ImmutableMap;
 
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.Calendar;
+import java.util.Map;
 
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.view.ActionMode;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.splashscreen.SplashScreen;
-import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.SettingsActivity;
 
-public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener
+public class MainActivity extends AppCompatActivity
 {
     private static final String TAG = "Catima";
+    private static final int MAIN_REQUEST_CODE = 1;
 
-    private final DBHelper mDB = new DBHelper(this);
-    private LoyaltyCardCursorAdapter mAdapter;
-    private ActionMode mCurrentActionMode;
-    private Menu mMenu;
-    private GestureDetector mGestureDetector;
-    protected String mFilter = "";
-    protected Object mGroup = null;
-    protected DBHelper.LoyaltyCardOrder mOrder = DBHelper.LoyaltyCardOrder.Alpha;
-    protected DBHelper.LoyaltyCardOrderDirection mOrderDirection = DBHelper.LoyaltyCardOrderDirection.Ascending;
-    protected int selectedTab = 0;
-    private RecyclerView mCardList;
-    private View mHelpText;
-    private View mNoMatchingCardsText;
-    private View mNoGroupCardsText;
-
-    private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback()
-    {
-        @Override
-        public boolean onCreateActionMode(ActionMode inputMode, Menu inputMenu) {
-            inputMode.getMenuInflater().inflate(R.menu.card_longclick_menu, inputMenu);
-            return true;
-        }
-
-        @Override
-        public boolean onPrepareActionMode(ActionMode inputMode, Menu inputMenu)
-        {
-            return false;
-        }
-
-        @Override
-        public boolean onActionItemClicked(ActionMode inputMode, MenuItem inputItem) {
-            if (inputItem.getItemId() == R.id.action_copy_to_clipboard) {
-                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-
-                String clipboardData;
-                int cardCount = mAdapter.getSelectedItemCount();
-
-                if (cardCount == 1) {
-                    clipboardData = mAdapter.getSelectedItems().get(0).cardId;
-                } else {
-                    StringBuilder cardIds = new StringBuilder();
-
-                    for (int i = 0; i < cardCount; i++) {
-                        LoyaltyCard loyaltyCard = mAdapter.getSelectedItems().get(i);
-
-                        cardIds.append(loyaltyCard.store + ": " + loyaltyCard.cardId);
-                        if (i < (cardCount - 1)) {
-                            cardIds.append("\n");
-                        }
-                    }
-
-                    clipboardData = cardIds.toString();
-                }
-
-                ClipData clip = ClipData.newPlainText(getString(R.string.card_ids_copied), clipboardData);
-                clipboard.setPrimaryClip(clip);
-                Toast.makeText(MainActivity.this, cardCount > 1 ? R.string.copy_to_clipboard_multiple_toast : R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
-                inputMode.finish();
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_share) {
-                final ImportURIHelper importURIHelper = new ImportURIHelper(MainActivity.this);
-                try {
-                    importURIHelper.startShareIntent(mAdapter.getSelectedItems());
-                } catch (UnsupportedEncodingException e) {
-                    Toast.makeText(MainActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
-                    e.printStackTrace();
-                }
-                inputMode.finish();
-                return true;
-            } else if(inputItem.getItemId() == R.id.action_edit) {
-                if (mAdapter.getSelectedItemCount() != 1) {
-                    throw new IllegalArgumentException("Cannot edit more than 1 card at a time");
-                }
-
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = new Bundle();
-                bundle.putInt(LoyaltyCardEditActivity.BUNDLE_ID, mAdapter.getSelectedItems().get(0).id);
-                bundle.putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true);
-                intent.putExtras(bundle);
-                startActivity(intent);
-                inputMode.finish();
-                return true;
-            } else if(inputItem.getItemId() == R.id.action_delete) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-                // The following may seem weird, but it is necessary to give translators enough flexibility.
-                // For example, in Russian, Android's plural quantity "one" actually refers to "any number ending on 1 but not ending in 11".
-                // So while in English the extra non-plural form seems unnecessary duplication, it is necessary to give translators enough flexibility.
-                // In here, we use the plain string when meaning exactly 1, and otherwise use the plural forms
-                if (mAdapter.getSelectedItemCount() == 1) {
-                    builder.setTitle(R.string.deleteTitle);
-                    builder.setMessage(R.string.deleteConfirmation);
-                } else {
-                    builder.setTitle(getResources().getQuantityString(R.plurals.deleteCardsTitle, mAdapter.getSelectedItemCount(), mAdapter.getSelectedItemCount()));
-                    builder.setMessage(getResources().getQuantityString(R.plurals.deleteCardsConfirmation, mAdapter.getSelectedItemCount(), mAdapter.getSelectedItemCount()));
-                }
-
-                builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
-                    DBHelper db = new DBHelper(MainActivity.this);
-
-                    for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                        Log.e(TAG, "Deleting card: " + loyaltyCard.id);
-
-                        db.deleteLoyaltyCard(loyaltyCard.id);
-
-                        ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
-                    }
-
-                    TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
-                    mGroup = tab != null ? tab.getTag() : null;
-
-                    updateLoyaltyCardList();
-
-                    dialog.dismiss();
-                });
-                builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-                AlertDialog dialog = builder.create();
-                dialog.show();
-
-                return true;
-            }
-
-            return false;
-        }
-
-        @Override
-        public void onDestroyActionMode(ActionMode inputMode)
-        {
-            mAdapter.clearSelections();
-            mCurrentActionMode = null;
-            mCardList.post(new Runnable()
-            {
-                @Override
-                public void run()
-                {
-                    mAdapter.resetAnimationIndex();
-                }
-            });
-        }
-    };
+    private Menu menu;
+    protected String filter = "";
 
     @Override
-    protected void onCreate(Bundle inputSavedInstanceState)
+    protected void onCreate(Bundle savedInstanceState)
     {
-        super.onCreate(inputSavedInstanceState);
-        SplashScreen.installSplashScreen(this);
-        setTitle(R.string.app_name);
+        super.onCreate(savedInstanceState);
         setContentView(R.layout.main_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        TabLayout groupsTabLayout = findViewById(R.id.groups);
-        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                selectedTab = tab.getPosition();
-                mGroup = tab.getTag();
-                updateLoyaltyCardList();
-
-                // Store active tab in Shared Preference to restore next app launch
-                SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
-                        getString(R.string.sharedpreference_active_tab),
-                        Context.MODE_PRIVATE);
-                SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
-                activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), tab.getPosition());
-                activeTabPrefEditor.apply();
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-
-            }
-        });
-
-        mGestureDetector = new GestureDetector(this, this);
-
-        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
-
-        mHelpText = findViewById(R.id.helpText);
-        mNoMatchingCardsText = findViewById(R.id.noMatchingCardsText);
-        mNoGroupCardsText = findViewById(R.id.noGroupCardsText);
-        mCardList = findViewById(R.id.list);
-
-        mHelpText.setOnTouchListener(gestureTouchListener);
-        mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
-        mCardList.setOnTouchListener(gestureTouchListener);
-
-        mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
-        mCardList.setAdapter(mAdapter);
-        registerForContextMenu(mCardList);
-
-        mGroup = null;
-        updateLoyaltyCardList();
-
-        /*
-         * This was added for Huawei, but Huawei is just too much of a fucking pain.
-         * Just leaving this commented out if needed for the future idk
-         * https://twitter.com/SylvieLorxu/status/1379437902741012483
-         *
-
-        // Show privacy policy on first run
-        SharedPreferences privacyPolicyShownPref = getApplicationContext().getSharedPreferences(
-                getString(R.string.sharedpreference_privacy_policy_shown),
-                Context.MODE_PRIVATE);
-
-
-        if (privacyPolicyShownPref.getInt(getString(R.string.sharedpreference_privacy_policy_shown), 0) == 0) {
-            SharedPreferences.Editor privacyPolicyShownPrefEditor = privacyPolicyShownPref.edit();
-            privacyPolicyShownPrefEditor.putInt(getString(R.string.sharedpreference_privacy_policy_shown), 1);
-            privacyPolicyShownPrefEditor.apply();
-
-            new AlertDialog.Builder(this)
-                    .setTitle(R.string.privacy_policy)
-                    .setMessage(R.string.privacy_policy_popup_text)
-                    .setPositiveButton(R.string.accept, null)
-                    .setNegativeButton(R.string.privacy_policy, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int whichButton) {
-                            openPrivacyPolicy();
-                        }
-                    })
-                    .setIcon(android.R.drawable.ic_dialog_info)
-                    .show();
-        }
-         */
+        updateLoyaltyCardList("");
     }
 
     @Override
-    protected void onResume()
-    {
+    protected void onResume() {
         super.onResume();
 
-        if(mCurrentActionMode != null)
+        if (menu != null)
         {
-            mAdapter.clearSelections();
-            mCurrentActionMode.finish();
-        }
+            SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
 
-        if (mMenu != null)
-        {
-            SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
-
-            if (!searchView.isIconified())
-            {
-                mFilter = searchView.getQuery().toString();
+            if (!searchView.isIconified()) {
+                filter = searchView.getQuery().toString();
             }
         }
 
-        // Start of active tab logic
-        TabLayout groupsTabLayout = findViewById(R.id.groups);
-        updateTabGroups(groupsTabLayout);
-
-        // Restore settings from Shared Preference
-        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
-                getString(R.string.sharedpreference_active_tab),
-                Context.MODE_PRIVATE);
-        selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
-        SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
-                getString(R.string.sharedpreference_sort),
-                Context.MODE_PRIVATE);
-        try {
-            mOrder = DBHelper.LoyaltyCardOrder.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_order), null));
-            mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_direction), null));
-        } catch (IllegalArgumentException | NullPointerException ignored) {}
-
-        mGroup = null;
-
-        if (groupsTabLayout.getTabCount() != 0) {
-            TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
-            if (tab == null) {
-                tab = groupsTabLayout.getTabAt(0);
-            }
-
-            groupsTabLayout.selectTab(tab);
-            assert tab != null;
-            mGroup = tab.getTag();
-        }
-        updateLoyaltyCardList();
-        // End of active tab logic
+        updateLoyaltyCardList(filter);
 
         FloatingActionButton addButton = findViewById(R.id.fabAdd);
-        addButton.setOnClickListener(v -> {
-            Intent intent = new Intent(getApplicationContext(), ScanActivity.class);
-            Bundle bundle = new Bundle();
-            if (selectedTab != 0) {
-                bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
+        addButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                startActivityForResult(i, MAIN_REQUEST_CODE);
             }
-            intent.putExtras(bundle);
-            startActivityForResult(intent, Utils.BARCODE_SCAN);
         });
-        addButton.bringToFront();
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        super.onActivityResult(requestCode, resultCode, intent);
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode == Utils.MAIN_REQUEST) {
+        if (requestCode == MAIN_REQUEST_CODE)
+        {
             // We're coming back from another view so clear the search
             // We only do this now to prevent a flash of all entries right after picking one
-            mFilter = "";
-            if (mMenu != null)
+            filter = "";
+            if (menu != null)
             {
-                MenuItem searchItem = mMenu.findItem(R.id.action_search);
+                MenuItem searchItem = menu.findItem(R.id.action_search);
                 searchItem.collapseActionView();
             }
-            ActivityCompat.recreate(this);
 
+            // In case the theme changed
+            recreate();
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (menu == null)
+        {
+            super.onBackPressed();
             return;
         }
 
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+        SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
 
-        if(!barcodeValues.isEmpty()) {
-            Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-            Bundle newBundle = new Bundle();
-            newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
-            newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
-            Bundle inputBundle = intent.getExtras();
-            if (inputBundle != null && inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) != null) {
-                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP));
-            }
-            newIntent.putExtras(newBundle);
-            startActivity(newIntent);
+        if (!searchView.isIconified()) {
+            searchView.setIconified(true);
+        } else {
+            super.onBackPressed();
         }
     }
 
-    @Override
-    public void onBackPressed()
+    private void updateLoyaltyCardList(String filterText)
     {
-        if (mMenu != null) {
-            SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
+        final ListView cardList = findViewById(R.id.list);
+        final TextView helpText = findViewById(R.id.helpText);
+        final TextView noMatchingCardsText = findViewById(R.id.noMatchingCardsText);
+        final DBHelper db = new DBHelper(this);
 
-            if (!searchView.isIconified()) {
-                searchView.setIconified(true);
-                return;
-            }
-        }
-
-        super.onBackPressed();
-    }
-
-    private void updateLoyaltyCardList() {
-        Group group = null;
-        if (mGroup != null) {
-            group = (Group) mGroup;
-        }
-
-        mAdapter.swapCursor(mDB.getLoyaltyCardCursor(mFilter, group, mOrder, mOrderDirection));
-
-        if(mDB.getLoyaltyCardCount() > 0)
+        if(db.getLoyaltyCardCount() > 0)
         {
             // We want the cardList to be visible regardless of the filtered match count
             // to ensure that the noMatchingCardsText doesn't end up being shown below
             // the keyboard
-            mHelpText.setVisibility(View.GONE);
-            mNoGroupCardsText.setVisibility(View.GONE);
-            if(mAdapter.getItemCount() > 0)
+            cardList.setVisibility(View.VISIBLE);
+            helpText.setVisibility(View.GONE);
+            if(db.getLoyaltyCardCount(filterText) > 0)
             {
-                mCardList.setVisibility(View.VISIBLE);
-                mNoMatchingCardsText.setVisibility(View.GONE);
+                noMatchingCardsText.setVisibility(View.GONE);
             }
             else
             {
-                mCardList.setVisibility(View.GONE);
-                if (!mFilter.isEmpty()) {
-                    // Actual Empty Search Result
-                    mNoMatchingCardsText.setVisibility(View.VISIBLE);
-                    mNoGroupCardsText.setVisibility(View.GONE);
-                } else {
-                    // Group Tab with no Group Cards
-                    mNoMatchingCardsText.setVisibility(View.GONE);
-                    mNoGroupCardsText.setVisibility(View.VISIBLE);
-                }
+                noMatchingCardsText.setVisibility(View.VISIBLE);
             }
         }
         else
         {
-            mCardList.setVisibility(View.GONE);
-            mHelpText.setVisibility(View.VISIBLE);
-            mNoMatchingCardsText.setVisibility(View.GONE);
-            mNoGroupCardsText.setVisibility(View.GONE);
+            cardList.setVisibility(View.GONE);
+            helpText.setVisibility(View.VISIBLE);
+            noMatchingCardsText.setVisibility(View.GONE);
         }
 
-        if (mCurrentActionMode != null) {
-            mCurrentActionMode.finish();
-        }
-    }
+        Cursor cardCursor = db.getLoyaltyCardCursor(filterText);
 
-    public void updateTabGroups(TabLayout groupsTabLayout)
-    {
-        final DBHelper db = new DBHelper(this);
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
+        cardList.setAdapter(adapter);
 
-        List<Group> newGroups = db.getGroups();
+        registerForContextMenu(cardList);
 
-        if (newGroups.size() == 0) {
-            groupsTabLayout.removeAllTabs();
-            groupsTabLayout.setVisibility(View.GONE);
-            return;
-        }
+        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
+        {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+            {
+                Cursor selected = (Cursor) parent.getItemAtPosition(position);
+                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 
-        groupsTabLayout.removeAllTabs();
+                Intent i = new Intent(view.getContext(), LoyaltyCardViewActivity.class);
+                i.setAction("");
+                final Bundle b = new Bundle();
+                b.putInt("id", loyaltyCard.id);
+                i.putExtras(b);
 
-        TabLayout.Tab allTab = groupsTabLayout.newTab();
-        allTab.setText(R.string.all);
-        allTab.setTag(null);
-        groupsTabLayout.addTab(allTab, false);
+                ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);
 
-        for (Group group : newGroups) {
-            TabLayout.Tab tab = groupsTabLayout.newTab();
-            tab.setText(group._id);
-            tab.setTag(group);
-            groupsTabLayout.addTab(tab, false);
-        }
-
-        groupsTabLayout.setVisibility(View.VISIBLE);
+                startActivityForResult(i, MAIN_REQUEST_CODE);
+            }
+        });
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu inputMenu)
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo)
     {
-        this.mMenu = inputMenu;
+        super.onCreateContextMenu(menu, v, menuInfo);
+        if (v.getId()==R.id.list)
+        {
+            MenuInflater inflater = getMenuInflater();
+            inflater.inflate(R.menu.card_longclick_menu, menu);
+        }
+    }
 
-        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
+    @Override
+    public boolean onContextItemSelected(MenuItem item)
+    {
+        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
+        ListView listView = findViewById(R.id.list);
+
+        Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position);
+        LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
+
+        if(card != null)
+        {
+            if(item.getItemId() == R.id.action_clipboard)
+            {
+                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+                ClipData clip = ClipData.newPlainText(card.store, card.cardId);
+                clipboard.setPrimaryClip(clip);
+
+                Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
+                return true;
+            }
+            else if(item.getItemId() == R.id.action_share)
+            {
+                final ImportURIHelper importURIHelper = new ImportURIHelper(this);
+                if(importURIHelper.startShareIntent(card))
+                {
+                    Toast.makeText(this, R.string.failedSharingCard, Toast.LENGTH_LONG).show();
+                }
+                return true;
+            }
+        }
+
+        return super.onContextItemSelected(item);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+        this.menu = menu;
+
+        getMenuInflater().inflate(R.menu.main_menu, menu);
 
         SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-        if (searchManager != null)
-        {
-            SearchView searchView = (SearchView) inputMenu.findItem(R.id.action_search).getActionView();
+        if (searchManager != null) {
+            SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
             searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
             searchView.setSubmitButtonEnabled(false);
 
-            searchView.setOnCloseListener(() -> {
-                invalidateOptionsMenu();
-                return false;
+            searchView.setOnCloseListener(new SearchView.OnCloseListener() {
+                @Override
+                public boolean onClose() {
+                    invalidateOptionsMenu();
+                    return false;
+                }
             });
 
-            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener()
-            {
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                 @Override
-                public boolean onQueryTextSubmit(String query)
-                {
+                public boolean onQueryTextSubmit(String query) {
                     return false;
                 }
 
                 @Override
-                public boolean onQueryTextChange(String newText)
-                {
-                    mFilter = newText;
-
-                    TabLayout groupsTabLayout = findViewById(R.id.groups);
-                    TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
-                    mGroup = currentTab != null ? currentTab.getTag() : null;
-
-                    updateLoyaltyCardList();
-
+                public boolean onQueryTextChange(String newText) {
+                    filter = newText;
+                    updateLoyaltyCardList(newText);
                     return true;
                 }
             });
         }
-        return super.onCreateOptionsMenu(inputMenu);
+
+        return super.onCreateOptionsMenu(menu);
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem inputItem)
+    public boolean onOptionsItemSelected(MenuItem item)
     {
-        int id = inputItem.getItemId();
+        int id = item.getItemId();
 
-        if (id == R.id.action_sort)
-        {
-            TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
-            AtomicInteger currentIndex = new AtomicInteger();
-            List<DBHelper.LoyaltyCardOrder> loyaltyCardOrders = Arrays.asList(DBHelper.LoyaltyCardOrder.values());
-            for (int i = 0; i < loyaltyCardOrders.size(); i++) {
-                if (mOrder == loyaltyCardOrders.get(i)) {
-                    currentIndex.set(i);
-                    break;
-                }
-            }
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-            builder.setTitle(R.string.sort_by);
-
-            final View customLayout = getLayoutInflater().inflate(R.layout.sorting_option, null);
-            builder.setView(customLayout);
-
-            CheckBox ch = (CheckBox) customLayout.findViewById(R.id.checkBox_reverse);
-            ch.setChecked(mOrderDirection == DBHelper.LoyaltyCardOrderDirection.Descending);
-
-            builder.setSingleChoiceItems(R.array.sort_types_array, currentIndex.get(), (dialog, which) -> currentIndex.set(which));
-
-            builder.setPositiveButton(R.string.sort, (dialog, which) -> {
-                if(ch.isChecked()) {
-                    setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Descending);
-                }
-                else {
-                    setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Ascending);
-                }
-                dialog.dismiss();
-            });
-
-            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-
-            AlertDialog dialog = builder.create();
-            dialog.show();
-
-            return true;
-        }
-
-        if (id == R.id.action_manage_groups)
-        {
-            Intent i = new Intent(getApplicationContext(), ManageGroupsActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
-            return true;
-        }
-
-        if (id == R.id.action_import_export)
+        if(id == R.id.action_import_export)
         {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
+            startActivityForResult(i, MAIN_REQUEST_CODE);
             return true;
         }
 
-        if (id == R.id.action_settings)
+        if(id == R.id.action_settings)
         {
             Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
+            startActivityForResult(i, MAIN_REQUEST_CODE);
             return true;
         }
 
-        if (id == R.id.action_about)
+        if(id == R.id.action_about)
         {
-            Intent i = new Intent(getApplicationContext(), AboutActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
+            displayAboutDialog();
             return true;
         }
 
-        return super.onOptionsItemSelected(inputItem);
+        return super.onOptionsItemSelected(item);
     }
 
-    private void setSort(DBHelper.LoyaltyCardOrder order, DBHelper.LoyaltyCardOrderDirection direction) {
-        // Update values
-        mOrder = order;
-        mOrderDirection = direction;
-
-        // Store in Shared Preference to restore next app launch
-        SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
-                getString(R.string.sharedpreference_sort),
-                Context.MODE_PRIVATE);
-        SharedPreferences.Editor sortPrefEditor = sortPref.edit();
-        sortPrefEditor.putString(getString(R.string.sharedpreference_sort_order), order.name());
-        sortPrefEditor.putString(getString(R.string.sharedpreference_sort_direction), direction.name());
-        sortPrefEditor.apply();
-
-        // Update card list
-        updateLoyaltyCardList();
-    }
-
-    protected static boolean isDarkModeEnabled(Context inputContext)
+    private void displayAboutDialog()
     {
-        Configuration config = inputContext.getResources().getConfiguration();
+        final Map<String, String> USED_LIBRARIES = new ImmutableMap.Builder<String, String>()
+            .put("Commons CSV", "https://commons.apache.org/proper/commons-csv/")
+            .put("Guava", "https://github.com/google/guava")
+            .put("ZXing", "https://github.com/zxing/zxing")
+            .put("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded")
+            .put("AppIntro", "https://github.com/apl-devs/AppIntro")
+            .put("Color Picker", "https://github.com/jaredrummler/ColorPicker")
+            .put("VNTNumberPickerPreference", "https://github.com/vanniktech/VNTNumberPickerPreference")
+            .build();
+
+        final Map<String, String> USED_ASSETS = ImmutableMap.of
+        (
+            "Save by Bernar Novalyi", "https://thenounproject.com/term/save/716011"
+        );
+
+        StringBuilder libs = new StringBuilder().append("<ul>");
+        for (Map.Entry<String, String> entry : USED_LIBRARIES.entrySet())
+        {
+            libs.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
+        }
+        libs.append("</ul>");
+
+        StringBuilder resources = new StringBuilder().append("<ul>");
+        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
+        {
+            resources.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
+        }
+        resources.append("</ul>");
+
+        String appName = getString(R.string.app_name);
+        int year = Calendar.getInstance().get(Calendar.YEAR);
+
+        String version = "?";
+        try
+        {
+            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
+            version = pi.versionName;
+        }
+        catch (PackageManager.NameNotFoundException e)
+        {
+            Log.w(TAG, "Package name not found", e);
+        }
+
+        WebView wv = new WebView(this);
+
+        // Set CSS for dark mode if dark mode
+        String css = "";
+        Configuration config = getResources().getConfiguration();
         int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
-    }
-
-    @Override
-    public boolean onDown(MotionEvent e) {
-        return false;
-    }
-
-    @Override
-    public void onShowPress(MotionEvent e) {
-
-    }
-
-    @Override
-    public boolean onSingleTapUp(MotionEvent e) {
-        return false;
-    }
-
-    @Override
-    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-        return false;
-    }
-
-    @Override
-    public void onLongPress(MotionEvent e) {
-
-    }
-
-    @Override
-    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-        Log.d(TAG, "On fling");
-
-        // Don't swipe if we have too much vertical movement
-        if (Math.abs(velocityY) > (0.75 * Math.abs(velocityX))) {
-            return false;
-        }
-
-        TabLayout groupsTabLayout = findViewById(R.id.groups);
-        if (groupsTabLayout.getTabCount() < 2) {
-            return false;
-        }
-
-        Integer currentTab = groupsTabLayout.getSelectedTabPosition();
-
-        // Swipe right
-        if (velocityX < -150) {
-            Integer nextTab = currentTab + 1;
-
-            if (nextTab == groupsTabLayout.getTabCount()) {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(0));
-            } else {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(nextTab));
-            }
-
-            return true;
-        }
-
-        // Swipe left
-        if (velocityX > 150) {
-            Integer nextTab = currentTab - 1;
-
-            if (nextTab < 0) {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(groupsTabLayout.getTabCount() - 1));
-            } else {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(nextTab));
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public void onRowLongClicked(int inputPosition)
-    {
-        enableActionMode(inputPosition);
-    }
-
-    private void enableActionMode(int inputPosition)
-    {
-        if (mCurrentActionMode == null)
+        if(currentNightMode == Configuration.UI_MODE_NIGHT_YES)
         {
-            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
+            css = "<style>body {color:white; background-color:black;}</style>";
         }
-        toggleSelection(inputPosition);
+
+        String html =
+            "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />" +
+            css +
+            "<h1>" +
+            String.format(getString(R.string.about_title_fmt),
+                    "<a href=\"" + getString(R.string.app_webpage_url)) + "\">" +
+            appName +
+            "</a>" +
+            "</h1><p>" +
+            appName +
+            " " +
+            String.format(getString(R.string.debug_version_fmt), version) +
+            "</p><p>" +
+            String.format(getString(R.string.app_revision_fmt),
+                    "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
+                            "GitHub" +
+                            "</a>") +
+            "</p><hr/><p>" +
+            String.format(getString(R.string.app_copyright_fmt), year) +
+            "</p><p>" +
+            getString(R.string.app_copyright_old) +
+            "</p><hr/><p>" +
+            getString(R.string.app_license) +
+            "</p><hr/><p>" +
+            String.format(getString(R.string.app_libraries), appName, libs.toString()) +
+            "</p><hr/><p>" +
+            String.format(getString(R.string.app_resources), appName, resources.toString());
+
+        wv.loadDataWithBaseURL("file:///android_res/drawable/", html, "text/html", "utf-8", null);
+        new AlertDialog.Builder(this)
+            .setView(wv)
+            .setCancelable(true)
+            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
+            {
+                public void onClick(DialogInterface dialog, int which)
+                {
+                    dialog.dismiss();
+                }
+            })
+            .show();
     }
-
-    private void toggleSelection(int inputPosition)
-    {
-        mAdapter.toggleSelection(inputPosition);
-        int count = mAdapter.getSelectedItemCount();
-
-        if (count == 0) {
-            mCurrentActionMode.finish();
-        } else {
-            mCurrentActionMode.setTitle(getResources().getQuantityString(R.plurals.selectedCardCount, count, count));
-
-            MenuItem editItem = mCurrentActionMode.getMenu().findItem(R.id.action_edit);
-            if (count == 1) {
-                editItem.setVisible(true);
-                editItem.setEnabled(true);
-            } else {
-                editItem.setVisible(false);
-                editItem.setEnabled(false);
-            }
-
-            mCurrentActionMode.invalidate();
-        }
-    }
-
-
-    @Override
-    public void onRowClicked(int inputPosition)
-    {
-        if (mAdapter.getSelectedItemCount() > 0)
-        {
-            enableActionMode(inputPosition);
-        }
-        else
-        {
-            Cursor selected = mAdapter.getCursor();
-            selected.moveToPosition(inputPosition);
-            LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
-
-            Intent i = new Intent(this, LoyaltyCardViewActivity.class);
-            i.setAction("");
-            final Bundle b = new Bundle();
-            b.putInt("id", loyaltyCard.id);
-            i.putExtras(b);
-
-            ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard);
-
-            startActivityForResult(i, Utils.MAIN_REQUEST);
-        }
-    }
-}
+}

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

@@ -1,218 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.text.InputType;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import java.util.List;
-
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener
-{
-    private static final String TAG = "Catima";
-
-    private final DBHelper mDb = new DBHelper(this);
-    private TextView mHelpText;
-    private RecyclerView mGroupList;
-    GroupCursorAdapter mAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setTitle(R.string.groups);
-        setContentView(R.layout.manage_groups_activity);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        FloatingActionButton addButton = findViewById(R.id.fabAdd);
-        addButton.setOnClickListener(v -> createGroup());
-        addButton.bringToFront();
-
-        mGroupList = findViewById(R.id.list);
-        mHelpText = findViewById(R.id.helpText);
-
-        // Init group list
-        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
-        mGroupList.setLayoutManager(mLayoutManager);
-        mGroupList.setItemAnimator(new DefaultItemAnimator());
-
-        mAdapter = new GroupCursorAdapter(this, null, this);
-        mGroupList.setAdapter(mAdapter);
-
-        updateGroupList();
-    }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-    }
-
-    private void updateGroupList()
-    {
-        mAdapter.swapCursor(mDb.getGroupCursor());
-
-        if (mDb.getGroupCount() == 0) {
-            mGroupList.setVisibility(View.GONE);
-            mHelpText.setVisibility(View.VISIBLE);
-
-            return;
-        }
-
-        mGroupList.setVisibility(View.VISIBLE);
-        mHelpText.setVisibility(View.GONE);
-    }
-
-    private void invalidateHomescreenActiveTab()
-    {
-        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
-                getString(R.string.sharedpreference_active_tab),
-                Context.MODE_PRIVATE);
-        SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
-        activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), 0);
-        activeTabPrefEditor.apply();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        int id = item.getItemId();
-
-        if (id == android.R.id.home) {
-            finish();
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void createGroup() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this,R.style.AlertDialogTheme);
-        builder.setTitle(R.string.enter_group_name);
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        builder.setView(input);
-
-        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            mDb.insertGroup(input.getText().toString());
-            updateGroupList();
-        });
-        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
-        AlertDialog dialog = builder.create();
-        dialog.show();
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        input.requestFocus();
-    }
-
-    private String getGroupName(View view) {
-        TextView groupNameTextView = view.findViewById(R.id.name);
-        return (String) groupNameTextView.getText();
-    }
-
-    private void moveGroup(View view, boolean up) {
-        List<Group> groups = mDb.getGroups();
-        final String groupName = getGroupName(view);
-
-        int currentIndex = mDb.getGroup(groupName).order;
-        int newIndex;
-
-        // Reinsert group in correct position
-        if (up) {
-            newIndex = currentIndex - 1;
-        } else {
-            newIndex = currentIndex + 1;
-        }
-
-        // Don't try to move out of bounds
-        if (newIndex < 0 || newIndex >= groups.size()) {
-            return;
-        }
-
-        Group group = groups.remove(currentIndex);
-        groups.add(newIndex, group);
-
-        // Update database
-        mDb.reorderGroups(groups);
-
-        // Update UI
-        updateGroupList();
-
-        // Ordering may have changed, so invalidate
-        invalidateHomescreenActiveTab();
-    }
-
-    @Override
-    public void onMoveDownButtonClicked(View view) {
-        moveGroup(view, false);
-    }
-
-    @Override
-    public void onMoveUpButtonClicked(View view) {
-        moveGroup(view, true);
-    }
-
-    @Override
-    public void onEditButtonClicked(View view) {
-        final String groupName = getGroupName(view);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.enter_group_name);
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.setText(groupName);
-        builder.setView(input);
-
-        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            String newGroupName = input.getText().toString();
-            mDb.updateGroup(groupName, newGroupName);
-            updateGroupList();
-        });
-        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
-        AlertDialog dialog = builder.create();
-        dialog.show();
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        input.requestFocus();
-    }
-
-    @Override
-    public void onDeleteButtonClicked(View view) {
-        final String groupName = getGroupName(view);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.deleteConfirmationGroup);
-        builder.setMessage(groupName);
-
-        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            mDb.deleteGroup(groupName);
-            updateGroupList();
-            // Delete may change ordering, so invalidate
-            invalidateHomescreenActiveTab();
-        });
-        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
-        AlertDialog dialog = builder.create();
-        dialog.show();
-    }
-}

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

@@ -1,12 +1,9 @@
-package protect.card_locker.importexport;
+package protect.card_locker;
 
-import android.content.Context;
 import android.util.Log;
 
 import java.io.IOException;
-import java.io.OutputStream;
-
-import protect.card_locker.DBHelper;
+import java.io.OutputStreamWriter;
 
 public class MultiFormatExporter
 {
@@ -18,21 +15,18 @@ public class MultiFormatExporter
      *
      * The output stream is closed on success.
      *
-     * @return ImportExportResult.Success if the database was successfully exported,
-     * another ImportExportResult otherwise. If not Success, partial data may have been
+     * @return true if the database was successfully exported,
+     * false otherwise. If false, partial data may have been
      * written to the output stream, and it should be discarded.
      */
-    public static ImportExportResult exportData(Context context, DBHelper db, OutputStream output, DataFormat format)
+    public static boolean exportData(DBHelper db, OutputStreamWriter output, DataFormat format)
     {
-        Exporter exporter = null;
+        DatabaseExporter exporter = null;
 
         switch(format)
         {
-            case Catima:
-                exporter = new CatimaExporter();
-                break;
-            default:
-                Log.e(TAG, "Failed to export data, unknown format " + format.name());
+            case CSV:
+                exporter = new CsvDatabaseExporter();
                 break;
         }
 
@@ -40,8 +34,8 @@ public class MultiFormatExporter
         {
             try
             {
-                exporter.exportData(context, db, output);
-                return ImportExportResult.Success;
+                exporter.exportData(db, output);
+                return true;
             }
             catch(IOException e)
             {
@@ -52,12 +46,12 @@ public class MultiFormatExporter
                 Log.e(TAG, "Failed to export data", e);
             }
 
-            return ImportExportResult.GenericFailure;
+            return false;
         }
         else
         {
             Log.e(TAG, "Unsupported data format exported: " + format.name());
-            return ImportExportResult.GenericFailure;
+            return false;
         }
     }
 }

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

@@ -0,0 +1,62 @@
+package protect.card_locker;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class MultiFormatImporter
+{
+    private static final String TAG = "Catima";
+
+    /**
+     * Attempts to import data from the input stream of the
+     * given format into the database.
+     *
+     * The input stream is not closed, and doing so is the
+     * responsibility of the caller.
+     *
+     * @return true if the database was successfully imported,
+     * false otherwise. If false, no data was written to
+     * the database.
+     */
+    public static boolean importData(DBHelper db, InputStreamReader input, DataFormat format)
+    {
+        DatabaseImporter importer = null;
+
+        switch(format)
+        {
+            case CSV:
+                importer = new CsvDatabaseImporter();
+                break;
+        }
+
+        if(importer != null)
+        {
+            try
+            {
+                importer.importData(db, input);
+                return true;
+            }
+            catch(IOException e)
+            {
+                Log.e(TAG, "Failed to input data", e);
+            }
+            catch(FormatException e)
+            {
+                Log.e(TAG, "Failed to input data", e);
+            }
+            catch(InterruptedException e)
+            {
+                Log.e(TAG, "Failed to input data", e);
+            }
+
+            return false;
+        }
+        else
+        {
+            Log.e(TAG, "Unsupported data format imported: " + format.name());
+            return false;
+        }
+    }
+}

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

@@ -0,0 +1,319 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.net.Uri;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.zxing.BarcodeFormat;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class PkpassImporter {
+    private Context context;
+
+    private Bitmap icon = null;
+
+    private HashMap<String, HashMap<String, String>> translations = new HashMap<>();
+
+    public PkpassImporter(Context context)
+    {
+        this.context = context;
+    }
+
+    private ByteArrayOutputStream readZipInputStream(ZipInputStream zipInputStream) throws IOException
+    {
+        byte[] buffer = new byte[2048];
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        int size;
+
+        while((size = zipInputStream.read(buffer, 0, buffer.length)) != -1)
+        {
+            byteArrayOutputStream.write(buffer, 0, size);
+        }
+
+        return byteArrayOutputStream;
+    }
+
+    private void loadBitmap(ByteArrayOutputStream byteArrayOutputStream)
+    {
+        byte[] bytes = byteArrayOutputStream.toByteArray();
+        // Only keep the largest icon
+        if(icon != null && bytes.length < icon.getByteCount())
+        {
+            return;
+        }
+        icon = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+    }
+
+    // FIXME: Probably very fragile
+    private void parseTranslations(String language, String iOSTranslationFileContent)
+    {
+        if(!translations.containsKey(language))
+        {
+            translations.put(language, new HashMap<String, String>());
+        }
+
+        HashMap<String, String> values = translations.get(language);
+
+        for (String entry : iOSTranslationFileContent.trim().split(";"))
+        {
+            String[] parts = entry.split(" = ", 2);
+
+            // Remove all spaces around the key and value
+            String key = parts[0].trim();
+            String value = parts[1].trim();
+
+            // iOS .string files quote everything in double quotes, we don't need to keep those
+            values.put(key.substring(1, key.length()-1), value.substring(1, value.length()-1));
+        }
+
+        translations.put(language, values);
+    }
+
+    private ExtrasHelper appendData(ExtrasHelper extrasHelper, JSONObject pkpassJSON, String styleKey, String arrayName) throws JSONException
+    {
+        // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/FieldDictionary.html#//apple_ref/doc/uid/TP40012026-CH4-SW1
+
+        JSONArray fields;
+        // These are all optional, so don't throw an exception if they don't exist
+        try
+        {
+            fields = pkpassJSON.getJSONObject(styleKey).getJSONArray(arrayName);
+        }
+        catch (JSONException ex)
+        {
+            return extrasHelper;
+        }
+
+        for(int i = 0; i < fields.length(); i++)
+        {
+            JSONObject fieldObject = fields.getJSONObject(i);
+            String key = fieldObject.getString("key");
+            String label = fieldObject.getString("label");
+            String value = fieldObject.getString("value");
+
+            // Label is optional
+            if(label == null)
+            {
+                label = key;
+            }
+
+            // Add the completely untranslated stuff as fallback
+            String formattedUntranslatedValue = value;
+            if(!label.isEmpty())
+            {
+                formattedUntranslatedValue = label + ": " + value;
+            }
+            extrasHelper.addLanguageValue("", key, formattedUntranslatedValue);
+
+            // Try to find translations
+            for(Map.Entry<String, HashMap<String, String>> language : translations.entrySet())
+            {
+                String translatedLabel = label;
+                if(language.getValue().containsKey(label))
+                {
+                    translatedLabel = language.getValue().get(label);
+                }
+
+                String translatedValue = value;
+                if(language.getValue().containsKey(value))
+                {
+                    translatedValue = language.getValue().get(value);
+                }
+
+                String formattedValue = translatedValue;
+
+                if(!translatedLabel.isEmpty())
+                {
+                    formattedValue = translatedLabel + ": " + translatedValue;
+                }
+
+                extrasHelper.addLanguageValue(language.getKey(), key, formattedValue);
+            }
+        }
+
+        return extrasHelper;
+    }
+
+    public LoyaltyCard fromURI(Uri uri) throws IOException, JSONException {
+        return fromInputStream(context.getContentResolver().openInputStream(uri));
+    }
+
+    public LoyaltyCard fromInputStream(InputStream inputStream) throws IOException, JSONException
+    {
+        String passJSONString = null;
+
+        ZipInputStream zipInputStream = new ZipInputStream(inputStream);
+
+        ZipEntry entry;
+
+        // We first want to parse the translations
+        while((entry = zipInputStream.getNextEntry()) != null) {
+            if(entry.getName().endsWith("pass.strings"))
+            {
+                // Example: en.lproj/pass.strings
+                String language = entry.getName().substring(0, entry.getName().indexOf("."));
+
+                parseTranslations(language, readZipInputStream(zipInputStream).toString("UTF-8"));
+            }
+            else if(entry.getName().equals("pass.json"))
+            {
+                passJSONString = readZipInputStream(zipInputStream).toString("UTF-8");
+            }
+            else if(entry.getName().equals("icon.png") || entry.getName().equals("icon@2x.png"))
+            {
+                loadBitmap(readZipInputStream(zipInputStream));
+            }
+        }
+
+        if(passJSONString == null)
+        {
+            return null;
+        }
+
+        return fromPassJSON(new JSONObject(passJSONString));
+    }
+
+    public LoyaltyCard fromPassJSON(JSONObject json) throws JSONException
+    {
+        String store = json.getString("organizationName");
+        String note = json.getString("description");
+
+        // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/TopLevel.html#//apple_ref/doc/uid/TP40012026-CH2-SW1
+        // barcodes is the new field
+        // barcode is deprecated, but used on old iOS versions, so we do fall back to it
+        JSONObject barcode = null;
+        JSONArray barcodes = null;
+
+        try {
+            barcodes = json.getJSONArray("barcodes");
+        } catch (JSONException ex) {
+        }
+
+        if (barcodes != null) {
+            barcode = barcodes.getJSONObject(0);
+        } else {
+            barcode = json.getJSONObject("barcode");
+        }
+
+        if (barcode == null) {
+            return null;
+        }
+
+        String cardId = barcode.getString("message");
+
+        // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/LowerLevel.html#//apple_ref/doc/uid/TP40012026-CH3-SW3
+        // Required. Barcode format. For the barcode dictionary, you can use only the following values: PKBarcodeFormatQR, PKBarcodeFormatPDF417, or PKBarcodeFormatAztec. For dictionaries in the barcodes array, you may also use PKBarcodeFormatCode128.
+        ImmutableMap<String, String> supportedBarcodeTypes = ImmutableMap.<String, String>builder()
+                .put("PKBarcodeFormatQR", BarcodeFormat.QR_CODE.name())
+                .put("PKBarcodeFormatPDF417", BarcodeFormat.PDF_417.name())
+                .put("PKBarcodeFormatAztec", BarcodeFormat.AZTEC.name())
+                .put("PKBarcodeFormatCode128", BarcodeFormat.CODE_128.name())
+                .build();
+
+        String barcodeType = supportedBarcodeTypes.get(barcode.getString("format"));
+
+        if(barcodeType == null)
+        {
+            return null;
+        }
+
+        // Prepare to parse colors
+        Pattern rgbPattern = Pattern.compile("^rgb\\(\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*\\)$");
+
+        // Optional. Background color of the pass, specified as an CSS-style RGB triple. For example, rgb(23, 187, 82).
+        Integer headerColor = null;
+        Matcher headerColorMatcher = rgbPattern.matcher(json.getString("backgroundColor"));
+        if(headerColorMatcher.find())
+        {
+            headerColor = Color.rgb(
+                    Integer.parseInt(headerColorMatcher.group(1)),
+                    Integer.parseInt(headerColorMatcher.group(2)),
+                    Integer.parseInt(headerColorMatcher.group(3)));
+        }
+        if(headerColor == null)
+        {
+            // Maybe they violate the spec, let's parse it in a format Android understands
+            // Necessary for at least Eurowings
+            try
+            {
+                headerColor = Color.parseColor(json.getString("backgroundColor"));
+            }
+            catch (IllegalArgumentException ex) {}
+        }
+
+
+        // Optional. Color of the label text, specified as a CSS-style RGB triple. For example, rgb(255, 255, 255).
+        Integer headerTextColor = null;
+        Matcher headerTextColorMatcher = rgbPattern.matcher(json.getString("labelColor"));
+        if(headerTextColorMatcher.find())
+        {
+            headerTextColor = Color.rgb(
+                Integer.parseInt(headerTextColorMatcher.group(1)),
+                Integer.parseInt(headerTextColorMatcher.group(2)),
+                Integer.parseInt(headerTextColorMatcher.group(3)));
+        }
+        if(headerTextColor == null)
+        {
+            // Maybe they violate the spec, let's parse it in a format Android understands
+            // Necessary for at least Eurowings
+            try
+            {
+                headerTextColor = Color.parseColor(json.getString("labelColor"));
+            }
+            catch (IllegalArgumentException ex) {}
+        }
+
+        // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/TopLevel.html#//apple_ref/doc/uid/TP40012026-CH2-SW6
+        // There needs to be exactly one style key
+
+        String styleKey = null;
+        ImmutableList<String> possibleStyleKeys = ImmutableList.<String>builder()
+                .add("boardingPass")
+                .add("coupon")
+                .add("eventTicket")
+                .add("generic")
+                .add("storeCard")
+                .build();
+        for(int i = 0; i < possibleStyleKeys.size(); i++)
+        {
+            String possibleStyleKey = possibleStyleKeys.get(i);
+            if(json.has(possibleStyleKey))
+            {
+                styleKey = possibleStyleKey;
+                break;
+            }
+        }
+
+        if(styleKey == null)
+        {
+            return null;
+        }
+
+        // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/LowerLevel.html#//apple_ref/doc/uid/TP40012026-CH3-SW14
+        ExtrasHelper extras = new ExtrasHelper();
+        extras = appendData(extras, json, styleKey, "headerFields");
+        extras = appendData(extras, json, styleKey, "primaryFields");
+        extras = appendData(extras, json, styleKey, "secondaryFields");
+        extras = appendData(extras, json, styleKey, "auxiliaryFields");
+        extras = appendData(extras, json, styleKey, "backFields");
+
+        return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, icon, extras);
+    }
+}

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

@@ -1,209 +0,0 @@
-package protect.card_locker;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Toast;
-
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.android.Intents;
-import com.journeyapps.barcodescanner.BarcodeCallback;
-import com.journeyapps.barcodescanner.BarcodeResult;
-import com.journeyapps.barcodescanner.CaptureManager;
-import com.journeyapps.barcodescanner.DecoratedBarcodeView;
-
-import java.util.List;
-
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-
-/**
- * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
- *
- * Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/java/example/zxing/CustomScannerActivity.java
- * originally licensed under Apache 2.0
- */
-public class ScanActivity extends CatimaAppCompatActivity {
-    private static final String TAG = "Catima";
-
-    private CaptureManager capture;
-    private DecoratedBarcodeView barcodeScannerView;
-
-    private String cardId;
-    private String addGroup;
-    private boolean torch = false;
-
-    private void extractIntentFields(Intent intent) {
-        final Bundle b = intent.getExtras();
-        cardId = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_CARDID) : null;
-        addGroup = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
-        Log.d(TAG, "Scan activity: id=" + cardId);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setTitle(R.string.scanCardBarcode);
-        setContentView(R.layout.scan_activity);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
-        extractIntentFields(getIntent());
-
-        findViewById(R.id.add_from_image).setOnClickListener(this::addFromImage);
-        findViewById(R.id.add_manually).setOnClickListener(this::addManually);
-
-        barcodeScannerView = findViewById(R.id.zxing_barcode_scanner);
-
-        // Even though we do the actual decoding with the barcodeScannerView
-        // CaptureManager needs to be running to show the camera and scanning bar
-        capture = new CatimaCaptureManager(this, barcodeScannerView);
-        Intent captureIntent = new Intent();
-        Bundle captureIntentBundle = new Bundle();
-        captureIntentBundle.putBoolean(Intents.Scan.BEEP_ENABLED, false);
-        captureIntent.putExtras(captureIntentBundle);
-        capture.initializeFromIntent(captureIntent, savedInstanceState);
-
-        barcodeScannerView.decodeSingle(new BarcodeCallback() {
-            @Override
-            public void barcodeResult(BarcodeResult result) {
-                Intent scanResult = new Intent();
-                Bundle scanResultBundle = new Bundle();
-                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, result.getText());
-                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().name());
-                if (addGroup != null) {
-                    scanResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
-                }
-                scanResult.putExtras(scanResultBundle);
-                ScanActivity.this.setResult(RESULT_OK, scanResult);
-                finish();
-            }
-
-            @Override
-            public void possibleResultPoints(List<ResultPoint> resultPoints) {
-
-            }
-        });
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        capture.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        capture.onPause();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        capture.onDestroy();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        capture.onSaveInstanceState(outState);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
-        if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)) {
-            getMenuInflater().inflate(R.menu.scan_menu, menu);
-        }
-
-        barcodeScannerView.setTorchOff();
-
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        if (item.getItemId() == android.R.id.home)
-        {
-            setResult(Activity.RESULT_CANCELED);
-            finish();
-            return true;
-        } else if (item.getItemId() == R.id.action_toggle_flashlight) {
-            if (torch) {
-                torch = false;
-                barcodeScannerView.setTorchOff();
-                item.setTitle(R.string.turn_flashlight_on);
-                item.setIcon(R.drawable.ic_flashlight_off_white_24dp);
-            } else {
-                torch = true;
-                barcodeScannerView.setTorchOn();
-                item.setTitle(R.string.turn_flashlight_off);
-                item.setIcon(R.drawable.ic_flashlight_on_white_24dp);
-            }
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent intent)
-    {
-        super.onActivityResult(requestCode, resultCode, intent);
-
-        BarcodeValues barcodeValues;
-
-        try {
-            barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
-        } catch (NullPointerException e) {
-            Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-            return;
-        }
-
-        if (!barcodeValues.isEmpty()) {
-            Intent manualResult = new Intent();
-            Bundle manualResultBundle = new Bundle();
-            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
-            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
-            if (addGroup != null) {
-                manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
-            }
-            manualResult.putExtras(manualResultBundle);
-            ScanActivity.this.setResult(RESULT_OK, manualResult);
-            finish();
-        }
-    }
-
-    public void addManually(View view) {
-        Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-        if (cardId != null) {
-            final Bundle b = new Bundle();
-            b.putString("initialCardId", cardId);
-            i.putExtras(b);
-        }
-        startActivityForResult(i, Utils.SELECT_BARCODE_REQUEST);
-    }
-
-    public void addFromImage(View view) {
-        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
-        photoPickerIntent.setType("image/*");
-        startActivityForResult(photoPickerIntent, Utils.BARCODE_IMPORT_FROM_IMAGE_FILE);
-    }
-}

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

@@ -1,19 +1,18 @@
 package protect.card_locker;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Bundle;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.graphics.drawable.Icon;
+import android.os.Build;
 
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import androidx.core.content.pm.ShortcutInfoCompat;
-import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.core.graphics.drawable.IconCompat;
-
 class ShortcutHelper
 {
     // Android documentation says that no more than 5 shortcuts
@@ -30,113 +29,125 @@ class ShortcutHelper
      * card exceeds the max number of shortcuts, then the least recently
      * used card shortcut is discarded.
      */
-    static void updateShortcuts(Context context, LoyaltyCard card)
+    @TargetApi(25)
+    static void updateShortcuts(Context context, LoyaltyCard card, Intent intent)
     {
-        LinkedList<ShortcutInfoCompat> list = new LinkedList<>(ShortcutManagerCompat.getDynamicShortcuts(context));
-
-        DBHelper dbHelper = new DBHelper(context);
-
-        String shortcutId = Integer.toString(card.id);
-
-        // Sort the shortcuts by rank, so working with the relative order will be easier.
-        // This sorts so that the lowest rank is first.
-        Collections.sort(list, Comparator.comparingInt(ShortcutInfoCompat::getRank));
-
-        Integer foundIndex = null;
-
-        for(int index = 0; index < list.size(); index++)
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1)
         {
-            if(list.get(index).getId().equals(shortcutId))
+            ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
+            LinkedList<ShortcutInfo> list = new LinkedList<>(shortcutManager.getDynamicShortcuts());
+
+            String shortcutId = Integer.toString(card.id);
+
+            // Sort the shortcuts by rank, so working with the relative order will be easier.
+            // This sorts so that the lowest rank is first.
+            Collections.sort(list, new Comparator<ShortcutInfo>()
             {
-                // Found the item already
-                foundIndex = index;
-                break;
-            }
-        }
+                @Override
+                public int compare(ShortcutInfo o1, ShortcutInfo o2)
+                {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
+                    {
+                        return o1.getRank() - o2.getRank();
+                    }
+                    else
+                    {
+                        return 0;
+                    }
+                }
+            });
 
-        if(foundIndex != null)
-        {
-            // If the item is already found, then the list needs to be
-            // reordered, so that the selected item now has the lowest
-            // rank, thus letting it survive longer.
-            ShortcutInfoCompat found = list.remove(foundIndex.intValue());
-            list.addFirst(found);
-        }
-        else
-        {
-            // The item is new to the list. First, we need to trim the list
-            // until it is able to accept a new item, then the item is
-            // inserted.
-            while(list.size() >= MAX_SHORTCUTS)
+            Integer foundIndex = null;
+
+            for(int index = 0; index < list.size(); index++)
             {
-                list.pollLast();
+                if(list.get(index).getId().equals(shortcutId))
+                {
+                    // Found the item already
+                    foundIndex = index;
+                    break;
+                }
             }
 
-            ShortcutInfoCompat shortcut = createShortcutBuilder(context, card).build();
+            if(foundIndex != null)
+            {
+                // If the item is already found, then the list needs to be
+                // reordered, so that the selected item now has the lowest
+                // rank, thus letting it survive longer.
+                ShortcutInfo found = list.remove(foundIndex.intValue());
+                list.addFirst(found);
+            }
+            else
+            {
+                // The item is new to the list. First, we need to trim the list
+                // until it is able to accept a new item, then the item is
+                // inserted.
+                while(list.size() >= MAX_SHORTCUTS)
+                {
+                    list.pollLast();
+                }
 
-            list.addFirst(shortcut);
-        }
+                ShortcutInfo shortcut = new ShortcutInfo.Builder(context, Integer.toString(card.id))
+                    .setShortLabel(card.store)
+                    .setLongLabel(card.store)
+                    .setIntent(intent)
+                    .build();
 
-        LinkedList<ShortcutInfoCompat> finalList = new LinkedList<>();
+                list.addFirst(shortcut);
+            }
 
-        // The ranks are now updated; the order in the list is the rank.
-        for(int index = 0; index < list.size(); index++)
-        {
-            ShortcutInfoCompat prevShortcut = list.get(index);
+            LinkedList<ShortcutInfo> finalList = new LinkedList<>();
 
-            LoyaltyCard loyaltyCard = dbHelper.getLoyaltyCard(Integer.parseInt(prevShortcut.getId()));
+            // The ranks are now updated; the order in the list is the rank.
+            for(int index = 0; index < list.size(); index++)
+            {
+                ShortcutInfo prevShortcut = list.get(index);
 
-            ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
+                Intent shortcutIntent = prevShortcut.getIntent();
+
+                // Prevent instances of the view activity from piling up; if one exists let this
+                // one replace it.
+                shortcutIntent.setFlags(shortcutIntent.getFlags() | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+
+                ShortcutInfo updatedShortcut = new ShortcutInfo.Builder(context, prevShortcut.getId())
+                        .setShortLabel(prevShortcut.getShortLabel())
+                        .setLongLabel(prevShortcut.getLongLabel())
+                        .setIntent(shortcutIntent)
+                        .setIcon(Icon.createWithResource(context, R.drawable.circle))
                         .setRank(index)
                         .build();
 
-            finalList.addLast(updatedShortcut);
-        }
+                finalList.addLast(updatedShortcut);
+            }
 
-        ShortcutManagerCompat.setDynamicShortcuts(context, finalList);
+            shortcutManager.setDynamicShortcuts(finalList);
+        }
     }
 
     /**
      * Remove the given card id from the app shortcuts, if such a
      * shortcut exists.
      */
+    @TargetApi(25)
     static void removeShortcut(Context context, int cardId)
     {
-        List<ShortcutInfoCompat> list = ShortcutManagerCompat.getDynamicShortcuts(context);
-
-        String shortcutId = Integer.toString(cardId);
-
-        for(int index = 0; index < list.size(); index++)
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1)
         {
-            if(list.get(index).getId().equals(shortcutId))
+            ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
+            List<ShortcutInfo> list = shortcutManager.getDynamicShortcuts();
+
+            String shortcutId = Integer.toString(cardId);
+
+            for(int index = 0; index < list.size(); index++)
             {
-                list.remove(index);
-                break;
+                if(list.get(index).getId().equals(shortcutId))
+                {
+                    list.remove(index);
+                    break;
+                }
             }
+
+            shortcutManager.setDynamicShortcuts(list);
         }
-
-        ShortcutManagerCompat.setDynamicShortcuts(context, list);
-    }
-
-    static ShortcutInfoCompat.Builder createShortcutBuilder(Context context, LoyaltyCard loyaltyCard) {
-        Intent intent = new Intent(context, LoyaltyCardViewActivity.class);
-        intent.setAction(Intent.ACTION_MAIN);
-        // Prevent instances of the view activity from piling up; if one exists let this
-        // one replace it.
-        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        final Bundle bundle = new Bundle();
-        bundle.putInt("id", loyaltyCard.id);
-        bundle.putBoolean("view", true);
-        intent.putExtras(bundle);
-
-        Bitmap iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
-
-        IconCompat icon = IconCompat.createWithAdaptiveBitmap(iconBitmap);
-
-        return new ShortcutInfoCompat.Builder(context, Integer.toString(loyaltyCard.id))
-                .setShortLabel(loyaltyCard.store)
-                .setLongLabel(loyaltyCard.store)
-                .setIntent(intent)
-                .setIcon(icon);
     }
 }

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

@@ -1,15 +0,0 @@
-package protect.card_locker;
-
-import android.text.Editable;
-import android.text.TextWatcher;
-
-public class SimpleTextWatcher implements TextWatcher {
-    @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
-    @Override
-    public void onTextChanged(CharSequence s, int start, int before, int count) { }
-
-    @Override
-    public void afterTextChanged(Editable s) { }
-}

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

@@ -1,25 +0,0 @@
-package protect.card_locker;
-
-public class ThirdPartyInfo {
-    private final String mName;
-    private final String mUrl;
-    private final String mLicense;
-
-    public ThirdPartyInfo(String name, String url, String license) {
-        mName = name;
-        mUrl = url;
-        mLicense = license;
-    }
-
-    public String name() {
-        return mName;
-    }
-
-    public String url() {
-        return mUrl;
-    }
-
-    public String license() {
-        return mLicense;
-    }
-}

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

@@ -1,404 +0,0 @@
-package protect.card_locker;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.ImageDecoder;
-import android.graphics.Matrix;
-import android.os.Build;
-import android.os.LocaleList;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.LuminanceSource;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.RGBLuminanceSource;
-import com.google.zxing.Result;
-import com.google.zxing.common.HybridBinarizer;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.text.NumberFormat;
-import java.util.Calendar;
-import java.util.Currency;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.Map;
-
-import androidx.core.graphics.ColorUtils;
-import androidx.exifinterface.media.ExifInterface;
-import protect.card_locker.preferences.Settings;
-
-public class Utils {
-    private static final String TAG = "Catima";
-
-    // Activity request codes
-    public static final int MAIN_REQUEST = 1;
-    public static final int SELECT_BARCODE_REQUEST = 2;
-    public static final int BARCODE_SCAN = 3;
-    public static final int BARCODE_IMPORT_FROM_IMAGE_FILE = 4;
-    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 5;
-    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 6;
-    public static final int CARD_IMAGE_FROM_FILE_FRONT = 7;
-    public static final int CARD_IMAGE_FROM_FILE_BACK = 8;
-
-    static final double LUMINANCE_MIDPOINT = 0.5;
-
-    static final int BITMAP_SIZE_BIG = 512;
-
-    static public LetterBitmap generateIcon(Context context, LoyaltyCard loyaltyCard, boolean forShortcut) {
-        return generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor, forShortcut);
-    }
-
-    static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor) {
-        return generateIcon(context, store, backgroundColor, false);
-    }
-
-    static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor, boolean forShortcut) {
-        if (store.length() == 0) {
-            return null;
-        }
-
-        int tileLetterFontSize;
-        if (forShortcut) {
-            tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSizeForShortcut);
-        } else {
-            tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
-        }
-
-        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
-
-        if (backgroundColor == null) {
-            backgroundColor = LetterBitmap.getDefaultColor(context, store);
-        }
-
-        return new LetterBitmap(context, store, store,
-                tileLetterFontSize, pixelSize, pixelSize, backgroundColor, needsDarkForeground(backgroundColor) ? Color.BLACK : Color.WHITE);
-    }
-
-    static public boolean needsDarkForeground(Integer backgroundColor) {
-        return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
-    }
-
-    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
-        String contents;
-        String format;
-
-        if (resultCode != Activity.RESULT_OK) {
-            return new BarcodeValues(null, null);
-        }
-
-        if (requestCode == Utils.BARCODE_IMPORT_FROM_IMAGE_FILE) {
-            Log.i(TAG, "Received image file with possible barcode");
-
-            Bitmap bitmap;
-            try {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    ImageDecoder.Source image_source = ImageDecoder.createSource(context.getContentResolver(), intent.getData());
-                    bitmap = ImageDecoder.decodeBitmap(image_source, (decoder, info, source) -> decoder.setMutableRequired(true));
-                } else {
-                    bitmap = MediaStore.Images.Media.getBitmap(context.getContentResolver(), intent.getData());
-                }
-            } catch (IOException e) {
-                Log.e(TAG, "Error getting data from image file");
-                e.printStackTrace();
-                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                return new BarcodeValues(null, null);
-            }
-
-            BarcodeValues barcodeFromBitmap = getBarcodeFromBitmap(bitmap);
-
-            if (barcodeFromBitmap.isEmpty()) {
-                Log.i(TAG, "No barcode found in image file");
-                Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
-            }
-
-            Log.i(TAG, "Read barcode id: " + barcodeFromBitmap.content());
-            Log.i(TAG, "Read format: " + barcodeFromBitmap.format());
-
-            return barcodeFromBitmap;
-        }
-
-        if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
-            if (requestCode == Utils.BARCODE_SCAN) {
-                Log.i(TAG, "Received barcode information from camera");
-            } else if (requestCode == Utils.SELECT_BARCODE_REQUEST) {
-                Log.i(TAG, "Received barcode information from typing it");
-            }
-
-            contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
-            format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
-
-            Log.i(TAG, "Read barcode id: " + contents);
-            Log.i(TAG, "Read format: " + format);
-
-            return new BarcodeValues(format, contents);
-        }
-
-        throw new UnsupportedOperationException("Unknown request code for parseSetBarcodeActivityResult");
-    }
-
-    static public BarcodeValues getBarcodeFromBitmap(Bitmap bitmap) {
-        // This function is vulnerable to OOM, so we try again with a smaller bitmap is we get OOM
-        for (int i = 0; i < 10; i++) {
-            try {
-                return Utils.getBarcodeFromBitmapReal(bitmap);
-            } catch (OutOfMemoryError e) {
-                Log.w(TAG, "Ran OOM in getBarcodeFromBitmap! Trying again with smaller picture! Retry " + i + " of 10.");
-                bitmap = Bitmap.createScaledBitmap(bitmap, (int) Math.round(0.75 * bitmap.getWidth()), (int) Math.round(0.75 * bitmap.getHeight()), false);
-            }
-        }
-
-        // Give up
-        return new BarcodeValues(null, null);
-    }
-
-    static private BarcodeValues getBarcodeFromBitmapReal(Bitmap bitmap) {
-        // In order to decode it, the Bitmap must first be converted into a pixel array...
-        int[] intArray = new int[bitmap.getWidth() * bitmap.getHeight()];
-        bitmap.getPixels(intArray, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
-
-        // ...and then turned into a binary bitmap from its luminance
-        LuminanceSource source = new RGBLuminanceSource(bitmap.getWidth(), bitmap.getHeight(), intArray);
-        BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
-
-        try {
-            Result barcodeResult = new MultiFormatReader().decode(binaryBitmap);
-
-            return new BarcodeValues(barcodeResult.getBarcodeFormat().name(), barcodeResult.getText());
-        } catch (NotFoundException e) {
-            return new BarcodeValues(null, null);
-        }
-    }
-
-    static public Boolean hasExpired(Date expiryDate) {
-        // today
-        Calendar date = new GregorianCalendar();
-        // reset hour, minutes, seconds and millis
-        date.set(Calendar.HOUR_OF_DAY, 0);
-        date.set(Calendar.MINUTE, 0);
-        date.set(Calendar.SECOND, 0);
-        date.set(Calendar.MILLISECOND, 0);
-
-        return expiryDate.before(date.getTime());
-    }
-
-    static public String formatBalance(Context context, BigDecimal value, Currency currency) {
-        NumberFormat numberFormat = NumberFormat.getInstance();
-
-        if (currency == null) {
-            numberFormat.setMaximumFractionDigits(0);
-            return context.getString(R.string.balancePoints, numberFormat.format(value));
-        }
-
-        NumberFormat currencyFormat = NumberFormat.getCurrencyInstance();
-        currencyFormat.setCurrency(currency);
-        currencyFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
-        currencyFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
-
-        return currencyFormat.format(value);
-    }
-
-    static public String formatBalanceWithoutCurrencySymbol(BigDecimal value, Currency currency) {
-        NumberFormat numberFormat = NumberFormat.getInstance();
-
-        if (currency == null) {
-            numberFormat.setMaximumFractionDigits(0);
-            return numberFormat.format(value);
-        }
-
-        numberFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
-        numberFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
-
-        return numberFormat.format(value);
-    }
-
-    static public Boolean currencyHasDecimals(Currency currency) {
-        if (currency == null) {
-            return false;
-        }
-
-        return currency.getDefaultFractionDigits() != 0;
-    }
-
-    static public BigDecimal parseCurrency(String value, Boolean hasDecimals) throws NumberFormatException {
-        // If there are no decimals expected, remove all separators before parsing
-        if (!hasDecimals) {
-            value = value.replaceAll("[^0-9]", "");
-            return new BigDecimal(value);
-        }
-
-        // There are many ways users can write a currency, so we fix it up a bit
-        // 1. Replace all non-numbers with dots
-        value = value.replaceAll("[^0-9]", ".");
-
-        // 2. Remove all but the last dot
-        while (value.split("\\.").length > 2) {
-            value = value.replaceFirst("\\.", "");
-        }
-
-        // Parse as BigDecimal
-        return new BigDecimal(value);
-    }
-
-    static public byte[] bitmapToByteArray(Bitmap bitmap) {
-        if (bitmap == null) {
-            return null;
-        }
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        bitmap.compress(Bitmap.CompressFormat.PNG, 100, bos);
-        return bos.toByteArray();
-    }
-
-    static public Bitmap resizeBitmap(Bitmap bitmap) {
-        if (bitmap == null) {
-            return null;
-        }
-
-        double maxSize = BITMAP_SIZE_BIG;
-
-        double width = bitmap.getWidth();
-        double height = bitmap.getHeight();
-
-        if (height > width) {
-            double scale = height / maxSize;
-            height = maxSize;
-            width = width / scale;
-        } else if (width > height) {
-            double scale = width / maxSize;
-            width = maxSize;
-            height = height / scale;
-        } else {
-            height = maxSize;
-            width = maxSize;
-        }
-
-        return Bitmap.createScaledBitmap(bitmap, (int) Math.round(width), (int) Math.round(height), true);
-    }
-
-    static public Bitmap rotateBitmap(Bitmap bitmap, ExifInterface exifInterface) {
-        switch (exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED)) {
-            case ExifInterface.ORIENTATION_ROTATE_90:
-                return rotateBitmap(bitmap, 90f);
-            case ExifInterface.ORIENTATION_ROTATE_180:
-                return rotateBitmap(bitmap, 180f);
-            case ExifInterface.ORIENTATION_ROTATE_270:
-                return rotateBitmap(bitmap, 270f);
-            default:
-                return bitmap;
-        }
-    }
-
-    static public Bitmap rotateBitmap(Bitmap bitmap, float rotation) {
-        if (rotation == 0) {
-            return bitmap;
-        }
-
-        Matrix matrix = new Matrix();
-        matrix.postRotate(rotation);
-        return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
-    }
-
-    static public String getCardImageFileName(int loyaltyCardId, boolean front) {
-        StringBuilder cardImageFileNameBuilder = new StringBuilder();
-
-        cardImageFileNameBuilder.append("card_");
-        cardImageFileNameBuilder.append(loyaltyCardId);
-        cardImageFileNameBuilder.append("_");
-        if (front) {
-            cardImageFileNameBuilder.append("front");
-        } else {
-            cardImageFileNameBuilder.append("back");
-        }
-        cardImageFileNameBuilder.append(".png");
-
-        return cardImageFileNameBuilder.toString();
-    }
-
-    static public void saveCardImage(Context context, Bitmap bitmap, String fileName) throws FileNotFoundException {
-        if (bitmap == null) {
-            context.deleteFile(fileName);
-            return;
-        }
-
-        FileOutputStream out = context.openFileOutput(fileName, Context.MODE_PRIVATE);
-
-        bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
-    }
-
-    static public void saveCardImage(Context context, Bitmap bitmap, int loyaltyCardId, boolean front) throws FileNotFoundException {
-        saveCardImage(context, bitmap, getCardImageFileName(loyaltyCardId, front));
-    }
-
-    static public Bitmap retrieveCardImage(Context context, String fileName) {
-        FileInputStream in;
-        try {
-            in = context.openFileInput(fileName);
-        } catch (FileNotFoundException e) {
-            return null;
-        }
-
-        return BitmapFactory.decodeStream(in);
-    }
-
-    static public Bitmap retrieveCardImage(Context context, int loyaltyCardId, boolean front) {
-        return retrieveCardImage(context, getCardImageFileName(loyaltyCardId, front));
-    }
-
-    static public <T,U> U mapGetOrDefault(Map<T,U> map, T key, U defaultValue) {
-        U value = map.get(key);
-        if (value == null) {
-            return defaultValue;
-        }
-        return value;
-    }
-
-    static public Locale stringToLocale(String localeString) {
-        String[] localeParts = localeString.split("-");
-        if (localeParts.length == 1) {
-            return new Locale(localeParts[0]);
-        }
-
-        if (localeParts[1].startsWith("r")) {
-            localeParts[1] = localeParts[1].substring(1);
-        }
-        return new Locale(localeParts[0], localeParts[1]);
-    }
-
-    static public Context updateBaseContextLocale(Context context) {
-        Settings settings = new Settings(context);
-
-        Locale chosenLocale = settings.getLocale();
-
-        Resources res = context.getResources();
-        Configuration configuration = res.getConfiguration();
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            configuration.locale = chosenLocale != null ? chosenLocale : Locale.getDefault();
-            res.updateConfiguration(configuration, res.getDisplayMetrics());
-            return context;
-        }
-
-        LocaleList localeList = chosenLocale != null ? new LocaleList(chosenLocale) : LocaleList.getDefault();
-        LocaleList.setDefault(localeList);
-        configuration.setLocales(localeList);
-        return context.createConfigurationContext(configuration);
-    }
-
-    static public long getUnixTime() {
-        return System.currentTimeMillis() / 1000;
-    }
-}

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

@@ -1,35 +0,0 @@
-package protect.card_locker;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-
-import net.lingala.zip4j.io.inputstream.ZipInputStream;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.StandardCharsets;
-
-public class ZipUtils {
-    static public String read(ZipInputStream zipInputStream) throws IOException {
-        StringBuilder stringBuilder = new StringBuilder();
-        Reader reader = new BufferedReader(new InputStreamReader(zipInputStream, StandardCharsets.UTF_8));
-        int c;
-        while ((c = reader.read()) != -1) {
-            stringBuilder.append((char) c);
-        }
-        return stringBuilder.toString();
-    }
-
-    static public Bitmap readImage(ZipInputStream zipInputStream) {
-        return BitmapFactory.decodeStream(zipInputStream);
-    }
-
-    static public JSONObject readJSON(ZipInputStream zipInputStream) throws IOException, JSONException {
-        return new JSONObject(read(zipInputStream));
-    }
-}

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

@@ -1,93 +0,0 @@
-package protect.card_locker.importexport;
-
-import org.apache.commons.csv.CSVRecord;
-
-import protect.card_locker.FormatException;
-
-public class CSVHelpers {
-    /**
-     * Extract a string from the items array. The index into the array
-     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, defaultValue is returned
-     * if it is not null. Otherwise, a FormatException is thrown.
-     */
-    static String extractString(String key, CSVRecord record, String defaultValue)
-            throws FormatException
-    {
-        String toReturn = defaultValue;
-
-        if(record.isMapped(key))
-        {
-            toReturn = record.get(key);
-        }
-        else
-        {
-            if(defaultValue == null)
-            {
-                throw new FormatException("Field not used but expected: " + key);
-            }
-        }
-
-        return toReturn;
-    }
-
-    /**
-     * Extract an integer from the items array. The index into the array
-     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, or the data is not a valid
-     * int, a FormatException is thrown.
-     */
-    static Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
-            throws FormatException
-    {
-        if(record.isMapped(key) == false)
-        {
-            throw new FormatException("Field not used but expected: " + key);
-        }
-
-        String value = record.get(key);
-        if(value.isEmpty() && nullIsOk)
-        {
-            return null;
-        }
-
-        try
-        {
-            return Integer.parseInt(record.get(key));
-        }
-        catch(NumberFormatException e)
-        {
-            throw new FormatException("Failed to parse field: " + key, e);
-        }
-    }
-
-    /**
-     * Extract a long from the items array. The index into the array
-     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, or the data is not a valid
-     * int, a FormatException is thrown.
-     */
-    static Long extractLong(String key, CSVRecord record, boolean nullIsOk)
-            throws FormatException
-    {
-        if(record.isMapped(key) == false)
-        {
-            throw new FormatException("Field not used but expected: " + key);
-        }
-
-        String value = record.get(key);
-        if(value.isEmpty() && nullIsOk)
-        {
-            return null;
-        }
-
-        try
-        {
-            return Long.parseLong(record.get(key));
-        }
-        catch(NumberFormatException e)
-        {
-            throw new FormatException("Failed to parse field: " + key, e);
-        }
-    }
-}

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

@@ -1,187 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-
-import net.lingala.zip4j.io.outputstream.ZipOutputStream;
-import net.lingala.zip4j.model.ZipParameters;
-import net.lingala.zip4j.util.InternalZipConstants;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVPrinter;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
-
-import protect.card_locker.DBHelper;
-import protect.card_locker.Group;
-import protect.card_locker.LoyaltyCard;
-import protect.card_locker.Utils;
-
-/**
- * Class for exporting the database into CSV (Comma Separate Values)
- * format.
- */
-public class CatimaExporter implements Exporter
-{
-    public void exportData(Context context, DBHelper db, OutputStream output) throws IOException, InterruptedException
-    {
-        // Necessary vars
-        int readLen;
-        byte[] readBuffer = new byte[InternalZipConstants.BUFF_SIZE];
-
-        // Create zip output stream
-        ZipOutputStream zipOutputStream = new ZipOutputStream(output);
-
-        // Generate CSV
-        ByteArrayOutputStream catimaOutputStream = new ByteArrayOutputStream();
-        OutputStreamWriter catimaOutputStreamWriter = new OutputStreamWriter(catimaOutputStream, StandardCharsets.UTF_8);
-        writeCSV(db, catimaOutputStreamWriter);
-
-        // Add CSV to zip file
-        ZipParameters csvZipParameters = new ZipParameters();
-        csvZipParameters.setFileNameInZip("catima.csv");
-        zipOutputStream.putNextEntry(csvZipParameters);
-        InputStream csvInputStream = new ByteArrayInputStream(catimaOutputStream.toByteArray());
-        while ((readLen = csvInputStream.read(readBuffer)) != -1) {
-            zipOutputStream.write(readBuffer, 0, readLen);
-        }
-        zipOutputStream.closeEntry();
-
-        // Loop over all cards again
-        Cursor cardCursor = db.getLoyaltyCardCursor();
-        while(cardCursor.moveToNext())
-        {
-            // For each card
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
-
-            // Prepare looping over both front and back image
-            boolean[] frontValues = new boolean[2];
-            frontValues[0] = true;
-            frontValues[1] = false;
-
-            // For each image
-            for (boolean front : frontValues) {
-                // If it exists, add to the .zip file
-                Bitmap image = Utils.retrieveCardImage(context, card.id, front);
-                if (image != null) {
-                    ZipParameters imageZipParameters = new ZipParameters();
-                    imageZipParameters.setFileNameInZip(Utils.getCardImageFileName(card.id, front));
-                    zipOutputStream.putNextEntry(imageZipParameters);
-                    InputStream imageInputStream = new ByteArrayInputStream(Utils.bitmapToByteArray(image));
-                    while ((readLen = imageInputStream.read(readBuffer)) != -1) {
-                        zipOutputStream.write(readBuffer, 0, readLen);
-                    }
-                    zipOutputStream.closeEntry();
-                }
-            }
-        }
-
-        zipOutputStream.close();
-    }
-
-    private void writeCSV(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException {
-        CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
-
-        // Print the version
-        printer.printRecord("2");
-
-        printer.println();
-
-        // Print the header for groups
-        printer.printRecord(DBHelper.LoyaltyCardDbGroups.ID);
-
-        Cursor groupCursor = db.getGroupCursor();
-
-        while(groupCursor.moveToNext())
-        {
-            Group group = Group.toGroup(groupCursor);
-
-            printer.printRecord(group._id);
-
-            if(Thread.currentThread().isInterrupted())
-            {
-                throw new InterruptedException();
-            }
-        }
-
-        groupCursor.close();
-
-        // Print an empty line
-        printer.println();
-
-        // Print the header for cards
-        printer.printRecord(DBHelper.LoyaltyCardDbIds.ID,
-                DBHelper.LoyaltyCardDbIds.STORE,
-                DBHelper.LoyaltyCardDbIds.NOTE,
-                DBHelper.LoyaltyCardDbIds.EXPIRY,
-                DBHelper.LoyaltyCardDbIds.BALANCE,
-                DBHelper.LoyaltyCardDbIds.BALANCE_TYPE,
-                DBHelper.LoyaltyCardDbIds.CARD_ID,
-                DBHelper.LoyaltyCardDbIds.BARCODE_ID,
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
-                DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS,
-                DBHelper.LoyaltyCardDbIds.LAST_USED);
-
-        Cursor cardCursor = db.getLoyaltyCardCursor();
-
-        while(cardCursor.moveToNext())
-        {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
-
-            printer.printRecord(card.id,
-                    card.store,
-                    card.note,
-                    card.expiry != null ? card.expiry.getTime() : "",
-                    card.balance,
-                    card.balanceType,
-                    card.cardId,
-                    card.barcodeId,
-                    card.barcodeType != null ? card.barcodeType.name() : "",
-                    card.headerColor,
-                    card.starStatus,
-                    card.lastUsed);
-
-            if(Thread.currentThread().isInterrupted())
-            {
-                throw new InterruptedException();
-            }
-        }
-
-        cardCursor.close();
-
-        // Print an empty line
-        printer.println();
-
-        // Print the header for card group mappings
-        printer.printRecord(DBHelper.LoyaltyCardDbIdsGroups.cardID,
-                DBHelper.LoyaltyCardDbIdsGroups.groupID);
-
-        Cursor cardCursor2 = db.getLoyaltyCardCursor();
-
-        while(cardCursor2.moveToNext())
-        {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor2);
-
-            for (Group group : db.getLoyaltyCardGroups(card.id)) {
-                printer.printRecord(card.id, group._id);
-            }
-
-            if(Thread.currentThread().isInterrupted())
-            {
-                throw new InterruptedException();
-            }
-        }
-
-        cardCursor2.close();
-
-        printer.close();
-    }
-}

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

@@ -1,395 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-
-import com.google.zxing.BarcodeFormat;
-
-import net.lingala.zip4j.io.inputstream.ZipInputStream;
-import net.lingala.zip4j.model.LocalFileHeader;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Currency;
-import java.util.Date;
-import java.util.List;
-
-import protect.card_locker.CatimaBarcode;
-import protect.card_locker.DBHelper;
-import protect.card_locker.FormatException;
-import protect.card_locker.Group;
-import protect.card_locker.Utils;
-import protect.card_locker.ZipUtils;
-
-/**
- * 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 CatimaImporter implements Importer
-{
-    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, InterruptedException {
-        InputStream bufferedInputStream = new BufferedInputStream(input);
-        bufferedInputStream.mark(100);
-
-        // First, check if this is a zip file
-        ZipInputStream zipInputStream = new ZipInputStream(bufferedInputStream);
-
-        boolean isZipFile = false;
-
-        LocalFileHeader localFileHeader;
-        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
-            isZipFile = true;
-
-            String fileName = Uri.parse(localFileHeader.getFileName()).getLastPathSegment();
-            if (fileName.equals("catima.csv")) {
-                importCSV(context, db, new ByteArrayInputStream(ZipUtils.read(zipInputStream).getBytes(StandardCharsets.UTF_8)));
-            } else if (fileName.endsWith(".png")) {
-                Utils.saveCardImage(context, ZipUtils.readImage(zipInputStream), fileName);
-            } else {
-                throw new FormatException("Unexpected file in import: " + fileName);
-            }
-        }
-
-        if (!isZipFile) {
-            // This is not a zip file, try importing as bare CSV
-            bufferedInputStream.reset();
-            importCSV(context, db, bufferedInputStream);
-        }
-    }
-
-    public void importCSV(Context context, DBHelper db, InputStream input) throws IOException, FormatException, InterruptedException {
-        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
-
-        bufferedReader.mark(100);
-
-        Integer version = 1;
-
-        try {
-            version = Integer.parseInt(bufferedReader.readLine());
-        } catch (NumberFormatException _e) {
-            // Assume version 1
-        }
-
-        bufferedReader.reset();
-
-        switch (version) {
-            case 1:
-                parseV1(context, db, bufferedReader);
-                break;
-            case 2:
-                parseV2(context, db, bufferedReader);
-                break;
-            default:
-                throw new FormatException(String.format("No code to parse version %s", version));
-        }
-
-        bufferedReader.close();
-    }
-
-    public void parseV1(Context context, DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
-    {
-        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.withHeader());
-
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
-        try
-        {
-            for (CSVRecord record : parser)
-            {
-                importLoyaltyCard(context, database, db, record);
-
-                if(Thread.currentThread().isInterrupted())
-                {
-                    throw new InterruptedException();
-                }
-            }
-
-            parser.close();
-            database.setTransactionSuccessful();
-        }
-        catch(IllegalArgumentException|IllegalStateException e)
-        {
-            throw new FormatException("Issue parsing CSV data", e);
-        }
-        finally
-        {
-            database.endTransaction();
-            database.close();
-        }
-    }
-
-    public void parseV2(Context context, DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
-    {
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
-        Integer part = 0;
-        String stringPart = "";
-
-        try {
-            while (true) {
-                String tmp = input.readLine();
-
-                if (tmp == null || tmp.isEmpty()) {
-                    boolean sectionParsed = false;
-
-                    switch (part) {
-                        case 0:
-                            // This is the version info, ignore
-                            sectionParsed = true;
-                            break;
-                        case 1:
-                            try {
-                                parseV2Groups(db, database, stringPart);
-                                sectionParsed = true;
-                            } catch (FormatException e) {
-                                // We may have a multiline field, try again
-                            }
-                            break;
-                        case 2:
-                            try {
-                                parseV2Cards(context, db, database, stringPart);
-                                sectionParsed = true;
-                            } catch (FormatException e) {
-                                // We may have a multiline field, try again
-                            }
-                            break;
-                        case 3:
-                            try {
-                                parseV2CardGroups(db, database, stringPart);
-                                sectionParsed = true;
-                            } catch (FormatException e) {
-                                // We may have a multiline field, try again
-                            }
-                            break;
-                        default:
-                            throw new FormatException("Issue parsing CSV data, too many parts for v2 parsing");
-                    }
-
-                    if (tmp == null) {
-                        break;
-                    }
-
-                    if (sectionParsed) {
-                        part += 1;
-                        stringPart = "";
-                    } else {
-                        stringPart += tmp + "\n";
-                    }
-                } else {
-                    stringPart += tmp + "\n";
-                }
-            }
-            database.setTransactionSuccessful();
-        } catch (FormatException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            database.endTransaction();
-            database.close();
-        }
-    }
-
-    public void parseV2Groups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
-    {
-        // Parse groups
-        final CSVParser groupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
-
-        List<CSVRecord> records = new ArrayList<>();
-
-        try {
-            for (CSVRecord record : groupParser) {
-                records.add(record);
-
-                if (Thread.currentThread().isInterrupted()) {
-                    throw new InterruptedException();
-                }
-            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            groupParser.close();
-        }
-
-        for (CSVRecord record : records) {
-            importGroup(database, db, record);
-        }
-    }
-
-    public void parseV2Cards(Context context, DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
-    {
-        // Parse cards
-        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
-
-        List<CSVRecord> records = new ArrayList<>();
-
-        try {
-            for (CSVRecord record : cardParser) {
-                records.add(record);
-
-                if (Thread.currentThread().isInterrupted()) {
-                    throw new InterruptedException();
-                }
-            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            cardParser.close();
-        }
-
-        for (CSVRecord record : records) {
-            importLoyaltyCard(context, database, db, record);
-        }
-    }
-
-    public void parseV2CardGroups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
-    {
-        // Parse card group mappings
-        final CSVParser cardGroupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
-
-        List<CSVRecord> records = new ArrayList<>();
-
-        try {
-            for (CSVRecord record : cardGroupParser) {
-                records.add(record);
-
-                if (Thread.currentThread().isInterrupted()) {
-                    throw new InterruptedException();
-                }
-            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            cardGroupParser.close();
-        }
-
-        for (CSVRecord record : records) {
-            importCardGroupMapping(database, db, record);
-        }
-    }
-
-    /**
-     * Import a single loyalty card into the database using the given
-     * session.
-     */
-    private void importLoyaltyCard(Context context, SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
-        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
-
-        String store = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
-        if(store.isEmpty())
-        {
-            throw new FormatException("No store listed, but is required");
-        }
-
-        String note = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
-        Date expiry = null;
-        try {
-            expiry = new Date(CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record, true));
-        } catch (NullPointerException | FormatException e) { }
-
-        BigDecimal balance;
-        try {
-            balance = new BigDecimal(CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
-        } catch (FormatException _e ) {
-            // These fields did not exist in versions 1.8.1 and before
-            // We catch this exception so we can still import old backups
-            balance = new BigDecimal("0");
-        }
-
-        Currency balanceType = null;
-        String unparsedBalanceType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE, record, "");
-        if(!unparsedBalanceType.isEmpty()) {
-            balanceType = Currency.getInstance(unparsedBalanceType);
-        }
-
-        String cardId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.CARD_ID, record, "");
-        if(cardId.isEmpty())
-        {
-            throw new FormatException("No card ID listed, but is required");
-        }
-
-        String barcodeId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_ID, record, "");
-        if(barcodeId.isEmpty())
-        {
-            barcodeId = null;
-        }
-
-        CatimaBarcode barcodeType = null;
-        String unparsedBarcodeType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
-        if(!unparsedBarcodeType.isEmpty())
-        {
-            barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
-        }
-
-        Integer headerColor = null;
-
-        if(record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR))
-        {
-            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
-        }
-
-        int starStatus = 0;
-        try {
-            starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
-        } catch (FormatException _e) {
-            // This field did not exist in versions 0.28 and before
-            // We catch this exception so we can still import old backups
-        }
-        if (starStatus != 1) starStatus = 0;
-
-        Long lastUsed = 0L;
-        try {
-            lastUsed = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.LAST_USED, record, false);
-        } catch (FormatException _e) {
-            // This field did not exist in versions 2.5.0 and before
-            // We catch this exception so we can still import old backups
-        }
-
-        helper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed);
-    }
-
-    /**
-     * Import a single group into the database using the given
-     * session.
-     */
-    private void importGroup(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
-        String id = CSVHelpers.extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
-
-        helper.insertGroup(database, id);
-    }
-
-    /**
-     * Import a single card to group mapping into the database using the given
-     * session.
-     */
-    private void importCardGroupMapping(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
-        Integer cardId = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
-        String groupId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);
-
-        List<Group> cardGroups = helper.getLoyaltyCardGroups(cardId);
-        cardGroups.add(helper.getGroup(groupId));
-        helper.setLoyaltyCardGroups(database, cardId, cardGroups);
-    }
-}

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

@@ -1,10 +0,0 @@
-package protect.card_locker.importexport;
-
-public enum DataFormat
-{
-    Catima,
-    Fidme,
-    Stocard,
-    VoucherVault
-    ;
-}

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

@@ -1,21 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.content.Context;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import protect.card_locker.DBHelper;
-
-/**
- * Interface for a class which can export the contents of the database
- * in a given format.
- */
-public interface Exporter
-{
-    /**
-     * Export the database to the output stream in a given format.
-     * @throws IOException
-     */
-    void exportData(Context context, DBHelper db, OutputStream output) throws IOException, InterruptedException;
-}

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

@@ -1,141 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.google.zxing.BarcodeFormat;
-
-import net.lingala.zip4j.io.inputstream.ZipInputStream;
-import net.lingala.zip4j.model.LocalFileHeader;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-import org.json.JSONException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-
-import protect.card_locker.CatimaBarcode;
-import protect.card_locker.DBHelper;
-import protect.card_locker.FormatException;
-import protect.card_locker.Utils;
-
-/**
- * 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 FidmeImporter implements Importer
-{
-    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
-        // We actually retrieve a .zip file
-        ZipInputStream zipInputStream = new ZipInputStream(input, password);
-
-        StringBuilder loyaltyCards = new StringBuilder();
-        byte[] buffer = new byte[1024];
-        int read = 0;
-
-        LocalFileHeader localFileHeader;
-
-        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
-            if (localFileHeader.getFileName().equals("loyalty_programs.csv")) {
-                while ((read = zipInputStream.read(buffer, 0, 1024)) >= 0) {
-                    loyaltyCards.append(new String(buffer, 0, read, StandardCharsets.UTF_8));
-                }
-            }
-        }
-
-        if (loyaltyCards.length() == 0) {
-            throw new FormatException("Couldn't find loyalty_programs.csv in zip file or it is empty");
-        }
-
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
-        final CSVParser fidmeParser = new CSVParser(new StringReader(loyaltyCards.toString()), CSVFormat.RFC4180.withDelimiter(';').withHeader());
-
-        try {
-            for (CSVRecord record : fidmeParser) {
-                importLoyaltyCard(database, db, record);
-
-                if (Thread.currentThread().isInterrupted()) {
-                    throw new InterruptedException();
-                }
-            }
-        } catch (IllegalArgumentException | IllegalStateException | InterruptedException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            fidmeParser.close();
-        }
-
-        database.setTransactionSuccessful();
-        database.endTransaction();
-        database.close();
-
-        zipInputStream.close();
-    }
-
-    /**
-     * Import a single loyalty card into the database using the given
-     * session.
-     */
-    private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
-        // A loyalty card export from Fidme contains the following fields:
-        // Retailer (store name)
-        // Program (program name)
-        // Added at (YYYY-MM-DD HH:MM:SS UTC)
-        // Reference (card ID)
-        // Firstname (card holder first name)
-        // Lastname (card holder last name)
-
-        // The store is called Retailer
-        String store = CSVHelpers.extractString("Retailer", record, "");
-
-        if (store.isEmpty())
-        {
-            throw new FormatException("No store listed, but is required");
-        }
-
-        // There seems to be no note field in the CSV? So let's combine other fields instead...
-        String program = CSVHelpers.extractString("Program", record, "").trim();
-        String addedAt = CSVHelpers.extractString("Added At", record, "").trim();
-        String firstName = CSVHelpers.extractString("Firstname", record, "").trim();
-        String lastName = CSVHelpers.extractString("Lastname", record, "").trim();
-
-        String combinedName = String.format("%s %s", firstName, lastName).trim();
-
-        StringBuilder noteBuilder = new StringBuilder();
-        if (!program.isEmpty()) noteBuilder.append(program).append('\n');
-        if (!addedAt.isEmpty()) noteBuilder.append(addedAt).append('\n');
-        if (!combinedName.isEmpty()) noteBuilder.append(combinedName).append('\n');
-        String note = noteBuilder.toString().trim();
-
-        // The ID is called reference
-        String cardId = CSVHelpers.extractString("Reference", record, "");
-        if(cardId.isEmpty())
-        {
-            throw new FormatException("No card ID listed, but is required");
-        }
-
-        // Sadly, Fidme exports don't contain the card type
-        // I guess they have an online DB of all the different companies and what type they use
-        // TODO: Hook this into our own loyalty card DB if we ever get one
-        CatimaBarcode barcodeType = null;
-
-        // No favourite data in the export either
-        int starStatus = 0;
-
-        // TODO: Front and back image
-
-        helper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus, null);
-    }
-}

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

@@ -1,9 +0,0 @@
-package protect.card_locker.importexport;
-
-public enum ImportExportResult
-{
-    Success,
-    GenericFailure,
-    BadPassword
-    ;
-}

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

@@ -1,27 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.content.Context;
-
-import org.json.JSONException;
-
-import java.io.IOException;
-import java.io.InputStream;
-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
- * into the database.
- */
-public interface Importer
-{
-    /**
-     * Import data from the input stream in a given format into
-     * the database.
-     * @throws IOException
-     * @throws FormatException
-     */
-    void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
-}

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

@@ -1,76 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.content.Context;
-import android.util.Log;
-
-import net.lingala.zip4j.exception.ZipException;
-
-import org.json.JSONException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.ParseException;
-
-import protect.card_locker.DBHelper;
-import protect.card_locker.FormatException;
-
-public class MultiFormatImporter
-{
-    private static final String TAG = "Catima";
-
-    /**
-     * Attempts to import data from the input stream of the
-     * given format into the database.
-     *
-     * The input stream is not closed, and doing so is the
-     * responsibility of the caller.
-     *
-     * @return ImportExportResult.Success if the database was successfully imported,
-     * or another result otherwise. If no Success, no data was written to
-     * the database.
-     */
-    public static ImportExportResult importData(Context context, DBHelper db, InputStream input, DataFormat format, char[] password)
-    {
-        Importer importer = null;
-
-        switch(format)
-        {
-            case Catima:
-                importer = new CatimaImporter();
-                break;
-            case Fidme:
-                importer = new FidmeImporter();
-                break;
-            case Stocard:
-                importer = new StocardImporter();
-                break;
-            case VoucherVault:
-                importer = new VoucherVaultImporter();
-                break;
-        }
-
-        if (importer != null)
-        {
-            try
-            {
-                importer.importData(context, db, input, password);
-                return ImportExportResult.Success;
-            }
-            catch(ZipException e)
-            {
-                return ImportExportResult.BadPassword;
-            }
-            catch(IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e)
-            {
-                Log.e(TAG, "Failed to import data", e);
-            }
-
-        }
-        else
-        {
-            Log.e(TAG, "Unsupported data format imported: " + format.name());
-        }
-
-        return ImportExportResult.GenericFailure;
-    }
-}

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

@@ -1,220 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
-
-import com.google.zxing.BarcodeFormat;
-
-import net.lingala.zip4j.io.inputstream.ZipInputStream;
-import net.lingala.zip4j.model.LocalFileHeader;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.util.HashMap;
-
-import protect.card_locker.CatimaBarcode;
-import protect.card_locker.DBHelper;
-import protect.card_locker.FormatException;
-import protect.card_locker.R;
-import protect.card_locker.Utils;
-import protect.card_locker.ZipUtils;
-
-/**
- * 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 StocardImporter implements Importer
-{
-    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
-        HashMap<String, HashMap<String, Object>> loyaltyCardHashMap = new HashMap<>();
-        HashMap<String, HashMap<String, String>> providers = new HashMap<>();
-
-        final CSVParser parser = new CSVParser(new InputStreamReader(context.getResources().openRawResource(R.raw.stocard_stores), StandardCharsets.UTF_8), CSVFormat.RFC4180.withHeader());
-
-        try
-        {
-            for (CSVRecord record : parser)
-            {
-                HashMap<String, String> recordData = new HashMap<>();
-                recordData.put("name", record.get("name"));
-                recordData.put("barcodeFormat", record.get("barcodeFormat"));
-
-                providers.put(record.get("_id"), recordData);
-            }
-
-            parser.close();
-        } catch(IllegalArgumentException|IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        }
-
-        ZipInputStream zipInputStream = new ZipInputStream(input, password);
-
-        String[] providersFileName = null;
-        String[] cardBaseName = null;
-        String cardName = "";
-        LocalFileHeader localFileHeader;
-        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
-            String fileName = localFileHeader.getFileName();
-            String[] nameParts = fileName.split("/");
-
-            if (providersFileName == null) {
-                providersFileName = new String[] {
-                        nameParts[0],
-                        "sync",
-                        "data",
-                        "users",
-                        nameParts[0],
-                        "analytics-properties.json"
-                };
-                cardBaseName = new String[] {
-                        nameParts[0],
-                        "sync",
-                        "data",
-                        "users",
-                        nameParts[0],
-                        "loyalty-cards"
-                };
-            }
-
-            if (startsWith(nameParts, cardBaseName, 1)) {
-                // Extract cardName
-                cardName = nameParts[cardBaseName.length].split("\\.", 2)[0];
-
-                // This is the card itself
-                if (nameParts.length == cardBaseName.length + 1) {
-                    // Ignore the .txt file
-                    if (fileName.endsWith(".json")) {
-                        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
-
-                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
-                                loyaltyCardHashMap,
-                                cardName,
-                                "cardId",
-                                jsonObject.getString("input_id")
-                        );
-                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
-                                loyaltyCardHashMap,
-                                cardName,
-                                "_providerId",
-                                jsonObject
-                                    .getJSONObject("input_provider_reference")
-                                    .getString("identifier")
-                                    .substring("/loyalty-card-providers/".length())
-                        );
-
-                        if (jsonObject.has("input_barcode_format")) {
-                            loyaltyCardHashMap = appendToLoyaltyCardHashMap(
-                                    loyaltyCardHashMap,
-                                    cardName,
-                                    "barcodeType",
-                                    jsonObject.getString("input_barcode_format")
-                            );
-                        }
-                    }
-                } else if (fileName.endsWith("notes/default.json")) {
-                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
-                            loyaltyCardHashMap,
-                            cardName,
-                            "note",
-                            ZipUtils.readJSON(zipInputStream)
-                                .getString("content")
-                    );
-                } else if (fileName.endsWith("/images/front.png")) {
-                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
-                            loyaltyCardHashMap,
-                            cardName,
-                            "frontImage",
-                            ZipUtils.readImage(zipInputStream)
-                    );
-                } else if (fileName.endsWith("/images/back.png")) {
-                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
-                            loyaltyCardHashMap,
-                            cardName,
-                            "backImage",
-                            ZipUtils.readImage(zipInputStream)
-                    );
-                }
-            }
-        }
-
-        if (loyaltyCardHashMap.keySet().size() == 0) {
-            throw new FormatException("Couldn't find any loyalty cards in this Stocard export.");
-        }
-
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
-        for (HashMap<String, Object> loyaltyCardData : loyaltyCardHashMap.values()) {
-            String providerId = (String) loyaltyCardData.get("_providerId");
-            HashMap<String, String> providerData = providers.get(providerId);
-
-            String store = providerData != null ? providerData.get("name") : providerId;
-            String note = (String) Utils.mapGetOrDefault(loyaltyCardData, "note", "");
-            String cardId = (String) loyaltyCardData.get("cardId");
-            String barcodeTypeString = (String) Utils.mapGetOrDefault(loyaltyCardData, "barcodeType", providerData != null ? providerData.get("barcodeFormat") : null);
-            CatimaBarcode barcodeType = null;
-            if (barcodeTypeString != null) {
-                if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
-                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
-                } else {
-                    barcodeType = CatimaBarcode.fromName(barcodeTypeString);
-                }
-            }
-
-            long loyaltyCardInternalId = db.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, 0, null);
-
-            if (loyaltyCardData.containsKey("frontImage")) {
-                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("frontImage"), (int) loyaltyCardInternalId, true);
-            }
-            if (loyaltyCardData.containsKey("backImage")) {
-                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("backImage"), (int) loyaltyCardInternalId, false);
-            }
-        }
-
-        database.setTransactionSuccessful();
-        database.endTransaction();
-        database.close();
-
-        zipInputStream.close();
-    }
-
-    private boolean startsWith(String[] full, String[] start, int minExtraLength) {
-        if (full.length - minExtraLength < start.length) {
-            return false;
-        }
-
-        for (int i = 0; i < start.length; i++) {
-            if (!start[i].contentEquals(full[i])) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private HashMap<String, HashMap<String, Object>> appendToLoyaltyCardHashMap(HashMap<String, HashMap<String, Object>> loyaltyCardHashMap, String cardID, String key, Object value) {
-        HashMap<String, Object> loyaltyCardData = loyaltyCardHashMap.get(cardID);
-        if (loyaltyCardData == null) {
-            loyaltyCardData = new HashMap<>();
-        }
-
-        loyaltyCardData.put(key, value);
-        loyaltyCardHashMap.put(cardID, loyaltyCardData);
-
-        return loyaltyCardHashMap;
-    }
-}

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

@@ -1,142 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-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.InputStream;
-import java.io.InputStreamReader;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Currency;
-import java.util.Date;
-import java.util.TimeZone;
-
-import protect.card_locker.CatimaBarcode;
-import protect.card_locker.DBHelper;
-import protect.card_locker.FormatException;
-import protect.card_locker.Utils;
-
-/**
- * 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 Importer
-{
-    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
-        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
-
-        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 = new BigDecimal("0");
-            if (jsonCard.has("balanceMilliunits")) {
-                if (!jsonCard.isNull("balanceMilliunits")) {
-                    balance = new BigDecimal(String.valueOf(jsonCard.getInt("balanceMilliunits") / 1000.0));
-                }
-            } else if (!jsonCard.isNull("balance")) {
-                balance = new BigDecimal(String.valueOf(jsonCard.getDouble("balance")));
-            }
-
-            Currency balanceType = Currency.getInstance("USD");
-
-            String cardId = jsonCard.getString("code");
-
-            CatimaBarcode barcodeType = null;
-
-            String codeTypeFromJSON = jsonCard.getString("codeType");
-            switch (codeTypeFromJSON) {
-                case "CODE128":
-                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128);
-                    break;
-                case "CODE39":
-                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_39);
-                    break;
-                case "EAN13":
-                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.EAN_13);
-                    break;
-                case "PDF417":
-                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.PDF_417);
-                    break;
-                case "QR":
-                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE);
-                    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 found: " + colorFromJSON);
-            }
-
-            db.insertLoyaltyCard(store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime());
-        }
-
-        database.setTransactionSuccessful();
-        database.endTransaction();
-        database.close();
-
-        bufferedReader.close();
-    }
-}

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

@@ -2,15 +2,12 @@ package protect.card_locker.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-
-import java.util.Locale;
-
+import android.preference.PreferenceManager;
 import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.preference.PreferenceManager;
+
 import protect.card_locker.R;
-import protect.card_locker.Utils;
 
 public class Settings
 {
@@ -48,17 +45,6 @@ public class Settings
         return settings.getBoolean(getResString(keyId), defaultValue);
     }
 
-    public Locale getLocale()
-    {
-        String value = getString(R.string.settings_key_locale, "");
-
-        if (value.length() == 0) {
-            return null;
-        }
-
-        return Utils.stringToLocale(value);
-    }
-
     public int getTheme()
     {
         String value = getString(R.string.settings_key_theme, getResString(R.string.settings_key_system_theme));
@@ -75,34 +61,29 @@ public class Settings
         return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
     }
 
-    public double getFontSizeScale()
+    public int getCardTitleListFontSize()
     {
-        return getInt(R.string.settings_key_max_font_size_scale, R.integer.settings_max_font_size_scale_pct) / 100.0;
+        return getInt(R.string.settings_key_card_title_list_font_size, R.integer.settings_card_title_list_font_size_sp);
     }
 
-    public int getSmallFont()
+    public int getCardNoteListFontSize()
     {
-        return 14;
+        return getInt(R.string.settings_key_card_note_list_font_size, R.integer.settings_card_note_list_font_size_sp);
     }
 
-    public int getMediumFont()
+    public int getCardTitleFontSize()
     {
-        return 28;
+        return getInt(R.string.settings_key_card_title_font_size, R.integer.settings_card_title_font_size_sp);
     }
 
-    public int getLargeFont()
+    public int getCardIdFontSize()
     {
-        return 40;
+        return getInt(R.string.settings_key_card_id_font_size, R.integer.settings_card_id_font_size_sp);
     }
 
-    public int getFontSizeMin(int fontSize)
+    public int getCardNoteFontSize()
     {
-        return (int) (Math.round(fontSize / 2.0) - 1);
-    }
-
-    public int getFontSizeMax(int fontSize)
-    {
-        return (int) Math.round(fontSize * getFontSizeScale());
+        return getInt(R.string.settings_key_card_note_font_size, R.integer.settings_card_note_font_size_sp);
     }
 
     public boolean useMaxBrightnessDisplayingBarcode()
@@ -114,14 +95,4 @@ 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/java/protect/card_locker/preferences/SettingsActivity.java

@@ -1,49 +1,31 @@
 package protect.card_locker.preferences;
 
-
 import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import android.view.MenuItem;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
-import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
-import protect.card_locker.CatimaAppCompatActivity;
 import protect.card_locker.R;
-import protect.card_locker.Utils;
 
-public class SettingsActivity extends CatimaAppCompatActivity
+public class SettingsActivity extends AppCompatActivity
 {
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        setTitle(R.string.settings);
-        setContentView(R.layout.settings_activity);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
         {
-            actionBar.setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
 
         // Display the fragment as the main content.
-        SettingsFragment fragment = new SettingsFragment();
-        fragment.setParentReference(this);
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.settings_container, fragment)
+        getFragmentManager().beginTransaction()
+                .replace(android.R.id.content, new SettingsFragment())
                 .commit();
     }
 
@@ -61,89 +43,38 @@ public class SettingsActivity extends CatimaAppCompatActivity
         return super.onOptionsItemSelected(item);
     }
 
-    public static class SettingsFragment extends PreferenceFragmentCompat
+    public static class SettingsFragment extends PreferenceFragment
     {
-        private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
-        private SettingsActivity parent;
-
-        public void setParentReference(SettingsActivity settingsActivity) {
-            parent = settingsActivity;
-        }
-
         @Override
-        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        public void onCreate(final Bundle savedInstanceState)
+        {
+            super.onCreate(savedInstanceState);
+
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.preferences);
 
-            // Show pretty names
-            ListPreference localePreference = findPreference(getResources().getString(R.string.settings_key_locale));
-            assert localePreference != null;
-            CharSequence[] entryValues = localePreference.getEntryValues();
-            List<CharSequence> entries = new ArrayList<>();
-            for (CharSequence entry : entryValues) {
-                if (entry.length() == 0) {
-                    entries.add(getResources().getString(R.string.settings_system_locale));
-                } else {
-                    Locale entryLocale = Utils.stringToLocale(entry.toString());
-                    entries.add(entryLocale.getDisplayName(entryLocale));
-                }
-            }
+            findPreference(getResources().getString(R.string.settings_key_theme)).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+            {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object o)
+                {
+                    if(o.toString().equals(getResources().getString(R.string.settings_key_light_theme)))
+                    {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    }
+                    else if(o.toString().equals(getResources().getString(R.string.settings_key_dark_theme)))
+                    {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    }
+                    else
+                    {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                    }
 
-            localePreference.setEntries(entries.toArray(new CharSequence[entryValues.length]));
-
-            Preference themePreference = findPreference(getResources().getString(R.string.settings_key_theme));
-            assert themePreference != null;
-            themePreference.setOnPreferenceChangeListener((preference, o) -> {
-                if (o.toString().equals(getResources().getString(R.string.settings_key_light_theme))) {
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-                } else if (o.toString().equals(getResources().getString(R.string.settings_key_dark_theme))) {
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                } else {
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                    getActivity().recreate();
+                    return true;
                 }
-
-                FragmentActivity activity = getActivity();
-                if (activity != null) {
-                    ActivityCompat.recreate(activity);
-                }
-                return true;
             });
-
-            Preference colorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
-            assert colorPreference != null;
-            colorPreference.setOnPreferenceChangeListener((preference, o) -> {
-                FragmentActivity activity = getActivity();
-                if (activity != null) {
-                    ActivityCompat.recreate(activity);
-                }
-                return true;
-            });
-            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
-                // Refresh the activity
-                parent.finish();
-                startActivity(parent.getIntent());
-
-                return true;
-            });
-        }
-
-        @Override
-        public void onDisplayPreferenceDialog(Preference preference) {
-            if (preference instanceof NumberDialogPreference) {
-                NumberDialogPreference dialogPreference = (NumberDialogPreference) preference;
-                DialogFragment dialogFragment = NumberPickerPreferenceDialogFragment
-                        .newInstance(
-                                dialogPreference.getKey(),
-                                dialogPreference.getMinValue(),
-                                dialogPreference.getMaxValue(),
-                                dialogPreference.getStepValue(),
-                                dialogPreference.getUnitText()
-                        );
-                dialogFragment.setTargetFragment(this, 0);
-                dialogFragment.show(getParentFragmentManager(), DIALOG_FRAGMENT_TAG);
-            } else {
-                super.onDisplayPreferenceDialog(preference);
-            }
         }
     }
 }

app/src/main/res/animator/flip_left_in.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-   <objectAnimator
-        android:duration="0"
-        android:propertyName="alpha"
-        android:valueFrom="1.0"
-        android:valueTo="0.0" />
-
-    <objectAnimator
-        android:duration="@integer/full_rotation_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="rotationY"
-        android:valueFrom="-180"
-        android:valueTo="0" />
-
-    <objectAnimator
-        android:duration="1"
-        android:propertyName="alpha"
-        android:startOffset="@integer/half_rotation_duration"
-        android:valueFrom="0.0"
-        android:valueTo="1.0" />
-</set>

app/src/main/res/animator/flip_left_out.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-        android:duration="@integer/full_rotation_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="rotationY"
-        android:valueFrom="0"
-        android:valueTo="180" />
-
-   <objectAnimator
-        android:duration="1"
-        android:propertyName="alpha"
-        android:startOffset="@integer/half_rotation_duration"
-        android:valueFrom="1.0"
-        android:valueTo="0.0" />
-</set>

app/src/main/res/animator/flip_right_in.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-   <objectAnimator
-        android:duration="0"
-        android:propertyName="alpha"
-        android:valueFrom="1.0"
-        android:valueTo="0.0" />
-
-    <objectAnimator
-        android:duration="@integer/full_rotation_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="rotationY"
-        android:valueFrom="180"
-        android:valueTo="0" />
-
-    <objectAnimator
-        android:duration="1"
-        android:propertyName="alpha"
-        android:startOffset="@integer/half_rotation_duration"
-        android:valueFrom="0.0"
-        android:valueTo="1.0" />
-</set>

app/src/main/res/animator/flip_right_out.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-        android:duration="@integer/full_rotation_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="rotationY"
-        android:valueFrom="0"
-        android:valueTo="-180" />
-
-    <objectAnimator
-        android:duration="1"
-        android:propertyName="alpha"
-        android:startOffset="@integer/half_rotation_duration"
-        android:valueFrom="1.0"
-        android:valueTo="0.0" />
-</set>