Release Catima v2.45.0

Update Fastlane changelogs

.github/dependabot.yml

@@ -9,10 +9,15 @@ updates:
       - mavenCentral
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7
+  
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
+    cooldown:
+      default-days: 7
 
 # Workaround for https://github.com/dependabot/dependabot-core/issues/6888
 registries:

.github/workflows/android.yml

@@ -4,11 +4,7 @@ on:
   push:
     branches:
       - main
-      - staging
-      - trying
   pull_request:
-    branches:
-      - main
 permissions:
   actions: none
   checks: none
@@ -24,49 +20,66 @@ permissions:
   security-events: none
   statuses: none
 env:
-  JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
+  JAVA_HOME: /usr/lib/jvm/java-25-openjdk-amd64
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        flavor: [Foss, Gplay]
+        flavor: [fdroidLegacy, foss, gplay]
     steps:
-      - uses: actions/checkout@v5.0.0
-      - 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/actions/wrapper-validation@v4
-      - name: set up OpenJDK 21
+      - uses: actions/checkout@v7.0.1
+      - name: Ensure sentence-cased flavor variables
+        run: |
+          flavor="$(echo ${{ matrix.flavor }})"
+          echo "sentenceCasedFlavor=${flavor^}" >> "$GITHUB_ENV"
+      - uses: gradle/actions/wrapper-validation@v6.2.0
+      - name: set up OpenJDK 25
         run: |
           sudo apt-get update
-          sudo apt-get install -y openjdk-21-jdk-headless
+          sudo apt-get install -y openjdk-25-jdk-headless
           sudo update-alternatives --auto java
       - name: Build
-        run: ./gradlew assemble${{ matrix.flavor }}Release
+        run: ./gradlew assemble${sentenceCasedFlavor}Release
+      - name: Check for non-free libraries
+        run: |
+          # Get Katastima APK scanner
+          wget -q https://codeberg.org/Katastima/apkscanner/releases/download/v0.0.9/apk-scanner_v0.0.9.jar
+          # Print pretty result
+          java -jar apk-scanner_v0.0.9.jar scan-apk "$(echo 'app/build/outputs/apk/${{ matrix.flavor }}/release/app-${{ matrix.flavor }}-release-unsigned.apk')"
+          # Check for offending libraries
+          # Exit code 4 = no result, which is what we want
+          set +e
+          java -jar apk-scanner_v0.0.9.jar scan-apk --json=yes "$(echo 'app/build/outputs/apk/${{ matrix.flavor }}/release/app-${{ matrix.flavor }}-release-unsigned.apk')" | jq --exit-status '.libraryCheckResult.offendingLibraries[] | select((.libraryId == "/org/acra" and .license == "Apache-2.0")|not)'
+          if [ "$?" -ne 4 ]; then
+            echo "Bad libraries found!"
+            exit 1
+          fi
+          set -e
       - name: Check lint
-        run: ./gradlew lint${{ matrix.flavor }}Release
+        run: ./gradlew lint${sentenceCasedFlavor}Release
       - name: Run unit tests
-        run: timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest; }
+        run: timeout 5m ./gradlew test${sentenceCasedFlavor}DebugUnitTest || { ./gradlew --stop && timeout 5m ./gradlew test${sentenceCasedFlavor}DebugUnitTest; }
       - name: Enable KVM
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
-      - name: Run instrumented tests (API 21)
-        uses: ReactiveCircus/android-emulator-runner@v2
+      - name: Run instrumented tests (API 23)
+        uses: ReactiveCircus/android-emulator-runner@v2.38.0
         with:
-          api-level: 21
+          api-level: 23
           arch: x86_64
-          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
+          script: ./gradlew connected${sentenceCasedFlavor}DebugAndroidTest
       - name: Run instrumented tests (API 35)
-        uses: ReactiveCircus/android-emulator-runner@v2
+        uses: ReactiveCircus/android-emulator-runner@v2.38.0
         with:
           api-level: 35
           arch: x86_64
-          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
+          script: ./gradlew connected${sentenceCasedFlavor}DebugAndroidTest
       - name: Archive test results
         if: always()
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7.0.1
         with:
-          name: test-results-flavor${{ matrix.flavor }}
+          name: test-results-flavor-${{ matrix.flavor }}
           path: app/build/reports

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

@@ -1,4 +1,5 @@
 name: Convert CHANGELOG to Fastlane
+
 on:
   workflow_dispatch:
   push:
@@ -6,20 +7,11 @@ on:
       - main
     paths:
       - 'CHANGELOG.md'
+
 permissions:
-  actions: none
-  checks: none
   contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
   pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
+
 jobs:
   convert_changelog_to_fastlane:
     runs-on: ubuntu-latest
@@ -27,15 +19,15 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v5.0.0
+      uses: actions/checkout@v7.0.1
     - name: Setup Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v7.0.0
       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@v7.0.8
+      uses: peter-evans/create-pull-request@v8.1.1
       with:
         title: "Update Fastlane changelogs"
         commit-message: "Update Fastlane changelogs"

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

@@ -1,22 +1,14 @@
 name: Write contributors to file
+
 on:
   workflow_dispatch:
   schedule:
     - cron: '3 4 * * 0'
+
 permissions:
-  actions: none
-  checks: none
   contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
   pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
+
 jobs:
   contributors_to_file:
     runs-on: ubuntu-latest
@@ -25,15 +17,17 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v5.0.0
+      uses: actions/checkout@v7.0.1
     - name: Update contributors
       id: update_contributors
       uses: TheLastProject/contributors-to-file-action@v3.2.0
       with:
         file_in_repo: app/src/main/res/raw/contributors.txt
         min_commit_count: 5
+    - name: Remove gradle-update-robot from contributors (not a person)
+      run: "sed -i '/^gradle-update-robot$/d' app/src/main/res/raw/contributors.txt"
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.8
+      uses: peter-evans/create-pull-request@v8.1.1
       with:
         title: "Update contributors"
         commit-message: "Update contributors"

.github/workflows/generate-feature-graphic.yml

@@ -1,4 +1,5 @@
 name: Generate feature graphic
+
 on:
   workflow_dispatch:
   push:
@@ -7,25 +8,16 @@ on:
     paths:
       - 'fastlane/**/title.txt'
       - '.scripts/generate_feature_graphic/**'
+
 permissions:
-  actions: none
-  checks: none
   contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
   pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
+
 jobs:
   generate-feature-graphic:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5.0.0
+    - uses: actions/checkout@v7.0.1
     - name: Install requirements
       run: |
         sudo apt-get update
@@ -39,7 +31,7 @@ jobs:
     - name: Generate featureGraphic.png for each language
       run: .scripts/generate_feature_graphic/generate_feature_graphic.sh
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.8
+      uses: peter-evans/create-pull-request@v8.1.1
       with:
         title: "Update feature graphic"
         commit-message: "Update feature graphic"

.github/workflows/i18n-check.yml

@@ -0,0 +1,30 @@
+name: i18n check
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+permissions:
+  actions: none
+  checks: none
+  contents: read
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7.0.1
+      - 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
+      - name: Check app_name consistency
+        run: bash .scripts/check_app_name.sh

.github/workflows/update-locales.yml

@@ -1,4 +1,5 @@
 name: Update locales
+
 on:
   workflow_dispatch:
   push:
@@ -7,31 +8,22 @@ on:
     paths:
       - app/src/main/res/values-*/strings.xml
       - app/src/main/res/values/settings.xml
+
 permissions:
-  actions: none
-  checks: none
   contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
   pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
+
 jobs:
   update-locales:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5.0.0
+    - uses: actions/checkout@v7.0.1
     - name: Add new locales
       run: .scripts/new-locales.py
     - name: Update locales
       run: .scripts/locales.py
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.8
+      uses: peter-evans/create-pull-request@v8.1.1
       with:
         title: "Update locales"
         commit-message: "Update locales"

.github/workflows/wear.yml

@@ -0,0 +1,53 @@
+name: Android Wear CI
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+permissions:
+  actions: none
+  checks: none
+  contents: read
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+env:
+  JAVA_HOME: /usr/lib/jvm/java-25-openjdk-amd64
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7.0.0
+      - uses: gradle/actions/wrapper-validation@v6.2.0
+      - name: set up OpenJDK 25
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y openjdk-25-jdk-headless
+          sudo update-alternatives --auto java
+      - name: Build
+        run: ./gradlew :wear:assembleRelease
+      - name: Check for non-free libraries
+        run: |
+          # Get Katastima APK scanner
+          wget -q https://codeberg.org/Katastima/apkscanner/releases/download/v0.0.9/apk-scanner_v0.0.9.jar
+          # Print pretty result
+          java -jar apk-scanner_v0.0.9.jar scan-apk "wear/build/outputs/apk/release/wear-release-unsigned.apk"
+          # Check for offending libraries
+          # Exit code 4 = no result, which is what we want
+          set +e
+          java -jar apk-scanner_v0.0.9.jar scan-apk --json=yes "wear/build/outputs/apk/release/wear-release-unsigned.apk" | jq --exit-status '.libraryCheckResult.offendingLibraries[]'
+          if [ "$?" -ne 4 ]; then
+            echo "Bad libraries found!"
+            exit 1
+          fi
+          set -e
+      - name: Check lint
+        run: ./gradlew :wear:lintRelease

.gitignore

@@ -19,8 +19,10 @@
 /app/*.log
 /app/build
 /app/release
-/.idea
-
+/wear/build
+/wear/release
+/.idea/*
+!/.idea/icon.svg
 # Bundle
 /.bundle/
 /vendor/bundle
@@ -28,3 +30,4 @@
 
 # Catima-specific
 SHA256SUMS
+/shared/build

.idea/icon.svg

@@ -0,0 +1 @@
+../.design/ic_launcher_foreground.svg

.ruby-version

@@ -0,0 +1 @@
+3.3.11

.scripts/changelog_to_fastlane.py

@@ -15,7 +15,7 @@ with open('CHANGELOG.md') as changelog:
                 changelogs[version_code] = text
 
             text = []
-            match = re.match("## \S* - (\d*).*", line)
+            match = re.match("## .+ - (\d*).*", line)
             if not match:
                 raise ValueError(f"Invalid version line: {line}")
             version_code = match.group(1)

.scripts/check_app_name.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+set -e
+shopt -s lastpipe   # Run last command in a pipeline in the current shell.
+
+# Colors
+LIGHTCYAN='\033[1;36m'
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+NC='\033[0m'    # No Color
+
+# Vars
+SUCCESS=1
+CANONICAL_TITLE="Catima"
+# peo is only temporarily allowed due to https://github.com/WeblateOrg/weblate/issues/17455
+ALLOWLIST=("ar" "bn" "fa" "fa-IR" "he-IL" "hi" "hi-IN" "kn" "kn-IN" "ml" "mr" "peo", "ta" "ta-IN" "zh-rTW" "zh-TW")  # TODO: Link values and fastlane with different codes together
+
+function get_lang() {
+    LANG_DIRNAME=$(dirname "$FILE" | xargs basename)
+    LANG=${LANG_DIRNAME#values-}    # Fetch lang name
+    LANG=${LANG#values}             # Handle "app/src/main/res/values"
+    LANG=${LANG:-en}                # Default to en
+}
+
+# FIXME: This function should use its own variables and return a success/fail status, instead of working on global variables
+function check() {
+    # FIXME: This allows inconsistency between values and fastlane if the app name is not Catima
+    # When the app name is not Catima, it should still check if title.txt and strings.xml use the same app name (or start)
+    if echo "${ALLOWLIST[*]}" | grep -w -q "${LANG}" || [[ -z ${APP_NAME} ]]; then
+        return 0
+    fi
+
+    if [[ ${FILE} == *"title.txt" ]]; then
+        if [[ ! ${APP_NAME} =~ ^${CANONICAL_TITLE} ]]; then
+            echo -e "${RED}Error: ${LIGHTCYAN}title in $FILE ($LANG) is ${RED}'$APP_NAME'${LIGHTCYAN}, expected to start with ${GREEN}'$CANONICAL_TITLE'. ${NC}"
+            SUCCESS=0
+        fi
+    else
+        if [[ ${APP_NAME} != "${CANONICAL_TITLE}" ]]; then
+            echo -e "${RED}Error: ${LIGHTCYAN}app_name in $FILE ($LANG) is ${RED}'$APP_NAME'${LIGHTCYAN}, expected ${GREEN}'$CANONICAL_TITLE'. ${NC}"
+            SUCCESS=0
+        fi
+    fi
+}
+
+# FIXME: This checks all title.txt and strings.xml files separately, but it needs to check if the title.txt and strings.xml match for a language as well
+echo -e "${LIGHTCYAN}Checking title.txt's. ${NC}"
+
+find fastlane/metadata/android/* -maxdepth 1 -type f -name "title.txt" | while read -r FILE; do
+    APP_NAME=$(head -n 1 "$FILE")
+
+    get_lang
+    check
+done
+
+echo -e "${LIGHTCYAN}Checking string.xml's. ${NC}"
+
+find app/src/main/res/values* -maxdepth 1 -type f -name "strings.xml" | while read -r FILE; do
+    # FIXME: This only checks app_name, but there are more strings with Catima inside it
+    # It should check the original English text for all strings that contain Catima and ensure they use the correct app_name for consistency
+    APP_NAME=$(grep -oP '<string name="app_name">\K[^<]+' "$FILE" | head -n1)
+
+    get_lang
+    check
+done
+
+if [[ $SUCCESS -eq 1 ]]; then
+    echo -e "\n${GREEN}Success!! All app_name values match the canonical title. ${NC}"
+else
+    echo -e "\n${RED}Unsuccessful!! Some app_name values did not match the canonical titles. ${NC}"
+    exit 1
+fi

.scripts/dump_stocard_stores.py

@@ -1,44 +0,0 @@
-#!/usr/bin/python3
-
-import csv
-import json
-import msgpack
-
-MSGPACK = "bootstrapdata.msgpack"
-OUTFILE = "stocard_stores.csv"
-
-
-def load(fh):
-    data = []
-    for r in msgpack.Unpacker(fh, raw=False):
-        if r["collection"] == "/loyalty-card-providers/":
-            d = json.loads(r["data"])
-            data.append([r["resource_id"], d["name"], d["default_barcode_format"]])
-    return data
-
-
-def save(data, output_file=OUTFILE):
-    with open(output_file, "w") as fh:
-        writer = csv.writer(fh, lineterminator="\n")
-        writer.writerow(["_id", "name", "barcodeFormat"])
-        for row in data:
-            writer.writerow(row)
-
-
-if __name__ == "__main__":
-    import argparse
-    parser = argparse.ArgumentParser(
-        epilog=f"INPUT_FILE must be a .msgpack or .apk and defaults to {MSGPACK}; "
-               f"OUTPUT_FILE defaults to {OUTFILE}")
-    parser.add_argument("input_file", metavar="INPUT_FILE", nargs="?", default=MSGPACK)
-    parser.add_argument("output_file", metavar="OUTPUT_FILE", nargs="?", default=OUTFILE)
-    args = parser.parse_args()
-    if args.input_file.lower().endswith(".apk"):
-        import zipfile
-        with zipfile.ZipFile(args.input_file) as zf:
-            with zf.open(f"assets/{MSGPACK}") as fh:
-                data = load(fh)
-    else:
-        with open(args.input_file, "rb") as fh:
-            data = load(fh)
-    save(data, args.output_file)

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -42,6 +42,7 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
       ja-JP) sed -i "s/Lexend/Noto Sans CJK JP/" featureGraphic.svg ;;
       kn-IN) sed -i -e 's/font-size="150"/font-size="125"/' -e 's/\(<tspan x="469" \)y="270"/\1y="240"/' -e "s/Lobster/Noto Sans Kannada/" -e "s/Lexend/Noto Sans Kannada/" featureGraphic.svg ;;
       ko) sed -i "s/Lexend/Noto Sans CJK KR/" featureGraphic.svg ;;
+      ta-IN) sed -i -e 's/font-size="150"/font-size="125"/' -e 's/\(<tspan x="469" \)y="270"/\1y="240"/' featureGraphic.svg ;;
       zh-CN) sed -i "s/Lexend/Noto Sans CJK SC/" featureGraphic.svg ;;
       zh-TW) sed -i -e "s/Lobster/Noto Sans CJK TC/" -e "s/Lexend/Noto Sans CJK TC/" featureGraphic.svg ;;
       *) ;;

CHANGELOG.md

@@ -1,5 +1,106 @@
 # Changelog
 
+## v2.45.0 (Android) - 1002
+
+- Add a Bluetooth server for Wear OS companion app support
+- Remove embedded CHANGELOG
+
+## v1.0.0 (Wear OS) - 200
+
+- Initial release of Wear OS companion app
+
+## v2.44.0 - 168 (2026-07-28)
+
+- Add option to open image in internal image viewer in gallery
+
+## v2.43.0 - 167 (2026-07-12)
+
+- Add support for showing the card ID in the card list
+- Add support to sort by most recently added
+- Add internal image viewer for zooming card front/back/icon images
+
+## v2.42.1 - 166 (2026-05-16)
+
+- Prevent crash on devices with misbehaving NFC
+
+## v2.42.0 - 165 (2026-05-06)
+
+- Disable NFC while showing a card by default
+- Ask keyboard to capitalize each word in store name in edit screen
+- Put date in export file name
+
+## v2.41.7 - 164 (2026-03-06)
+
+Android 5.0 and 5.1 are no longer supported starting with this release. If you want to use Catima on these versions, please use version 2.41.6.
+
+- Fix crash when switching cards using volume buttons if only one card is available
+- Fix shortcut returning to previous card after rotation
+
+## v2.41.6 - 163 (2026-01-23)
+
+- Auto-detect URLs in card ID and make the clickable in card ID details pop-up
+- Fix barcode selector activity showing white squares instead of barcodes
+
+## v2.41.5 - 162 (2026-01-15)
+
+- Fix list widget sometimes opening wrong card
+- Fix several bugs with shortcut handling
+- Fix About activity not using pure black title bar in OLED mode
+- Fully remove automatic barcode encoding detection
+- Expose barcode encoding through ContentProvider (used by Gadgetbridge)
+
+## v2.41.4 - 161 (2026-01-04)
+
+- Disable automatic barcode encoding detection for now (breaks too many cards)
+
+## v2.41.3 - 160 (2026-01-04)
+
+- Follow-up for fix in 2.41.2 for cards explicitly set to ISO-8859-1
+- Migrate old cards to ISO-8859-1 to fix sudden behaviour differences for existing cards
+
+## v2.41.2 - 159 (2026-01-03)
+
+- Fix change introduced in 2.41.0 that broke support for some scanners for non-UTF-8 barcodes
+
+## v2.41.1 - 158 (2025-12-31)
+
+- Fix status and navigation bar colour in new About activity
+
+## v2.41.0 - 157 (2025-12-30)
+
+- Add support for UTF-8 barcodes
+- Add duplicate option to main screen and reorder options slightly
+- Fix column count setting not being applied to group card list
+- Remove theme colour support
+- Reduce max photo size to reduce storage use (only for newly added photos)
+- Migrate About activity from Android XML to Jetpack Compose
+
+## v2.40.0 - 156 (2025-12-08)
+
+- Copy card ID to clipboard from view dialog or long press
+- Swap balance and currency fields to hopefully reduce unintended rounding
+
+## v2.39.2 - 155 (2025-11-04)
+
+- Preparations for future improvements (rewrote many classes to Kotlin)
+
+## v2.39.1 - 154 (2025-10-01)
+
+- Fix possible crash that could occur for cards missing colour information in the database
+
+## v2.39.0 - 153 (2025-09-30)
+
+- Target Android 16
+- Fix possible crash after removing image from card
+- Remove "Screen orientation" feature (Google removed the ability for apps to control screen rotation when targeting Android 16)
+- Add crash reporter to FOSS build (not used in Google Play version, only in other app stores)
+
+## v2.38.0 - 152 (2025-09-12)
+
+- Add support for .pkpasses files
+- Remove Stocard importer (Stocard no longer exists)
+- Temporarily disable widget images below Android 12L (workaround for a crash issue)
+
 ## v2.37.0 - 151 (2025-08-22)
 
 - New redesign of the Catima logo

CONTRIBUTING.md

@@ -23,6 +23,40 @@ for good reason.
 
 ## Code Changes
 
+### LLM ("AI") and coding agents
+
+**Note:** submitting LLM ("AI") generated code is strongly discouraged, as such
+code is often (subtly) incorrect or overcomplicated (for example: unnecessarily
+pulling in extra libraries for functionality already covered by existing
+libraries). It also often makes unrelated changes that increase the risk of
+introducing new issues and complicates reviewing. Even when it doesn't do any
+of the before mentioned things, it will often not fit the coding style and flow
+of existing code, requiring excessive refactoring.
+
+While we cannot ever control or be sure if LLMs were used to generate the
+submitted code, it is your responsibility to ensure that whatever code you
+submit is correct and fits within the design of existing code. It is never
+acceptable to defend a change by stating a LLM suggested it.
+
+This is a personal plea more than anything: please understand that writing code
+is the easy part. The hard part is making sure the code fits the design of the
+rest of the application and is maintainable. Reviewing is a very time-consuming
+task for this reason. Please do not use LLMs to quickly generate a "fix" and
+moving the cost of labor to me as a reviewer. If you do use LLMs to generate
+part of your code, please be open about this, explain what was generated how
+and how you confirmed and refactored the code to fit the project and minimized
+risk.
+
+Please never submit LLM-generated code as-is.
+
+### Kotlin and Compose migration
+
+Catima uses a lot of "legacy" tech, Java, Android XML. This will be ported to Kotlin,
+then Jetpack Compose; for further details, see
+<https://github.com/CatimaLoyalty/Android/issues/2483>.
+
+Thus, prefer Kotlin and Jetpack Compose for new code/UI where practical, especially new files/features.
+
 ### Test Your Code
 
 There are four possible tests you can run to verify your code.  The first

Gemfile

@@ -1,8 +1,3 @@
 source "https://rubygems.org"
 
 gem "fastlane"
-
-# https://github.com/fastlane/fastlane/issues/29183
-gem "abbrev"
-gem "mutex_m"
-gem "ostruct"

Gemfile.lock

@@ -1,48 +1,50 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
+    CFPropertyList (3.0.8)
     abbrev (0.1.2)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1117.0)
-    aws-sdk-core (3.226.0)
+    aws-partitions (1.1269.0)
+    aws-sdk-core (3.254.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.105.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-kms (1.130.0)
+      aws-sdk-core (~> 3, >= 3.254.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.189.1)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-s3 (1.227.0)
+      aws-sdk-core (~> 3, >= 3.254.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.2)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.5)
     declarative (0.0.20)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.112.0)
-    faraday (1.10.4)
+    excon (1.5.0)
+      logger
+    faraday (1.10.6)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -54,53 +56,62 @@ GEM
       faraday-rack (~> 1.0)
       faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
+    faraday-cookie_jar (0.0.8)
       faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
+      http-cookie (>= 1.0.0)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.1)
+    faraday-multipart (1.2.0)
       multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
+    faraday-retry (1.0.4)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.4.0)
-    fastlane (2.228.0)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
+    fastimage (2.4.1)
+    fastlane (2.237.0)
+      CFPropertyList (>= 2.3, < 5.0.0)
+      abbrev (~> 0.1)
+      addressable (>= 2.9.0, < 3.0.0)
       artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
+      aws-sdk-s3 (~> 1.197)
       babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
+      base64 (~> 0.2)
+      benchmark (>= 0.1.0)
+      bundler (>= 2.4.0, < 5.0.0)
       colored (~> 1.2)
       commander (~> 4.6)
+      csv (~> 3.3)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
-      excon (>= 0.71.0, < 1.0.0)
+      excon (>= 0.71.0, < 2.0.0)
       faraday (~> 1.0)
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
-      fastlane-sirp (>= 1.0.0)
+      fastlane-sirp (>= 1.1.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-env (>= 1.6.0, < 2.3.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
       json (< 3.0.0)
-      jwt (>= 2.1.0, < 3)
+      jwt (>= 2.10.3, < 4)
+      logger (>= 1.6, < 2.0)
       mini_magick (>= 4.9.4, < 5.0.0)
+      multi_json (~> 1.12)
       multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3)
       naturally (~> 2.2)
+      nkf (~> 0.2)
       optparse (>= 0.1.1, < 1.0.0)
+      ostruct (>= 0.1.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.5)
@@ -113,44 +124,48 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-sirp (1.0.0)
-      sysrandom (~> 1.0)
+    fastlane-sirp (1.1.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.54.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.3)
+    google-apis-androidpublisher_v3 (0.104.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (0.18.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-      rexml
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.31.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.8.0)
+    google-apis-iamcredentials_v1 (0.28.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.18.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.64.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.9.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.5.0)
-    google-cloud-storage (1.47.0)
+    google-cloud-env (2.2.2)
+      base64 (~> 0.2)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.7.0)
+    google-cloud-storage (1.62.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.31.0)
+      google-apis-core (>= 0.18, < 2)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
       google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
-      jwt (>= 1.4, < 3.0)
-      multi_json (~> 1.11)
+    google-logging-utils (0.2.0)
+    googleauth (1.17.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
+      jwt (>= 1.4, < 4.0)
       os (>= 0.9, < 2.0)
+      pstore (~> 0.1)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
     http-cookie (1.0.8)
@@ -158,43 +173,42 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.12.2)
-    jwt (2.10.1)
+    json (2.21.1)
+    jwt (3.2.0)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.15.0)
+    multi_json (1.21.1)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
     naturally (2.3.0)
-    nkf (0.2.0)
-    optparse (0.6.0)
+    nkf (0.3.0)
+    optparse (0.8.1)
     os (1.1.4)
-    ostruct (0.6.1)
+    ostruct (0.6.3)
     plist (3.7.2)
-    public_suffix (6.0.2)
-    rake (13.3.0)
+    pstore (0.2.1)
+    public_suffix (7.0.5)
+    rake (13.4.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.4.1)
+    retriable (3.8.0)
+    rexml (3.4.4)
     rouge (3.28.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
     security (0.1.5)
-    signet (0.20.0)
+    signet (0.22.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
+      jwt (>= 1.5, < 4.0)
     simctl (1.6.10)
       CFPropertyList
       naturally
-    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -206,12 +220,14 @@ GEM
     uber (0.1.0)
     unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.27.0)
+    xcodeproj (1.28.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
+      base64
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
+      nkf
       rexml (>= 3.3.6, < 4.0)
     xcpretty (0.4.1)
       rouge (~> 3.28.0)
@@ -222,10 +238,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  abbrev
   fastlane
-  mutex_m
-  ostruct
 
 BUNDLED WITH
    2.5.22

PRIVACY.md

@@ -1,16 +1,24 @@
 **Last updated**  
-August 30 2023
+August 7 2026
 
 # Privacy Policy
 Catima does not collect or transmit any personal information.
 
 To ensure correct app functionality, we require access to the following:
 
+- Bluetooth: When using Catima together with the Wear OS companion app, Bluetooth access is needed to be able to communicate to Wear OS. This may show up as "find, connect to, and determine the relative position of nearby devices" because Android considers Bluetooth as part of location, but location information is never collected or used. The app can still be used when Bluetooth permission is denied, but you will not be able to use the Wear OS companion app.
 - Camera: We need access to your camera to be able to scan barcodes. The app can still be used when camera access is denied, but you will have to manually type the barcode information.
+- NFC: We need NFC access to temporarily disable NFC while showing a barcode to prevent NFC payment apps from triggering (such as when using a check-in gates which support both barcodes and NFC payments). This functionality can be disabled in settings.
 - Storage (Android 5 and 6 only): We need access to your device storage to create or import backups. The app can still be used when storage access is denied, but you will not be able to create or import backups.
 
 Catima offers a feature to share cards with other users. All the relevant data is in the generated shareable URLs and never transmitted to our servers. When viewed through catima.app, the data in the URL is rendered using client-side Javascript to further ensure no data is ever transmitted to us.
 
+## Crash reporting privacy
+
+In the FOSS version of Catima (the version used on IzzyOnDroid, F-Droid and GitHub), the open source crash reporter ACRA is used for crash reporting. When a crash is detected, Catima will ask the user if they are willing to report the crash. If they choose to do so, the user's mail client is opened so they can review the data that would be sent. Crash reporting data is only sent when the user explicitly chooses to do so, it is **never** sent automatically. Crash reporting data is only used to solve crashes and no (potentially) sensitive information is ever shared. Users who do not want to be asked to report crashes can disable the "Ask to send crash reports" setting in Catima settings.
+
+For the Google Play version of Catima, crash reporting is [managed by Google](https://support.google.com/googleplay/android-developer/answer/9859174?hl=en). Users can opt in or out of crash reporting through the Google app under the "Usage and diagnostics" setting.
+
 # Changes
 This Privacy Policy may be updated from time to time for any reason. We will notify you of any changes to our Privacy Policy by posting the new Privacy Policy to https://catima.app/privacy-policy/. A snapshot of the Privacy Policy is available within the Catima app, though it may be outdated. When the Privacy Policy on the website and in the app differ, the website should be considered leading. You are advised to consult the Privacy Policy regularly for any changes, as continued use is deemed approval of all changes.
 

app/build.gradle.kts

@@ -1,8 +1,10 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.com.android.application)
+    alias(libs.plugins.org.jetbrains.kotlin.android)
+    alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
 }
 
 kotlin {
@@ -11,31 +13,32 @@ kotlin {
 
 android {
     namespace = "protect.card_locker"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "me.hackerchick.catima"
-        minSdk = 21
-        targetSdk = 35
-        versionCode = 151
-        versionName = "2.37.0"
+        minSdk = 23
+        targetSdk = 36
+        versionCode = 1002
+        versionName = "2.45.0"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
 
-        resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
+        resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "peo", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("boolean", "showDonate", "true")
         buildConfigField("boolean", "showRateOnGooglePlay", "false")
+        buildConfigField("boolean", "useAcraCrashReporter", "true")
     }
 
     buildTypes {
         release {
             isMinifyEnabled = true
             proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
+                getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
@@ -46,6 +49,7 @@ android {
 
     buildFeatures {
         buildConfig = true
+        compose = true
         viewBinding = true
     }
 
@@ -55,12 +59,21 @@ android {
             dimension = "type"
             isDefault = true
         }
+        create("fdroidLegacy") {
+            dimension = "type"
+            versionNameSuffix = " (F-Droid)"
+            versionCode = defaultConfig.versionCode!! - 1
+        }
         create("gplay") {
             dimension = "type"
+            versionNameSuffix = " (Google)"
 
             // Google doesn't allow donation links
             buildConfigField("boolean", "showDonate", "false")
             buildConfigField("boolean", "showRateOnGooglePlay", "true")
+
+            // Google Play already sends crashes to the Google Play Console
+            buildConfigField("boolean", "useAcraCrashReporter", "false")
         }
     }
 
@@ -70,16 +83,6 @@ android {
         }
     }
 
-    compileOptions {
-        encoding = "UTF-8"
-
-        // Flag to enable support for the new language APIs
-        isCoreLibraryDesugaringEnabled = true
-
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
     sourceSets {
         getByName("test") {
             resources.srcDirs("src/test/res")
@@ -98,54 +101,78 @@ android {
     lint {
         lintConfig = file("lint.xml")
     }
-    kotlinOptions {
-        jvmTarget = "21"
+
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_21
+        }
     }
     compileOptions {
+        encoding = "UTF-8"
+
+        // Flag to enable support for the new language APIs
+        isCoreLibraryDesugaringEnabled = true
+
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
 }
 
 dependencies {
+    implementation(project(":shared"))
+
     // AndroidX
-    implementation("androidx.appcompat:appcompat:1.7.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
-    implementation("androidx.core:core-ktx:1.16.0")
-    implementation("androidx.core:core-remoteviews:1.1.0")
-    implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.exifinterface:exifinterface:1.4.1")
-    implementation("androidx.palette:palette:1.0.0")
-    implementation("androidx.preference:preference:1.2.1")
-    implementation("com.google.android.material:material:1.12.0")
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+    implementation(libs.androidx.appcompat.appcompat)
+    implementation(libs.androidx.constraintlayout.constraintlayout)
+    implementation(libs.androidx.core.core.ktx)
+    implementation(libs.androidx.core.core.remoteviews)
+    implementation(libs.androidx.core.core.splashscreen)
+    implementation(libs.androidx.exifinterface.exifinterface)
+    implementation(libs.androidx.palette.palette)
+    implementation(libs.androidx.preference.preference)
+    implementation(libs.com.google.android.material.material)
+    coreLibraryDesugaring(libs.com.android.tools.desugar.jdk.libs)
+
+    // Compose
+    implementation(libs.androidx.activity.activity.compose)
+    val composeBom = platform(libs.androidx.compose.compose.bom)
+    implementation(composeBom)
+    implementation(libs.androidx.compose.foundation.foundation)
+    implementation(libs.androidx.compose.material3.material3)
+    implementation(libs.androidx.compose.material.material.icons.extended)
+    implementation(libs.androidx.compose.ui.ui.tooling.preview.android)
+    debugImplementation(libs.androidx.compose.ui.ui.test.manifest)
+
+    androidTestImplementation(composeBom)
+    androidTestImplementation(libs.androidx.compose.ui.ui.test.junit4)
 
     // Third-party
-    implementation("com.journeyapps:zxing-android-embedded:4.3.0@aar")
-    implementation("com.github.yalantis:ucrop:2.2.10")
-    implementation("com.google.zxing:core:3.5.3")
-    implementation("org.apache.commons:commons-csv:1.9.0")
-    implementation("com.jaredrummler:colorpicker:1.1.0")
-    implementation("net.lingala.zip4j:zip4j:2.11.5")
+    implementation(libs.com.journeyapps.zxing.android.embedded)
+    implementation(libs.com.github.yalantis.ucrop)
+    implementation(libs.com.google.zxing.core)
+    implementation(libs.org.apache.commons.commons.csv)
+    implementation(libs.com.jaredrummler.colorpicker)
+    implementation(libs.net.lingala.zip4j.zip4j)
+
+    // Crash reporting
+    implementation(libs.bundles.acra)
 
     // Testing
-    val androidXTestVersion = "1.7.0"
-    val junitVersion = "4.13.2"
-    testImplementation("androidx.test:core:$androidXTestVersion")
-    testImplementation("junit:junit:$junitVersion")
-    testImplementation("org.robolectric:robolectric:4.15.1")
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.junit.junit)
+    testImplementation(libs.org.robolectric.robolectric)
 
-    androidTestImplementation("androidx.test:core:$androidXTestVersion")
-    androidTestImplementation("junit:junit:$junitVersion")
-    androidTestImplementation("androidx.test.ext:junit:1.3.0")
-    androidTestImplementation("androidx.test:runner:$androidXTestVersion")
-    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
+    androidTestImplementation(libs.bundles.androidx.test)
+    androidTestImplementation(libs.junit.junit)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.rules)
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.androidx.test.uiautomator.uiautomator)
+    androidTestImplementation(libs.androidx.test.espresso.espresso.core)
 }
 
 tasks.register("copyRawResFiles", Copy::class) {
     from(
-        layout.projectDirectory.file("../CHANGELOG.md"),
         layout.projectDirectory.file("../PRIVACY.md")
     )
     into(layout.projectDirectory.dir("src/main/res/raw"))
@@ -153,7 +180,7 @@ tasks.register("copyRawResFiles", Copy::class) {
 }.also {
     tasks.preBuild.dependsOn(it)
     tasks.getByName<Delete>("clean") {
-        val filesNamesToDelete = listOf("CHANGELOG", "PRIVACY")
+        val filesNamesToDelete = listOf("PRIVACY")
         filesNamesToDelete.forEach { fileName ->
             delete(layout.projectDirectory.file("src/main/res/raw/${fileName.lowercase()}.md"))
         }

app/proguard-rules.pro

@@ -21,4 +21,19 @@
 -keepattributes SourceFile,LineNumberTable
 
 # This keep the class and method names the same, for debugging stack traces
--dontobfuscate
+-dontobfuscate
+
+# Required for uCrop 2.2.11
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn javax.annotation.processing.AbstractProcessor
+-dontwarn javax.annotation.processing.SupportedOptions
+-dontwarn okhttp3.Call
+-dontwarn okhttp3.Dispatcher
+-dontwarn okhttp3.OkHttpClient
+-dontwarn okhttp3.Request$Builder
+-dontwarn okhttp3.Request
+-dontwarn okhttp3.Response
+-dontwarn okhttp3.ResponseBody
+-dontwarn okio.BufferedSource
+-dontwarn okio.Okio
+-dontwarn okio.Sink

app/src/androidTest/java/protect/card_locker/AboutActivityTest.kt

@@ -0,0 +1,89 @@
+package protect.card_locker
+
+import android.app.Instrumentation
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.junit4.ComposeContentTestRule
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.runComposeUiTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import protect.card_locker.compose.theme.CatimaTheme
+
+@OptIn(ExperimentalTestApi::class)
+@RunWith(AndroidJUnit4::class)
+class AboutActivityTest {
+    @get:Rule
+    private val rule: ComposeContentTestRule = createComposeRule()
+
+    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
+
+    private val content: AboutContent = AboutContent(instrumentation.targetContext)
+
+    @Test
+    fun testInitialState(): Unit = runComposeUiTest {
+        setContent {
+            AboutScreenContent(content = content)
+        }
+
+        onNodeWithTag("topbar_catima").assertIsDisplayed()
+
+        onNodeWithTag("card_version_history").assertIsDisplayed()
+        onNodeWithText(content.versionHistory).assertIsDisplayed()
+
+        onNodeWithTag("card_credits").assertIsDisplayed()
+        onNodeWithText(content.copyrightShort).assertIsDisplayed()
+
+        onNodeWithTag("card_translate").assertIsDisplayed()
+        onNodeWithTag("card_license").assertIsDisplayed()
+
+        // We might be off the screen so start scrolling
+        onNodeWithTag("card_source_github").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_privacy_policy").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_donate").performScrollTo().assertIsDisplayed()
+        // Dont scroll to this, since its not displayed
+        onNodeWithTag("card_rate_google").assertIsNotDisplayed()
+        onNodeWithTag("card_report_error").performScrollTo().assertIsDisplayed()
+    }
+
+    @Test
+    fun testDonateAndGoogleCardVisible(): Unit = runComposeUiTest {
+        setContent {
+            CatimaTheme {
+                AboutScreenContent(
+                    content = content,
+                    showDonate = true,
+                    showRateOnGooglePlay = true,
+                )
+            }
+        }
+
+        onNodeWithTag("card_donate").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_rate_google").performScrollTo().assertIsDisplayed()
+    }
+
+    @Test
+    fun testDonateAndGoogleCardHidden(): Unit = runComposeUiTest {
+        setContent {
+            CatimaTheme {
+                AboutScreenContent(
+                    content = content,
+                    showDonate = false,
+                    showRateOnGooglePlay = false,
+                )
+            }
+        }
+
+        onNodeWithTag("card_privacy_policy").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_donate").assertIsNotDisplayed()
+        onNodeWithTag("card_rate_google").assertIsNotDisplayed()
+        onNodeWithTag("card_report_error").performScrollTo().assertIsDisplayed()
+    }
+}

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Catima Debug</string>
-</resources>
+    <string name="app_name">Debug di Catima</string>
+</resources>

app/src/debug/res/values-pt/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Depuração do Catima</string>
+</resources>

app/src/debug/res/values-zh-rTW/strings.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Catima 除錯版</string>
-</resources>
+    <string name="app_name">卡提碼除錯版</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
 
     <permission
         android:description="@string/permissionReadCardsDescription"
-        android:icon="@drawable/ic_launcher_foreground"
+        android:icon="@drawable/ic_launcher_monochrome"
         android:label="@string/permissionReadCardsLabel"
         android:name="${applicationId}.READ_CARDS"
         android:protectionLevel="dangerous" />
@@ -12,8 +12,18 @@
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23" />
 
+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="false" />
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
@@ -65,6 +75,7 @@
                 <data android:mimeType="application/vnd.apple.pkpass" />
                 <data android:mimeType="application/vnd-com.apple.pkpass" />
                 <data android:mimeType="application/vnd.espass-espass" />
+                <data android:mimeType="application/vnd.apple.pkpasses" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -76,6 +87,7 @@
                 <data android:mimeType="application/vnd.apple.pkpass" />
                 <data android:mimeType="application/vnd-com.apple.pkpass" />
                 <data android:mimeType="application/vnd.espass-espass" />
+                <data android:mimeType="application/vnd.apple.pkpasses" />
             </intent-filter>
         </activity>
         <activity
@@ -92,9 +104,12 @@
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize"/>
         <activity
-            android:name=".LoyaltyCardViewActivity"
+            android:name=".cardview.LoyaltyCardViewActivity"
             android:exported="true"
             android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".cardimageview.LoyaltyCardImageViewActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".LoyaltyCardEditActivity"
             android:exported="true"
@@ -142,12 +157,11 @@
             android:name=".preferences.SettingsActivity"
             android:label="@string/settings"
             android:theme="@style/AppTheme.NoActionBar" />
-        <!-- FIXME: locked screenOrientation is a workaround for https://github.com/CatimaLoyalty/Android/issues/1715, remove when https://github.com/CatimaLoyalty/Android/issues/513 is fixed -->
+        <!-- FIXME: ImportExportActivity cancels import on rotation -->
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
             android:exported="true"
-            android:screenOrientation="locked"
             android:theme="@style/AppTheme.NoActionBar">
 
             <!-- ZIP Intent Filter -->
@@ -218,5 +232,26 @@
                 <action android:name="android.service.controls.ControlsProviderService" />
             </intent-filter>
         </service>
+
+        <service
+            android:name=".wearos.BluetoothServerService"
+            android:exported="false"
+            android:foregroundServiceType="connectedDevice" />
+
+        <activity
+            android:name=".wearos.BluetoothPairingActivity"
+            android:exported="false"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTop"
+            android:theme="@style/AppTheme.Transparent" />
+
+        <receiver
+            android:name=".wearos.BluetoothPairingReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="protect.card_locker.wearos.action.ALLOW_DEVICE" />
+                <action android:name="protect.card_locker.wearos.action.BLOCK_DEVICE" />
+            </intent-filter>
+        </receiver>
     </application>
 </manifest>

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

@@ -1,149 +1,160 @@
 package protect.card_locker
 
 import android.os.Bundle
-import android.text.Spanned
-import android.view.MenuItem
-import android.view.View
-import android.widget.ScrollView
-import android.widget.TextView
+import androidx.activity.OnBackPressedDispatcher
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.fromHtml
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.tooling.preview.Preview
+import protect.card_locker.compose.CatimaAboutSection
+import protect.card_locker.compose.CatimaTopAppBar
+import protect.card_locker.compose.theme.CatimaTheme
 
-import androidx.annotation.StringRes
-import androidx.core.view.isVisible
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-import protect.card_locker.databinding.AboutActivityBinding
-
-class AboutActivity : CatimaAppCompatActivity() {
-    private companion object {
-        private const val TAG = "Catima"
-    }
-
-    private lateinit var binding: AboutActivityBinding
+class AboutActivity : CatimaComponentActivity() {
     private lateinit var content: AboutContent
 
+    @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = AboutActivityBinding.inflate(layoutInflater)
+
+        fixedEdgeToEdge()
+
         content = AboutContent(this)
         title = content.pageTitle
-        setContentView(binding.root)
-        setSupportActionBar(binding.toolbar)
-        enableToolbarBackButton()
 
-        binding.apply {
-            creditsSub.text = content.copyrightShort
-            versionHistorySub.text = content.versionHistory
-
-            versionHistory.tag = "https://catima.app/changelog/"
-            translate.tag = "https://hosted.weblate.org/engage/catima/"
-            license.tag = "https://github.com/CatimaLoyalty/Android/blob/main/LICENSE"
-            repo.tag = "https://github.com/CatimaLoyalty/Android/"
-            privacy.tag = "https://catima.app/privacy-policy/"
-            reportError.tag = "https://github.com/CatimaLoyalty/Android/issues"
-            rate.tag = "https://play.google.com/store/apps/details?id=me.hackerchick.catima"
-            donate.tag = "https://catima.app/donate"
-
-            // Hide Google Play rate button if not on Google Play
-            rate.isVisible = BuildConfig.showRateOnGooglePlay
-            // Hide donate button on Google Play (Google Play doesn't allow donation links)
-            donate.isVisible = BuildConfig.showDonate
-        }
-
-        bindClickListeners()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            android.R.id.home -> {
-                finish()
-                true
+        setContent {
+            CatimaTheme {
+                AboutScreenContent(
+                    content = content,
+                    showDonate = BuildConfig.showDonate,
+                    showRateOnGooglePlay = BuildConfig.showRateOnGooglePlay,
+                    onBackPressedDispatcher = onBackPressedDispatcher
+                )
             }
-
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        content.destroy()
-        clearClickListeners()
-    }
-
-    private fun bindClickListeners() {
-        binding.apply {
-            versionHistory.setOnClickListener { showHistory(it) }
-            translate.setOnClickListener { openExternalBrowser(it) }
-            license.setOnClickListener { showLicense(it) }
-            repo.setOnClickListener { openExternalBrowser(it) }
-            privacy.setOnClickListener { showPrivacy(it) }
-            reportError.setOnClickListener { openExternalBrowser(it) }
-            rate.setOnClickListener { openExternalBrowser(it) }
-            donate.setOnClickListener { openExternalBrowser(it) }
-            credits.setOnClickListener { showCredits() }
-        }
-    }
-
-    private fun clearClickListeners() {
-        binding.apply {
-            versionHistory.setOnClickListener(null)
-            translate.setOnClickListener(null)
-            license.setOnClickListener(null)
-            repo.setOnClickListener(null)
-            privacy.setOnClickListener(null)
-            reportError.setOnClickListener(null)
-            rate.setOnClickListener(null)
-            donate.setOnClickListener(null)
-            credits.setOnClickListener(null)
-        }
-    }
-
-    private fun showCredits() {
-        showHTML(R.string.credits, content.contributorInfo, null)
-    }
-
-    private fun showHistory(view: View) {
-        showHTML(R.string.version_history, content.historyInfo, view)
-    }
-
-    private fun showLicense(view: View) {
-        showHTML(R.string.license, content.licenseInfo, view)
-    }
-
-    private fun showPrivacy(view: View) {
-        showHTML(R.string.privacy_policy, content.privacyInfo, view)
-    }
-
-    private fun showHTML(@StringRes title: Int, text: Spanned, view: View?) {
-        val dialogContentPadding = resources.getDimensionPixelSize(R.dimen.alert_dialog_content_padding)
-        val textView = TextView(this).apply {
-            setText(text)
-            Utils.makeTextViewLinksClickable(this, text)
-        }
-
-        val scrollView = ScrollView(this).apply {
-            addView(textView)
-            setPadding(dialogContentPadding, dialogContentPadding / 2, dialogContentPadding, 0)
-        }
-
-        MaterialAlertDialogBuilder(this).apply {
-            setTitle(title)
-            setView(scrollView)
-            setPositiveButton(R.string.ok, null)
-
-            // Add View online button if an URL is linked to this view
-            view?.tag?.let {
-                setNeutralButton(R.string.view_online) { _, _ -> openExternalBrowser(view) }
-            }
-
-            show()
-        }
-    }
-
-    private fun openExternalBrowser(view: View) {
-        val tag = view.tag
-        if (tag is String && tag.startsWith("https://")) {
-            OpenWebLinkHandler().openBrowser(this, tag)
         }
     }
 }
+
+@Composable
+fun AboutScreenContent(
+    content: AboutContent,
+    showDonate: Boolean = true,
+    showRateOnGooglePlay: Boolean = false,
+    onBackPressedDispatcher: OnBackPressedDispatcher? = null,
+) {
+    Scaffold(
+        topBar = { CatimaTopAppBar(content.pageTitle.toString(), onBackPressedDispatcher) }
+    ) { innerPadding ->
+        Column(
+            modifier = Modifier
+                .padding(innerPadding)
+                .verticalScroll(rememberScrollState())
+        ) {
+            CatimaAboutSection(
+                stringResource(R.string.version_history),
+                content.versionHistory,
+                modifier = Modifier.testTag("card_version_history"),
+                onClickUrl = "https://catima.app/changelog/"
+            )
+            CatimaAboutSection(
+                stringResource(R.string.credits),
+                content.copyrightShort,
+                modifier = Modifier.testTag("card_credits"),
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.contributorInfoHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            CatimaAboutSection(
+                stringResource(R.string.help_translate_this_app),
+                stringResource(R.string.translate_platform),
+                modifier = Modifier.testTag("card_translate"),
+                onClickUrl = "https://hosted.weblate.org/engage/catima/"
+            )
+            CatimaAboutSection(
+                stringResource(R.string.license),
+                stringResource(R.string.app_license),
+                modifier = Modifier.testTag("card_license"),
+                onClickUrl = "https://github.com/CatimaLoyalty/Android/blob/main/LICENSE",
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.licenseHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            CatimaAboutSection(
+                stringResource(R.string.source_repository),
+                stringResource(R.string.on_github),
+                modifier = Modifier.testTag("card_source_github"),
+                onClickUrl = "https://github.com/CatimaLoyalty/Android/"
+            )
+            CatimaAboutSection(
+                stringResource(R.string.privacy_policy),
+                stringResource(R.string.and_data_usage),
+                modifier = Modifier.testTag("card_privacy_policy"),
+                onClickUrl = "https://catima.app/privacy-policy/",
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.privacyHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            if (showDonate) {
+                CatimaAboutSection(
+                    stringResource(R.string.donate),
+                    "",
+                    modifier = Modifier.testTag("card_donate"),
+                    onClickUrl = "https://catima.app/donate"
+                )
+            }
+            if (showRateOnGooglePlay) {
+                CatimaAboutSection(
+                    stringResource(R.string.rate_this_app),
+                    stringResource(R.string.on_google_play),
+                    modifier = Modifier.testTag("card_rate_google"),
+                    onClickUrl = "https://play.google.com/store/apps/details?id=me.hackerchick.catima"
+                )
+            }
+            CatimaAboutSection(
+                stringResource(R.string.report_error),
+                stringResource(R.string.on_github),
+                modifier = Modifier.testTag("card_report_error"),
+                onClickUrl = "https://github.com/CatimaLoyalty/Android/issues"
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun AboutActivityPreview() {
+    AboutScreenContent(AboutContent(LocalContext.current))
+}

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

@@ -3,11 +3,8 @@ package protect.card_locker;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.text.Spanned;
 import android.util.Log;
 
-import androidx.core.text.HtmlCompat;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -55,7 +52,7 @@ public class AboutContent {
         return context.getString(R.string.app_copyright_short);
     }
 
-    public String getContributors() {
+    public String getContributorsHtml() {
         String contributors;
         try {
             contributors = "<br/>" + Utils.readTextFile(context, R.raw.contributors);
@@ -65,19 +62,7 @@ public class AboutContent {
         return contributors.replace("\n", "<br />");
     }
 
-    public String getHistory() {
-        String versionHistory;
-        try {
-            versionHistory = Utils.readTextFile(context, R.raw.changelog)
-                    .replace("# Changelog\n\n", "");
-        }  catch (IOException ignored) {
-            return "";
-        }
-        return Utils.linkify(Utils.basicMDToHTML(versionHistory))
-                .replace("\n", "<br />");
-    }
-
-    public String getLicense() {
+    public String getLicenseHtml() {
         try {
             return Utils.readTextFile(context, R.raw.license);
         }  catch (IOException ignored) {
@@ -85,7 +70,7 @@ public class AboutContent {
         }
     }
 
-    public String getPrivacy() {
+    public String getPrivacyHtml() {
         String privacyPolicy;
         try {
             privacyPolicy = Utils.readTextFile(context, R.raw.privacy)
@@ -97,11 +82,11 @@ public class AboutContent {
                 .replace("\n", "<br />");
     }
 
-    public String getThirdPartyLibraries() {
+    public String getThirdPartyLibrariesHtml() {
         final List<ThirdPartyInfo> usedLibraries = new ArrayList<>();
+        usedLibraries.add(new ThirdPartyInfo("ACRA", "https://github.com/ACRA/acra", "Apache 2.0"));
         usedLibraries.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
         usedLibraries.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
-        usedLibraries.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
         usedLibraries.add(new ThirdPartyInfo("uCrop", "https://github.com/Yalantis/uCrop", "Apache 2.0"));
         usedLibraries.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
         usedLibraries.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
@@ -116,7 +101,7 @@ public class AboutContent {
         return result.toString();
     }
 
-    public String getUsedThirdPartyAssets() {
+    public String getUsedThirdPartyAssetsHtml() {
         final List<ThirdPartyInfo> usedAssets = new ArrayList<>();
         usedAssets.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
 
@@ -129,31 +114,19 @@ public class AboutContent {
         return result.toString();
     }
 
-    public Spanned getContributorInfo() {
+    public String getContributorInfoHtml() {
         StringBuilder contributorInfo = new StringBuilder();
         contributorInfo.append(getCopyright());
         contributorInfo.append("<br/><br/>");
         contributorInfo.append(context.getString(R.string.app_copyright_old));
         contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_contributors), getContributors()));
+        contributorInfo.append(String.format(context.getString(R.string.app_contributors), getContributorsHtml()));
         contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()));
+        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibrariesHtml()));
         contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()));
+        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssetsHtml()));
 
-        return HtmlCompat.fromHtml(contributorInfo.toString(), HtmlCompat.FROM_HTML_MODE_COMPACT);
-    }
-
-    public Spanned getHistoryInfo() {
-        return HtmlCompat.fromHtml(getHistory(), HtmlCompat.FROM_HTML_MODE_COMPACT);
-    }
-
-    public Spanned getLicenseInfo() {
-        return HtmlCompat.fromHtml(getLicense(), HtmlCompat.FROM_HTML_MODE_LEGACY);
-    }
-
-    public Spanned getPrivacyInfo() {
-        return HtmlCompat.fromHtml(getPrivacy(), HtmlCompat.FROM_HTML_MODE_COMPACT);
+        return contributorInfo.toString();
     }
 
     public String getVersionHistory() {

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

@@ -1,5 +0,0 @@
-package protect.card_locker;
-
-public interface BarcodeImageWriterResultCallback {
-    void onBarcodeImageWriterResult(boolean success);
-}

app/src/main/java/protect/card_locker/BarcodeImageWriterResultCallback.kt

@@ -0,0 +1,5 @@
+package protect.card_locker
+
+interface BarcodeImageWriterResultCallback {
+    fun onBarcodeImageWriterResult(success: Boolean)
+}

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

@@ -4,17 +4,27 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.util.ArrayMap;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.zxing.EncodeHintType;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.StringUtils;
 
 import java.lang.ref.WeakReference;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Objects;
 
 import protect.card_locker.async.CompatCallable;
 
@@ -39,6 +49,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     private final WeakReference<TextView> textViewReference;
     private String cardId;
     private final CatimaBarcode format;
+    private final Charset encoding;
     private final int imageHeight;
     private final int imageWidth;
     private final int imagePadding;
@@ -46,9 +57,9 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     private final boolean showFallback;
     private final BarcodeImageWriterResultCallback callback;
 
-    BarcodeImageWriterTask(
+    public BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
-            CatimaBarcode barcodeFormat, TextView textView,
+            CatimaBarcode barcodeFormat, @NonNull Charset barcodeEncoding, TextView textView,
             boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding, boolean isFullscreen
     ) {
         mContext = context;
@@ -62,6 +73,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
 
         cardId = cardIdString;
         format = barcodeFormat;
+        encoding = barcodeEncoding;
 
         int imageViewHeight = imageView.getHeight();
         int imageViewWidth = imageView.getWidth();
@@ -172,10 +184,32 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         }
 
         MultiFormatWriter writer = new MultiFormatWriter();
+
+        Map<EncodeHintType, Object> encodeHints = new ArrayMap<>();
+        // We don't want to pass the ISO-8859-1 as an encoding hint as zxing may add this as ECI
+        // inside the barcode.
+        //
+        // Due to many barcode scanners in the wild being badly coded they may trip over ECI
+        // info existing and fail to scan.
+        // See:
+        // - https://github.com/CatimaLoyalty/Android/issues/2921
+        // - https://github.com/CatimaLoyalty/Android/issues/2932
+        //
+        // Just not always passing the encoding hint is slightly hacky, but in 5+ years of Catima
+        // cards without encode hints have never caused any issues (unless they were UTF-8), yet
+        // just days after passing ISO-8859-1 as CHARACTER_SET in the encode hints already 2
+        // scan failures were reported (one for QR, one for Aztec).
+        if (!Objects.equals(encoding.name(), StandardCharsets.ISO_8859_1.name())) {
+            Log.d(TAG, "Chosen encoding is not ISO_8859_1, so passing as encoding hint");
+            encodeHints.put(EncodeHintType.CHARACTER_SET, encoding);
+        } else {
+            Log.d(TAG, "Not passing encoding as encoding hint");
+        }
+
         BitMatrix bitMatrix;
         try {
             try {
-                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, null);
+                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, encodeHints);
             } catch (Exception e) {
                 // Cast a wider net here and catch any exception, as there are some
                 // cases where an encoder may fail if the data is invalid for the

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

@@ -10,6 +10,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
 import protect.card_locker.async.TaskHandler;
@@ -74,6 +75,9 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
         return viewHolder.image.getTag() != null && (boolean) viewHolder.image.getTag();
     }
 
+    // FIXME: The examples in the selector activity are always rendering using ISO-8859-1, even if UTF-8 is the selected type
+    // This needs some refactoring to properly retrieve the barcode encoding when rendering an active barcode
+    // This is the case for example when editing an active card, pressing the "Edit barcode" button, then "More options" and then "Enter the barcode manually"
     private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text) {
         final CatimaBarcode format = CatimaBarcode.fromName(formatType);
 
@@ -92,13 +96,13 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
 
                             Log.d(TAG, "Generating barcode for type " + formatType);
 
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, StandardCharsets.ISO_8859_1, text, true, null, true, false);
                             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, StandardCharsets.ISO_8859_1, text, true, null, true, false);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -22,6 +22,8 @@ import java.util.List;
 import java.util.concurrent.Flow;
 import java.util.function.Consumer;
 
+import protect.card_locker.cardview.LoyaltyCardViewActivity;
+
 @RequiresApi(Build.VERSION_CODES.R)
 public class CardsOnPowerScreenService extends ControlsProviderService {
 

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

@@ -38,15 +38,10 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
         Window window = getWindow();
         if (window != null) {
             boolean darkMode = Utils.isDarkModeEnabled(this);
-            if (Build.VERSION.SDK_INT >= 23) {
-                View decorView = window.getDecorView();
-                WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
-                wic.setAppearanceLightStatusBars(!darkMode);
-                window.setStatusBarColor(Color.TRANSPARENT);
-            } else {
-                // icons are always white back then
-                window.setStatusBarColor(darkMode ? Color.TRANSPARENT : Color.argb(127, 0, 0, 0));
-            }
+            View decorView = window.getDecorView();
+            WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
+            wic.setAppearanceLightStatusBars(!darkMode);
+            window.setStatusBarColor(Color.TRANSPARENT);
         }
         // XXX android 9 and below has a nasty rendering bug if the theme was patched earlier
         Utils.postPatchColors(this);
@@ -66,7 +61,4 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
     }
-
-    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    }
 }

app/src/main/java/protect/card_locker/CatimaComponentActivity.kt

@@ -0,0 +1,42 @@
+package protect.card_locker
+
+import android.graphics.Color
+import android.os.Bundle
+import android.os.PersistableBundle
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatDelegate
+import protect.card_locker.preferences.Settings
+
+open class CatimaComponentActivity() : ComponentActivity() {
+    fun fixedEdgeToEdge() {
+        // Fix edge-to-edge
+        // When overriding onCreate this does not correctly get applied, which is why it is its own function
+
+        // We explicitly need to set the systemBarStyle ourselves, to prevent issues where Android
+        // for example renders white icons on top of a white statusbar (or black on black)
+        val settings = Settings(this)
+        val systemBarStyle = when (settings.theme) {
+            AppCompatDelegate.MODE_NIGHT_NO ->
+                SystemBarStyle.light(
+                    scrim = Color.TRANSPARENT,
+                    darkScrim = Color.TRANSPARENT,
+                )
+            AppCompatDelegate.MODE_NIGHT_YES ->
+                SystemBarStyle.dark(
+                    scrim = Color.TRANSPARENT,
+                )
+            else ->
+                SystemBarStyle.auto(
+                    lightScrim = Color.TRANSPARENT,
+                    darkScrim = Color.TRANSPARENT
+                )
+        }
+
+        enableEdgeToEdge(
+            statusBarStyle = systemBarStyle,
+            navigationBarStyle = systemBarStyle
+        )
+    }
+}

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

@@ -10,8 +10,12 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.io.FileNotFoundException;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Currency;
@@ -23,7 +27,7 @@ import java.util.Set;
 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 = 17;
+    public static final int DATABASE_VERSION = 20;
 
     // NB: changing these values requires a migration
     public static final int DEFAULT_ZOOM_LEVEL = 100;
@@ -49,6 +53,7 @@ public class DBHelper extends SQLiteOpenHelper {
         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 BARCODE_ENCODING = "barcodeencoding";
         public static final String STAR_STATUS = "starstatus";
         public static final String LAST_USED = "lastused";
         public static final String ZOOM_LEVEL = "zoomlevel";
@@ -71,6 +76,7 @@ public class DBHelper extends SQLiteOpenHelper {
 
     public enum LoyaltyCardOrder {
         Alpha,
+        LastAdded,
         LastUsed,
         ValidFrom,
         Expiry
@@ -112,6 +118,7 @@ public class DBHelper extends SQLiteOpenHelper {
                 LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
                 LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
                 LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
+                LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT not null," +
                 LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
                 LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
                 LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
@@ -335,6 +342,160 @@ public class DBHelper extends SQLiteOpenHelper {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '100' ");
         }
+
+        if (oldVersion < 18 && newVersion >= 18) {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT");
+        }
+
+        // On upgrade to 2.41.3, force all existing "Automatic" cards to ISO-8859-1.
+        // UTF-8 support was only added in 2.42.0, before that, all barcodes were saved without
+        // any encoding info. As many scanners deal badly with ECI info, automatically guessing
+        // UTF-8 for old barcodes may break them.
+        //
+        // New cards will be saved using either "Automatic" encoding to guess or, for pkpass files,
+        // whatever encoding is specified.
+        if (oldVersion < 19 && newVersion >= 19) {
+            db.execSQL("UPDATE " + LoyaltyCardDbIds.TABLE + " SET " + LoyaltyCardDbIds.BARCODE_ENCODING + " = 'ISO-8859-1' WHERE " + LoyaltyCardDbIds.BARCODE_ENCODING + " IS NULL");
+        }
+
+        if (oldVersion < 20 && newVersion >= 20) {
+            // SQLite doesn't support modify column
+            // So we need to create a temp column to make barcode encoding non-nullable
+            // https://www.sqlite.org/faq.html#q11
+            db.beginTransaction();
+
+            // First migrate all cards to ISO-8859-1
+            db.execSQL("UPDATE " + LoyaltyCardDbIds.TABLE + " SET " + LoyaltyCardDbIds.BARCODE_ENCODING + " = 'ISO-8859-1' WHERE " + LoyaltyCardDbIds.BARCODE_ENCODING + " IS NULL");
+
+            // create temp table
+            db.execSQL("CREATE TEMPORARY TABLE tmp (" +
+                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
+                    LoyaltyCardDbIds.STORE + " TEXT not null," +
+                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                    LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
+                    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.BARCODE_ENCODING + " TEXT not null," +
+                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
+                    LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL_WIDTH + "', " +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
+
+            // Insert all cards into temp table
+            db.execSQL("INSERT INTO tmp (" +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.VALID_FROM + " , " +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + " ," +
+                    LoyaltyCardDbIds.LAST_USED + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.VALID_FROM + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + " ," +
+                    LoyaltyCardDbIds.LAST_USED + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS +
+                    " FROM " + LoyaltyCardDbIds.TABLE);
+
+            // Drop old table
+            db.execSQL("DROP TABLE " + LoyaltyCardDbIds.TABLE);
+
+            // Create table again
+            db.execSQL("CREATE TABLE " + LoyaltyCardDbIds.TABLE + "(" +
+                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
+                    LoyaltyCardDbIds.STORE + " TEXT not null," +
+                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                    LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
+                    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.BARCODE_ENCODING + " TEXT not null," +
+                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
+                    LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL_WIDTH + "', " +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
+
+            // Insert all temp cards into newly created table
+            db.execSQL("INSERT INTO " + LoyaltyCardDbIds.TABLE + "(" +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.VALID_FROM + " , " +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + " ," +
+                    LoyaltyCardDbIds.LAST_USED + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.VALID_FROM + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + " ," +
+                    LoyaltyCardDbIds.LAST_USED + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
+                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
+                    LoyaltyCardDbIds.ARCHIVE_STATUS +
+                    " FROM tmp");
+
+            // Drop tmp table
+            db.execSQL("DROP TABLE tmp");
+
+            db.setTransactionSuccessful();
+            db.endTransaction();
+        }
+
     }
 
     public static Set<String> imageFiles(Context context, final SQLiteDatabase database) {
@@ -396,7 +557,8 @@ public class DBHelper extends SQLiteOpenHelper {
     public static long insertLoyaltyCard(
             final SQLiteDatabase database, final String store, final String note, final Date validFrom,
             final Date expiry, final BigDecimal balance, final Currency balanceType, final String cardId,
-            final String barcodeId, final CatimaBarcode barcodeType, final Integer headerColor,
+            final String barcodeId, final CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
+            final Integer headerColor,
             final int starStatus, final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
@@ -411,6 +573,7 @@ public class DBHelper extends SQLiteOpenHelper {
         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_ENCODING, barcodeEncoding.name());
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -430,7 +593,8 @@ public class DBHelper extends SQLiteOpenHelper {
             final SQLiteDatabase database, final int id, final String store, final String note,
             final Date validFrom, 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 CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
+            final Integer headerColor, final int starStatus,
             final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
@@ -446,6 +610,7 @@ public class DBHelper extends SQLiteOpenHelper {
         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_ENCODING, barcodeEncoding.name());
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -465,7 +630,8 @@ public class DBHelper extends SQLiteOpenHelper {
             SQLiteDatabase database, final int id, final String store, final String note,
             final Date validFrom, 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 CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
+            final Integer headerColor, final int starStatus,
             final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
@@ -480,6 +646,7 @@ public class DBHelper extends SQLiteOpenHelper {
         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_ENCODING, barcodeEncoding.name());
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -923,6 +1090,10 @@ public class DBHelper extends SQLiteOpenHelper {
             return LoyaltyCardDbIds.STORE;
         }
 
+        if (order == LoyaltyCardOrder.LastAdded) {
+            return LoyaltyCardDbIds.ID;
+        }
+
         if (order == LoyaltyCardOrder.LastUsed) {
             return LoyaltyCardDbIds.LAST_USED;
         }
@@ -939,8 +1110,8 @@ public class DBHelper extends SQLiteOpenHelper {
     }
 
     private static String getDbDirection(LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
-        if (order == LoyaltyCardOrder.LastUsed) {
-            // We want the default sorting to put the most recently used first
+        if (order == LoyaltyCardOrder.LastAdded || order == LoyaltyCardOrder.LastUsed) {
+            // We want the default sorting to put the most recently added/used first
             return direction == LoyaltyCardOrderDirection.Descending ? "ASC" : "DESC";
         }
 

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

@@ -1,402 +0,0 @@
-package protect.card_locker;
-
-import android.content.ActivityNotFoundException;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.InputType;
-import android.util.Log;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.textfield.TextInputLayout;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import protect.card_locker.async.TaskHandler;
-import protect.card_locker.databinding.ImportExportActivityBinding;
-import protect.card_locker.importexport.DataFormat;
-import protect.card_locker.importexport.ImportExportResult;
-import protect.card_locker.importexport.ImportExportResultType;
-
-public class ImportExportActivity extends CatimaAppCompatActivity {
-    private ImportExportActivityBinding binding;
-    private static final String TAG = "Catima";
-
-    private ImportExportTask importExporter;
-
-    private String importAlertTitle;
-    private String importAlertMessage;
-    private DataFormat importDataFormat;
-    private String exportPassword;
-
-    private ActivityResultLauncher<Intent> fileCreateLauncher;
-    private ActivityResultLauncher<String> fileOpenLauncher;
-
-    final private TaskHandler mTasks = new TaskHandler();
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        binding = ImportExportActivityBinding.inflate(getLayoutInflater());
-        setTitle(R.string.importExport);
-        setContentView(binding.getRoot());
-        Utils.applyWindowInsets(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
-        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
-
-        Intent fileIntent = getIntent();
-        if (fileIntent != null && fileIntent.getType() != null) {
-            chooseImportType(fileIntent.getData());
-        }
-
-        // would use ActivityResultContracts.CreateDocument() but mime type cannot be set
-        fileCreateLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-            Intent intent = result.getData();
-            if (intent == null) {
-                Log.e(TAG, "Activity returned NULL data");
-                return;
-            }
-            Uri uri = intent.getData();
-            if (uri == null) {
-                Log.e(TAG, "Activity returned NULL uri");
-                return;
-            }
-            // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
-            // FIXME: This is still suboptimal, because showing that the export started is delayed until the network request finishes
-            new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        OutputStream writer = getContentResolver().openOutputStream(uri);
-                        Log.d(TAG, "Starting file export with: " + result);
-                        startExport(writer, uri, exportPassword.toCharArray(), true);
-                    } catch (IOException e) {
-                        Log.e(TAG, "Failed to export file: " + result, e);
-                        onExportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, result.toString()), uri);
-                    }
-                }
-            }.start();
-        });
-        fileOpenLauncher = registerForActivityResult(new ActivityResultContracts.GetContent(), result -> {
-            if (result == null) {
-                Log.e(TAG, "Activity returned NULL data");
-                return;
-            }
-            openFileForImport(result, null);
-        });
-
-        // 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");
-
-        Button exportButton = binding.exportButton;
-        exportButton.setOnClickListener(v -> {
-            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ImportExportActivity.this);
-            builder.setTitle(R.string.exportPassword);
-
-            FrameLayout container = new FrameLayout(ImportExportActivity.this);
-
-            final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
-            textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
-            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-            params.setMargins(50, 10, 50, 0);
-            textInputLayout.setLayoutParams(params);
-
-            final EditText input = new EditText(ImportExportActivity.this);
-            input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-            input.setHint(R.string.exportPasswordHint);
-
-            textInputLayout.addView(input);
-            container.addView(textInputLayout);
-            builder.setView(container);
-            builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
-                exportPassword = input.getText().toString();
-                try {
-                    fileCreateLauncher.launch(intentCreateDocumentAction);
-                } catch (ActivityNotFoundException e) {
-                    Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
-                    Log.e(TAG, "No activity found to handle intent", e);
-                }
-            });
-            builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
-            builder.show();
-        });
-
-        // Check that there is a file manager available
-        Button importFilesystem = binding.importOptionFilesystemButton;
-        importFilesystem.setOnClickListener(v -> chooseImportType(null));
-
-        // FIXME: The importer/exporter is currently quite broken
-        // To prevent the screen from turning off during import/export and some devices killing Catima as it's no longer foregrounded, force the screen to stay on here
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-    }
-
-    private void openFileForImport(Uri uri, char[] password) {
-        // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
-        // FIXME: This is still suboptimal, because showing that the import started is delayed until the network request finishes
-        new Thread() {
-            @Override
-            public void run() {
-                try {
-                    InputStream reader = getContentResolver().openInputStream(uri);
-                    Log.d(TAG, "Starting file import with: " + uri);
-                    startImport(reader, uri, importDataFormat, password, true);
-                } catch (IOException e) {
-                    Log.e(TAG, "Failed to import file: " + uri, e);
-                    onImportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, e.toString()), uri, importDataFormat);
-                }
-            }
-        }.start();
-    }
-
-    private void chooseImportType(@Nullable Uri fileData) {
-
-        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);
-        }
-
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(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");
-                    }
-
-                    if (fileData != null) {
-                        openFileForImport(fileData, null);
-                        return;
-                    }
-
-                    new MaterialAlertDialogBuilder(this)
-                            .setTitle(importAlertTitle)
-                            .setMessage(importAlertMessage)
-                            .setPositiveButton(R.string.ok, (dialog1, which1) -> {
-                                try {
-                                    fileOpenLauncher.launch("*/*");
-                                } catch (ActivityNotFoundException e) {
-                                    Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
-                                    Log.e(TAG, "No activity found to handle intent", e);
-                                }
-                            })
-                            .setNegativeButton(R.string.cancel, null)
-                            .show();
-                });
-        builder.show();
-    }
-
-    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password, final boolean closeWhenDone) {
-        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
-            @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
-                onImportComplete(result, targetUri, dataFormat);
-                if (closeWhenDone) {
-                    try {
-                        target.close();
-                    } catch (IOException ioException) {
-                        ioException.printStackTrace();
-                    }
-                }
-            }
-        };
-
-        importExporter = new ImportExportTask(ImportExportActivity.this,
-                dataFormat, target, password, listener);
-        mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter);
-    }
-
-    private void startExport(final OutputStream target, final Uri targetUri, char[] password, final boolean closeWhenDone) {
-        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
-            @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
-                onExportComplete(result, targetUri);
-                if (closeWhenDone) {
-                    try {
-                        target.close();
-                    } catch (IOException ioException) {
-                        ioException.printStackTrace();
-                    }
-                }
-            }
-        };
-
-        importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.Catima, target, password, listener);
-        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
-    }
-
-    @Override
-    protected void onDestroy() {
-        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
-        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
-        super.onDestroy();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-
-        if (id == android.R.id.home) {
-            finish();
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void retryWithPassword(DataFormat dataFormat, Uri uri) {
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-        builder.setTitle(R.string.passwordRequired);
-
-        FrameLayout container = new FrameLayout(ImportExportActivity.this);
-
-        final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
-        textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(50, 10, 50, 0);
-        textInputLayout.setLayoutParams(params);
-
-        final EditText input = new EditText(ImportExportActivity.this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-        input.setHint(R.string.exportPasswordHint);
-
-        textInputLayout.addView(input);
-        container.addView(textInputLayout);
-        builder.setView(container);
-
-        builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
-            openFileForImport(uri, input.getText().toString().toCharArray());
-        });
-        builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
-
-        builder.show();
-    }
-
-    private String buildResultDialogMessage(ImportExportResult result, boolean isImport) {
-        int messageId;
-
-        if (result.resultType() == ImportExportResultType.Success) {
-            messageId = isImport ? R.string.importSuccessful : R.string.exportSuccessful;
-        } else {
-            messageId = isImport ? R.string.importFailed : R.string.exportFailed;
-        }
-
-        StringBuilder messageBuilder = new StringBuilder(getResources().getString(messageId));
-        if (result.developerDetails() != null) {
-            messageBuilder.append("\n\n");
-            messageBuilder.append(getResources().getString(R.string.include_if_asking_support));
-            messageBuilder.append("\n\n");
-            messageBuilder.append(result.developerDetails());
-        }
-
-        return messageBuilder.toString();
-    }
-
-    private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
-        ImportExportResultType resultType = result.resultType();
-
-        if (resultType == ImportExportResultType.BadPassword) {
-            retryWithPassword(dataFormat, path);
-            return;
-        }
-
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-        builder.setTitle(resultType == ImportExportResultType.Success ? R.string.importSuccessfulTitle : R.string.importFailedTitle);
-        builder.setMessage(buildResultDialogMessage(result, true));
-        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
-
-        builder.create().show();
-    }
-
-    private void onExportComplete(ImportExportResult result, final Uri path) {
-        ImportExportResultType resultType = result.resultType();
-
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-        builder.setTitle(resultType == ImportExportResultType.Success ? R.string.exportSuccessfulTitle : R.string.exportFailedTitle);
-        builder.setMessage(buildResultDialogMessage(result, false));
-        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
-
-        if (resultType == ImportExportResultType.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");
-
-                // 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));
-
-                dialog.dismiss();
-            });
-        }
-
-        builder.create().show();
-    }
-}

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

@@ -0,0 +1,424 @@
+package protect.card_locker
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.text.InputType
+import android.util.Log
+import android.view.MenuItem
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.Button
+import android.widget.EditText
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.widget.Toolbar
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.TextInputLayout
+import protect.card_locker.async.TaskHandler
+import protect.card_locker.databinding.ImportExportActivityBinding
+import protect.card_locker.importexport.DataFormat
+import protect.card_locker.importexport.ImportExportResult
+import protect.card_locker.importexport.ImportExportResultType
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+class ImportExportActivity : CatimaAppCompatActivity() {
+    private lateinit var binding: ImportExportActivityBinding
+
+    private var importExporter: ImportExportTask? = null
+
+    private var importAlertTitle: String? = null
+    private var importAlertMessage: String? = null
+    private var importDataFormat: DataFormat? = null
+    private var exportPassword: String? = null
+
+    private lateinit var fileCreateLauncher: ActivityResultLauncher<Intent>
+    private lateinit var fileOpenLauncher: ActivityResultLauncher<String>
+
+    private val mTasks = TaskHandler()
+
+    companion object {
+        private const val TAG = "Catima"
+
+        internal fun getExportFilename(): String {
+            val sdf = SimpleDateFormat("yyyyMMdd", Locale.US)
+            return "catima_${sdf.format(Date())}.zip"
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ImportExportActivityBinding.inflate(layoutInflater)
+        setTitle(R.string.importExport)
+        setContentView(binding.root)
+        Utils.applyWindowInsets(binding.root)
+        val toolbar: Toolbar = binding.toolbar
+        setSupportActionBar(toolbar)
+        enableToolbarBackButton()
+
+        val fileIntent = intent
+        if (fileIntent?.type != null) {
+            chooseImportType(fileIntent.data)
+        }
+
+        // would use ActivityResultContracts.CreateDocument() but mime type cannot be set
+        fileCreateLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                val intent = result.data
+                if (intent == null) {
+                    Log.e(TAG, "Activity returned NULL data")
+                    return@registerForActivityResult
+                }
+                val uri = intent.data
+                if (uri == null) {
+                    Log.e(TAG, "Activity returned NULL uri")
+                    return@registerForActivityResult
+                }
+                // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
+                // FIXME: This is still suboptimal, because showing that the export started is delayed until the network request finishes
+                Thread {
+                    try {
+                        val writer = contentResolver.openOutputStream(uri)
+                        Log.d(TAG, "Starting file export with: $result")
+                        startExport(writer, uri, exportPassword?.toCharArray(), true)
+                    } catch (e: IOException) {
+                        Log.e(TAG, "Failed to export file: $result", e)
+                        onExportComplete(
+                            ImportExportResult(
+                                ImportExportResultType.GenericFailure,
+                                result.toString()
+                            ), uri
+                        )
+                    }
+                }.start()
+            }
+
+        fileOpenLauncher =
+            registerForActivityResult(ActivityResultContracts.GetContent()) { result ->
+                if (result == null) {
+                    Log.e(TAG, "Activity returned NULL data")
+                    return@registerForActivityResult
+                }
+                openFileForImport(result, null)
+            }
+
+        // Check that there is a file manager available
+        val intentCreateDocumentAction = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            type = "application/zip"
+            putExtra(Intent.EXTRA_TITLE, getExportFilename())
+        }
+
+        val exportButton: Button = binding.exportButton
+        exportButton.setOnClickListener {
+            val builder = MaterialAlertDialogBuilder(this@ImportExportActivity)
+            builder.setTitle(R.string.exportPassword)
+
+            val container = FrameLayout(this@ImportExportActivity)
+
+            val textInputLayout = TextInputLayout(this@ImportExportActivity).apply {
+                endIconMode = TextInputLayout.END_ICON_PASSWORD_TOGGLE
+                layoutParams = LinearLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+                ).apply {
+                    setMargins(50, 10, 50, 0)
+                }
+            }
+
+            val input = EditText(this@ImportExportActivity).apply {
+                inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+                setHint(R.string.exportPasswordHint)
+            }
+
+            textInputLayout.addView(input)
+            container.addView(textInputLayout)
+            builder.setView(container)
+            builder.setPositiveButton(R.string.ok) { _, _ ->
+                exportPassword = input.text.toString()
+                try {
+                    fileCreateLauncher.launch(intentCreateDocumentAction)
+                } catch (e: ActivityNotFoundException) {
+                    Toast.makeText(
+                        applicationContext,
+                        R.string.failedOpeningFileManager,
+                        Toast.LENGTH_LONG
+                    ).show()
+                    Log.e(TAG, "No activity found to handle intent", e)
+                }
+            }
+            builder.setNegativeButton(R.string.cancel) { dialogInterface, _ -> dialogInterface.cancel() }
+            builder.show()
+        }
+
+        // Check that there is a file manager available
+        val importFilesystem: Button = binding.importOptionFilesystemButton
+        importFilesystem.setOnClickListener { chooseImportType(null) }
+
+        // FIXME: The importer/exporter is currently quite broken
+        // To prevent the screen from turning off during import/export and some devices killing Catima as it's no longer foregrounded, force the screen to stay on here
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+    }
+
+    private fun openFileForImport(uri: Uri, password: CharArray?) {
+        // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
+        // FIXME: This is still suboptimal, because showing that the import started is delayed until the network request finishes
+        Thread {
+            try {
+                val reader = contentResolver.openInputStream(uri)
+                Log.d(TAG, "Starting file import with: $uri")
+                startImport(reader, uri, importDataFormat, password, true)
+            } catch (e: IOException) {
+                Log.e(TAG, "Failed to import file: $uri", e)
+                onImportComplete(
+                    ImportExportResult(
+                        ImportExportResultType.GenericFailure,
+                        e.toString()
+                    ), uri, importDataFormat
+                )
+            }
+        }.start()
+    }
+
+    private fun chooseImportType(fileData: Uri?) {
+        val betaImportOptions = mutableListOf<CharSequence>()
+        betaImportOptions.add("Fidme")
+        val importOptions = mutableListOf<CharSequence>()
+
+        for (importOption in resources.getStringArray(R.array.import_types_array)) {
+            var option = importOption
+            if (betaImportOptions.contains(importOption)) {
+                option = "$importOption (BETA)"
+            }
+            importOptions.add(option)
+        }
+
+        val builder = MaterialAlertDialogBuilder(this)
+        builder.setTitle(R.string.chooseImportType)
+            .setItems(importOptions.toTypedArray()) { _, which ->
+                when (which) {
+                    // Catima
+                    0 -> {
+                        importAlertTitle = getString(R.string.importCatima)
+                        importAlertMessage = getString(R.string.importCatimaMessage)
+                        importDataFormat = DataFormat.Catima
+                    }
+                    // Fidme
+                    1 -> {
+                        importAlertTitle = getString(R.string.importFidme)
+                        importAlertMessage = getString(R.string.importFidmeMessage)
+                        importDataFormat = DataFormat.Fidme
+                    }
+                    // Loyalty Card Keychain
+                    2 -> {
+                        importAlertTitle = getString(R.string.importLoyaltyCardKeychain)
+                        importAlertMessage = getString(R.string.importLoyaltyCardKeychainMessage)
+                        importDataFormat = DataFormat.Catima
+                    }
+                    // Voucher Vault
+                    3 -> {
+                        importAlertTitle = getString(R.string.importVoucherVault)
+                        importAlertMessage = getString(R.string.importVoucherVaultMessage)
+                        importDataFormat = DataFormat.VoucherVault
+                    }
+
+                    else -> throw IllegalArgumentException("Unknown DataFormat")
+                }
+
+                if (fileData != null) {
+                    openFileForImport(fileData, null)
+                    return@setItems
+                }
+
+                MaterialAlertDialogBuilder(this)
+                    .setTitle(importAlertTitle)
+                    .setMessage(importAlertMessage)
+                    .setPositiveButton(R.string.ok) { _, _ ->
+                        try {
+                            fileOpenLauncher.launch("*/*")
+                        } catch (e: ActivityNotFoundException) {
+                            Toast.makeText(
+                                applicationContext,
+                                R.string.failedOpeningFileManager,
+                                Toast.LENGTH_LONG
+                            ).show()
+                            Log.e(TAG, "No activity found to handle intent", e)
+                        }
+                    }
+                    .setNegativeButton(R.string.cancel, null)
+                    .show()
+            }
+        builder.show()
+    }
+
+    private fun startImport(
+        target: InputStream?,
+        targetUri: Uri,
+        dataFormat: DataFormat?,
+        password: CharArray?,
+        closeWhenDone: Boolean
+    ) {
+        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false)
+        val listener = ImportExportTask.TaskCompleteListener { result, dataFormat ->
+            onImportComplete(result, targetUri, dataFormat)
+            if (closeWhenDone) {
+                try {
+                    target?.close()
+                } catch (ioException: IOException) {
+                    ioException.printStackTrace()
+                }
+            }
+        }
+
+        importExporter = ImportExportTask(
+            this@ImportExportActivity,
+            dataFormat, target, password, listener
+        )
+        mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter)
+    }
+
+    private fun startExport(
+        target: OutputStream?,
+        targetUri: Uri,
+        password: CharArray?,
+        closeWhenDone: Boolean
+    ) {
+        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false)
+        val listener = ImportExportTask.TaskCompleteListener { result, dataFormat ->
+            onExportComplete(result, targetUri)
+            if (closeWhenDone) {
+                try {
+                    target?.close()
+                } catch (ioException: IOException) {
+                    ioException.printStackTrace()
+                }
+            }
+        }
+
+        importExporter = ImportExportTask(
+            this@ImportExportActivity,
+            DataFormat.Catima, target, password, listener
+        )
+        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter)
+    }
+
+    override fun onDestroy() {
+        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false)
+        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false)
+        super.onDestroy()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
+
+        if (id == android.R.id.home) {
+            finish()
+            return true
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun retryWithPassword(dataFormat: DataFormat, uri: Uri) {
+        val builder = MaterialAlertDialogBuilder(this)
+        builder.setTitle(R.string.passwordRequired)
+
+        val container = FrameLayout(this@ImportExportActivity)
+
+        val textInputLayout = TextInputLayout(this@ImportExportActivity).apply {
+            endIconMode = TextInputLayout.END_ICON_PASSWORD_TOGGLE
+            layoutParams = LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            ).apply {
+                setMargins(50, 10, 50, 0)
+            }
+        }
+
+        val input = EditText(this@ImportExportActivity).apply {
+            inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+            setHint(R.string.exportPasswordHint)
+        }
+
+        textInputLayout.addView(input)
+        container.addView(textInputLayout)
+        builder.setView(container)
+
+        builder.setPositiveButton(R.string.ok) { _, _ ->
+            openFileForImport(uri, input.text.toString().toCharArray())
+        }
+        builder.setNegativeButton(R.string.cancel) { dialogInterface, _ -> dialogInterface.cancel() }
+
+        builder.show()
+    }
+
+    private fun buildResultDialogMessage(result: ImportExportResult, isImport: Boolean): String {
+        val messageId = if (result.resultType() == ImportExportResultType.Success) {
+            if (isImport) R.string.importSuccessful else R.string.exportSuccessful
+        } else {
+            if (isImport) R.string.importFailed else R.string.exportFailed
+        }
+
+        val messageBuilder = StringBuilder(resources.getString(messageId))
+        if (result.developerDetails() != null) {
+            messageBuilder.append("\n\n")
+            messageBuilder.append(resources.getString(R.string.include_if_asking_support))
+            messageBuilder.append("\n\n")
+            messageBuilder.append(result.developerDetails())
+        }
+
+        return messageBuilder.toString()
+    }
+
+    private fun onImportComplete(result: ImportExportResult, path: Uri, dataFormat: DataFormat?) {
+        val resultType = result.resultType()
+
+        if (resultType == ImportExportResultType.BadPassword) {
+            retryWithPassword(dataFormat!!, path)
+            return
+        }
+
+        val builder = MaterialAlertDialogBuilder(this)
+        builder.setTitle(if (resultType == ImportExportResultType.Success) R.string.importSuccessfulTitle else R.string.importFailedTitle)
+        builder.setMessage(buildResultDialogMessage(result, true))
+        builder.setNeutralButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
+
+        builder.create().show()
+    }
+
+    private fun onExportComplete(result: ImportExportResult, path: Uri) {
+        val resultType = result.resultType()
+
+        val builder = MaterialAlertDialogBuilder(this)
+        builder.setTitle(if (resultType == ImportExportResultType.Success) R.string.exportSuccessfulTitle else R.string.exportFailedTitle)
+        builder.setMessage(buildResultDialogMessage(result, false))
+        builder.setNeutralButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
+
+        if (resultType == ImportExportResultType.Success) {
+            val sendLabel = this@ImportExportActivity.resources.getText(R.string.sendLabel)
+
+            builder.setPositiveButton(sendLabel) { dialog, _ ->
+                val sendIntent = Intent(Intent.ACTION_SEND).apply {
+                    putExtra(Intent.EXTRA_STREAM, path)
+                    type = "text/csv"
+                    // set flag to give temporary permission to external app to use the FileProvider
+                    flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
+                }
+
+                this@ImportExportActivity.startActivity(Intent.createChooser(sendIntent, sendLabel))
+                dialog.dismiss()
+            }
+        }
+
+        builder.create().show()
+    }
+}

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

@@ -1,12 +1,17 @@
 package protect.card_locker;
 
 import android.app.Activity;
-import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
-import android.widget.Toast;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,7 +37,7 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
     private char[] password;
     private TaskCompleteListener listener;
 
-    private ProgressDialog progress;
+    private AlertDialog progress;
 
     /**
      * Constructor which will setup a task for exporting to the given file
@@ -88,12 +93,36 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
     }
 
     public void onPreExecute() {
-        progress = new ProgressDialog(activity);
-        progress.setTitle(doImport ? R.string.importing : R.string.exporting);
+        MaterialAlertDialogBuilder progressDialogBuilder = new MaterialAlertDialogBuilder(activity);
+        progressDialogBuilder.setCancelable(false);  // Don't cancel if user taps next to dialog
+        progressDialogBuilder.setTitle(doImport ? R.string.importing : R.string.exporting);
 
-        progress.setOnCancelListener(dialog -> cancel());
-        progress.setOnDismissListener(dialog -> cancel());
+        // Create components
+        TextView progressDialogTextView = new TextView(activity);
+        progressDialogTextView.setText(R.string.pleaseDoNotRotateTheDevice); // FIXME: Instead of telling the user to not rotate, rotation should not cancel the import
+        ProgressBar progressDialogProgressBar = new ProgressBar(activity);
+        progressDialogProgressBar.setIndeterminate(true);
 
+        // Create LinearLayout (to put the components below each other)
+        LinearLayout progressDialogLayout = new LinearLayout(activity);
+        progressDialogLayout.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams progressDialogLayoutParams = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+        );
+        int contentPadding = activity.getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        progressDialogLayoutParams.setMargins(contentPadding, contentPadding / 2, contentPadding, 0);
+
+        // Put components in layout
+        progressDialogLayout.addView(progressDialogTextView, progressDialogLayoutParams);
+        progressDialogLayout.addView(progressDialogProgressBar, progressDialogLayoutParams);
+
+        // Create and show dialog
+        progressDialogBuilder.setView(progressDialogLayout);
+        progressDialogBuilder.setNeutralButton(R.string.cancel, (dialogInterface, i) -> cancel());
+        progressDialogBuilder.setOnCancelListener(dialogInterface -> cancel());
+        progressDialogBuilder.setOnDismissListener(dialogInterface -> cancel());
+        progress = progressDialogBuilder.create();
         progress.show();
     }
 

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

@@ -4,11 +4,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
+import androidx.annotation.Nullable;
+
 import java.io.InvalidObjectException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Date;
@@ -25,6 +28,7 @@ public class ImportURIHelper {
     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 BARCODE_ENCODING = DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING;
     private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
 
     private final Context context;
@@ -66,6 +70,7 @@ public class ImportURIHelper {
         try {
             // These values are allowed to be null
             CatimaBarcode barcodeType = null;
+            Charset barcodeEncoding = StandardCharsets.ISO_8859_1;
             Date validFrom = null;
             Date expiry = null;
             BigDecimal balance = new BigDecimal("0");
@@ -103,6 +108,11 @@ public class ImportURIHelper {
                 barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
             }
 
+            String unparsedBarcodeEncoding = kv.get(BARCODE_ENCODING);
+            if (unparsedBarcodeEncoding != null && !unparsedBarcodeEncoding.equals("")) {
+                barcodeEncoding = Charset.forName(unparsedBarcodeEncoding);
+            }
+
             String unparsedBalance = kv.get(BALANCE);
             if (unparsedBalance != null && !unparsedBalance.equals("")) {
                 balance = new BigDecimal(unparsedBalance);
@@ -136,6 +146,7 @@ public class ImportURIHelper {
                     cardId,
                     barcodeId,
                     barcodeType,
+                    barcodeEncoding,
                     headerColor,
                     0,
                     Utils.getUnixTime(),
@@ -195,6 +206,7 @@ public class ImportURIHelper {
         if (loyaltyCard.barcodeType != null) {
             fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.name());
         }
+        fragment = appendFragment(fragment, BARCODE_ENCODING, loyaltyCard.barcodeEncoding.name());
         if (loyaltyCard.headerColor != null) {
             fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());
         }

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

@@ -1,145 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.Typeface;
-import android.text.TextPaint;
-import android.util.Log;
-
-import androidx.core.graphics.PaintCompat;
-
-/**
- * Original from https://github.com/andOTP/andOTP/blob/master/app/src/main/java/org/shadowice/flocke/andotp/Utilities/LetterBitmap.java
- * which was originally from http://stackoverflow.com/questions/23122088/colored-boxed-with-letters-a-la-gmail
- * Used to create a {@link Bitmap} that contains a letter used in the English
- * alphabet or digit, if there is no letter or digit available, a default image
- * is shown instead.
- */
-class LetterBitmap {
-
-    /**
-     * The number of available tile colors
-     */
-    private static final int NUM_OF_TILE_COLORS = 8;
-    /**
-     * The letter bitmap
-     */
-    private final Bitmap mBitmap;
-    /**
-     * The background color of the letter bitmap
-     */
-    private final Integer mColor;
-
-    /**
-     * Constructor for <code>LetterTileProvider</code>
-     *
-     * @param context            The {@link Context} to use
-     * @param displayName        The name used to create the letter for the tile
-     * @param key                The key used to generate the background color for the tile
-     * @param tileLetterFontSize The font size used to display the letter
-     * @param width              The desired width of the tile
-     * @param height             The desired height of the tile
-     * @param backgroundColor    (optional) color to use for background.
-     * @param textColor          (optional) color to use for text.
-     */
-    public LetterBitmap(Context context, String displayName, String key, int tileLetterFontSize,
-                        int width, int height, Integer backgroundColor, Integer textColor) {
-        TextPaint paint = new TextPaint();
-
-        if (textColor != null) {
-            paint.setColor(textColor);
-        } else {
-            paint.setColor(Color.WHITE);
-        }
-
-        paint.setTextAlign(Paint.Align.CENTER);
-        paint.setAntiAlias(true);
-        paint.setTextSize(tileLetterFontSize);
-        paint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
-
-        if (backgroundColor == null) {
-            mColor = getDefaultColor(context, key);
-        } else {
-            mColor = backgroundColor;
-        }
-
-        mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        String firstChar = displayName.substring(0, 1).toUpperCase();
-        int firstCharEnd = 2;
-        while (firstCharEnd <= displayName.length()) {
-            // Test for the longest render-able string
-            // But ignore containing only a-Z0-9 to not render things like ffi as a single character
-            String test = displayName.substring(0, firstCharEnd);
-            if (!isAlphabetical(test) && PaintCompat.hasGlyph(paint, test)) {
-                firstChar = test;
-            }
-            firstCharEnd++;
-        }
-
-        Log.d("LetterBitmap", "using sequence " + firstChar + " to render first char which has length " + firstChar.length());
-
-        final Canvas c = new Canvas();
-        c.setBitmap(mBitmap);
-        c.drawColor(mColor);
-
-        Rect bounds = new Rect();
-        paint.getTextBounds(firstChar, 0, firstChar.length(), bounds);
-        c.drawText(firstChar,
-                0, firstChar.length(),
-                width / 2.0f, (height - (bounds.bottom + bounds.top)) / 2.0f
-                , paint);
-
-    }
-
-    /**
-     * @return A {@link Bitmap} that contains a letter used in the English
-     * alphabet or digit, if there is no letter or digit available, a
-     * default image is shown instead
-     */
-    public Bitmap getLetterTile() {
-        return mBitmap;
-    }
-
-    /**
-     * @return background color used for letter title.
-     */
-    public int getBackgroundColor() {
-        return mColor;
-    }
-
-    /**
-     * @param key The key used to generate the tile color
-     * @return A new or previously chosen color for <code>key</code> used as the
-     * tile background color
-     */
-    private static int pickColor(String key, TypedArray colors) {
-        // String.hashCode() is not supposed to change across java versions, so
-        // this should guarantee the same key always maps to the same color
-        final int color = Math.abs(key.hashCode()) % NUM_OF_TILE_COLORS;
-        return colors.getColor(color, Color.BLACK);
-    }
-
-    private static boolean isAlphabetical(String string) {
-        return string.matches("[a-zA-Z0-9]*");
-    }
-
-    /**
-     * Determine the color which the letter tile will use if no default
-     * color is provided.
-     */
-    public static int getDefaultColor(Context context, String key) {
-        final Resources res = context.getResources();
-
-        TypedArray colors = res.obtainTypedArray(R.array.letter_tile_colors);
-        int color = pickColor(key, colors);
-        colors.recycle();
-
-        return color;
-    }
-}

app/src/main/java/protect/card_locker/LetterBitmap.kt

@@ -0,0 +1,136 @@
+package protect.card_locker
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Rect
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.util.Log
+import androidx.core.graphics.PaintCompat
+import java.util.Locale
+import kotlin.math.abs
+
+/**
+ * Original from https://github.com/andOTP/andOTP/blob/master/app/src/main/java/org/shadowice/flocke/andotp/Utilities/LetterBitmap.java
+ * which was originally from http://stackoverflow.com/questions/23122088/colored-boxed-with-letters-a-la-gmail
+ * Used to create a {@link Bitmap} that contains a letter used in the English
+ * alphabet or digit, if there is no letter or digit available, a default image
+ * is shown instead.
+ *
+ * @constructor Constructor for <code>LetterTileProvider</code>
+ * @param context            The {@link Context} to use
+ * @param displayName        The name used to create the letter for the tile
+ * @param key                The key used to generate the background color for the tile
+ * @param tileLetterFontSize The font size used to display the letter
+ * @param width              The desired width of the tile
+ * @param height             The desired height of the tile
+ * @param backgroundColor    (optional) color to use for background.
+ * @param textColor          (optional) color to use for text.
+ */
+class LetterBitmap(
+    context: Context, displayName: String, key: String, tileLetterFontSize: Int,
+    width: Int, height: Int, backgroundColor: Int?, textColor: Int?
+) {
+    /**
+     * A {@link Bitmap} that contains a letter used in the English
+     * alphabet or digit, if there is no letter or digit available, a
+     * default image is shown instead
+     */
+    private val letterTile: Bitmap
+
+    /**
+     * The background color of the letter bitmap
+     */
+    private val mColor: Int
+
+    init {
+        val paint = TextPaint().apply {
+            color = textColor ?: Color.WHITE
+            textAlign = Paint.Align.CENTER
+            isAntiAlias = true
+            textSize = tileLetterFontSize.toFloat()
+            typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+        }
+
+        mColor = backgroundColor ?: getDefaultColor(context, key)
+
+        this.letterTile = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+
+        var firstChar = displayName.substring(0, 1).uppercase(Locale.getDefault())
+        var firstCharEnd = 2
+        while (firstCharEnd <= displayName.length) {
+            // Test for the longest render-able string
+            // But ignore containing only a-Z0-9 to not render things like ffi as a single character
+            val test = displayName.substring(0, firstCharEnd)
+            if (!isAlphabetical(test) && PaintCompat.hasGlyph(paint, test)) {
+                firstChar = test
+            }
+            firstCharEnd++
+        }
+
+        Log.d(
+            "LetterBitmap",
+            "using sequence $firstChar to render first char which has length ${firstChar.length}"
+        )
+
+        Canvas().apply {
+            setBitmap(this@LetterBitmap.letterTile)
+            drawColor(mColor)
+
+            val bounds = Rect()
+            paint.getTextBounds(firstChar, 0, firstChar.length, bounds)
+            drawText(
+                firstChar,
+                0, firstChar.length,
+                width / 2.0f, (height - (bounds.bottom + bounds.top)) / 2.0f,
+                paint
+            )
+        }
+    }
+
+    val backgroundColor: Int
+        /**
+         * @return background color used for letter title.
+         */
+        get() = mColor
+    
+    fun getLetterTile(): Bitmap {
+        return letterTile
+    }
+
+    companion object {
+        /**
+         * @param key The key used to generate the tile color
+         * @return A new or previously chosen color for `key` used as the
+         * tile background color
+         */
+        private fun pickColor(key: String, colors: TypedArray): Int {
+            // String.hashCode() is not supposed to change across java versions, so
+            // this should guarantee the same key always maps to the same color
+            val color = abs(key.hashCode()) % colors.length()
+            return colors.getColor(color, Color.BLACK)
+        }
+
+        private fun isAlphabetical(string: String): Boolean {
+            return string.matches("[a-zA-Z0-9]*".toRegex())
+        }
+
+        /**
+         * Determine the color which the letter tile will use if no default
+         * color is provided.
+         */
+        fun getDefaultColor(context: Context, key: String): Int {
+            val res = context.resources
+
+            val colors = res.obtainTypedArray(R.array.letter_tile_colors)
+            val color: Int = pickColor(key, colors)
+            colors.recycle()
+
+            return color
+        }
+    }
+}

app/src/main/java/protect/card_locker/ListWidget.kt

@@ -13,6 +13,8 @@ import android.view.View
 import android.widget.RemoteViews
 import androidx.core.widget.RemoteViewsCompat
 import protect.card_locker.DBHelper.LoyaltyCardArchiveFilter
+import protect.card_locker.cardview.LoyaltyCardViewActivity
+import protect.card_locker.shared.ForegroundColorHelper
 
 class ListWidget : AppWidgetProvider() {
     fun updateAll(context: Context) {
@@ -69,7 +71,9 @@ class ListWidget : AppWidgetProvider() {
             if (hasCards) {
                 // If we have cards, create the list
                 views = RemoteViews(context.packageName, R.layout.list_widget)
-                val templateIntent = Intent(context, LoyaltyCardViewActivity::class.java)
+                val templateIntent = Intent(context, LoyaltyCardViewActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                }
                 val pendingIntent = PendingIntent.getActivity(
                     context,
                     0,
@@ -97,11 +101,11 @@ class ListWidget : AppWidgetProvider() {
         // Note: Android 5 will not use bitmaps
         val remoteViews = RemoteViews(context.packageName, R.layout.list_widget_item).apply {
             val headerColor = Utils.getHeaderColor(context, loyaltyCard)
-            val foreground = if (Utils.needsDarkForeground(headerColor)) Color.BLACK else Color.WHITE
+            val foreground = if (ForegroundColorHelper.needsDarkForeground(headerColor)) Color.BLACK else Color.WHITE
             setInt(R.id.item_container_foreground, "setBackgroundColor", headerColor)
             val icon = loyaltyCard.getImageThumbnail(context)
-            // setImageViewIcon is not supported on Android 5, so force Android 5 down the text path
-            if (icon != null && Build.VERSION.SDK_INT >= 23) {
+            // FIXME: The icon flow causes a crash up to Android 12L, so force anything below 33 down this path
+            if (icon != null && Build.VERSION.SDK_INT >= 32) {
                 setInt(R.id.item_container_foreground, "setBackgroundColor", foreground)
                 setImageViewIcon(R.id.item_image, Icon.createWithBitmap(icon))
                 setViewVisibility(R.id.item_text, View.INVISIBLE)
@@ -127,4 +131,4 @@ class ListWidget : AppWidgetProvider() {
 
         return remoteViews
     }
-}
+}

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

@@ -9,6 +9,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
@@ -30,6 +32,7 @@ public class LoyaltyCard {
     public String barcodeId;
     @Nullable
     public CatimaBarcode barcodeType;
+    public Charset barcodeEncoding;
     @Nullable
     public Integer headerColor;
     public int starStatus;
@@ -62,6 +65,7 @@ public class LoyaltyCard {
     public static final String BUNDLE_LOYALTY_CARD_CARD_ID = "loyaltyCardCardId";
     public static final String BUNDLE_LOYALTY_CARD_BARCODE_ID = "loyaltyCardBarcodeId";
     public static final String BUNDLE_LOYALTY_CARD_BARCODE_TYPE = "loyaltyCardBarcodeType";
+    public static final String BUNDLE_LOYALTY_CARD_BARCODE_ENCODING = "loyaltyCardBarcodeEncoding";
     public static final String BUNDLE_LOYALTY_CARD_HEADER_COLOR = "loyaltyCardHeaderColor";
     public static final String BUNDLE_LOYALTY_CARD_STAR_STATUS = "loyaltyCardStarStatus";
     public static final String BUNDLE_LOYALTY_CARD_LAST_USED = "loyaltyCardLastUsed";
@@ -90,6 +94,7 @@ public class LoyaltyCard {
         setCardId("");
         setBarcodeId(null);
         setBarcodeType(null);
+        setBarcodeEncoding(StandardCharsets.ISO_8859_1);
         setHeaderColor(null);
         setStarStatus(0);
         setLastUsed(Utils.getUnixTime());
@@ -124,7 +129,7 @@ public class LoyaltyCard {
     public LoyaltyCard(final int id, final String store, final String note, @Nullable final Date validFrom,
                        @Nullable final Date expiry, final BigDecimal balance, @Nullable final Currency balanceType,
                        final String cardId, @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
-                       @Nullable final Integer headerColor, final int starStatus,
+                       @NonNull final Charset barcodeEncoding, @Nullable final Integer headerColor, final int starStatus,
                        final long lastUsed, final int zoomLevel, final int zoomLevelWidth, final int archiveStatus,
                        @Nullable Bitmap imageThumbnail, @Nullable String imageThumbnailPath,
                        @Nullable Bitmap imageFront, @Nullable String imageFrontPath,
@@ -139,6 +144,7 @@ public class LoyaltyCard {
         setCardId(cardId);
         setBarcodeId(barcodeId);
         setBarcodeType(barcodeType);
+        setBarcodeEncoding(barcodeEncoding);
         setHeaderColor(headerColor);
         setStarStatus(starStatus);
         setLastUsed(lastUsed);
@@ -244,6 +250,10 @@ public class LoyaltyCard {
         this.barcodeType = barcodeType;
     }
 
+    public void setBarcodeEncoding(@NonNull Charset barcodeEncoding) {
+        this.barcodeEncoding = barcodeEncoding;
+    }
+
     public void setHeaderColor(@Nullable Integer headerColor) {
         this.headerColor = headerColor;
     }
@@ -379,6 +389,11 @@ public class LoyaltyCard {
         } else if (requireFull) {
             throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BARCODE_TYPE);
         }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)) {
+            setBarcodeEncoding(Charset.forName(bundle.getString(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BARCODE_ENCODING);
+        }
         if (bundle.containsKey(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
             int tmpHeaderColor = bundle.getInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR);
             setHeaderColor(tmpHeaderColor != -1 ? tmpHeaderColor : null);
@@ -462,6 +477,9 @@ public class LoyaltyCard {
         if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_TYPE)) {
             bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING, barcodeEncoding.name());
+        }
         if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
             bundle.putInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR, headerColor != null ? headerColor : -1);
         }
@@ -539,6 +557,8 @@ public class LoyaltyCard {
         // barcodeType
         int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
         CatimaBarcode barcodeType = !cursor.isNull(barcodeTypeColumn) ? CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn)) : null;
+        // barcodeEncoding
+        Charset barcodeEncoding = Charset.forName(cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING)));
         // headerColor
         int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
         Integer headerColor = !cursor.isNull(headerColorColumn) ? cursor.getInt(headerColorColumn) : null;
@@ -564,6 +584,7 @@ public class LoyaltyCard {
                 cardId,
                 barcodeId,
                 barcodeType,
+                barcodeEncoding,
                 headerColor,
                 starStatus,
                 lastUsed,
@@ -593,6 +614,7 @@ public class LoyaltyCard {
                 Utils.equals(a.barcodeId, b.barcodeId) && // nullable String
                 Utils.equals(a.barcodeType == null ? null : a.barcodeType.format(),
                         b.barcodeType == null ? null : b.barcodeType.format()) && // nullable CatimaBarcode with no overridden .equals(), so we need to check .format()
+                a.barcodeEncoding.name().equals(b.barcodeEncoding.name()) && // non-nullable String
                 Utils.equals(a.headerColor, b.headerColor) && // nullable Integer
                 a.starStatus == b.starStatus && // non-nullable int
                 a.archiveStatus == b.archiveStatus && // non-nullable int
@@ -619,7 +641,7 @@ public class LoyaltyCard {
     public String toString() {
         return String.format(
                 "LoyaltyCard{%n  id=%s,%n  store=%s,%n  note=%s,%n  validFrom=%s,%n  expiry=%s,%n"
-                        + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n"
+                        + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n barcodeEncoding=%s,%n"
                         + "  headerColor=%s,%n  starStatus=%s,%n  lastUsed=%s,%n  zoomLevel=%s,%n  zoomLevelWidth=%s,%n  archiveStatus=%s%n"
                         + "  imageThumbnail=%s,%n  imageThumbnailPath=%s,%n  imageFront=%s,%n  imageFrontPath=%s,%n  imageBack=%s,%n  imageBackPath=%s,%n}",
                 this.id,
@@ -632,6 +654,7 @@ public class LoyaltyCard {
                 this.cardId,
                 this.barcodeId,
                 this.barcodeType != null ? this.barcodeType.format() : null,
+                this.barcodeEncoding.name(),
                 this.headerColor,
                 this.starStatus,
                 this.lastUsed,

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

@@ -105,6 +105,12 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             inputHolder.setNoteField(null);
         }
 
+        if (mLoyaltyCardListDisplayOptions.showingCardId() && !loyaltyCard.cardId.isEmpty()) {
+            inputHolder.setExtraField(inputHolder.mCardIdField, loyaltyCard.cardId, null, showDivider);
+        } else {
+            inputHolder.setExtraField(inputHolder.mCardIdField, null, null, false);
+        }
+
         if (mLoyaltyCardListDisplayOptions.showingBalance() && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
             inputHolder.setExtraField(inputHolder.mBalanceField, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType), null, showDivider);
         } else {
@@ -211,7 +217,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
     public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
 
-        public TextView mCardText, mStoreField, mNoteField, mBalanceField, mValidFromField, mExpiryField;
+        public TextView mCardText, mStoreField, mNoteField, mCardIdField, mBalanceField, mValidFromField, mExpiryField;
         public ImageView mCardIcon, mTickIcon;
         public MaterialCardView mRow;
         public ConstraintLayout mStar, mArchived;
@@ -224,6 +230,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             mDivider = loyaltyCardLayoutBinding.infoDivider;
             mStoreField = loyaltyCardLayoutBinding.store;
             mNoteField = loyaltyCardLayoutBinding.note;
+            mCardIdField = loyaltyCardLayoutBinding.cardId;
             mBalanceField = loyaltyCardLayoutBinding.balance;
             mValidFromField = loyaltyCardLayoutBinding.validFrom;
             mExpiryField = loyaltyCardLayoutBinding.expiry;

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

@@ -70,6 +70,8 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -89,6 +91,7 @@ import java.util.concurrent.Callable;
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.LayoutChipChoiceBinding;
 import protect.card_locker.databinding.LoyaltyCardEditActivityBinding;
+import protect.card_locker.shared.ForegroundColorHelper;
 import protect.card_locker.viewmodels.LoyaltyCardEditActivityViewModel;
 
 public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements BarcodeImageWriterResultCallback, ColorPickerDialogListener {
@@ -123,11 +126,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     ChipGroup groupsChips;
     AutoCompleteTextView validFromField;
     AutoCompleteTextView expiryField;
-    EditText balanceField;
     AutoCompleteTextView balanceCurrencyField;
+    EditText balanceField;
     TextView cardIdFieldView;
     AutoCompleteTextView barcodeIdField;
     AutoCompleteTextView barcodeTypeField;
+    AutoCompleteTextView barcodeEncodingField;
     ImageView barcodeImage;
     View barcodeImageLayout;
     View barcodeCaptureLayout;
@@ -148,9 +152,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     boolean onRestoring = false;
     AlertDialog confirmExitDialog = null;
 
-    boolean validBalance = true;
     HashMap<String, Currency> currencies = new HashMap<>();
     HashMap<String, String> currencySymbols = new HashMap<>();
+    boolean validBalance = true;
 
     ActivityResultLauncher<Uri> mPhotoTakerLauncher;
     ActivityResultLauncher<Intent> mPhotoPickerLauncher;
@@ -193,14 +197,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         viewModel.setHasChanged(true);
     }
 
-    protected void setLoyaltyCardBalance(@NonNull BigDecimal balance) {
-        viewModel.getLoyaltyCard().setBalance(balance);
+    protected void setLoyaltyCardBalanceType(@Nullable Currency balanceType) {
+        viewModel.getLoyaltyCard().setBalanceType(balanceType);
 
         viewModel.setHasChanged(true);
     }
 
-    protected void setLoyaltyCardBalanceType(@Nullable Currency balanceType) {
-        viewModel.getLoyaltyCard().setBalanceType(balanceType);
+    protected void setLoyaltyCardBalance(@NonNull BigDecimal balance) {
+        viewModel.getLoyaltyCard().setBalance(balance);
 
         viewModel.setHasChanged(true);
     }
@@ -229,6 +233,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         viewModel.setHasChanged(true);
     }
 
+    protected void setLoyaltyCardBarcodeEncoding(@NonNull Charset barcodeEncoding) {
+        viewModel.getLoyaltyCard().setBarcodeEncoding(barcodeEncoding);
+
+        generateBarcode();
+
+        viewModel.setHasChanged(true);
+    }
+
     protected void setLoyaltyCardHeaderColor(@Nullable Integer headerColor) {
         viewModel.getLoyaltyCard().setHeaderColor(headerColor);
 
@@ -329,11 +341,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         groupsChips = binding.groupChips;
         validFromField = binding.validFromField;
         expiryField = binding.expiryField;
-        balanceField = binding.balanceField;
         balanceCurrencyField = binding.balanceCurrencyField;
+        balanceField = binding.balanceField;
         cardIdFieldView = binding.cardIdView;
         barcodeIdField = binding.barcodeIdField;
         barcodeTypeField = binding.barcodeTypeField;
+        barcodeEncodingField = binding.barcodeEncodingField;
         barcodeImage = binding.barcode;
         barcodeImage.setClipToOutline(true);
         barcodeImageLayout = binding.barcodeLayout;
@@ -373,33 +386,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         setMaterialDatePickerResultListener();
 
-        balanceField.setOnFocusChangeListener((v, hasFocus) -> {
-            if (!hasFocus && !onResuming && !onRestoring) {
-                if (balanceField.getText().toString().isEmpty()) {
-                    setLoyaltyCardBalance(BigDecimal.valueOf(0));
-                }
-
-                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType));
-            }
-        });
-
-        balanceField.addTextChangedListener(new SimpleTextWatcher() {
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (onResuming || onRestoring) return;
-                try {
-                    BigDecimal balance = Utils.parseBalance(s.toString(), viewModel.getLoyaltyCard().balanceType);
-                    setLoyaltyCardBalance(balance);
-                    balanceField.setError(null);
-                    validBalance = true;
-                } catch (ParseException e) {
-                    e.printStackTrace();
-                    balanceField.setError(getString(R.string.balanceParsingFailed));
-                    validBalance = false;
-                }
-            }
-        });
-
         balanceCurrencyField.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
@@ -452,6 +438,33 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             }
         });
 
+        balanceField.setOnFocusChangeListener((v, hasFocus) -> {
+            if (!hasFocus && !onResuming && !onRestoring) {
+                if (balanceField.getText().toString().isEmpty()) {
+                    setLoyaltyCardBalance(BigDecimal.valueOf(0));
+                }
+
+                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType));
+            }
+        });
+
+        balanceField.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (onResuming || onRestoring) return;
+                try {
+                    BigDecimal balance = Utils.parseBalance(s.toString(), viewModel.getLoyaltyCard().balanceType);
+                    setLoyaltyCardBalance(balance);
+                    balanceField.setError(null);
+                    validBalance = true;
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                    balanceField.setError(getString(R.string.balanceParsingFailed));
+                    validBalance = false;
+                }
+            }
+        });
+
         cardIdFieldView.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -577,6 +590,25 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             }
         });
 
+        barcodeEncodingField.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (!s.toString().isEmpty()) {
+                    Log.d(TAG, "Setting barcode encoding to " + s.toString());
+                    setLoyaltyCardBarcodeEncoding(Charset.forName(s.toString()));
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                ArrayList<String> barcodeEncodingList = new ArrayList<>();
+                barcodeEncodingList.add(StandardCharsets.ISO_8859_1.name());
+                barcodeEncodingList.add(StandardCharsets.UTF_8.name());
+                ArrayAdapter<String> barcodeEncodingAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, barcodeEncodingList);
+                barcodeEncodingField.setAdapter(barcodeEncodingAdapter);
+            }
+        });
+
         binding.tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
@@ -688,6 +720,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         });
     }
 
+    @Override
+    protected void onDestroy() {
+        if (mDatabase != null && mDatabase.isOpen()) {
+            mDatabase.close();
+        }
+        super.onDestroy();
+    }
+
     private void selectTab(int index) {
         binding.tabs.selectTab(binding.tabs.getTabAt(index));
         viewModel.setTabIndex(index);
@@ -719,7 +759,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
         int colorBackground = MaterialColors.getColor(this, android.R.attr.colorBackground, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
         mCropperOptions.setToolbarColor(colorSurface);
-        mCropperOptions.setStatusBarColor(colorSurface);
         mCropperOptions.setToolbarWidgetColor(colorOnSurface);
         mCropperOptions.setRootViewBackgroundColor(colorBackground);
         // set tool tip to be the darker of primary color
@@ -774,6 +813,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         barcodeIdField.setText(barcodeId != null && !barcodeId.isEmpty() ? barcodeId : getString(R.string.sameAsCardId));
         CatimaBarcode barcodeType = viewModel.getLoyaltyCard().barcodeType;
         barcodeTypeField.setText(barcodeType != null ? barcodeType.prettyName() : getString(R.string.noBarcode));
+        Charset barcodeEncoding = viewModel.getLoyaltyCard().barcodeEncoding;
+        barcodeEncodingField.setText(barcodeEncoding.name());
 
         // We set the balance here (with onResuming/onRestoring == true) to prevent formatBalanceCurrencyField() from setting it (via onTextChanged),
         // which can cause issues when switching locale because it parses the balance and e.g. the decimal separator may have changed.
@@ -856,8 +897,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         Integer headerColor = viewModel.getLoyaltyCard().headerColor;
         if (headerColor != null) {
             thumbnail.setOnClickListener(new ChooseCardImage());
-            thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
-            thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
+            thumbnailEditIcon.setBackgroundColor(ForegroundColorHelper.Companion.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+            thumbnailEditIcon.setColorFilter(ForegroundColorHelper.Companion.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
         }
 
         onResuming = false;
@@ -879,18 +920,18 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
             setLoyaltyCardHeaderColor(headerColor);
 
-            thumbnail.setBackgroundColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+            thumbnail.setBackgroundColor(ForegroundColorHelper.Companion.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
 
-            thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
-            thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
+            thumbnailEditIcon.setBackgroundColor(ForegroundColorHelper.Companion.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+            thumbnailEditIcon.setColorFilter(ForegroundColorHelper.Companion.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
         } else {
             generateIcon(storeFieldEdit.getText().toString().trim());
 
             Integer headerColor = viewModel.getLoyaltyCard().headerColor;
 
             if (headerColor != null) {
-                thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
-                thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
+                thumbnailEditIcon.setBackgroundColor(ForegroundColorHelper.Companion.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+                thumbnailEditIcon.setColorFilter(ForegroundColorHelper.Companion.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
             }
         }
     }
@@ -1480,9 +1521,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         // This makes the DBHelper set it to the current date
         // So that new and edited card are always on top when sorting by recently used
         if (viewModel.getUpdateLoyaltyCard()) {
-            DBHelper.updateLoyaltyCard(mDatabase, viewModel.getLoyaltyCardId(), viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().headerColor, viewModel.getLoyaltyCard().starStatus, null, viewModel.getLoyaltyCard().archiveStatus);
+            DBHelper.updateLoyaltyCard(mDatabase, viewModel.getLoyaltyCardId(), viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().barcodeEncoding, viewModel.getLoyaltyCard().headerColor, viewModel.getLoyaltyCard().starStatus, null, viewModel.getLoyaltyCard().archiveStatus);
         } else {
-            viewModel.setLoyaltyCardId((int) DBHelper.insertLoyaltyCard(mDatabase, viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().headerColor, 0, null, 0));
+            viewModel.setLoyaltyCardId((int) DBHelper.insertLoyaltyCard(mDatabase, viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().barcodeEncoding, viewModel.getLoyaltyCard().headerColor, 0, null, 0));
         }
 
         try {
@@ -1495,7 +1536,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         DBHelper.setLoyaltyCardGroups(mDatabase, viewModel.getLoyaltyCardId(), selectedGroups);
 
-        ShortcutHelper.updateShortcuts(this, DBHelper.getLoyaltyCard(this, mDatabase, viewModel.getLoyaltyCardId()));
+        ShortcutHelper.updateShortcuts(this);
 
         if (viewModel.getDuplicateFromLoyaltyCardId()) {
             Intent intent = new Intent(getApplicationContext(), MainActivity.class);
@@ -1597,6 +1638,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         String cardIdString = viewModel.getLoyaltyCard().barcodeId != null ? viewModel.getLoyaltyCard().barcodeId : viewModel.getLoyaltyCard().cardId;
         CatimaBarcode barcodeFormat = viewModel.getLoyaltyCard().barcodeType;
+        Charset barcodeEncoding = viewModel.getLoyaltyCard().barcodeEncoding;
 
         if (cardIdString == null || cardIdString.isEmpty() || barcodeFormat == null) {
             barcodeImageLayout.setVisibility(View.GONE);
@@ -1616,13 +1658,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, LoyaltyCardEditActivity.this, true, false);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, barcodeEncoding, null, false, LoyaltyCardEditActivity.this, true, false);
                             viewModel.getTaskHandler().executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, this, true, false);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, barcodeEncoding, null, false, this, true, false);
             viewModel.getTaskHandler().executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -35,6 +35,7 @@ public class LoyaltyCardListDisplayOptionsManager {
 
     private boolean mShowNameBelowThumbnail;
     private boolean mShowNote;
+    private boolean mShowCardId;
     private boolean mShowBalance;
     private boolean mShowValidity;
     private boolean mShowArchivedCards;
@@ -50,6 +51,7 @@ public class LoyaltyCardListDisplayOptionsManager {
                 Context.MODE_PRIVATE);
         mShowNameBelowThumbnail = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_name_below_thumbnail), false);
         mShowNote = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_note), true);
+        mShowCardId = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_card_id), false);
         mShowBalance = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_balance), true);
         mShowValidity = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_validity), true);
         mShowArchivedCards = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_archived_cards), true);
@@ -83,6 +85,17 @@ public class LoyaltyCardListDisplayOptionsManager {
         return mShowNote;
     }
 
+    public void showCardId(boolean show) {
+        mShowCardId = show;
+        mRefreshCardsCallback.run();
+
+        saveDetailState(R.string.sharedpreference_card_details_show_card_id, show);
+    }
+
+    public boolean showingCardId() {
+        return mShowCardId;
+    }
+
     public void showBalance(boolean show) {
         mShowBalance = show;
         mRefreshCardsCallback.run();
@@ -137,6 +150,11 @@ public class LoyaltyCardListDisplayOptionsManager {
                 showingNote(),
                 this::showNote
         ));
+        displayOptions.add(new LoyaltyCardDisplayOption(
+                mContext.getString(R.string.show_card_id),
+                showingCardId(),
+                this::showCardId
+        ));
         displayOptions.add(new LoyaltyCardDisplayOption(
                 mContext.getString(R.string.show_balance),
                 showingBalance(),

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

@@ -1,10 +1,17 @@
 package protect.card_locker;
 
 import android.app.Application;
+import android.content.Intent;
 
 import androidx.appcompat.app.AppCompatDelegate;
+import org.acra.ACRA;
+import org.acra.config.CoreConfigurationBuilder;
+import org.acra.config.DialogConfigurationBuilder;
+import org.acra.config.MailSenderConfigurationBuilder;
+import org.acra.data.StringFormat;
 
 import protect.card_locker.preferences.Settings;
+import protect.card_locker.wearos.WearSyncServiceManager;
 
 public class LoyaltyCardLockerApplication extends Application {
 
@@ -12,7 +19,33 @@ public class LoyaltyCardLockerApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
+        // Initialize crash reporter (if enabled)
+        if (BuildConfig.useAcraCrashReporter) {
+            ACRA.init(this, new CoreConfigurationBuilder()
+                    //core configuration:
+                    .withBuildConfigClass(BuildConfig.class)
+                    .withReportFormat(StringFormat.KEY_VALUE_LIST)
+                    .withPluginConfigurations(
+                            new DialogConfigurationBuilder()
+                                    .withText(String.format(getString(R.string.acra_catima_has_crashed), getString(R.string.app_name)))
+                                    .withCommentPrompt(getString(R.string.acra_explain_crash))
+                                    .withResTheme(R.style.AppTheme)
+                                    .build(),
+                            new MailSenderConfigurationBuilder()
+                                    .withMailTo("acra-crash@catima.app")
+                                    .withSubject(String.format(getString(R.string.acra_crash_email_subject), getString(R.string.app_name)))
+                                    .build()
+                    )
+            );
+        }
+
+        // Set theme
         Settings settings = new Settings(this);
         AppCompatDelegate.setDefaultNightMode(settings.getTheme());
+
+        // Start Bluetooth server for Wear OS companion if enabled.
+        // The service checks BLUETOOTH_CONNECT itself and stops if the permission is missing.
+        // The permission is requested from the launcher Activity when the UI resumes.
+        WearSyncServiceManager.INSTANCE.synchronize(this, null);
     }
 }

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

@@ -1,880 +0,0 @@
-package protect.card_locker;
-
-import android.app.Activity;
-import android.app.SearchManager;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.CursorIndexOutOfBoundsException;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.Toast;
-
-import androidx.activity.OnBackPressedCallback;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.view.ActionMode;
-import androidx.appcompat.widget.SearchView;
-import androidx.core.splashscreen.SplashScreen;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.tabs.TabLayout;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import protect.card_locker.databinding.ContentMainBinding;
-import protect.card_locker.databinding.MainActivityBinding;
-import protect.card_locker.databinding.SortingOptionBinding;
-import protect.card_locker.preferences.Settings;
-import protect.card_locker.preferences.SettingsActivity;
-
-public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
-    private MainActivityBinding binding;
-    private ContentMainBinding contentMainBinding;
-    private static final String TAG = "Catima";
-    public static final String RESTART_ACTIVITY_INTENT = "restart_activity_intent";
-
-    private static final int MEDIUM_SCALE_FACTOR_DIP = 460;
-    static final String STATE_SEARCH_QUERY = "SEARCH_QUERY";
-
-    private SQLiteDatabase mDatabase;
-    private LoyaltyCardCursorAdapter mAdapter;
-    private ActionMode mCurrentActionMode;
-    private SearchView mSearchView;
-    private int mLoyaltyCardCount = 0;
-    protected String mFilter = "";
-    private String currentQuery = "";
-    private String finalQuery = "";
-    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 mHelpSection;
-    private View mNoMatchingCardsText;
-    private View mNoGroupCardsText;
-    private TabLayout groupsTabLayout;
-    private Runnable mUpdateLoyaltyCardListRunnable;
-    private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
-    private ActivityResultLauncher<Intent> mSettingsLauncher;
-
-    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_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 MaterialAlertDialogBuilder(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) -> {
-                    for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                        Log.d(TAG, "Deleting card: " + loyaltyCard.id);
-
-                        DBHelper.deleteLoyaltyCard(mDatabase, MainActivity.this, loyaltyCard.id);
-
-                        ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
-                    }
-
-                    TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
-                    mGroup = tab != null ? tab.getTag() : null;
-
-                    updateLoyaltyCardList(true);
-
-                    dialog.dismiss();
-                });
-                builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-                AlertDialog dialog = builder.create();
-                dialog.show();
-
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_archive) {
-                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                    Log.d(TAG, "Archiving card: " + loyaltyCard.id);
-                    DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 1);
-                    ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
-                    updateLoyaltyCardList(false);
-                    inputMode.finish();
-                    invalidateOptionsMenu();
-                }
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_unarchive) {
-                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                    Log.d(TAG, "Unarchiving card: " + loyaltyCard.id);
-                    DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 0);
-                    updateLoyaltyCardList(false);
-                    inputMode.finish();
-                    invalidateOptionsMenu();
-                }
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_star) {
-                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                    Log.d(TAG, "Starring card: " + loyaltyCard.id);
-                    DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 1);
-                    updateLoyaltyCardList(false);
-                    inputMode.finish();
-                }
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_unstar) {
-                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                    Log.d(TAG, "Unstarring card: " + loyaltyCard.id);
-                    DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 0);
-                    updateLoyaltyCardList(false);
-                    inputMode.finish();
-                }
-                return true;
-            }
-
-            return false;
-        }
-
-        @Override
-        public void onDestroyActionMode(ActionMode inputMode) {
-            mAdapter.clearSelections();
-            mCurrentActionMode = null;
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle inputSavedInstanceState) {
-        SplashScreen.installSplashScreen(this);
-        super.onCreate(inputSavedInstanceState);
-
-        // Delete old cache files
-        // These could be temporary images for the cropper, temporary images in LoyaltyCard toBundle/writeParcel/ etc.
-        new Thread(() -> {
-            long twentyFourHoursAgo = System.currentTimeMillis() - (1000 * 60 * 60 * 24);
-
-            File[] tempFiles = getCacheDir().listFiles();
-
-            if (tempFiles == null) {
-                Log.e(TAG, "getCacheDir().listFiles() somehow returned null, this should never happen... Skipping cache cleanup...");
-                return;
-            }
-
-            for (File file : tempFiles) {
-                if (file.lastModified() < twentyFourHoursAgo) {
-                    if (!file.delete()) {
-                        Log.w(TAG, "Failed to delete cache file " + file.getPath());
-                    }
-                };
-            }
-        }).start();
-
-        // We should extract the share intent after we called the super.onCreate as it may need to spawn a dialog window and the app needs to be initialized to not crash
-        extractIntentFields(getIntent());
-
-        binding = MainActivityBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-        Utils.applyWindowInsets(binding.getRoot());
-        setSupportActionBar(binding.toolbar);
-        groupsTabLayout = binding.groups;
-        contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
-
-        mDatabase = new DBHelper(this).getWritableDatabase();
-
-        mUpdateLoyaltyCardListRunnable = () -> {
-            updateLoyaltyCardList(false);
-        };
-
-        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                selectedTab = tab.getPosition();
-                Log.d("onTabSelected", "Tab Position " + tab.getPosition());
-                mGroup = tab.getTag();
-                updateLoyaltyCardList(false);
-                // 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) {
-
-            }
-        });
-
-        mHelpSection = contentMainBinding.helpSection;
-        mNoMatchingCardsText = contentMainBinding.noMatchingCardsText;
-        mNoGroupCardsText = contentMainBinding.noGroupCardsText;
-        mCardList = contentMainBinding.list;
-
-        mAdapter = new LoyaltyCardCursorAdapter(this, null, this, mUpdateLoyaltyCardListRunnable);
-        mCardList.setAdapter(mAdapter);
-        registerForContextMenu(mCardList);
-
-        mBarcodeScannerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-            // Exit early if the user cancelled the scan (pressed back/home)
-            if (result.getResultCode() != RESULT_OK) {
-                return;
-            }
-
-            Intent editIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-            editIntent.putExtras(result.getData().getExtras());
-            startActivity(editIntent);
-        });
-
-        mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-            if (result.getResultCode() == Activity.RESULT_OK) {
-                Intent intent = result.getData();
-                if (intent != null && intent.getBooleanExtra(RESTART_ACTIVITY_INTENT, false)) {
-                    recreate();
-                }
-            }
-        });
-
-        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-            @Override
-            public void handleOnBackPressed() {
-                if (mSearchView != null && !mSearchView.isIconified()) {
-                    mSearchView.setIconified(true);
-                } else {
-                    finish();
-                }
-            }
-        });
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (mCurrentActionMode != null) {
-            mAdapter.clearSelections();
-            mCurrentActionMode.finish();
-        }
-
-        if (mSearchView != null && !mSearchView.isIconified()) {
-            mFilter = mSearchView.getQuery().toString();
-        }
-        // Start of active tab logic
-        updateTabGroups(groupsTabLayout);
-
-        // Restore selected tab 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);
-
-        // Restore sort preferences from Shared Preferences
-        mOrder = Utils.getLoyaltyCardOrder(this);
-        mOrderDirection = Utils.getLoyaltyCardOrderDirection(this);
-
-        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();
-        } else {
-            scaleScreen();
-        }
-
-        updateLoyaltyCardList(true);
-        // End of active tab logic
-
-        FloatingActionButton addButton = binding.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());
-            }
-            intent.putExtras(bundle);
-            mBarcodeScannerLauncher.launch(intent);
-        });
-        addButton.bringToFront();
-
-        var layoutManager = (GridLayoutManager) mCardList.getLayoutManager();
-        if (layoutManager != null) {
-            var settings = new Settings(this);
-            layoutManager.setSpanCount(settings.getPreferredColumnCount());
-        }
-    }
-
-    private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
-        for (int id : new int[]{R.id.action_search, R.id.action_display_options, R.id.action_sort}) {
-            menu.findItem(id).setVisible(shouldShow);
-        }
-    }
-
-    private void updateLoyaltyCardCount() {
-        mLoyaltyCardCount = DBHelper.getLoyaltyCardCount(mDatabase);
-    }
-
-    private void updateLoyaltyCardList(boolean updateCount) {
-        Group group = null;
-        if (mGroup != null) {
-            group = (Group) mGroup;
-        }
-
-        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mAdapter.showingArchivedCards() ? DBHelper.LoyaltyCardArchiveFilter.All : DBHelper.LoyaltyCardArchiveFilter.Unarchived));
-
-        if (updateCount) {
-            updateLoyaltyCardCount();
-            // Update menu icons if necessary
-            invalidateOptionsMenu();
-        }
-
-        if (mLoyaltyCardCount > 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
-            mHelpSection.setVisibility(View.GONE);
-            mNoGroupCardsText.setVisibility(View.GONE);
-
-            if (mAdapter.getItemCount() > 0) {
-                mCardList.setVisibility(View.VISIBLE);
-                mNoMatchingCardsText.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);
-                }
-            }
-        } else {
-            mCardList.setVisibility(View.GONE);
-            mHelpSection.setVisibility(View.VISIBLE);
-
-            mNoMatchingCardsText.setVisibility(View.GONE);
-            mNoGroupCardsText.setVisibility(View.GONE);
-        }
-
-        if (mCurrentActionMode != null) {
-            mCurrentActionMode.finish();
-        }
-
-        new ListWidget().updateAll(mAdapter.mContext);
-    }
-
-    private void processParseResultList(List<ParseResult> parseResultList, String group, boolean closeAppOnNoBarcode) {
-        if (parseResultList.isEmpty()) {
-            throw new IllegalArgumentException("parseResultList may not be empty");
-        }
-
-        Utils.makeUserChooseParseResultFromList(MainActivity.this, parseResultList, new ParseResultListDisambiguatorCallback() {
-            @Override
-            public void onUserChoseParseResult(ParseResult parseResult) {
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = parseResult.toLoyaltyCardBundle(MainActivity.this);
-                if (group != null) {
-                    bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
-                }
-                intent.putExtras(bundle);
-                startActivity(intent);
-            }
-
-            @Override
-            public void onUserDismissedSelector() {
-                if (closeAppOnNoBarcode) {
-                    finish();
-                }
-            }
-        });
-    }
-
-    private void onSharedIntent(Intent intent) {
-        String receivedAction = intent.getAction();
-        String receivedType = intent.getType();
-
-        if (receivedAction == null || receivedType == null) {
-            return;
-        }
-
-        List<ParseResult> parseResultList;
-
-        // Check for shared text
-        if (receivedAction.equals(Intent.ACTION_SEND) && receivedType.equals("text/plain")) {
-            LoyaltyCard loyaltyCard = new LoyaltyCard();
-            loyaltyCard.setCardId(intent.getStringExtra(Intent.EXTRA_TEXT));
-            parseResultList = Collections.singletonList(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
-        } else {
-            // Parse whatever file was sent, regardless of opening or sharing
-            Uri data;
-            if (receivedAction.equals(Intent.ACTION_VIEW)) {
-                data = intent.getData();
-            } else if (receivedAction.equals(Intent.ACTION_SEND)) {
-                data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-            } else {
-                Log.e(TAG, "Wrong action type to parse intent");
-                return;
-            }
-
-            if (receivedType.startsWith("image/")) {
-                parseResultList = Utils.retrieveBarcodesFromImage(this, data);
-            } else if (receivedType.equals("application/pdf")) {
-                parseResultList = Utils.retrieveBarcodesFromPdf(this, data);
-            } else if (Arrays.asList("application/vnd.apple.pkpass", "application/vnd-com.apple.pkpass").contains(receivedType)) {
-                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
-            } else if (receivedType.equals("application/vnd.espass-espass")) {
-                // FIXME: espass is not pkpass
-                // However, several users stated in https://github.com/CatimaLoyalty/Android/issues/2197 that the formats are extremely similar to the point they could rename an .espass file to .pkpass and have it imported
-                // So it makes sense to "unofficially" treat it as a PKPASS for now, even though not completely correct
-                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
-            } else {
-                Log.e(TAG, "Wrong mime-type");
-                return;
-            }
-        }
-
-        // Give up if we should parse but there is nothing to parse
-        if (parseResultList == null || parseResultList.isEmpty()) {
-            finish();
-            return;
-        }
-
-        processParseResultList(parseResultList, null, true);
-    }
-
-    private void extractIntentFields(Intent intent) {
-        onSharedIntent(intent);
-    }
-
-    public void updateTabGroups(TabLayout groupsTabLayout) {
-        List<Group> newGroups = DBHelper.getGroups(mDatabase);
-
-        if (newGroups.size() == 0) {
-            groupsTabLayout.removeAllTabs();
-            groupsTabLayout.setVisibility(View.GONE);
-            return;
-        }
-
-        groupsTabLayout.removeAllTabs();
-
-        TabLayout.Tab allTab = groupsTabLayout.newTab();
-        allTab.setText(R.string.all);
-        allTab.setTag(null);
-        groupsTabLayout.addTab(allTab, false);
-
-        for (Group group : newGroups) {
-            TabLayout.Tab tab = groupsTabLayout.newTab();
-            tab.setText(group._id);
-            tab.setTag(group);
-            groupsTabLayout.addTab(tab, false);
-        }
-
-        groupsTabLayout.setVisibility(View.VISIBLE);
-
-    }
-
-    @Override
-    // Saving currentQuery to finalQuery for user, this will be used to restore search history, happens when user clicks a card from list
-    protected void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        finalQuery = currentQuery;
-        // Putting the query also into outState for later use in onRestoreInstanceState when rotating screen
-        if (mSearchView != null) {
-            outState.putString(STATE_SEARCH_QUERY, finalQuery);
-        }
-    }
-
-    @Override
-    // Restoring instance state when rotation of screen happens with the goal to restore search query for user
-    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        finalQuery = savedInstanceState.getString(STATE_SEARCH_QUERY, "");
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu inputMenu) {
-        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
-
-        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
-
-        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-        if (searchManager != null) {
-            MenuItem searchMenuItem = inputMenu.findItem(R.id.action_search);
-            mSearchView = (SearchView) searchMenuItem.getActionView();
-            mSearchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
-            mSearchView.setSubmitButtonEnabled(false);
-            mSearchView.setOnCloseListener(() -> {
-                invalidateOptionsMenu();
-                return false;
-            });
-
-            /*
-             * On Android 13 and later, pressing Back while the search view is open hides the keyboard
-             * and collapses the search view at the same time.
-             * This brings back the old behavior on Android 12 and lower: pressing Back once
-             * hides the keyboard, press again while keyboard is hidden to collapse the search view.
-             */
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                searchMenuItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
-                    @Override
-                    public boolean onMenuItemActionExpand(@NonNull MenuItem item) {
-                        return true;
-                    }
-
-                    @Override
-                    public boolean onMenuItemActionCollapse(@NonNull MenuItem item) {
-                        if (mSearchView.hasFocus()) {
-                            mSearchView.clearFocus();
-                            return false;
-                        }
-                        currentQuery = "";
-                        mFilter = "";
-                        updateLoyaltyCardList(false);
-                        return true;
-                    }
-                });
-            }
-
-            mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-                @Override
-                public boolean onQueryTextSubmit(String query) {
-                    return false;
-                }
-
-                @Override
-                public boolean onQueryTextChange(String newText) {
-                    mFilter = newText;
-                    // New logic to ensure search history after coming back from picked card - user will see the last search query
-                    if (newText.isEmpty()) {
-                        if(!finalQuery.isEmpty()){
-                            // Setting the query text for user after coming back from picked card from finalQuery
-                            mSearchView.setQuery(finalQuery, false);
-                        }
-                        else if(!currentQuery.isEmpty()){
-                            // Else if is needed in case user deletes search - expected behaviour is to show all cards
-                            currentQuery = "";
-                            mSearchView.setQuery(currentQuery, false);
-                        }
-                    } else {
-                        // Setting search query each time user changes the text in search to temporary variable to be used later in finalQuery String which will be used to restore search history
-                        currentQuery = newText;
-                    }
-                    TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
-                    mGroup = currentTab != null ? currentTab.getTag() : null;
-
-                    updateLoyaltyCardList(false);
-
-                    return true;
-                }
-            });
-            // Check if we came from a picked card back to search, in that case we want to show the search view with previous search query
-            if(!finalQuery.isEmpty()){
-                // Expand the search view to show the query
-                searchMenuItem.expandActionView();
-                // Setting the query text to empty String due to behaviour of onQueryTextChange after coming back from picked card - onQueryTextChange is called automatically without users interaction
-                finalQuery = "";
-                mSearchView.setQuery(currentQuery, false);
-            }
-        }
-
-        return super.onCreateOptionsMenu(inputMenu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem inputItem) {
-        int id = inputItem.getItemId();
-
-        if (id == android.R.id.home) {
-            getOnBackPressedDispatcher().onBackPressed();
-        }
-
-        if (id == R.id.action_display_options) {
-            mAdapter.showDisplayOptionsDialog();
-            invalidateOptionsMenu();
-
-            return true;
-        }
-
-        if (id == R.id.action_sort) {
-            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 MaterialAlertDialogBuilder(MainActivity.this);
-            builder.setTitle(R.string.sort_by);
-
-            SortingOptionBinding sortingOptionBinding = SortingOptionBinding
-                    .inflate(LayoutInflater.from(MainActivity.this), null, false);
-            final View customLayout = sortingOptionBinding.getRoot();
-            builder.setView(customLayout);
-
-            CheckBox showReversed = sortingOptionBinding.checkBoxReverse;
-
-
-            showReversed.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) -> {
-
-                setSort(
-                        loyaltyCardOrders.get(currentIndex.get()),
-                        showReversed.isChecked() ? DBHelper.LoyaltyCardOrderDirection.Descending : DBHelper.LoyaltyCardOrderDirection.Ascending
-                );
-
-                new ListWidget().updateAll(this);
-
-                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);
-            startActivity(i);
-            return true;
-        }
-
-        if (id == R.id.action_import_export) {
-            Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
-            startActivity(i);
-            return true;
-        }
-
-        if (id == R.id.action_settings) {
-            Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
-            mSettingsLauncher.launch(i);
-            return true;
-        }
-
-        if (id == R.id.action_about) {
-            Intent i = new Intent(getApplicationContext(), AboutActivity.class);
-            startActivity(i);
-            return true;
-        }
-
-
-        return super.onOptionsItemSelected(inputItem);
-    }
-
-    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(false);
-    }
-
-    @Override
-    public void onRowLongClicked(int inputPosition) {
-        enableActionMode(inputPosition);
-    }
-
-    private void enableActionMode(int inputPosition) {
-        if (mCurrentActionMode == null) {
-            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
-        }
-        toggleSelection(inputPosition);
-    }
-
-    private void scaleScreen() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        int screenHeight = displayMetrics.heightPixels;
-        float mediumSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,MEDIUM_SCALE_FACTOR_DIP,getResources().getDisplayMetrics());
-        boolean shouldScaleSmaller = screenHeight < mediumSizePx;
-
-        binding.include.welcomeIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
-    }
-
-    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);
-            MenuItem archiveItem = mCurrentActionMode.getMenu().findItem(R.id.action_archive);
-            MenuItem unarchiveItem = mCurrentActionMode.getMenu().findItem(R.id.action_unarchive);
-            MenuItem starItem = mCurrentActionMode.getMenu().findItem(R.id.action_star);
-            MenuItem unstarItem = mCurrentActionMode.getMenu().findItem(R.id.action_unstar);
-
-            boolean hasStarred = false;
-            boolean hasUnstarred = false;
-            boolean hasArchived = false;
-            boolean hasUnarchived = false;
-
-            for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                if (loyaltyCard.starStatus == 1) {
-                    hasStarred = true;
-                } else {
-                    hasUnstarred = true;
-                }
-
-                if (loyaltyCard.archiveStatus == 1) {
-                    hasArchived = true;
-                } else {
-                    hasUnarchived = true;
-                }
-
-                // We have all types, no need to keep checking
-                if (hasStarred && hasUnstarred && hasArchived && hasUnarchived) {
-                    break;
-                }
-            }
-
-            unarchiveItem.setVisible(hasArchived);
-            archiveItem.setVisible(hasUnarchived);
-
-            if (count == 1) {
-                starItem.setVisible(!hasStarred);
-                unstarItem.setVisible(!hasUnstarred);
-                editItem.setVisible(true);
-                editItem.setEnabled(true);
-            } else {
-                starItem.setVisible(hasUnstarred);
-                unstarItem.setVisible(hasStarred);
-
-                editItem.setVisible(false);
-                editItem.setEnabled(false);
-            }
-
-            mCurrentActionMode.invalidate();
-        }
-    }
-
-
-    @Override
-    public void onRowClicked(int inputPosition) {
-        if (mAdapter.getSelectedItemCount() > 0) {
-            enableActionMode(inputPosition);
-        } else {
-            // FIXME
-            //
-            // There is a really nasty edge case that can happen when someone taps a card but right
-            // after it swipes (very small window, hard to reproduce). The cursor gets replaced and
-            // may not have a card at the ID number that is returned from onRowClicked.
-            //
-            // The proper fix, obviously, would involve makes sure an onFling can't happen while a
-            // click is being processed. Sadly, I have not yet found a way to make that possible.
-            LoyaltyCard loyaltyCard;
-            try {
-                loyaltyCard = mAdapter.getCard(inputPosition);
-            } catch (CursorIndexOutOfBoundsException e) {
-                Log.w(TAG, "Prevented crash from tap + swipe on ID " + inputPosition + ": " + e);
-                return;
-            }
-
-            Intent intent = new Intent(this, LoyaltyCardViewActivity.class);
-            intent.setAction("");
-            final Bundle b = new Bundle();
-            b.putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id);
-
-            ArrayList<Integer> cardList = new ArrayList<>();
-            for (int i = 0; i < mAdapter.getItemCount(); i++) {
-                cardList.add(mAdapter.getCard(i).id);
-            }
-
-            b.putIntegerArrayList(LoyaltyCardViewActivity.BUNDLE_CARDLIST, cardList);
-            intent.putExtras(b);
-
-            startActivity(intent);
-        }
-    }
-}

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

@@ -0,0 +1,942 @@
+package protect.card_locker
+
+import android.app.SearchManager
+import android.content.DialogInterface
+import android.content.Intent
+import android.database.CursorIndexOutOfBoundsException
+import android.database.sqlite.SQLiteDatabase
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.util.DisplayMetrics
+import android.util.Log
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultCallback
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+import androidx.appcompat.view.ActionMode
+import androidx.appcompat.widget.SearchView
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.recyclerview.widget.GridLayoutManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
+import protect.card_locker.DBHelper.LoyaltyCardOrder
+import protect.card_locker.DBHelper.LoyaltyCardOrderDirection
+import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
+import protect.card_locker.cardview.LoyaltyCardViewActivity
+import protect.card_locker.databinding.ContentMainBinding
+import protect.card_locker.databinding.MainActivityBinding
+import protect.card_locker.databinding.SortingOptionBinding
+import protect.card_locker.preferences.Settings
+import protect.card_locker.preferences.SettingsActivity
+import protect.card_locker.wearos.WearSyncPermissionRequester
+import java.io.UnsupportedEncodingException
+import java.util.concurrent.atomic.AtomicInteger
+import androidx.core.content.edit
+
+class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
+    private lateinit var binding: MainActivityBinding
+    private lateinit var contentMainBinding: ContentMainBinding
+    private lateinit var mDatabase: SQLiteDatabase
+    private lateinit var mAdapter: LoyaltyCardCursorAdapter
+    private var mCurrentActionMode: ActionMode? = null
+    private var mSearchView: SearchView? = null
+    private var mLoyaltyCardCount = 0
+    @JvmField
+    var mFilter: String = ""
+    private var currentQuery = ""
+    private var finalQuery = ""
+    private var mGroup: Any? = null
+    private var mOrder: LoyaltyCardOrder = LoyaltyCardOrder.Alpha
+    private var mOrderDirection: LoyaltyCardOrderDirection = LoyaltyCardOrderDirection.Ascending
+    private var selectedTab: Int = 0
+    private lateinit var groupsTabLayout: TabLayout
+    private lateinit var mUpdateLoyaltyCardListRunnable: Runnable
+    private lateinit var mBarcodeScannerLauncher: ActivityResultLauncher<Intent>
+    private lateinit var mSettingsLauncher: ActivityResultLauncher<Intent>
+    private lateinit var mWearSyncPermissionRequester: WearSyncPermissionRequester
+
+    private val mCurrentActionModeCallback: ActionMode.Callback = object : ActionMode.Callback {
+        override fun onCreateActionMode(inputMode: ActionMode, inputMenu: Menu?): Boolean {
+            inputMode.menuInflater.inflate(R.menu.card_longclick_menu, inputMenu)
+            return true
+        }
+
+        override fun onPrepareActionMode(inputMode: ActionMode?, inputMenu: Menu?): Boolean {
+            return false
+        }
+
+        override fun onActionItemClicked(inputMode: ActionMode, inputItem: MenuItem): Boolean {
+            when (inputItem.itemId) {
+                R.id.action_share -> {
+                    try {
+                        ImportURIHelper(this@MainActivity).startShareIntent(mAdapter.getSelectedItems())
+                    } catch (e: UnsupportedEncodingException) {
+                        Toast.makeText(
+                            this@MainActivity,
+                            R.string.failedGeneratingShareURL,
+                            Toast.LENGTH_LONG
+                        ).show()
+                        e.printStackTrace()
+                    }
+                    inputMode.finish()
+                    return true
+                }
+                R.id.action_edit -> {
+                    require(mAdapter.selectedItemCount == 1) { "Cannot edit more than 1 card at a time" }
+
+                    startActivity(
+                        Intent(applicationContext, LoyaltyCardEditActivity::class.java).apply {
+                            putExtras(Bundle().apply {
+                                putInt(
+                                    LoyaltyCardEditActivity.BUNDLE_ID,
+                                    mAdapter.getSelectedItems()[0].id
+                                )
+                                putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true)
+                            })
+                        }
+                    )
+
+                    inputMode.finish()
+                    return true
+                }
+                R.id.action_duplicate -> {
+                    require(mAdapter.selectedItemCount == 1) { "Cannot duplicate more than 1 card at a time" }
+
+                    startActivity(
+                        Intent(applicationContext, LoyaltyCardEditActivity::class.java).apply {
+                            putExtras(Bundle().apply {
+                                putInt(
+                                    LoyaltyCardEditActivity.BUNDLE_ID,
+                                    mAdapter.getSelectedItems()[0].id
+                                )
+                                putBoolean(LoyaltyCardEditActivity.BUNDLE_DUPLICATE_ID, true)
+                            })
+                        }
+                    )
+
+                    inputMode.finish()
+                    return true
+                }
+                R.id.action_delete -> {
+                    MaterialAlertDialogBuilder(this@MainActivity).apply {
+                        // 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.selectedItemCount == 1) {
+                            setTitle(R.string.deleteTitle)
+                            setMessage(R.string.deleteConfirmation)
+                        } else {
+                            setTitle(
+                                getResources().getQuantityString(
+                                    R.plurals.deleteCardsTitle,
+                                    mAdapter.selectedItemCount,
+                                    mAdapter.selectedItemCount
+                                )
+                            )
+                            setMessage(
+                                getResources().getQuantityString(
+                                    R.plurals.deleteCardsConfirmation,
+                                    mAdapter.selectedItemCount,
+                                    mAdapter.selectedItemCount
+                                )
+                            )
+                        }
+
+                        setPositiveButton(
+                            R.string.confirm
+                        ) { dialog, _ ->
+                            for (loyaltyCard in mAdapter.getSelectedItems()) {
+                                Log.d(TAG, "Deleting card: " + loyaltyCard.id)
+
+                                DBHelper.deleteLoyaltyCard(mDatabase, this@MainActivity, loyaltyCard.id)
+                            }
+                            val tab = groupsTabLayout.getTabAt(selectedTab)
+                            mGroup = tab?.tag
+
+                            updateLoyaltyCardList(true)
+                            dialog.dismiss()
+                        }
+
+                        setNegativeButton(R.string.cancel) { dialog, _ ->
+                            dialog.dismiss()
+                        }
+                    }.create().show()
+
+                    return true
+                }
+                R.id.action_archive -> {
+                    for (loyaltyCard in mAdapter.getSelectedItems()) {
+                        Log.d(TAG, "Archiving card: " + loyaltyCard.id)
+                        DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 1)
+                        updateLoyaltyCardList(false)
+                        inputMode.finish()
+                        invalidateOptionsMenu()
+                    }
+                    return true
+                }
+                R.id.action_unarchive -> {
+                    for (loyaltyCard in mAdapter.getSelectedItems()) {
+                        Log.d(TAG, "Unarchiving card: " + loyaltyCard.id)
+                        DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 0)
+                        updateLoyaltyCardList(false)
+                        inputMode.finish()
+                        invalidateOptionsMenu()
+                    }
+                    return true
+                }
+                R.id.action_star -> {
+                    for (loyaltyCard in mAdapter.getSelectedItems()) {
+                        Log.d(TAG, "Starring card: " + loyaltyCard.id)
+                        DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 1)
+                        updateLoyaltyCardList(false)
+                        inputMode.finish()
+                    }
+                    return true
+                }
+                R.id.action_unstar -> {
+                    for (loyaltyCard in mAdapter.getSelectedItems()) {
+                        Log.d(TAG, "Unstarring card: " + loyaltyCard.id)
+                        DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 0)
+                        updateLoyaltyCardList(false)
+                        inputMode.finish()
+                    }
+                    return true
+                }
+            }
+
+            return false
+        }
+
+        override fun onDestroyActionMode(inputMode: ActionMode?) {
+            mAdapter.clearSelections()
+            mCurrentActionMode = null
+        }
+    }
+
+    override fun onCreate(inputSavedInstanceState: Bundle?) {
+        installSplashScreen()
+        super.onCreate(inputSavedInstanceState)
+
+        // Delete old cache files
+        // These could be temporary images for the cropper, temporary images in LoyaltyCard toBundle/writeParcel/ etc.
+        Thread {
+            val twentyFourHoursAgo = System.currentTimeMillis() - (1000 * 60 * 60 * 24)
+            val tempFiles = cacheDir.listFiles()
+
+            if (tempFiles == null) {
+                Log.e(
+                    TAG,
+                    "getCacheDir().listFiles() somehow returned null, this should never happen... Skipping cache cleanup..."
+                )
+                return@Thread
+            }
+            for (file in tempFiles) {
+                if (file.lastModified() < twentyFourHoursAgo) {
+                    if (!file.delete()) {
+                        Log.w(TAG, "Failed to delete cache file " + file.path)
+                    }
+                }
+            }
+        }.start()
+
+        // We should extract the share intent after we called the super.onCreate as it may need to spawn a dialog window and the app needs to be initialized to not crash
+        extractIntentFields(intent)
+
+        binding = MainActivityBinding.inflate(layoutInflater)
+        setContentView(binding.getRoot())
+        Utils.applyWindowInsets(binding.getRoot())
+        setSupportActionBar(binding.toolbar)
+        groupsTabLayout = binding.groups
+        contentMainBinding = ContentMainBinding.bind(binding.include.getRoot())
+
+        mDatabase = DBHelper(this).writableDatabase
+
+        mUpdateLoyaltyCardListRunnable = Runnable {
+            updateLoyaltyCardList(false)
+        }
+
+        groupsTabLayout.addOnTabSelectedListener(object : OnTabSelectedListener {
+            override fun onTabSelected(tab: TabLayout.Tab) {
+                selectedTab = tab.position
+                Log.d("onTabSelected", "Tab Position " + tab.position)
+                mGroup = tab.tag
+                updateLoyaltyCardList(false)
+                // Store active tab in Shared Preference to restore next app launch
+                applicationContext.getSharedPreferences(
+                    getString(R.string.sharedpreference_active_tab),
+                    MODE_PRIVATE
+                ).edit {
+                    putInt(
+                        getString(R.string.sharedpreference_active_tab),
+                        tab.position
+                    )
+                }
+            }
+
+            override fun onTabUnselected(tab: TabLayout.Tab?) {
+            }
+
+            override fun onTabReselected(tab: TabLayout.Tab?) {
+            }
+        })
+
+        mAdapter = LoyaltyCardCursorAdapter(this, null, this, mUpdateLoyaltyCardListRunnable)
+        contentMainBinding.list.setAdapter(mAdapter)
+        registerForContextMenu(contentMainBinding.list)
+
+        mBarcodeScannerLauncher = registerForActivityResult(
+            StartActivityForResult(),
+            ActivityResultCallback registerForActivityResult@{ result: ActivityResult? ->
+                // Exit early if the user cancelled the scan (pressed back/home)
+                if (result == null || result.resultCode != RESULT_OK) {
+                    return@registerForActivityResult
+                }
+
+                startActivity(
+                    Intent(applicationContext, LoyaltyCardEditActivity::class.java).apply {
+                        putExtras(result.data!!.extras!!)
+                    }
+                )
+            })
+
+        mSettingsLauncher = registerForActivityResult(
+            StartActivityForResult()
+        ) { result: ActivityResult? ->
+            if (result?.resultCode == RESULT_OK) {
+                val intent = result.data
+                if (intent != null && intent.getBooleanExtra(RESTART_ACTIVITY_INTENT, false)) {
+                    recreate()
+                }
+            }
+        }
+
+        mWearSyncPermissionRequester = WearSyncPermissionRequester(this, this)
+
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (mSearchView != null && !mSearchView!!.isIconified) {
+                    mSearchView!!.isIconified = true
+                } else {
+                    finish()
+                }
+            }
+        })
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        if (mCurrentActionMode != null) {
+            mAdapter.clearSelections()
+            mCurrentActionMode!!.finish()
+        }
+
+        if (mSearchView != null && !mSearchView!!.isIconified) {
+            mFilter = mSearchView!!.query.toString()
+        }
+        // Start of active tab logic
+        updateTabGroups(groupsTabLayout)
+
+        // Restore selected tab from Shared Preference
+        selectedTab = applicationContext.getSharedPreferences(
+            getString(R.string.sharedpreference_active_tab),
+            MODE_PRIVATE
+        ).getInt(getString(R.string.sharedpreference_active_tab), 0)
+
+        // Restore sort preferences from Shared Preferences
+        mOrder = Utils.getLoyaltyCardOrder(this)
+        mOrderDirection = Utils.getLoyaltyCardOrderDirection(this)
+
+        mGroup = null
+
+        if (groupsTabLayout.tabCount != 0) {
+            var tab = groupsTabLayout.getTabAt(selectedTab)
+            if (tab == null) {
+                tab = groupsTabLayout.getTabAt(0)
+            }
+
+            groupsTabLayout.selectTab(tab)
+            checkNotNull(tab)
+            mGroup = tab.tag
+        } else {
+            scaleScreen()
+        }
+
+        updateLoyaltyCardList(true)
+
+        // End of active tab logic
+
+        binding.fabAdd.setOnClickListener {
+            mBarcodeScannerLauncher.launch(
+                Intent(applicationContext, ScanActivity::class.java).apply {
+                    putExtras(Bundle().apply {
+                        if (selectedTab != 0) {
+                            putString(
+                                LoyaltyCardEditActivity.BUNDLE_ADDGROUP,
+                                groupsTabLayout.getTabAt(selectedTab)!!.text.toString()
+                            )
+                        }
+                    })
+                }
+            )
+        }
+        binding.fabAdd.bringToFront()
+
+        // Apply column count setting to card list
+        val layoutManager = contentMainBinding.list.layoutManager as GridLayoutManager?
+        if (layoutManager != null) {
+            val settings = Settings(this)
+            layoutManager.setSpanCount(settings.getPreferredColumnCount())
+        }
+
+        mWearSyncPermissionRequester.synchronize()
+    }
+
+    private fun displayCardSetupOptions(menu: Menu, shouldShow: Boolean) {
+        for (id in intArrayOf(R.id.action_search, R.id.action_display_options, R.id.action_sort)) {
+            menu.findItem(id).isVisible = shouldShow
+        }
+    }
+
+    private fun updateLoyaltyCardCount() {
+        mLoyaltyCardCount = DBHelper.getLoyaltyCardCount(mDatabase)
+    }
+
+    private fun updateLoyaltyCardList(updateCount: Boolean) {
+        var group: Group? = null
+        if (mGroup != null) {
+            group = mGroup as Group
+        }
+
+        mAdapter.swapCursor(
+            DBHelper.getLoyaltyCardCursor(
+                mDatabase,
+                mFilter,
+                group,
+                mOrder,
+                mOrderDirection,
+                if (mAdapter.showingArchivedCards()) DBHelper.LoyaltyCardArchiveFilter.All else DBHelper.LoyaltyCardArchiveFilter.Unarchived
+            )
+        )
+
+        if (updateCount) {
+            updateLoyaltyCardCount()
+            // Update menu icons if necessary
+            invalidateOptionsMenu()
+        }
+
+        if (mLoyaltyCardCount > 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
+            contentMainBinding.helpSection.visibility = View.GONE
+            contentMainBinding.noGroupCardsText.visibility = View.GONE
+
+            if (mAdapter.itemCount > 0) {
+                contentMainBinding.list.visibility = View.VISIBLE
+                contentMainBinding.noMatchingCardsText.visibility = View.GONE
+            } else {
+                contentMainBinding.list.visibility = View.GONE
+                if (!mFilter.isEmpty()) {
+                    // Actual Empty Search Result
+                    contentMainBinding.noMatchingCardsText.visibility = View.VISIBLE
+                    contentMainBinding.noGroupCardsText.visibility = View.GONE
+                } else {
+                    // Group Tab with no Group Cards
+                    contentMainBinding.noMatchingCardsText.visibility = View.GONE
+                    contentMainBinding.noGroupCardsText.visibility = View.VISIBLE
+                }
+            }
+        } else {
+            contentMainBinding.list.visibility = View.GONE
+            contentMainBinding.helpSection.visibility = View.VISIBLE
+
+            contentMainBinding.noMatchingCardsText.visibility = View.GONE
+            contentMainBinding.noGroupCardsText.visibility = View.GONE
+        }
+
+        if (mCurrentActionMode != null) {
+            mCurrentActionMode!!.finish()
+        }
+
+        ListWidget().updateAll(mAdapter.mContext)
+        ShortcutHelper.updateShortcuts(mAdapter.mContext)
+    }
+
+    private fun processParseResultList(parseResultList: MutableList<ParseResult?>) {
+        require(!parseResultList.isEmpty()) { "parseResultList may not be empty" }
+
+        Utils.makeUserChooseParseResultFromList(
+            this@MainActivity,
+            parseResultList,
+            object : ParseResultListDisambiguatorCallback {
+                override fun onUserChoseParseResult(parseResult: ParseResult) {
+                    val intent =
+                        Intent(applicationContext, LoyaltyCardEditActivity::class.java)
+                    val bundle = parseResult.toLoyaltyCardBundle(this@MainActivity)
+                    intent.putExtras(bundle)
+                    startActivity(intent)
+                }
+
+                override fun onUserDismissedSelector() {
+                    finish()
+                }
+            })
+    }
+
+    private fun onSharedIntent(intent: Intent) {
+        val receivedAction = intent.action
+        val receivedType = intent.type
+
+        if (receivedAction == null || receivedType == null) {
+            return
+        }
+
+        val parseResultList: MutableList<ParseResult?>?
+
+        // Check for shared text
+        if (receivedAction == Intent.ACTION_SEND && receivedType == "text/plain") {
+            val loyaltyCard = LoyaltyCard()
+            loyaltyCard.setCardId(intent.getStringExtra(Intent.EXTRA_TEXT)!!)
+            parseResultList = mutableListOf(ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard))
+        } else {
+            // Parse whatever file was sent, regardless of opening or sharing
+            val data: Uri? = when (receivedAction) {
+                Intent.ACTION_VIEW -> {
+                    intent.data
+                }
+                Intent.ACTION_SEND -> {
+                    intent.getParcelableExtra(Intent.EXTRA_STREAM)
+                }
+                else -> {
+                    Log.e(TAG, "Wrong action type to parse intent")
+                    return
+                }
+            }
+
+            if (receivedType.startsWith("image/")) {
+                parseResultList = Utils.retrieveBarcodesFromImage(this, data)
+            } else if (receivedType == "application/pdf") {
+                parseResultList = Utils.retrieveBarcodesFromPdf(this, data)
+            } else if (mutableListOf<String?>(
+                    "application/vnd.apple.pkpass",
+                    "application/vnd-com.apple.pkpass"
+                ).contains(receivedType)
+            ) {
+                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data)
+            } else if (receivedType == "application/vnd.espass-espass") {
+                // FIXME: espass is not pkpass
+                // However, several users stated in https://github.com/CatimaLoyalty/Android/issues/2197 that the formats are extremely similar to the point they could rename an .espass file to .pkpass and have it imported
+                // So it makes sense to "unofficially" treat it as a PKPASS for now, even though not completely correct
+                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data)
+            } else if (receivedType == "application/vnd.apple.pkpasses") {
+                parseResultList = Utils.retrieveBarcodesFromPkPasses(this, data)
+            } else {
+                Log.e(TAG, "Wrong mime-type")
+                return
+            }
+        }
+
+        // Give up if we should parse but there is nothing to parse
+        if (parseResultList == null || parseResultList.isEmpty()) {
+            finish()
+            return
+        }
+
+        processParseResultList(parseResultList)
+    }
+
+    private fun extractIntentFields(intent: Intent) {
+        onSharedIntent(intent)
+    }
+
+    fun updateTabGroups(groupsTabLayout: TabLayout) {
+        val newGroups = DBHelper.getGroups(mDatabase)
+
+        if (newGroups.isEmpty()) {
+            groupsTabLayout.removeAllTabs()
+            groupsTabLayout.visibility = View.GONE
+            return
+        }
+
+        groupsTabLayout.removeAllTabs()
+        groupsTabLayout.addTab(
+            groupsTabLayout.newTab().apply {
+                setText(R.string.all)
+                tag = null
+            },
+            false
+        )
+
+        for (group in newGroups) {
+            groupsTabLayout.addTab(
+                groupsTabLayout.newTab().apply {
+                    text = group._id
+                    tag = group
+                },
+                false
+            )
+        }
+
+        groupsTabLayout.visibility = View.VISIBLE
+    }
+
+    // Saving currentQuery to finalQuery for user, this will be used to restore search history, happens when user clicks a card from list
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        finalQuery = currentQuery
+        // Putting the query also into outState for later use in onRestoreInstanceState when rotating screen
+        if (mSearchView != null) {
+            outState.putString(STATE_SEARCH_QUERY, finalQuery)
+        }
+    }
+
+    // Restoring instance state when rotation of screen happens with the goal to restore search query for user
+    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        super.onRestoreInstanceState(savedInstanceState)
+        finalQuery = savedInstanceState.getString(STATE_SEARCH_QUERY, "")
+    }
+
+    override fun onCreateOptionsMenu(inputMenu: Menu): Boolean {
+        menuInflater.inflate(R.menu.main_menu, inputMenu)
+
+        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0)
+
+        val searchManager = getSystemService(SEARCH_SERVICE) as SearchManager?
+        if (searchManager != null) {
+            val searchMenuItem = inputMenu.findItem(R.id.action_search)
+            mSearchView = searchMenuItem.actionView as SearchView?
+            mSearchView!!.setSearchableInfo(searchManager.getSearchableInfo(componentName))
+            mSearchView!!.setSubmitButtonEnabled(false)
+            mSearchView!!.setOnCloseListener {
+                invalidateOptionsMenu()
+                false
+            }
+
+            /*
+             * On Android 13 and later, pressing Back while the search view is open hides the keyboard
+             * and collapses the search view at the same time.
+             * This brings back the old behavior on Android 12 and lower: pressing Back once
+             * hides the keyboard, press again while keyboard is hidden to collapse the search view.
+             */
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                searchMenuItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+                    override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                        return true
+                    }
+
+                    override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+                        if (mSearchView!!.hasFocus()) {
+                            mSearchView!!.clearFocus()
+                            return false
+                        }
+                        currentQuery = ""
+                        mFilter = ""
+                        updateLoyaltyCardList(false)
+                        return true
+                    }
+                })
+            }
+
+            mSearchView!!.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String?): Boolean {
+                    return false
+                }
+
+                override fun onQueryTextChange(newText: String): Boolean {
+                    mFilter = newText
+                    // New logic to ensure search history after coming back from picked card - user will see the last search query
+                    if (newText.isEmpty()) {
+                        if (!finalQuery.isEmpty()) {
+                            // Setting the query text for user after coming back from picked card from finalQuery
+                            mSearchView!!.setQuery(finalQuery, false)
+                        } else if (!currentQuery.isEmpty()) {
+                            // Else if is needed in case user deletes search - expected behaviour is to show all cards
+                            currentQuery = ""
+                            mSearchView!!.setQuery(currentQuery, false)
+                        }
+                    } else {
+                        // Setting search query each time user changes the text in search to temporary variable to be used later in finalQuery String which will be used to restore search history
+                        currentQuery = newText
+                    }
+                    val currentTab =
+                        groupsTabLayout.getTabAt(groupsTabLayout.selectedTabPosition)
+                    mGroup = currentTab?.tag
+
+                    updateLoyaltyCardList(false)
+
+                    return true
+                }
+            })
+            // Check if we came from a picked card back to search, in that case we want to show the search view with previous search query
+            if (!finalQuery.isEmpty()) {
+                // Expand the search view to show the query
+                searchMenuItem.expandActionView()
+                // Setting the query text to empty String due to behaviour of onQueryTextChange after coming back from picked card - onQueryTextChange is called automatically without users interaction
+                finalQuery = ""
+                mSearchView!!.setQuery(currentQuery, false)
+            }
+        }
+
+        return super.onCreateOptionsMenu(inputMenu)
+    }
+
+    override fun onOptionsItemSelected(inputItem: MenuItem): Boolean {
+        when (inputItem.itemId) {
+            android.R.id.home -> {
+                onBackPressedDispatcher.onBackPressed()
+            }
+            R.id.action_display_options -> {
+                mAdapter.showDisplayOptionsDialog()
+                invalidateOptionsMenu()
+                return true
+            }
+            R.id.action_sort -> {
+                val currentIndex = AtomicInteger()
+                val loyaltyCardOrders = listOf<LoyaltyCardOrder?>(*LoyaltyCardOrder.entries.toTypedArray())
+                for (i in loyaltyCardOrders.indices) {
+                    if (mOrder == loyaltyCardOrders[i]) {
+                        currentIndex.set(i)
+                        break
+                    }
+                }
+
+                MaterialAlertDialogBuilder(this@MainActivity).apply {
+                    setTitle(R.string.sort_by)
+
+                    val sortingOptionBinding = SortingOptionBinding.inflate(LayoutInflater.from(this@MainActivity), null, false)
+                    val customLayout: View = sortingOptionBinding.getRoot()
+                    setView(customLayout)
+
+                    val showReversed = sortingOptionBinding.checkBoxReverse
+
+                    showReversed.isChecked = mOrderDirection == LoyaltyCardOrderDirection.Descending
+
+                    setSingleChoiceItems(
+                        R.array.sort_types_array,
+                        currentIndex.get()
+                    ) { _: DialogInterface?, which: Int ->
+                        currentIndex.set(which)
+                    }
+
+                    setPositiveButton(
+                        R.string.sort
+                    ) { dialog, _ ->
+                        setSort(
+                            loyaltyCardOrders[currentIndex.get()]!!,
+                            if (showReversed.isChecked) LoyaltyCardOrderDirection.Descending else LoyaltyCardOrderDirection.Ascending
+                        )
+                        ListWidget().updateAll(this@MainActivity)
+                        dialog?.dismiss()
+                    }
+
+                    setNegativeButton(R.string.cancel) { dialog, _ ->
+                        dialog.dismiss()
+                    }
+                }.create().show()
+
+                return true
+            }
+            R.id.action_manage_groups -> {
+                startActivity(
+                    Intent(applicationContext, ManageGroupsActivity::class.java)
+                )
+                return true
+            }
+            R.id.action_import_export -> {
+                startActivity(
+                    Intent(applicationContext, ImportExportActivity::class.java)
+                )
+                return true
+            }
+            R.id.action_settings -> {
+                mSettingsLauncher.launch(
+                    Intent(applicationContext, SettingsActivity::class.java)
+                )
+                return true
+            }
+            R.id.action_about -> {
+                startActivity(
+                    Intent(applicationContext, AboutActivity::class.java)
+                )
+                return true
+            }
+        }
+
+        return super.onOptionsItemSelected(inputItem)
+    }
+
+    private fun setSort(order: LoyaltyCardOrder, direction: LoyaltyCardOrderDirection) {
+        // Update values
+        mOrder = order
+        mOrderDirection = direction
+
+        // Store in Shared Preference to restore next app launch
+        applicationContext.getSharedPreferences(
+            getString(R.string.sharedpreference_sort),
+            MODE_PRIVATE
+        ).edit {
+            putString(
+                getString(R.string.sharedpreference_sort_order),
+                order.name
+            )
+            putString(
+                getString(R.string.sharedpreference_sort_direction),
+                direction.name
+            )
+        }
+
+        // Update card list
+        updateLoyaltyCardList(false)
+    }
+
+    override fun onRowLongClicked(inputPosition: Int) {
+        enableActionMode(inputPosition)
+    }
+
+    private fun enableActionMode(inputPosition: Int) {
+        if (mCurrentActionMode == null) {
+            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback)
+        }
+        toggleSelection(inputPosition)
+    }
+
+    private fun scaleScreen() {
+        val displayMetrics = DisplayMetrics()
+        windowManager.defaultDisplay.getMetrics(displayMetrics)
+        val screenHeight = displayMetrics.heightPixels
+        val mediumSizePx = TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            MEDIUM_SCALE_FACTOR_DIP.toFloat(),
+            getResources().displayMetrics
+        )
+        val shouldScaleSmaller = screenHeight < mediumSizePx
+
+        binding.include.welcomeIcon.visibility = if (shouldScaleSmaller) View.GONE else View.VISIBLE
+    }
+
+    private fun toggleSelection(inputPosition: Int) {
+        mAdapter.toggleSelection(inputPosition)
+        val count = mAdapter.selectedItemCount
+
+        if (count == 0) {
+            mCurrentActionMode!!.finish()
+        } else {
+            mCurrentActionMode!!.title = getResources().getQuantityString(
+                R.plurals.selectedCardCount,
+                count,
+                count
+            )
+
+            val editItem = mCurrentActionMode!!.menu.findItem(R.id.action_edit)
+            val duplicateItem = mCurrentActionMode!!.menu.findItem(R.id.action_duplicate)
+            val archiveItem = mCurrentActionMode!!.menu.findItem(R.id.action_archive)
+            val unarchiveItem = mCurrentActionMode!!.menu.findItem(R.id.action_unarchive)
+            val starItem = mCurrentActionMode!!.menu.findItem(R.id.action_star)
+            val unstarItem = mCurrentActionMode!!.menu.findItem(R.id.action_unstar)
+
+            var hasStarred = false
+            var hasUnstarred = false
+            var hasArchived = false
+            var hasUnarchived = false
+
+            for (loyaltyCard in mAdapter.getSelectedItems()) {
+                if (loyaltyCard.starStatus == 1) {
+                    hasStarred = true
+                } else {
+                    hasUnstarred = true
+                }
+
+                if (loyaltyCard.archiveStatus == 1) {
+                    hasArchived = true
+                } else {
+                    hasUnarchived = true
+                }
+
+                // We have all types, no need to keep checking
+                if (hasStarred && hasUnstarred && hasArchived && hasUnarchived) {
+                    break
+                }
+            }
+
+            unarchiveItem.isVisible = hasArchived
+            archiveItem.isVisible = hasUnarchived
+
+            if (count == 1) {
+                starItem.isVisible = !hasStarred
+                unstarItem.isVisible = !hasUnstarred
+                editItem.isVisible = true
+                editItem.isEnabled = true
+                duplicateItem.isVisible = true
+                duplicateItem.isEnabled = true
+            } else {
+                starItem.isVisible = hasUnstarred
+                unstarItem.isVisible = hasStarred
+
+                editItem.isVisible = false
+                editItem.isEnabled = false
+                duplicateItem.isVisible = false
+                duplicateItem.isEnabled = false
+            }
+
+            mCurrentActionMode!!.invalidate()
+        }
+    }
+
+
+    override fun onRowClicked(inputPosition: Int) {
+        if (mAdapter.selectedItemCount > 0) {
+            enableActionMode(inputPosition)
+        } else {
+            // FIXME
+            //
+            // There is a really nasty edge case that can happen when someone taps a card but right
+            // after it swipes (very small window, hard to reproduce). The cursor gets replaced and
+            // may not have a card at the ID number that is returned from onRowClicked.
+            //
+            // The proper fix, obviously, would involve makes sure an onFling can't happen while a
+            // click is being processed. Sadly, I have not yet found a way to make that possible.
+            val loyaltyCard: LoyaltyCard
+            try {
+                loyaltyCard = mAdapter.getCard(inputPosition)
+            } catch (e: CursorIndexOutOfBoundsException) {
+                Log.w(TAG, "Prevented crash from tap + swipe on ID $inputPosition: $e")
+                return
+            }
+
+            startActivity(
+                Intent(this, LoyaltyCardViewActivity::class.java).apply {
+                    action = ""
+                    putExtras(Bundle().apply {
+                        putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id)
+
+                        val cardList = ArrayList<Int?>()
+                        for (i in 0..<mAdapter.itemCount) {
+                            cardList.add(mAdapter.getCard(i).id)
+                        }
+
+                        putIntegerArrayList(LoyaltyCardViewActivity.BUNDLE_CARDLIST, cardList)
+                    })
+                }
+            )
+        }
+    }
+
+    companion object {
+        private const val TAG = "Catima"
+        const val RESTART_ACTIVITY_INTENT: String = "restart_activity_intent"
+
+        private const val MEDIUM_SCALE_FACTOR_DIP = 460
+        const val STATE_SEARCH_QUERY: String = "SEARCH_QUERY"
+    }
+}

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

@@ -1,242 +0,0 @@
-package protect.card_locker;
-
-import android.content.Intent;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import protect.card_locker.databinding.ActivityManageGroupBinding;
-
-public class ManageGroupActivity extends CatimaAppCompatActivity implements ManageGroupCursorAdapter.CardAdapterListener {
-    private ActivityManageGroupBinding binding;
-    private SQLiteDatabase mDatabase;
-    private ManageGroupCursorAdapter mAdapter;
-
-    private final String SAVE_INSTANCE_ADAPTER_STATE = "adapterState";
-    private final String SAVE_INSTANCE_CURRENT_GROUP_NAME = "currentGroupName";
-
-    protected Group mGroup = null;
-    private RecyclerView mCardList;
-    private TextView noGroupCardsText;
-    private EditText mGroupNameText;
-
-    private boolean mGroupNameNotInUse;
-
-    @Override
-    protected void onCreate(Bundle inputSavedInstanceState) {
-        super.onCreate(inputSavedInstanceState);
-        binding = ActivityManageGroupBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-        Utils.applyWindowInsetsAndFabOffset(binding.getRoot(), binding.fabSave);
-        Toolbar toolbar = binding.toolbar;
-        setSupportActionBar(toolbar);
-
-        mDatabase = new DBHelper(this).getWritableDatabase();
-
-        noGroupCardsText = binding.include.noGroupCardsText;
-        mCardList = binding.include.list;
-        FloatingActionButton saveButton = binding.fabSave;
-
-        mGroupNameText = binding.editTextGroupName;
-
-        mGroupNameText.addTextChangedListener(new 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) {
-                mGroupNameNotInUse = true;
-                mGroupNameText.setError(null);
-                String currentGroupName = mGroupNameText.getText().toString().trim();
-                if (currentGroupName.length() == 0) {
-                    mGroupNameText.setError(getResources().getText(R.string.group_name_is_empty));
-                    return;
-                }
-                if (!mGroup._id.equals(currentGroupName)) {
-                    if (DBHelper.getGroup(mDatabase, currentGroupName) != null) {
-                        mGroupNameNotInUse = false;
-                        mGroupNameText.setError(getResources().getText(R.string.group_name_already_in_use));
-                    } else {
-                        mGroupNameNotInUse = true;
-                    }
-                }
-            }
-        });
-
-        Intent intent = getIntent();
-        String groupId = intent.getStringExtra("group");
-        if (groupId == null) {
-            throw (new IllegalArgumentException("this activity expects a group loaded into it's intent"));
-        }
-        Log.d("groupId", "groupId: " + groupId);
-        mGroup = DBHelper.getGroup(mDatabase, groupId);
-        if (mGroup == null) {
-            throw (new IllegalArgumentException("cannot load group " + groupId + " from database"));
-        }
-        mGroupNameText.setText(mGroup._id);
-        setTitle(getString(R.string.editGroup, mGroup._id));
-        mAdapter = new ManageGroupCursorAdapter(this, null, this, mGroup, null);
-        mCardList.setAdapter(mAdapter);
-        registerForContextMenu(mCardList);
-
-        if (inputSavedInstanceState != null) {
-            mAdapter.importInGroupState(integerArrayToAdapterState(inputSavedInstanceState.getIntegerArrayList(SAVE_INSTANCE_ADAPTER_STATE)));
-            mGroupNameText.setText(inputSavedInstanceState.getString(SAVE_INSTANCE_CURRENT_GROUP_NAME));
-        }
-
-        enableToolbarBackButton();
-
-        saveButton.setOnClickListener(v -> {
-            String currentGroupName = mGroupNameText.getText().toString().trim();
-            if (!currentGroupName.equals(mGroup._id)) {
-                if (currentGroupName.length() == 0) {
-                    Toast.makeText(getApplicationContext(), R.string.group_name_is_empty, Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                if (!mGroupNameNotInUse) {
-                    Toast.makeText(getApplicationContext(), R.string.group_name_already_in_use, Toast.LENGTH_SHORT).show();
-                    return;
-                }
-            }
-
-            mAdapter.commitToDatabase();
-            if (!currentGroupName.equals(mGroup._id)) {
-                DBHelper.updateGroup(mDatabase, mGroup._id, currentGroupName);
-            }
-            Toast.makeText(getApplicationContext(), R.string.group_updated, Toast.LENGTH_SHORT).show();
-            finish();
-        });
-        // this setText is here because content_main.xml is reused from main activity
-        noGroupCardsText.setText(getResources().getText(R.string.noGiftCardsGroup));
-        updateLoyaltyCardList();
-
-        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-            @Override
-            public void handleOnBackPressed() {
-                leaveWithoutSaving();
-            }
-        });
-    }
-
-    private ArrayList<Integer> adapterStateToIntegerArray(HashMap<Integer, Boolean> adapterState) {
-        ArrayList<Integer> ret = new ArrayList<>(adapterState.size() * 2);
-        for (Map.Entry<Integer, Boolean> entry : adapterState.entrySet()) {
-            ret.add(entry.getKey());
-            ret.add(entry.getValue() ? 1 : 0);
-        }
-        return ret;
-    }
-
-    private HashMap<Integer, Boolean> integerArrayToAdapterState(ArrayList<Integer> in) {
-        HashMap<Integer, Boolean> ret = new HashMap<>();
-        if (in.size() % 2 != 0) {
-            throw (new RuntimeException("failed restoring adapterState from integer array list"));
-        }
-        for (int i = 0; i < in.size(); i += 2) {
-            ret.put(in.get(i), in.get(i + 1) == 1);
-        }
-        return ret;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu inputMenu) {
-        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
-
-        return super.onCreateOptionsMenu(inputMenu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem inputItem) {
-        int id = inputItem.getItemId();
-
-        if (id == R.id.action_display_options) {
-            mAdapter.showDisplayOptionsDialog();
-            invalidateOptionsMenu();
-
-            return true;
-        }
-
-        return super.onOptionsItemSelected(inputItem);
-    }
-
-    @Override
-    protected void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-
-        outState.putIntegerArrayList(SAVE_INSTANCE_ADAPTER_STATE, adapterStateToIntegerArray(mAdapter.exportInGroupState()));
-        outState.putString(SAVE_INSTANCE_CURRENT_GROUP_NAME, mGroupNameText.getText().toString());
-    }
-
-    private void updateLoyaltyCardList() {
-        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase));
-
-        if (mAdapter.getItemCount() == 0) {
-            mCardList.setVisibility(View.GONE);
-            noGroupCardsText.setVisibility(View.VISIBLE);
-        } else {
-            mCardList.setVisibility(View.VISIBLE);
-            noGroupCardsText.setVisibility(View.GONE);
-        }
-    }
-
-    private void leaveWithoutSaving() {
-        if (hasChanged()) {
-            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ManageGroupActivity.this);
-            builder.setTitle(R.string.leaveWithoutSaveTitle);
-            builder.setMessage(R.string.leaveWithoutSaveConfirmation);
-            builder.setPositiveButton(R.string.confirm, (dialog, which) -> finish());
-            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-            AlertDialog dialog = builder.create();
-            dialog.show();
-        } else {
-            finish();
-        }
-    }
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        getOnBackPressedDispatcher().onBackPressed();
-        return true;
-    }
-
-    private boolean hasChanged() {
-        return mAdapter.hasChanged() || !mGroup._id.equals(mGroupNameText.getText().toString().trim());
-    }
-
-    @Override
-    public void onRowLongClicked(int inputPosition) {
-        mAdapter.toggleSelection(inputPosition);
-    }
-
-    @Override
-    public void onRowClicked(int inputPosition) {
-        mAdapter.toggleSelection(inputPosition);
-
-    }
-}

app/src/main/java/protect/card_locker/ManageGroupActivity.kt

@@ -0,0 +1,246 @@
+package protect.card_locker
+
+import android.content.DialogInterface
+import android.database.sqlite.SQLiteDatabase
+import android.os.Bundle
+import android.util.Log
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.EditText
+import android.widget.TextView
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.core.widget.doAfterTextChanged
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
+import protect.card_locker.databinding.ActivityManageGroupBinding
+import protect.card_locker.preferences.Settings
+
+class ManageGroupActivity : CatimaAppCompatActivity(), CardAdapterListener {
+    private lateinit var binding: ActivityManageGroupBinding
+    private lateinit var mDatabase: SQLiteDatabase
+    private lateinit var mAdapter: ManageGroupCursorAdapter
+
+    private lateinit var mGroup: Group
+    private lateinit var mCardList: RecyclerView
+    private lateinit var noGroupCardsText: TextView
+    private lateinit var mGroupNameText: EditText
+
+    private var mGroupNameNotInUse = false
+
+    override fun onCreate(inputSavedInstanceState: Bundle?) {
+        super.onCreate(inputSavedInstanceState)
+        binding = ActivityManageGroupBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        Utils.applyWindowInsetsAndFabOffset(binding.root, binding.fabSave)
+        setSupportActionBar(binding.toolbar)
+
+        mDatabase = DBHelper(this).writableDatabase
+        noGroupCardsText = binding.include.noGroupCardsText
+        mCardList = binding.include.list
+
+        mGroupNameText = binding.editTextGroupName
+        mGroupNameText.doAfterTextChanged {
+            mGroupNameNotInUse = true
+            mGroupNameText.error = null
+            val currentGroupName = mGroupNameText.text.trim().toString()
+            if (currentGroupName.isEmpty()) {
+                mGroupNameText.error = getText(R.string.group_name_is_empty)
+                return@doAfterTextChanged
+            }
+            if (mGroup._id != currentGroupName) {
+                if (DBHelper.getGroup(mDatabase, currentGroupName) != null) {
+                    mGroupNameNotInUse = false
+                    mGroupNameText.error = getText(R.string.group_name_already_in_use)
+                } else {
+                    mGroupNameNotInUse = true
+                }
+            }
+        }
+
+        val groupId = intent.getStringExtra("group")
+            ?: throw (IllegalArgumentException("this activity expects a group loaded into it's intent"))
+        Log.d("groupId", "groupId: $groupId")
+        mGroup = DBHelper.getGroup(mDatabase, groupId)
+            ?: throw IllegalArgumentException("Cannot load group $groupId from database")
+        mGroupNameText.setText(mGroup._id)
+        setTitle(getString(R.string.editGroup, mGroup._id))
+        mAdapter = ManageGroupCursorAdapter(this, null, this, mGroup, null)
+        mCardList.adapter = mAdapter
+        registerForContextMenu(mCardList)
+
+        if (inputSavedInstanceState != null) {
+            mAdapter.importInGroupState(
+                bundleToAdapterState(
+                    adapterStateBundle = inputSavedInstanceState.getBundle(
+                        SAVE_INSTANCE_ADAPTER_STATE
+                    )
+                )
+            )
+            mGroupNameText.setText(
+                inputSavedInstanceState.getString(
+                    SAVE_INSTANCE_CURRENT_GROUP_NAME
+                )
+            )
+        }
+
+        enableToolbarBackButton()
+
+        binding.fabSave.setOnClickListener { v: View ->
+            val currentGroupName = mGroupNameText.text.trim().toString()
+            if (currentGroupName != mGroup._id) {
+                when {
+                    currentGroupName.isEmpty() -> {
+                        Toast.makeText(
+                            applicationContext,
+                            R.string.group_name_is_empty,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                        return@setOnClickListener
+                    }
+
+                    !mGroupNameNotInUse -> {
+                        Toast.makeText(
+                            applicationContext,
+                            R.string.group_name_already_in_use,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                        return@setOnClickListener
+                    }
+                }
+            }
+
+            mAdapter.commitToDatabase()
+            if (currentGroupName != mGroup._id) {
+                DBHelper.updateGroup(mDatabase, mGroup._id, currentGroupName)
+            }
+            Toast.makeText(
+                applicationContext,
+                R.string.group_updated,
+                Toast.LENGTH_SHORT
+            ).show()
+            finish()
+        }
+        // this setText is here because content_main.xml is reused from main activity
+        noGroupCardsText.text = getText(R.string.noGiftCardsGroup)
+        updateLoyaltyCardList()
+
+        onBackPressedDispatcher.addCallback(
+            owner = this,
+            onBackPressedCallback = object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    leaveWithoutSaving()
+                }
+            }
+        )
+
+        // Apply column count setting to card list
+        val layoutManager = mCardList.layoutManager as GridLayoutManager?
+        if (layoutManager != null) {
+            val settings = Settings(this)
+            layoutManager.setSpanCount(settings.getPreferredColumnCount())
+        }
+    }
+
+    private fun adapterStateToBundle(adapterState: HashMap<Int, Boolean>): Bundle {
+        val adapterStateBundle = Bundle().apply {
+            for (entry in adapterState.entries) {
+                putBoolean(entry.key.toString(), entry.value)
+            }
+        }
+        return adapterStateBundle
+    }
+
+    private fun bundleToAdapterState(adapterStateBundle: Bundle?): Map<Int, Boolean> {
+        adapterStateBundle ?: return emptyMap()
+        val adapterStateMap = buildMap {
+            for (key in adapterStateBundle.keySet()) {
+                put(key.toInt(), adapterStateBundle.getBoolean(key))
+            }
+        }
+        return adapterStateMap
+    }
+
+    override fun onCreateOptionsMenu(inputMenu: Menu): Boolean {
+        menuInflater.inflate(R.menu.card_details_menu, inputMenu)
+
+        return super.onCreateOptionsMenu(inputMenu)
+    }
+
+    override fun onOptionsItemSelected(inputItem: MenuItem): Boolean {
+        val id = inputItem.itemId
+
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog()
+            invalidateOptionsMenu()
+
+            return true
+        }
+
+        return super.onOptionsItemSelected(inputItem)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        outState.putBundle(
+            SAVE_INSTANCE_ADAPTER_STATE,
+            adapterStateToBundle(mAdapter.exportInGroupState())
+        )
+        outState.putString(SAVE_INSTANCE_CURRENT_GROUP_NAME, mGroupNameText.text.toString())
+    }
+
+    private fun updateLoyaltyCardList() {
+        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase))
+
+        if (mAdapter.itemCount == 0) {
+            mCardList.visibility = View.GONE
+            noGroupCardsText.visibility = View.VISIBLE
+        } else {
+            mCardList.visibility = View.VISIBLE
+            noGroupCardsText.visibility = View.GONE
+        }
+    }
+
+    private fun leaveWithoutSaving() {
+        if (hasChanged()) {
+            MaterialAlertDialogBuilder(this@ManageGroupActivity).apply {
+                setTitle(R.string.leaveWithoutSaveTitle)
+                setMessage(R.string.leaveWithoutSaveConfirmation)
+                setPositiveButton(R.string.confirm) { dialog: DialogInterface, _ ->
+                    finish()
+                }
+                setNegativeButton(R.string.cancel) { dialog: DialogInterface, _ ->
+                    dialog.dismiss()
+                }
+            }.create().show()
+        } else {
+            finish()
+        }
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressedDispatcher.onBackPressed()
+        return true
+    }
+
+    private fun hasChanged(): Boolean {
+        return mAdapter.hasChanged() || mGroup._id != mGroupNameText.text.trim().toString()
+    }
+
+    override fun onRowLongClicked(inputPosition: Int) {
+        mAdapter.toggleSelection(inputPosition)
+    }
+
+    override fun onRowClicked(inputPosition: Int) {
+        mAdapter.toggleSelection(inputPosition)
+    }
+
+    private companion object {
+        const val SAVE_INSTANCE_ADAPTER_STATE = "adapterState"
+        const val SAVE_INSTANCE_CURRENT_GROUP_NAME = "currentGroupName"
+    }
+}

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

@@ -99,7 +99,7 @@ public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
         }
     }
 
-    public void importInGroupState(HashMap<Integer, Boolean> cardIdInGroupMap) {
+    public void importInGroupState(Map<Integer, Boolean> cardIdInGroupMap) {
         mInGroupOverlay = new HashMap<>(cardIdInGroupMap);
     }
 

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

@@ -1,247 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Bundle;
-import android.text.InputType;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-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;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import java.util.List;
-
-import protect.card_locker.databinding.ManageGroupsActivityBinding;
-
-public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener {
-    private ManageGroupsActivityBinding binding;
-    private static final String TAG = "Catima";
-
-    private SQLiteDatabase mDatabase;
-    private TextView mHelpText;
-    private RecyclerView mGroupList;
-    GroupCursorAdapter mAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        binding = ManageGroupsActivityBinding.inflate(getLayoutInflater());
-        setTitle(R.string.groups);
-        setContentView(binding.getRoot());
-        Utils.applyWindowInsets(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
-        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
-
-        mDatabase = new DBHelper(this).getWritableDatabase();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        FloatingActionButton addButton = binding.fabAdd;
-        addButton.setOnClickListener(v -> createGroup());
-        addButton.bringToFront();
-
-        mGroupList = binding.include.list;
-        mHelpText = binding.include.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();
-    }
-
-    private void updateGroupList() {
-        mAdapter.swapCursor(DBHelper.getGroupCursor(mDatabase));
-
-        if (DBHelper.getGroupCount(mDatabase) == 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 MaterialAlertDialogBuilder(this);
-
-        // Header
-        builder.setTitle(R.string.enter_group_name);
-
-        // Layout
-        LinearLayout layout = new LinearLayout(this);
-        layout.setOrientation(LinearLayout.VERTICAL);
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        );
-        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
-        params.leftMargin = contentPadding;
-        params.topMargin = contentPadding / 2;
-        params.rightMargin = contentPadding;
-
-        // EditText with spacing
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.setLayoutParams(params);
-        layout.addView(input);
-
-        // Set layout
-        builder.setView(layout);
-
-        // Buttons
-        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            DBHelper.insertGroup(mDatabase, input.getText().toString().trim());
-            updateGroupList();
-        });
-        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
-        AlertDialog dialog = builder.create();
-
-        // Now that the dialog exists, we can bind something that affects the OK button
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                String groupName = s.toString().trim();
-
-                if (groupName.length() == 0) {
-                    input.setError(getString(R.string.group_name_is_empty));
-                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-                    return;
-                }
-
-                if (DBHelper.getGroup(mDatabase, groupName) != null) {
-                    input.setError(getString(R.string.group_name_already_in_use));
-                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-                    return;
-                }
-
-                input.setError(null);
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
-            }
-        });
-
-        dialog.show();
-
-        // Disable button (must be done **after** dialog is shown to prevent crash
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-        // Set focus on input field
-        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 = DBHelper.getGroups(mDatabase);
-        final String groupName = getGroupName(view);
-
-        int currentIndex = DBHelper.getGroup(mDatabase, 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
-        DBHelper.reorderGroups(mDatabase, 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) {
-        Intent intent = new Intent(this, ManageGroupActivity.class);
-        intent.putExtra("group", getGroupName(view));
-        startActivity(intent);
-    }
-
-    @Override
-    public void onDeleteButtonClicked(View view) {
-        final String groupName = getGroupName(view);
-
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-        builder.setTitle(R.string.deleteConfirmationGroup);
-        builder.setMessage(groupName);
-
-        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            DBHelper.deleteGroup(mDatabase, 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/ManageGroupsActivity.kt

@@ -0,0 +1,240 @@
+package protect.card_locker
+
+import android.content.DialogInterface
+import android.content.Intent
+import android.database.sqlite.SQLiteDatabase
+import android.os.Bundle
+import android.text.InputType
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.edit
+import androidx.core.widget.doOnTextChanged
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import protect.card_locker.GroupCursorAdapter.GroupAdapterListener
+import protect.card_locker.databinding.ManageGroupsActivityBinding
+
+class ManageGroupsActivity : CatimaAppCompatActivity(), GroupAdapterListener {
+    private lateinit var binding: ManageGroupsActivityBinding
+    private lateinit var mDatabase: SQLiteDatabase
+    private lateinit var mHelpText: TextView
+    private lateinit var mGroupList: RecyclerView
+    private lateinit var mAdapter: GroupCursorAdapter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ManageGroupsActivityBinding.inflate(layoutInflater)
+        setTitle(R.string.groups)
+        setContentView(binding.root)
+        Utils.applyWindowInsets(binding.root)
+        setSupportActionBar(binding.toolbar)
+        enableToolbarBackButton()
+
+        mDatabase = DBHelper(this).writableDatabase
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        with(binding.fabAdd) {
+            setOnClickListener { v: View ->
+                createGroup()
+            }
+            bringToFront()
+        }
+
+        mGroupList = binding.include.list
+        mHelpText = binding.include.helpText
+
+        // Init group list
+        LinearLayoutManager(applicationContext).apply {
+            mGroupList.layoutManager = this
+        }
+        mGroupList.setItemAnimator(DefaultItemAnimator())
+        mAdapter = GroupCursorAdapter(this, null, this)
+        mGroupList.setAdapter(mAdapter)
+
+        updateGroupList()
+    }
+
+    private fun updateGroupList() {
+        mAdapter.swapCursor(DBHelper.getGroupCursor(mDatabase))
+
+        if (DBHelper.getGroupCount(mDatabase) == 0) {
+            mGroupList.visibility = View.GONE
+            mHelpText.visibility = View.VISIBLE
+
+            return
+        }
+
+        mGroupList.visibility = View.VISIBLE
+        mHelpText.visibility = View.GONE
+    }
+
+    private fun invalidateHomescreenActiveTab() {
+        val activeTabPref = getSharedPreferences(
+            getString(R.string.sharedpreference_active_tab),
+            MODE_PRIVATE
+        )
+        activeTabPref.edit {
+            putInt(getString(R.string.sharedpreference_active_tab), 0)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            finish()
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun createGroup() {
+        val builder: AlertDialog.Builder = MaterialAlertDialogBuilder(this)
+
+        // Header
+        builder.setTitle(R.string.enter_group_name)
+
+        // Layout
+        val layout = LinearLayout(this)
+        layout.orientation = LinearLayout.VERTICAL
+        val params = LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        ).apply {
+            val contentPadding =
+                resources.getDimensionPixelSize(R.dimen.alert_dialog_content_padding)
+            leftMargin = contentPadding
+            topMargin = contentPadding / 2
+            rightMargin = contentPadding
+        }
+
+        // EditText with spacing
+        val input = EditText(this)
+        input.setInputType(InputType.TYPE_CLASS_TEXT)
+        input.setLayoutParams(params)
+        layout.addView(input)
+
+        // Set layout
+        builder.setView(layout)
+
+        // Buttons
+        builder.setPositiveButton(getString(R.string.ok)) { dialog: DialogInterface, which: Int ->
+            DBHelper.insertGroup(mDatabase, input.text.trim().toString())
+            updateGroupList()
+        }
+        builder.setNegativeButton(getString(R.string.cancel)) { dialog: DialogInterface, which: Int ->
+            dialog.cancel()
+        }
+        val dialog = builder.create()
+
+        // Now that the dialog exists, we can bind something that affects the OK button
+        input.doOnTextChanged { s: CharSequence?, start: Int, before: Int, count: Int ->
+            val groupName = s?.trim().toString()
+
+            if (groupName.isEmpty()) {
+                input.error = getString(R.string.group_name_is_empty)
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false)
+                return@doOnTextChanged
+            }
+
+            if (DBHelper.getGroup(mDatabase, groupName) != null) {
+                input.error = getString(R.string.group_name_already_in_use)
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false)
+                return@doOnTextChanged
+            }
+
+            input.error = null
+            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true)
+        }
+
+        dialog.apply {
+            show()
+            // Disable button (must be done **after** dialog is shown to prevent crash
+            getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false)
+            // Set focus on input field
+            window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+        }
+
+        input.requestFocus()
+    }
+
+    private fun getGroupName(view: View): String {
+        val groupNameTextView = view.findViewById<TextView>(R.id.name)
+        return groupNameTextView.text.toString()
+    }
+
+    private fun moveGroup(view: View, up: Boolean) {
+        val groups = DBHelper.getGroups(mDatabase)
+        val groupName = getGroupName(view)
+
+        val currentIndex = DBHelper.getGroup(mDatabase, groupName).order
+
+        // Reinsert group in correct position
+        val newIndex: Int = if (up) {
+            currentIndex - 1
+        } else {
+            currentIndex + 1
+        }
+
+        // Don't try to move out of bounds
+        if (newIndex < 0 || newIndex >= groups.size) {
+            return
+        }
+
+        val group = groups.removeAt(currentIndex)
+        groups.add(newIndex, group)
+
+        // Update database
+        DBHelper.reorderGroups(mDatabase, groups)
+
+        // Update UI
+        updateGroupList()
+
+        // Ordering may have changed, so invalidate
+        invalidateHomescreenActiveTab()
+    }
+
+    override fun onMoveDownButtonClicked(view: View) {
+        moveGroup(view, false)
+    }
+
+    override fun onMoveUpButtonClicked(view: View) {
+        moveGroup(view, true)
+    }
+
+    override fun onEditButtonClicked(view: View) {
+        Intent(this, ManageGroupActivity::class.java).apply {
+            putExtra("group", getGroupName(view))
+            startActivity(this)
+        }
+    }
+
+    override fun onDeleteButtonClicked(view: View) {
+        val groupName = getGroupName(view)
+
+        MaterialAlertDialogBuilder(this).apply {
+            setTitle(R.string.deleteConfirmationGroup)
+            setMessage(groupName)
+
+            setPositiveButton(getString(R.string.ok)) { dialog: DialogInterface, which: Int ->
+                DBHelper.deleteGroup(mDatabase, groupName)
+                updateGroupList()
+                // Delete may change ordering, so invalidate
+                invalidateHomescreenActiveTab()
+            }
+            setNegativeButton(getString(R.string.cancel)) { dialog: DialogInterface, which: Int ->
+                dialog.cancel()
+            }
+        }.create().show()
+    }
+}

app/src/main/java/protect/card_locker/NotificationInfo.kt

@@ -0,0 +1,11 @@
+package protect.card_locker
+
+object NotificationInfo {
+    object WearBluetooth {
+        const val NOTIFICATION_ID = 1001
+        const val CHANNEL_ID = "catima_wear_bt"
+        const val PAIRING_CHANNEL_ID = "catima_wear_bt_pairing"
+        const val CRITICAL_ERROR_NOTIFICATION_ID = 1002
+        const val CRITICAL_ERROR_CHANNEL_ID = "catima_wear_bt_critical_error"
+    }
+}

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

@@ -1,18 +1,17 @@
 package protect.card_locker;
 
+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.util.Log;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 public class OpenWebLinkHandler {
 
     private static final String TAG = "Catima";
 
-    public void openBrowser(AppCompatActivity activity, String url) {
+    public void openBrowser(Activity activity, String url) {
         if (url == null) {
             return;
         }

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

@@ -34,11 +34,6 @@ public class PermissionUtils {
      * @return
      */
     public static boolean needsCameraPermission(Activity activity) {
-        // Android only introduced the runtime permission system in Marshmallow (Android 6.0)
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            return false;
-        }
-
         return ContextCompat.checkSelfPermission(activity, android.Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED;
     }
 
@@ -49,21 +44,14 @@ public class PermissionUtils {
      * @param activity
      * @param requestCode
      */
-    public static void requestStorageReadPermission(CatimaAppCompatActivity activity, int requestCode) {
+    public static void requestStorageReadPermission(Activity activity, int requestCode) {
         String[] permissions = new String[]{ android.Manifest.permission.READ_EXTERNAL_STORAGE };
         int[] mockedResults = new int[]{ PackageManager.PERMISSION_GRANTED };
 
         if (needsStorageReadPermission(activity)) {
             ActivityCompat.requestPermissions(activity, permissions, requestCode);
         } else {
-            // FIXME: This points to onMockedRequestPermissionResult instead of to
-            // onRequestPermissionResult because onRequestPermissionResult was only introduced in
-            // Android 6.0 (SDK 23) and we and to support Android 5.0 (SDK 21) too.
-            //
-            // When minSdk becomes 23, this should point to onRequestPermissionResult directly and
-            // the activity input variable should be changed from CatimaAppCompatActivity to
-            // Activity.
-            activity.onMockedRequestPermissionsResult(requestCode, permissions, mockedResults);
+            activity.onRequestPermissionsResult(requestCode, permissions, mockedResults);
         }
     }
 
@@ -74,21 +62,14 @@ public class PermissionUtils {
      * @param activity
      * @param requestCode
      */
-    public static void requestCameraPermission(CatimaAppCompatActivity activity, int requestCode) {
+    public static void requestCameraPermission(Activity activity, int requestCode) {
         String[] permissions = new String[]{ Manifest.permission.CAMERA };
         int[] mockedResults = new int[]{ PackageManager.PERMISSION_GRANTED };
 
         if (needsCameraPermission(activity)) {
             ActivityCompat.requestPermissions(activity, permissions, requestCode);
         } else {
-            // FIXME: This points to onMockedRequestPermissionResult instead of to
-            // onRequestPermissionResult because onRequestPermissionResult was only introduced in
-            // Android 6.0 (SDK 23) and we and to support Android 5.0 (SDK 21) too.
-            //
-            // When minSdk becomes 23, this should point to onRequestPermissionResult directly and
-            // the activity input variable should be changed from CatimaAppCompatActivity to
-            // Activity.
-            activity.onMockedRequestPermissionsResult(requestCode, permissions, mockedResults);
+            activity.onRequestPermissionsResult(requestCode, permissions, mockedResults);
         }
     }
 }

app/src/main/java/protect/card_locker/PkpassParser.kt

@@ -14,6 +14,8 @@ import org.json.JSONObject
 import java.io.FileNotFoundException
 import java.io.IOException
 import java.math.BigDecimal
+import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
 import java.text.DateFormat
 import java.text.ParseException
 import java.time.ZonedDateTime
@@ -40,6 +42,7 @@ class PkpassParser(context: Context, uri: Uri?) {
     private var cardId: String = context.getString(R.string.noBarcode)
     private var barcodeId: String? = null
     private var barcodeType: CatimaBarcode? = null
+    private var barcodeEncoding: Charset = StandardCharsets.ISO_8859_1
     private var headerColor: Int? = null
     private val starStatus = 0
     private val lastUsed: Long = 0
@@ -134,6 +137,7 @@ class PkpassParser(context: Context, uri: Uri?) {
             cardId,
             barcodeId,
             barcodeType,
+            barcodeEncoding,
             headerColor,
             starStatus,
             lastUsed,
@@ -342,7 +346,6 @@ class PkpassParser(context: Context, uri: Uri?) {
             else -> throw IllegalArgumentException("No valid barcode type")
         }
 
-        // FIXME: We probably need to do something with the messageEncoding field
         try {
             cardId = barcodeInfo.getString("altText")
             barcodeId = barcodeInfo.getString("message")
@@ -351,6 +354,12 @@ class PkpassParser(context: Context, uri: Uri?) {
             barcodeId = null
         }
 
+        try {
+            barcodeEncoding = Charset.forName(barcodeInfo.getString("messageEncoding"))
+        } catch (ignored: Exception) {
+            // If encoding is not defined, null or otherwise invalid, stick to the default
+        }
+
         // Don't set barcodeId if it's the same as cardId
         if (cardId == barcodeId) {
             barcodeId = null

app/src/main/java/protect/card_locker/PkpassesParser.kt

@@ -0,0 +1,73 @@
+package protect.card_locker
+
+import android.content.Context
+import android.net.Uri
+import android.util.Log
+import androidx.core.net.toUri
+import net.lingala.zip4j.io.inputstream.ZipInputStream
+import net.lingala.zip4j.model.LocalFileHeader
+import java.io.FileNotFoundException
+import java.io.IOException
+
+class PkpassesParser(context: Context, uri: Uri?) {
+    private var mContext = context
+    private val pkPassParsers: ArrayList<PkpassParser> = ArrayList()
+
+    init {
+        mContext = context
+
+        Log.i(TAG, "Received Pkpasses file")
+        if (uri == null) {
+            Log.e(TAG, "Uri did not contain any data")
+            throw IOException(context.getString(R.string.errorReadingFile))
+        }
+
+        try {
+            mContext.contentResolver.openInputStream(uri).use { inputStream ->
+                ZipInputStream(inputStream).use { zipInputStream ->
+                    var localFileHeader: LocalFileHeader?
+
+                    while (true) {
+                        // Retrieve the next file
+                        localFileHeader = zipInputStream.nextEntry
+
+                        // If no next file, exit loop
+                        if (localFileHeader == null) {
+                            break
+                        }
+
+                        // Ignore directories
+                        if (localFileHeader.isDirectory) continue
+
+                        // Ignore non-pkpass files
+                        if (!localFileHeader.fileName.endsWith(".pkpass")) continue
+
+                        // Extract .pkpass (.zip) inside .pkpasses to cache directory
+                        val tempFileName = "pkpassparser_" + System.currentTimeMillis() + "_" + localFileHeader.fileName
+                        val tempFile = Utils.copyToTempFile(mContext, zipInputStream, tempFileName)
+
+                        // Parse temporary file
+                        pkPassParsers.add(
+                            PkpassParser(mContext, tempFile.toUri())
+                        )
+
+                        // Delete temporary file
+                        tempFile.delete()
+                    }
+                }
+            }
+        } catch (e: FileNotFoundException) {
+            throw IOException(mContext.getString(R.string.errorReadingFile))
+        } catch (e: Exception) {
+            throw e
+        }
+    }
+
+    fun getPkpassParsers(): ArrayList<PkpassParser> {
+        return pkPassParsers
+    }
+
+    companion object {
+        private const val TAG = "Catima"
+    }
+}

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

@@ -1,542 +0,0 @@
-package protect.card_locker;
-
-import static protect.card_locker.BarcodeSelectorActivity.BARCODE_CONTENTS;
-import static protect.card_locker.BarcodeSelectorActivity.BARCODE_FORMAT;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.InputType;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ListAdapter;
-import android.widget.SimpleAdapter;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.zxing.DecodeHintType;
-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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import protect.card_locker.databinding.CustomBarcodeScannerBinding;
-import protect.card_locker.databinding.ScanActivityBinding;
-
-/**
- * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
- * <p>
- * 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 ScanActivityBinding binding;
-    private CustomBarcodeScannerBinding customBarcodeScannerBinding;
-    private static final String TAG = "Catima";
-
-    private static final int MEDIUM_SCALE_FACTOR_DIP = 460;
-    private static final int COMPAT_SCALE_FACTOR_DIP = 320;
-
-    private static final int PERMISSION_SCAN_ADD_FROM_IMAGE = 100;
-    private static final int PERMISSION_SCAN_ADD_FROM_PDF = 101;
-    private static final int PERMISSION_SCAN_ADD_FROM_PKPASS = 102;
-
-    private CaptureManager capture;
-    private DecoratedBarcodeView barcodeScannerView;
-
-    private String cardId;
-    private String addGroup;
-    private boolean torch = false;
-
-    private ActivityResultLauncher<Intent> manualAddLauncher;
-    // can't use the pre-made contract because that launches the file manager for image type instead of gallery
-    private ActivityResultLauncher<Intent> photoPickerLauncher;
-    private ActivityResultLauncher<Intent> pdfPickerLauncher;
-    private ActivityResultLauncher<Intent> pkpassPickerLauncher;
-
-    static final String STATE_SCANNER_ACTIVE = "scannerActive";
-    private boolean mScannerActive = true;
-    private boolean mHasError = false;
-
-    private void extractIntentFields(Intent intent) {
-        final Bundle b = intent.getExtras();
-        cardId = b != null ? b.getString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID) : 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);
-        binding = ScanActivityBinding.inflate(getLayoutInflater());
-        customBarcodeScannerBinding = CustomBarcodeScannerBinding.bind(binding.zxingBarcodeScanner);
-        setTitle(R.string.scanCardBarcode);
-        setContentView(binding.getRoot());
-        Utils.applyWindowInsets(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
-        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
-
-        extractIntentFields(getIntent());
-
-        manualAddLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.SELECT_BARCODE_REQUEST, result.getResultCode(), result.getData()));
-        photoPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_IMAGE_FILE, result.getResultCode(), result.getData()));
-        pdfPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PDF_FILE, result.getResultCode(), result.getData()));
-        pkpassPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PKPASS_FILE, result.getResultCode(), result.getData()));
-        customBarcodeScannerBinding.fabOtherOptions.setOnClickListener(view -> {
-            setScannerActive(false);
-
-            ArrayList<HashMap<String, Object>> list = new ArrayList<>();
-            String[] texts = new String[]{
-                getString(R.string.addWithoutBarcode),
-                getString(R.string.addManually),
-                getString(R.string.addFromImage),
-                getString(R.string.addFromPdfFile),
-                getString(R.string.addFromPkpass)
-            };
-            Object[] icons = new Object[]{
-                R.drawable.baseline_block_24,
-                R.drawable.ic_edit,
-                R.drawable.baseline_image_24,
-                R.drawable.baseline_picture_as_pdf_24,
-                R.drawable.local_activity_24px
-            };
-            String[] columns = new String[]{"text", "icon"};
-
-            for (int i = 0; i < texts.length; i++) {
-                HashMap<String, Object> map = new HashMap<>();
-                map.put(columns[0], texts[i]);
-                map.put(columns[1], icons[i]);
-                list.add(map);
-            }
-
-            ListAdapter adapter = new SimpleAdapter(
-                ScanActivity.this,
-                list,
-                R.layout.alertdialog_row_with_icon,
-                columns,
-                new int[]{R.id.textView, R.id.imageView}
-            );
-
-            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
-            builder.setTitle(getString(R.string.add_a_card_in_a_different_way));
-            builder.setAdapter(
-                    adapter,
-                    (dialogInterface, i) -> {
-                        switch (i) {
-                            case 0:
-                                addWithoutBarcode();
-                                break;
-                            case 1:
-                                addManually();
-                                break;
-                            case 2:
-                                addFromImage();
-                                break;
-                            case 3:
-                                addFromPdf();
-                                break;
-                            case 4:
-                                addFromPkPass();
-                                break;
-                            default:
-                                throw new IllegalArgumentException("Unknown 'Add a card in a different way' dialog option");
-                        }
-                    }
-            );
-            builder.setOnCancelListener(dialogInterface -> setScannerActive(true));
-            builder.show();
-        });
-
-        // Configure barcodeScanner
-        barcodeScannerView = binding.zxingBarcodeScanner;
-        Intent barcodeScannerIntent = new Intent();
-        Bundle barcodeScannerIntentBundle = new Bundle();
-        barcodeScannerIntentBundle.putBoolean(DecodeHintType.ALSO_INVERTED.name(), Boolean.TRUE);
-        barcodeScannerIntent.putExtras(barcodeScannerIntentBundle);
-        barcodeScannerView.initializeFromIntent(barcodeScannerIntent);
-
-        // 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, this::onCaptureManagerError);
-        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) {
-                LoyaltyCard loyaltyCard = new LoyaltyCard();
-                loyaltyCard.setCardId(result.getText());
-                loyaltyCard.setBarcodeType(CatimaBarcode.fromBarcode(result.getBarcodeFormat()));
-
-                returnResult(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
-            }
-
-            @Override
-            public void possibleResultPoints(List<ResultPoint> resultPoints) {
-
-            }
-        });
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (mScannerActive) {
-            capture.onResume();
-        }
-
-        if (!Utils.deviceHasCamera(this)) {
-            showCameraError(getString(R.string.noCameraFoundGuideText), false);
-        } else if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
-            showCameraPermissionMissingText();
-        } else {
-            hideCameraError();
-        }
-
-        scaleScreen();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        capture.onPause();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        capture.onDestroy();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle savedInstanceState) {
-        super.onSaveInstanceState(savedInstanceState);
-        capture.onSaveInstanceState(savedInstanceState);
-
-        savedInstanceState.putBoolean(STATE_SCANNER_ACTIVE, mScannerActive);
-    }
-
-    @Override
-    public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-
-        mScannerActive = savedInstanceState.getBoolean(STATE_SCANNER_ACTIVE);
-    }
-
-    @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);
-    }
-
-    private void setScannerActive(boolean isActive) {
-        if (isActive) {
-            barcodeScannerView.resume();
-        } else {
-            barcodeScannerView.pause();
-        }
-        mScannerActive = isActive;
-    }
-
-    private void returnResult(ParseResult parseResult) {
-        Intent result = new Intent();
-        Bundle bundle = parseResult.toLoyaltyCardBundle(ScanActivity.this);
-        if (addGroup != null) {
-            bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
-        }
-        result.putExtras(bundle);
-        ScanActivity.this.setResult(RESULT_OK, result);
-        finish();
-    }
-
-    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
-        super.onActivityResult(requestCode, resultCode, intent);
-
-        List<ParseResult> parseResultList = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
-
-        if (parseResultList.isEmpty()) {
-            setScannerActive(true);
-            return;
-        }
-
-        Utils.makeUserChooseParseResultFromList(this, parseResultList, new ParseResultListDisambiguatorCallback() {
-            @Override
-            public void onUserChoseParseResult(ParseResult parseResult) {
-                returnResult(parseResult);
-            }
-
-            @Override
-            public void onUserDismissedSelector() {
-                setScannerActive(true);
-            }
-        });
-    }
-
-    private void addWithoutBarcode() {
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-
-        builder.setOnCancelListener(dialogInterface -> setScannerActive(true));
-
-        // Header
-        builder.setTitle(R.string.addWithoutBarcode);
-
-        // Layout
-        LinearLayout layout = new LinearLayout(this);
-        layout.setOrientation(LinearLayout.VERTICAL);
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        );
-        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
-        params.leftMargin = contentPadding;
-        params.topMargin = contentPadding / 2;
-        params.rightMargin = contentPadding;
-
-        // Description
-        TextView currentTextview = new TextView(this);
-        currentTextview.setText(getString(R.string.enter_card_id));
-        currentTextview.setLayoutParams(params);
-        layout.addView(currentTextview);
-
-        // EditText with spacing
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.setLayoutParams(params);
-        layout.addView(input);
-
-        // Set layout
-        builder.setView(layout);
-
-        // Buttons
-        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            LoyaltyCard loyaltyCard = new LoyaltyCard();
-            loyaltyCard.setCardId(input.getText().toString());
-            returnResult(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
-        });
-        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
-        AlertDialog dialog = builder.create();
-
-        // Now that the dialog exists, we can bind something that affects the OK button
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (s.length() == 0) {
-                    input.setError(getString(R.string.card_id_must_not_be_empty));
-                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-                } else {
-                    input.setError(null);
-                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
-                }
-            }
-        });
-
-        dialog.show();
-
-        // Disable button (must be done **after** dialog is shown to prevent crash
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-        // Set focus on input field
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        input.requestFocus();
-    }
-
-    public void addManually() {
-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
-        builder.setTitle(R.string.add_manually_warning_title);
-        builder.setMessage(R.string.add_manually_warning_message);
-        builder.setPositiveButton(R.string.continue_, (dialog, which) -> {
-            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-            if (cardId != null) {
-                final Bundle b = new Bundle();
-                b.putString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID, cardId);
-                i.putExtras(b);
-            }
-            manualAddLauncher.launch(i);
-        });
-        builder.setNegativeButton(R.string.cancel, (dialog, which) -> setScannerActive(true));
-        builder.setOnCancelListener(dialog -> setScannerActive(true));
-        builder.show();
-    }
-
-    public void addFromImage() {
-        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
-    }
-
-    public void addFromPdf() {
-        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PDF);
-    }
-
-    public void addFromPkPass() {
-        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PKPASS);
-    }
-
-    private void addFromImageOrFileAfterPermission(String mimeType, ActivityResultLauncher<Intent> launcher, int chooserText, int errorMessage) {
-        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
-        photoPickerIntent.setType(mimeType);
-        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
-        contentIntent.setType(mimeType);
-
-        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(chooserText));
-        chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { contentIntent });
-        try {
-            launcher.launch(chooserIntent);
-        } catch (ActivityNotFoundException e) {
-            setScannerActive(true);
-            Toast.makeText(getApplicationContext(), errorMessage, Toast.LENGTH_LONG).show();
-            Log.e(TAG, "No activity found to handle intent", e);
-        }
-    }
-
-    public void onCaptureManagerError(String errorMessage) {
-        if (mHasError) {
-            // We're already showing an error, ignore this new error
-            return;
-        }
-
-        showCameraError(errorMessage, false);
-    }
-
-    private void showCameraPermissionMissingText() {
-        showCameraError(getString(R.string.noCameraPermissionDirectToSystemSetting), true);
-    }
-
-    private void showCameraError(String message, boolean setOnClick) {
-        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorMessage.setText(message);
-
-        setCameraErrorState(true, setOnClick);
-    }
-
-    private void hideCameraError() {
-        setCameraErrorState(false, false);
-    }
-
-    private void setCameraErrorState(boolean visible, boolean setOnClick) {
-        mHasError = visible;
-
-        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorClickableArea.setOnClickListener(visible && setOnClick ? v -> {
-            navigateToSystemPermissionSetting();
-        } : null);
-        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(visible ? obtainThemeAttribute(com.google.android.material.R.attr.colorSurface) : Color.TRANSPARENT);
-        customBarcodeScannerBinding.cameraErrorLayout.getRoot().setVisibility(visible ? View.VISIBLE : View.GONE);
-    }
-
-    private void scaleScreen() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        int screenHeight = displayMetrics.heightPixels;
-        float mediumSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,MEDIUM_SCALE_FACTOR_DIP,getResources().getDisplayMetrics());
-        boolean shouldScaleSmaller = screenHeight < mediumSizePx;
-
-        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
-        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorTitle.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
-    }
-
-    private int obtainThemeAttribute(int attribute) {
-        TypedValue typedValue = new TypedValue();
-        getTheme().resolveAttribute(attribute, typedValue, true);
-        return typedValue.data;
-    }
-
-    private void navigateToSystemPermissionSetting() {
-        Intent permissionIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.fromParts("package", getPackageName(), null));
-        permissionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(permissionIntent);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
-        onMockedRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
-    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        boolean granted = grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
-
-        if (requestCode == CaptureManager.getCameraPermissionReqCode()) {
-            if (granted) {
-                hideCameraError();
-            } else {
-                showCameraPermissionMissingText();
-            }
-        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE || requestCode == PERMISSION_SCAN_ADD_FROM_PDF || requestCode == PERMISSION_SCAN_ADD_FROM_PKPASS) {
-            if (granted) {
-                if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
-                    addFromImageOrFileAfterPermission("image/*", photoPickerLauncher, R.string.addFromImage, R.string.failedLaunchingPhotoPicker);
-                } else if (requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
-                    addFromImageOrFileAfterPermission("application/pdf", pdfPickerLauncher, R.string.addFromPdfFile, R.string.failedLaunchingFileManager);
-                } else {
-                    addFromImageOrFileAfterPermission("application/*", pkpassPickerLauncher, R.string.addFromPkpass, R.string.failedLaunchingFileManager);
-                }
-            } else {
-                setScannerActive(true);
-                Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG).show();
-            }
-        }
-    }
-}

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

@@ -0,0 +1,591 @@
+package protect.card_locker
+
+
+import android.Manifest
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.Color
+import android.net.Uri
+import android.os.Bundle
+import android.provider.Settings
+import android.text.InputType
+import android.util.DisplayMetrics
+import android.util.Log
+import android.util.TypedValue
+import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.ListAdapter
+import android.widget.SimpleAdapter
+import android.widget.TextView
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import androidx.core.widget.doOnTextChanged
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.zxing.DecodeHintType
+import com.google.zxing.ResultPoint
+import com.journeyapps.barcodescanner.BarcodeCallback
+import com.journeyapps.barcodescanner.BarcodeResult
+import com.journeyapps.barcodescanner.CaptureManager
+import com.journeyapps.barcodescanner.DecoratedBarcodeView
+import protect.card_locker.databinding.CustomBarcodeScannerBinding
+import protect.card_locker.databinding.ScanActivityBinding
+
+/**
+ * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
+ * <p>
+ * 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
+ */
+class ScanActivity : CatimaAppCompatActivity() {
+    private lateinit var binding: ScanActivityBinding
+    private lateinit var customBarcodeScannerBinding: CustomBarcodeScannerBinding
+
+    companion object {
+        private const val TAG = "Catima"
+
+        private const val MEDIUM_SCALE_FACTOR_DIP = 460
+        private const val COMPAT_SCALE_FACTOR_DIP = 320
+
+        private const val PERMISSION_SCAN_ADD_FROM_IMAGE = 100
+        private const val PERMISSION_SCAN_ADD_FROM_PDF = 101
+        private const val PERMISSION_SCAN_ADD_FROM_PKPASS = 102
+
+        private const val STATE_SCANNER_ACTIVE = "scannerActive"
+    }
+
+    private lateinit var capture: CaptureManager
+    private lateinit var barcodeScannerView: DecoratedBarcodeView
+    private var cardId: String? = null
+    private var addGroup: String? = null
+    private var torch = false
+
+    private lateinit var manualAddLauncher: ActivityResultLauncher<Intent>
+    // can't use the pre-made contract because that launches the file manager for image type instead of gallery
+    private lateinit var photoPickerLauncher: ActivityResultLauncher<Intent>
+    private lateinit var pdfPickerLauncher: ActivityResultLauncher<Intent>
+    private lateinit var pkpassPickerLauncher: ActivityResultLauncher<Intent>
+
+    private var mScannerActive = true
+    private var mHasError = false
+
+    private fun extractIntentFields(intent: Intent) {
+        val b = intent.extras
+        cardId = b?.getString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID)
+        addGroup = b?.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP)
+        Log.d(TAG, "Scan activity: id=$cardId")
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ScanActivityBinding.inflate(layoutInflater)
+        customBarcodeScannerBinding = CustomBarcodeScannerBinding.bind(binding.zxingBarcodeScanner)
+        setTitle(R.string.scanCardBarcode)
+        setContentView(binding.root)
+        Utils.applyWindowInsets(binding.root)
+        setSupportActionBar(binding.toolbar)
+        enableToolbarBackButton()
+
+        extractIntentFields(intent)
+
+        manualAddLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                handleActivityResult(
+                    Utils.SELECT_BARCODE_REQUEST,
+                    result.resultCode,
+                    result.data
+                )
+            }
+        photoPickerLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                handleActivityResult(
+                    Utils.BARCODE_IMPORT_FROM_IMAGE_FILE,
+                    result.resultCode,
+                    result.data
+                )
+            }
+        pdfPickerLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                handleActivityResult(
+                    Utils.BARCODE_IMPORT_FROM_PDF_FILE,
+                    result.resultCode,
+                    result.data
+                )
+            }
+        pkpassPickerLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                handleActivityResult(
+                    Utils.BARCODE_IMPORT_FROM_PKPASS_FILE,
+                    result.resultCode,
+                    result.data
+                )
+            }
+
+        customBarcodeScannerBinding.fabOtherOptions.setOnClickListener {
+            setScannerActive(false)
+
+            val list: ArrayList<HashMap<String, Any>> = arrayListOf()
+            val texts = arrayOf(
+                getString(R.string.addWithoutBarcode),
+                getString(R.string.addManually),
+                getString(R.string.addFromImage),
+                getString(R.string.addFromPdfFile),
+                getString(R.string.addFromPkpass)
+            )
+            val icons = arrayOf(
+                R.drawable.baseline_block_24,
+                R.drawable.ic_edit,
+                R.drawable.baseline_image_24,
+                R.drawable.baseline_picture_as_pdf_24,
+                R.drawable.local_activity_24px
+            )
+            val columns = arrayOf("text", "icon")
+
+            for (i in 0 until texts.size) {
+                val map: HashMap<String, Any> = hashMapOf()
+                map.put(columns[0], texts[i])
+                map.put(columns[1], icons[i])
+                list.add(map)
+            }
+
+            val adapter: ListAdapter = SimpleAdapter(
+                this,
+                list,
+                R.layout.alertdialog_row_with_icon,
+                columns,
+                intArrayOf(R.id.textView, R.id.imageView)
+            )
+
+            val builder = MaterialAlertDialogBuilder(this).apply {
+                setTitle(getString(R.string.add_a_card_in_a_different_way))
+                setAdapter(adapter) { _, i ->
+                    when (i) {
+                        0 -> addWithoutBarcode()
+                        1 -> addManually()
+                        2 -> addFromImage()
+                        3 -> addFromPdf()
+                        4 -> addFromPkPass()
+                        else -> throw IllegalArgumentException(
+                            "Unknown 'Add a card in a different way' dialog option: $i"
+                        )
+                    }
+                }
+                setOnCancelListener { _ -> setScannerActive(true) }
+            }
+            builder.show()
+        }
+
+        // Configure barcodeScanner
+        barcodeScannerView = binding.zxingBarcodeScanner
+
+        val barcodeScannerIntent = Intent().apply {
+            val barcodeScannerIntentBundle = Bundle().apply {
+                putBoolean(DecodeHintType.ALSO_INVERTED.name, true)
+            }
+            putExtras(barcodeScannerIntentBundle)
+        }
+        barcodeScannerView.initializeFromIntent(barcodeScannerIntent)
+
+        // Even though we do the actual decoding with the barcodeScannerView
+        // CaptureManager needs to be running to show the camera and scanning bar
+        capture = CatimaCaptureManager(this, barcodeScannerView, this::onCaptureManagerError)
+        val captureIntent = Intent().apply {
+            val captureIntentBundle = Bundle().apply {
+                putBoolean(DecodeHintType.ALSO_INVERTED.name, false)
+            }
+            putExtras(captureIntentBundle)
+        }
+        capture.initializeFromIntent(captureIntent, savedInstanceState)
+
+        barcodeScannerView.decodeSingle(object : BarcodeCallback {
+            override fun barcodeResult(result: BarcodeResult) {
+                val loyaltyCard = LoyaltyCard().apply {
+                    setCardId(result.text)
+                    setBarcodeType(CatimaBarcode.fromBarcode(result.barcodeFormat))
+                }
+
+                returnResult(ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard))
+            }
+
+            override fun possibleResultPoints(resultPoints: List<ResultPoint?>?) {}
+        })
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        if (mScannerActive) {
+            capture.onResume()
+        }
+
+        if (!Utils.deviceHasCamera(this)) {
+            showCameraError(getString(R.string.noCameraFoundGuideText), false)
+        } else if (ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.CAMERA
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            showCameraPermissionMissingText()
+        } else {
+            hideCameraError()
+        }
+
+        scaleScreen()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        capture.onPause()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        capture.onDestroy()
+    }
+
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        super.onSaveInstanceState(savedInstanceState)
+        capture.onSaveInstanceState(savedInstanceState)
+
+        savedInstanceState.putBoolean(STATE_SCANNER_ACTIVE, mScannerActive)
+    }
+
+    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        super.onRestoreInstanceState(savedInstanceState)
+
+        mScannerActive = savedInstanceState.getBoolean(STATE_SCANNER_ACTIVE)
+    }
+
+    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
+        return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        if (packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)) {
+            menuInflater.inflate(R.menu.scan_menu, menu)
+        }
+
+        barcodeScannerView.setTorchOff()
+
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            setResult(RESULT_CANCELED)
+            finish()
+            return true
+        } else if (item.itemId == 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)
+    }
+
+    private fun setScannerActive(isActive: Boolean) {
+        if (isActive) {
+            barcodeScannerView.resume()
+        } else {
+            barcodeScannerView.pause()
+        }
+        mScannerActive = isActive
+    }
+
+    private fun returnResult(parseResult: ParseResult) {
+        val bundle = parseResult.toLoyaltyCardBundle(this).apply {
+            addGroup?.let { putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, it) }
+        }
+        val result = Intent().apply { putExtras(bundle) }
+        this.setResult(RESULT_OK, result)
+        finish()
+    }
+
+    private fun handleActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
+        super.onActivityResult(resultCode, resultCode, intent)
+
+        val parseResultList: List<ParseResult> =
+            Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this)
+
+        if (parseResultList.isEmpty()) {
+            setScannerActive(true)
+            return
+        }
+
+
+        Utils.makeUserChooseParseResultFromList(
+            this,
+            parseResultList,
+            object : ParseResultListDisambiguatorCallback {
+                override fun onUserChoseParseResult(parseResult: ParseResult) {
+                    returnResult(parseResult)
+                }
+
+                override fun onUserDismissedSelector() {
+                    setScannerActive(true)
+                }
+            })
+    }
+
+    private fun addWithoutBarcode() {
+        val builder: AlertDialog.Builder = MaterialAlertDialogBuilder(this).apply {
+            setOnCancelListener { dialogInterface -> setScannerActive(true) }
+            // Header
+            setTitle(R.string.addWithoutBarcode)
+        }
+
+        // Layout
+        val layout = LinearLayout(this).apply {
+            orientation = LinearLayout.VERTICAL
+        }
+        val contentPadding = resources.getDimensionPixelSize(R.dimen.alert_dialog_content_padding)
+        val params = LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        ).apply {
+            leftMargin = contentPadding
+            topMargin = contentPadding / 2
+            rightMargin = contentPadding
+        }
+
+        // Description
+        val currentTextview = TextView(this).apply {
+            text = getString(R.string.enter_card_id)
+            layoutParams = params
+        }
+        layout.addView(currentTextview)
+
+        //EditText with spacing
+        val input = EditText(this).apply {
+            inputType = InputType.TYPE_CLASS_TEXT
+            layoutParams = params
+        }
+        layout.addView(input)
+
+        // Set layout
+        builder.setView(layout).apply {
+
+            setPositiveButton(getString(R.string.ok)) { _, _ ->
+                val loyaltyCard = LoyaltyCard()
+                loyaltyCard.cardId = input.text.toString()
+                returnResult(ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard))
+            }
+            setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
+                dialog.cancel()
+            }
+        }
+        val dialog: AlertDialog = builder.create()
+
+        // Now that the dialog exists, we can bind something that affects the OK button
+        input.doOnTextChanged { text, _, _, _ ->
+            if (text.isNullOrEmpty()) {
+                input.error = getString(R.string.card_id_must_not_be_empty)
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
+            } else {
+                input.error = null
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true
+            }
+        }
+
+        dialog.show()
+
+        // Disable button (must be done **after** dialog is shown to prevent crash
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
+        // Set focus on input field
+        dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+        input.requestFocus()
+    }
+
+    fun addManually() {
+        val builder = MaterialAlertDialogBuilder(this).apply {
+            setTitle(R.string.add_manually_warning_title)
+            setMessage(R.string.add_manually_warning_message)
+            setPositiveButton(R.string.continue_) { _, _ ->
+                val i = Intent(applicationContext, BarcodeSelectorActivity::class.java)
+                if (cardId != null) {
+                    val b = Bundle()
+                    b.putString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID, cardId)
+                    i.putExtras(b)
+                }
+                manualAddLauncher.launch(i)
+            }
+            setNegativeButton(R.string.cancel) { _, _ -> setScannerActive(true) }
+            setOnCancelListener { _ -> setScannerActive(true) }
+        }
+        builder.show()
+    }
+
+    fun addFromImage() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE)
+    }
+
+    fun addFromPdf() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PDF)
+    }
+
+    fun addFromPkPass() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PKPASS)
+    }
+
+    private fun addFromImageOrFileAfterPermission(
+        mimeType: String,
+        launcher: ActivityResultLauncher<Intent>,
+        chooserText: Int,
+        errorMessage: Int
+    ) {
+        val photoPickerIntent = Intent(Intent.ACTION_PICK)
+        photoPickerIntent.type = mimeType
+        val contentIntent = Intent(Intent.ACTION_GET_CONTENT)
+        contentIntent.type = mimeType
+
+        val chooserIntent = Intent.createChooser(photoPickerIntent, getString(chooserText))
+        chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, arrayOf(contentIntent))
+        try {
+            launcher.launch(chooserIntent)
+        } catch (e: ActivityNotFoundException) {
+            setScannerActive(true)
+            Toast.makeText(applicationContext, errorMessage, Toast.LENGTH_LONG).show()
+            Log.e(TAG, "No activity found to handle intent", e)
+        }
+    }
+
+    fun onCaptureManagerError(errorMessage: String) {
+        if (mHasError) {
+            // We're already showing an error, ignore this new error
+            return
+        }
+
+        showCameraError(errorMessage, false)
+    }
+
+    private fun showCameraPermissionMissingText() {
+        showCameraError(getString(R.string.noCameraPermissionDirectToSystemSetting), true)
+    }
+
+    private fun showCameraError(message: String, setOnClick: Boolean) {
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorMessage.text = message
+
+        setCameraErrorState(true, setOnClick)
+    }
+
+    private fun hideCameraError() {
+        setCameraErrorState(false, false)
+    }
+
+    private fun setCameraErrorState(visible: Boolean, setOnClick: Boolean) {
+        mHasError = visible
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorClickableArea.setOnClickListener(
+            if (visible && setOnClick) { _ -> navigateToSystemPermissionSetting() }
+            else null
+        )
+        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(
+            if (visible) obtainThemeAttribute(com.google.android.material.R.attr.colorSurface)
+            else Color.TRANSPARENT
+        )
+        customBarcodeScannerBinding.cameraErrorLayout.root.visibility =
+            if (visible) View.VISIBLE else View.GONE
+    }
+
+    private fun scaleScreen() {
+        val displayMetrics = DisplayMetrics()
+        windowManager.defaultDisplay.getMetrics(displayMetrics)
+        val screenHeight: Int = displayMetrics.heightPixels
+        val mediumSizePx: Float = TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            MEDIUM_SCALE_FACTOR_DIP.toFloat(),
+            resources.displayMetrics
+        )
+        val shouldScaleSmaller = screenHeight < mediumSizePx
+
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorIcon.visibility =
+            if (shouldScaleSmaller) View.GONE else View.VISIBLE
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorTitle.visibility =
+            if (shouldScaleSmaller) View.GONE else View.VISIBLE
+    }
+
+    private fun obtainThemeAttribute(attribute: Int): Int {
+        val typedValue = TypedValue()
+        theme.resolveAttribute(attribute, typedValue, true)
+        return typedValue.data
+    }
+
+    private fun navigateToSystemPermissionSetting() {
+        val permissionIntent = Intent(
+            Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+            Uri.fromParts("package", getPackageName(), null)
+        )
+        permissionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        startActivity(permissionIntent)
+    }
+
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+
+        val granted =
+            grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
+
+        if (requestCode == CaptureManager.getCameraPermissionReqCode()) {
+            if (granted) {
+                hideCameraError()
+            } else {
+                showCameraPermissionMissingText()
+            }
+        } else if (requestCode in listOf(
+                PERMISSION_SCAN_ADD_FROM_IMAGE,
+                PERMISSION_SCAN_ADD_FROM_PDF,
+                PERMISSION_SCAN_ADD_FROM_PKPASS
+            )
+        ) {
+            if (granted) {
+                if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
+                    addFromImageOrFileAfterPermission(
+                        "image/*",
+                        photoPickerLauncher,
+                        R.string.addFromImage,
+                        R.string.failedLaunchingPhotoPicker
+                    )
+                } else if (requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
+                    addFromImageOrFileAfterPermission(
+                        "application/pdf",
+                        pdfPickerLauncher,
+                        R.string.addFromPdfFile,
+                        R.string.failedLaunchingFileManager
+                    )
+                } else {
+                    addFromImageOrFileAfterPermission(
+                        "application/*",
+                        pkpassPickerLauncher,
+                        R.string.addFromPkpass,
+                        R.string.failedLaunchingFileManager
+                    )
+                }
+            } else {
+                setScannerActive(true)
+                Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG)
+                    .show()
+            }
+        }
+    }
+}

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

@@ -2,31 +2,36 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Bundle;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.IconCompat;
 
 import org.jetbrains.annotations.NotNull;
-
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.LinkedList;
-import java.util.List;
 
-class ShortcutHelper {
-    // Android documentation says that no more than 5 shortcuts
-    // are supported. However, that may be too many, as not all
-    // launcher will show all 5. Instead, the number is limited
-    // to 3 here, so that the most recent shortcut has a good
-    // chance of being shown.
-    private static final int MAX_SHORTCUTS = 3;
+import protect.card_locker.cardview.LoyaltyCardViewActivity;
+import protect.card_locker.shared.ForegroundColorHelper;
+
+public class ShortcutHelper {
+    /**
+     * This variable controls the maximum number of shortcuts available.
+     * It is made public only to make testing easier and should not be
+     * manually modified. We use -1 here as a default value to check if
+     * the value has been set either manually by the test scenario or
+     * automatically in the `updateShortcuts` function.
+     * Its actual value will be set based on the maximum amount of shortcuts
+     * declared by the launcher via `getMaxShortcutCountPerActivity`.
+     */
+    @VisibleForTesting
+    public static int maxShortcuts = -1;
 
     // https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html
     private static final int ADAPTIVE_BITMAP_SCALE = 1;
@@ -35,86 +40,45 @@ class ShortcutHelper {
     private static final int ADAPTIVE_BITMAP_IMAGE_SIZE = ADAPTIVE_BITMAP_VISIBLE_SIZE + 5 * ADAPTIVE_BITMAP_SCALE;
 
     /**
-     * Add a card to the app shortcuts, and maintain a list of the most
-     * recently used cards. If there is already a shortcut for the card,
-     * the card is marked as the most recently used card. If adding this
-     * card exceeds the max number of shortcuts, then the least recently
-     * used card shortcut is discarded.
+     * Update the dynamic shortcut list with the most recently viewed cards
+     * based on the lastUsed field. Archived cards are excluded from the shortcuts
+     * list. The list keeps at most maxShortcuts number of elements.
      */
-    static void updateShortcuts(Context context, LoyaltyCard card) {
-        if (card.archiveStatus == 1) {
-            // Don't add archived card to menu
-            return;
+    public static void updateShortcuts(Context context) {
+        if (maxShortcuts == -1) {
+            maxShortcuts = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context);
         }
-
-        LinkedList<ShortcutInfoCompat> list = new LinkedList<>(ShortcutManagerCompat.getDynamicShortcuts(context));
-
-        SQLiteDatabase database = new DBHelper(context).getReadableDatabase();
-
-        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 (list.get(index).getId().equals(shortcutId)) {
-                // Found the item already
-                foundIndex = index;
-                break;
-            }
-        }
-
-        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. We add it and trim the list later.
-            ShortcutInfoCompat shortcut = createShortcutBuilder(context, card).build();
-            list.addFirst(shortcut);
-        }
-
         LinkedList<ShortcutInfoCompat> finalList = new LinkedList<>();
-        int rank = 0;
+        DBHelper dbHelper = new DBHelper(context);
+        SQLiteDatabase database = dbHelper.getReadableDatabase();
+        try (Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(
+                database,
+                "",
+                null,
+                DBHelper.LoyaltyCardOrder.LastUsed,
+                DBHelper.LoyaltyCardOrderDirection.Ascending,
+                DBHelper.LoyaltyCardArchiveFilter.Unarchived
+        )) {
+            int rank = 0;
 
-        // 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);
+            while (rank < maxShortcuts && loyaltyCardCursor.moveToNext()) {
+                int id = loyaltyCardCursor.getInt(loyaltyCardCursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
+                LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(context, database, id);
 
-            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(context, database, Integer.parseInt(prevShortcut.getId()));
-
-            // skip outdated cards that no longer exist
-            if (loyaltyCard != null) {
                 ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
                         .setRank(rank)
                         .build();
 
                 finalList.addLast(updatedShortcut);
                 rank++;
-
-                // trim the list
-                if (rank >= MAX_SHORTCUTS) {
-                    break;
-                }
             }
+        } finally {
+            dbHelper.close();
         }
 
         ShortcutManagerCompat.setDynamicShortcuts(context, finalList);
     }
 
-    /**
-     * Remove the given card id from the app shortcuts, if such a
-     * shortcut exists.
-     */
-    static void removeShortcut(Context context, int cardId) {
-        ShortcutManagerCompat.removeDynamicShortcuts(context, Collections.singletonList(Integer.toString(cardId)));
-    }
-
     static @NotNull
     Bitmap createAdaptiveBitmap(@NotNull Bitmap in, int paddingColor) {
         Bitmap ret = Bitmap.createBitmap(ADAPTIVE_BITMAP_SIZE, ADAPTIVE_BITMAP_SIZE, Bitmap.Config.ARGB_8888);
@@ -130,7 +94,7 @@ class ShortcutHelper {
         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);
+        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         final Bundle bundle = new Bundle();
         bundle.putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id);
         intent.putExtras(bundle);
@@ -139,7 +103,7 @@ class ShortcutHelper {
         if (iconBitmap == null) {
             iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
         } else {
-            iconBitmap = createAdaptiveBitmap(iconBitmap, Utils.needsDarkForeground(Utils.getHeaderColor(context, loyaltyCard)) ? Color.BLACK : Color.WHITE);
+            iconBitmap = createAdaptiveBitmap(iconBitmap, ForegroundColorHelper.Companion.needsDarkForeground(Utils.getHeaderColor(context, loyaltyCard)) ? Color.BLACK : Color.WHITE);
         }
 
         IconCompat icon = IconCompat.createWithAdaptiveBitmap(iconBitmap);
@@ -150,4 +114,4 @@ class ShortcutHelper {
                 .setIntent(intent)
                 .setIcon(icon);
     }
-}
+}

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

@@ -1,29 +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;
-    }
-
-    public String toHtml() {
-        return String.format("<a href=\"%s\">%s</a> (%s)", url(), name(), license());
-    }
-}

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

@@ -0,0 +1,23 @@
+package protect.card_locker
+
+class ThirdPartyInfo(
+    private val mName: String,
+    private val mUrl: String,
+    private val mLicense: String
+) {
+    fun name(): String {
+        return mName
+    }
+
+    fun url(): String {
+        return mUrl
+    }
+
+    fun license(): String {
+        return mLicense
+    }
+
+    fun toHtml(): String {
+        return String.format("<a href=\"%s\">%s</a> (%s)", url(), name(), license())
+    }
+}

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

@@ -1,93 +0,0 @@
-package protect.card_locker;
-
-import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.View;
-import android.view.Window;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatImageView;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.ColorUtils;
-import androidx.core.view.WindowInsetsControllerCompat;
-
-import com.google.android.material.color.MaterialColors;
-import com.google.android.material.textview.MaterialTextView;
-import com.yalantis.ucrop.UCropActivity;
-
-public class UCropWrapper extends UCropActivity {
-    public static final String UCROP_TOOLBAR_TYPEFACE_STYLE = "ucop_toolbar_typeface_style";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Utils.applyWindowInsets(findViewById(android.R.id.content));
-    }
-
-    @Override
-    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        boolean darkMode = Utils.isDarkModeEnabled(this);
-        Window window = getWindow();
-        // setup status bar to look like the rest of the app
-        if (Build.VERSION.SDK_INT >= 23) {
-            if (window != null) {
-                View decorView = window.getDecorView();
-                WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
-                wic.setAppearanceLightStatusBars(!darkMode);
-            }
-        } else {
-            // icons are always white back then
-            if (window != null && !darkMode) {
-                window.setStatusBarColor(ColorUtils.compositeColors(Color.argb(127, 0, 0, 0), window.getStatusBarColor()));
-            }
-        }
-
-        // find and check views that we wish to color modify
-        // for when we update ucrop or switch to another cropper
-        View check = findViewById(com.yalantis.ucrop.R.id.wrapper_controls);
-        if (check instanceof FrameLayout) {
-            FrameLayout controls = (FrameLayout) check;
-            check = findViewById(com.yalantis.ucrop.R.id.wrapper_states);
-            if (check instanceof LinearLayout) {
-                LinearLayout states = (LinearLayout) check;
-                for (int i = 0; i < controls.getChildCount(); i++) {
-                    check = controls.getChildAt(i);
-                    if (check instanceof AppCompatImageView) {
-                        AppCompatImageView controlsBackgroundImage = (AppCompatImageView) check;
-                        // everything gathered and are as expected, now perform color patching
-                        Utils.patchColors(this);
-                        int colorSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-                        int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
-
-                        Drawable controlsBackgroundImageDrawable = controlsBackgroundImage.getBackground();
-                        controlsBackgroundImageDrawable.mutate();
-                        controlsBackgroundImageDrawable.setTint(darkMode ? colorOnSurface : colorSurface);
-                        controlsBackgroundImage.setBackgroundDrawable(controlsBackgroundImageDrawable);
-
-                        states.setBackgroundColor(darkMode ? colorSurface : colorOnSurface);
-                        break;
-                    }
-                }
-            }
-        }
-
-        // change toolbar font
-        check = findViewById(com.yalantis.ucrop.R.id.toolbar_title);
-        if (check instanceof MaterialTextView) {
-            MaterialTextView toolbarTextview = (MaterialTextView) check;
-            Intent intent = getIntent();
-            int style = intent.getIntExtra(UCROP_TOOLBAR_TYPEFACE_STYLE, -1);
-            if (style != -1) {
-                toolbarTextview.setTypeface(Typeface.defaultFromStyle(style));
-            }
-        }
-    }
-}

app/src/main/java/protect/card_locker/UCropWrapper.kt

@@ -0,0 +1,115 @@
+package protect.card_locker
+
+import android.graphics.Color
+import android.graphics.Typeface
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.children
+import com.google.android.material.color.MaterialColors
+import com.google.android.material.textview.MaterialTextView
+import com.yalantis.ucrop.UCropActivity
+
+class UCropWrapper : UCropActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        Utils.applyWindowInsets(findViewById(android.R.id.content))
+    }
+
+    override fun onPostCreate(savedInstanceState: Bundle?) {
+        super.onPostCreate(savedInstanceState)
+        val darkMode = Utils.isDarkModeEnabled(this)
+        // setup status bar to look like the rest of the app
+        setupStatusBar(darkMode)
+        // find and check views that we wish to color modify
+        // for when we update ucrop or switch to another cropper
+        checkViews(darkMode)
+        // change toolbar font
+        changeToolbarFont()
+    }
+
+    private fun setupStatusBar(darkMode: Boolean) {
+        if (window == null) {
+            return
+        }
+
+        val decorView = window.decorView
+        val wic = WindowInsetsControllerCompat(window, decorView)
+        wic.isAppearanceLightStatusBars = !darkMode
+    }
+
+    private fun checkViews(darkMode: Boolean) {
+        var view = findViewById<View?>(com.yalantis.ucrop.R.id.wrapper_controls)
+        if (view !is FrameLayout) {
+            return
+        }
+
+        val controls = view
+        view = findViewById(com.yalantis.ucrop.R.id.wrapper_states)
+        if (view !is LinearLayout) {
+            return
+        }
+        val states = view
+        controls.children.firstOrNull { it is AppCompatImageView }?.let {
+            // everything gathered and are as expected, now perform color patching
+            Utils.patchColors(this)
+            val colorSurface = MaterialColors.getColor(
+                this,
+                com.google.android.material.R.attr.colorSurface,
+                ContextCompat.getColor(
+                    this,
+                    R.color.md_theme_light_surface
+                )
+            )
+            val colorOnSurface = MaterialColors.getColor(
+                this,
+                com.google.android.material.R.attr.colorOnSurface,
+                ContextCompat.getColor(
+                    this,
+                    R.color.md_theme_light_onSurface
+                )
+            )
+
+            val controlsBackgroundImageDrawable = it.background
+            controlsBackgroundImageDrawable.mutate()
+            controlsBackgroundImageDrawable.setTint(
+                if (darkMode) {
+                    colorOnSurface
+                } else {
+                    colorSurface
+                }
+            )
+            it.background = controlsBackgroundImageDrawable
+            states.setBackgroundColor(
+                if (darkMode) {
+                    colorSurface
+                } else {
+                    colorOnSurface
+                }
+            )
+        }
+    }
+
+    private fun changeToolbarFont() {
+        val toolbar = findViewById<View?>(com.yalantis.ucrop.R.id.toolbar_title)
+        if (toolbar !is MaterialTextView) {
+            return
+        }
+
+        val style = intent.getIntExtra(UCROP_TOOLBAR_TYPEFACE_STYLE, -1)
+        if (style != -1) {
+            toolbar.setTypeface(Typeface.defaultFromStyle(style))
+        }
+    }
+
+    internal companion object {
+        const val UCROP_TOOLBAR_TYPEFACE_STYLE: String = "ucop_toolbar_typeface_style"
+    }
+}

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

@@ -39,7 +39,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RawRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.Insets;
 import androidx.core.os.LocaleListCompat;
 import androidx.core.view.ViewCompat;
@@ -87,14 +86,15 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.EnumMap;
 import java.util.GregorianCalendar;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import protect.card_locker.preferences.Settings;
+import protect.card_locker.shared.ForegroundColorHelper;
 
 public class Utils {
     private static final String TAG = "Catima";
@@ -115,10 +115,8 @@ public class Utils {
 
     public static final String CARD_IMAGE_FILENAME_REGEX = "^(card_)(\\d+)(_(?:front|back|icon)\\.png)$";
 
-    static final double LUMINANCE_MIDPOINT = 0.5;
-
     static final int BITMAP_SIZE_SMALL = 512;
-    static final int BITMAP_SIZE_BIG = 2048;
+    static final int BITMAP_SIZE_BIG = 1600;
 
     static public LetterBitmap generateIcon(Context context, LoyaltyCard loyaltyCard, boolean forShortcut) {
         return generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor, forShortcut);
@@ -143,15 +141,11 @@ public class Utils {
         int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterImageSize);
 
         if (backgroundColor == null) {
-            backgroundColor = LetterBitmap.getDefaultColor(context, store);
+            backgroundColor = LetterBitmap.Companion.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;
+                tileLetterFontSize, pixelSize, pixelSize, backgroundColor, ForegroundColorHelper.Companion.needsDarkForeground(backgroundColor) ? Color.BLACK : Color.WHITE);
     }
 
     static public List<ParseResult> retrieveBarcodesFromImage(Context context, Uri uri) {
@@ -228,6 +222,58 @@ public class Utils {
         return parseResultList;
     }
 
+    static public List<ParseResult> retrieveBarcodesFromPkPasses(Context context, Uri uri) {
+        Log.i(TAG, "Received Pkpasses file with possible barcode");
+        if (uri == null) {
+            Log.e(TAG, "Pkpasses did not contain any data");
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        PkpassesParser pkpassesParser;
+        try {
+            pkpassesParser = new PkpassesParser(context, uri);
+        } catch (Exception e) {
+            Log.e(TAG, "Error reading pkpasses file", e);
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        List<ParseResult> parseResultList = new ArrayList<>();
+        int i = 0;
+        for (PkpassParser pkpassParser : pkpassesParser.getPkpassParsers()) {
+            ParseResult parseResult;
+            List<String> locales = pkpassParser.listLocales();
+            if (locales.isEmpty()) {
+                try {
+                    parseResult = new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(null));
+                } catch (Exception e) {
+                    Log.e(TAG, "Error calling toLoyaltyCard on pkpass file", e);
+                    Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+                    return new ArrayList<>();
+                }
+                parseResult.setNote(String.format(context.getString(R.string.cardWithNumber), i+1));
+                parseResultList.add(parseResult);
+            } else {
+                for (String locale : locales) {
+                    try {
+                        parseResult = new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(locale));
+                    } catch (Exception e) {
+                        Log.e(TAG, "Error calling toLoyaltyCard on pkpass file", e);
+                        Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+                        return new ArrayList<>();
+                    }
+                    parseResult.setNote(String.format(context.getString(R.string.cardWithNumberAndLocale), i+1, locale));
+                    parseResultList.add(parseResult);
+                }
+            }
+
+            i++;
+        }
+
+        return parseResultList;
+    }
+
     static public List<ParseResult> retrieveBarcodesFromPdf(Context context, Uri uri) {
         Log.i(TAG, "Received PDF file with possible barcode");
         if (uri == null) {
@@ -319,7 +365,19 @@ public class Utils {
         }
 
         if (requestCode == Utils.BARCODE_IMPORT_FROM_PKPASS_FILE) {
-            return retrieveBarcodesFromPkPass(context, intent.getData());
+            Uri intentData = intent.getData();
+
+            if (intentData == null) {
+                Log.e(TAG, "Uri did not contain any data");
+                Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+                return new ArrayList<>();
+            }
+
+            if (Objects.equals(context.getContentResolver().getType(intentData), "application/vnd.apple.pkpasses")) {
+                return retrieveBarcodesFromPkPasses(context, intentData);
+            }
+
+            return retrieveBarcodesFromPkPass(context, intentData);
         }
 
         if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
@@ -850,7 +908,7 @@ public class Utils {
 
     public static File copyToTempFile(Context context, InputStream input, String name) throws IOException {
         File file = createTempFile(context, name);
-        try (input; FileOutputStream out = new FileOutputStream(file)) {
+        try (FileOutputStream out = new FileOutputStream(file)) {
             byte[] buf = new byte[4096];
             int len;
             while ((len = input.read(buf)) != -1) {
@@ -899,31 +957,9 @@ public class Utils {
     // replace colors in the current theme
     public static void patchColors(AppCompatActivity activity) {
         Settings settings = new Settings(activity);
-        String color = settings.getColor();
 
         Resources.Theme theme = activity.getTheme();
-        Resources resources = activity.getResources();
-        if (color.equals(resources.getString(R.string.settings_key_pink_theme))) {
-            theme.applyStyle(R.style.pink, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_magenta_theme))) {
-            theme.applyStyle(R.style.magenta, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_violet_theme))) {
-            theme.applyStyle(R.style.violet, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_blue_theme))) {
-            theme.applyStyle(R.style.blue, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_sky_blue_theme))) {
-            theme.applyStyle(R.style.skyblue, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_green_theme))) {
-            theme.applyStyle(R.style.green, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_brown_theme))) {
-            theme.applyStyle(R.style.brown, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_catima_theme))) {
-            // catima theme is AppTheme itself, no dynamic colors nor applyStyle
-        } else {
-            // final catch all in case of invalid theme value from older versions
-            // also handles R.string.settings_key_system_theme
-            DynamicColors.applyToActivityIfAvailable(activity);
-        }
+        DynamicColors.applyToActivityIfAvailable(activity);
 
         if (isDarkModeEnabled(activity) && settings.getOledDark()) {
             theme.applyStyle(R.style.DarkBackground, true);
@@ -1028,7 +1064,7 @@ public class Utils {
 
         if (icon != null) {
             // Use header colour to decide if this image will need a white or black background
-            backgroundOrIcon.setBackgroundColor(needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+            backgroundOrIcon.setBackgroundColor(ForegroundColorHelper.Companion.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
 
             // Ensure correct cropping style
             backgroundOrIcon.setScaleType(Utils.getRecommendedScaleTypeForThumbnailImage(icon));
@@ -1058,14 +1094,14 @@ public class Utils {
             // Actually set the text and colour
             textWhenNoImage.setVisibility(View.VISIBLE);
             textWhenNoImage.setText(loyaltyCard.store);
-            textWhenNoImage.setTextColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+            textWhenNoImage.setTextColor(ForegroundColorHelper.Companion.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
         }
 
         return headerColor;
     }
 
     public static int getHeaderColor(Context context, LoyaltyCard loyaltyCard) {
-        return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
+        return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.Companion.getDefaultColor(context, loyaltyCard.store);
     }
 
     public static String checksum(InputStream input) throws IOException {

app/src/main/java/protect/card_locker/async/CompatCallable.java

@@ -1,9 +0,0 @@
-package protect.card_locker.async;
-
-import java.util.concurrent.Callable;
-
-public interface CompatCallable<T> extends Callable<T> {
-    void onPostExecute(Object result);
-
-    void onPreExecute();
-}

app/src/main/java/protect/card_locker/async/CompatCallable.kt

@@ -0,0 +1,9 @@
+package protect.card_locker.async
+
+import java.util.concurrent.Callable
+
+interface CompatCallable<T> : Callable<T?> {
+    fun onPostExecute(result: Any?)
+
+    fun onPreExecute()
+}

app/src/main/java/protect/card_locker/cardimageview/LoyaltyCardImageViewActivity.kt

@@ -0,0 +1,240 @@
+package protect.card_locker.cardimageview
+
+import android.content.Context
+import android.content.Intent
+import android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION
+import android.graphics.Bitmap
+import android.os.Bundle
+import android.view.WindowManager
+import android.widget.Toast
+import androidx.activity.OnBackPressedDispatcher
+import androidx.activity.compose.setContent
+import androidx.annotation.StringRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.gestures.rememberTransformableState
+import androidx.compose.foundation.gestures.transformable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.IntSize
+import androidx.core.content.FileProvider
+import protect.card_locker.CatimaComponentActivity
+import protect.card_locker.ImageLocationType
+import protect.card_locker.R
+import protect.card_locker.Utils
+import protect.card_locker.compose.CatimaTopAppBar
+import protect.card_locker.compose.theme.CatimaTheme
+import protect.card_locker.preferences.Settings
+
+class LoyaltyCardImageViewActivity : CatimaComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        fixedEdgeToEdge()
+        applyWindowPreferences()
+
+        val imageLocationType = intent.imageLocationType()
+        val loyaltyCardId = intent.getIntExtra(BUNDLE_ID, 0)
+        val bitmap = imageLocationType?.let {
+            Utils.retrieveCardImage(this, loyaltyCardId, it)
+        }
+
+        if (loyaltyCardId == 0 || imageLocationType == null || bitmap == null) {
+            Toast.makeText(this, R.string.failedToRetrieveImageFile, Toast.LENGTH_SHORT).show()
+            finish()
+            return
+        }
+
+        title = getString(imageLocationType.descriptionRes())
+
+        setContent {
+            CatimaTheme {
+                LoyaltyCardImageViewScreen(
+                    bitmap = bitmap,
+                    imageLocationType = imageLocationType,
+                    cardId = loyaltyCardId,
+                    contentDescriptionRes = imageLocationType.descriptionRes(),
+                    onBackPressedDispatcher = onBackPressedDispatcher
+                )
+            }
+        }
+    }
+
+    private fun applyWindowPreferences() {
+        val settings = Settings(this)
+        val currentWindow = window ?: return
+
+        val attributes = currentWindow.attributes
+        if (settings.useMaxBrightnessDisplayingBarcode()) {
+            attributes.screenBrightness = 1F
+        }
+
+        if (settings.keepScreenOn) {
+            currentWindow.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
+
+        currentWindow.attributes = attributes
+    }
+
+    private fun Intent.imageLocationType(): ImageLocationType? {
+        val name = getStringExtra(BUNDLE_IMAGE_LOCATION_TYPE) ?: return null
+        return runCatching { ImageLocationType.valueOf(name) }.getOrNull()
+    }
+
+    private fun ImageLocationType.descriptionRes(): Int {
+        return when (this) {
+            ImageLocationType.icon -> R.string.thumbnailDescription
+            ImageLocationType.front -> R.string.frontImageDescription
+            ImageLocationType.back -> R.string.backImageDescription
+        }
+    }
+
+    companion object {
+        const val BUNDLE_ID = "id"
+        const val BUNDLE_IMAGE_LOCATION_TYPE = "imageLocationType"
+
+        @JvmStatic
+        fun createIntent(
+            context: Context,
+            loyaltyCardId: Int,
+            imageLocationType: ImageLocationType
+        ): Intent {
+            return Intent(context, LoyaltyCardImageViewActivity::class.java)
+                .putExtra(BUNDLE_ID, loyaltyCardId)
+                .putExtra(BUNDLE_IMAGE_LOCATION_TYPE, imageLocationType.name)
+        }
+    }
+}
+
+@Composable
+fun LoyaltyCardImageViewScreen(
+    bitmap: Bitmap,
+    imageLocationType: ImageLocationType,
+    cardId: Int,
+    @StringRes contentDescriptionRes: Int,
+    onBackPressedDispatcher: OnBackPressedDispatcher,
+) {
+    val context = LocalContext.current
+    var scale by remember { mutableFloatStateOf(1F) }
+    var offset by remember { mutableStateOf(Offset.Zero) }
+    var size by remember { mutableStateOf(IntSize.Zero) }
+    val zoomState = rememberTransformableState { _, zoomChange, panChange, _ ->
+        val nextScale = (scale * zoomChange).coerceIn(1F, MAX_IMAGE_SCALE)
+        scale = nextScale
+        offset = if (nextScale == 1F) {
+            Offset.Zero
+        } else {
+            (offset + panChange).clampTo(size, nextScale)
+        }
+    }
+
+    Scaffold(
+        topBar = {
+            CatimaTopAppBar(
+                title = stringResource(contentDescriptionRes),
+                onBackPressedDispatcher = onBackPressedDispatcher,
+                actions = {
+                    var expanded by remember { mutableStateOf(false) }
+                    IconButton(onClick = { expanded = !expanded }) {
+                        Icon(
+                            imageVector = Icons.Filled.MoreVert,
+                            contentDescription = stringResource(R.string.action_more_options)
+                        )
+                    }
+                    DropdownMenu(
+                        expanded = expanded,
+                        onDismissRequest = { expanded = false }
+                    ) {
+                        DropdownMenuItem(onClick = { openInImageGallery(context, cardId, imageLocationType) },
+                            text = { Text(stringResource(R.string.open_in_gallery)) },
+                        )
+                    }
+                }
+            )
+        }
+    ) { innerPadding ->
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(innerPadding)
+                .background(MaterialTheme.colorScheme.background)
+                .testTag("card_image_zoom")
+        ) {
+            Image(
+                bitmap = bitmap.asImageBitmap(),
+                contentDescription = stringResource(contentDescriptionRes),
+                contentScale = ContentScale.Fit,
+                modifier = Modifier
+                    .fillMaxSize()
+                    .onSizeChanged { size = it }
+                    .pointerInput(bitmap) {
+                        detectTapGestures(
+                            onDoubleTap = {
+                                scale = 1F
+                                offset = Offset.Zero
+                            }
+                        )
+                    }
+                    .transformable(zoomState)
+                    .graphicsLayer {
+                        scaleX = scale
+                        scaleY = scale
+                        translationX = offset.x
+                        translationY = offset.y
+                    }
+                    .testTag("card_image")
+            )
+        }
+    }
+}
+
+private fun Offset.clampTo(size: IntSize, scale: Float): Offset {
+    if (size.width == 0 || size.height == 0) {
+        return this
+    }
+
+    val maxX = size.width * (scale - 1F) / 2F
+    val maxY = size.height * (scale - 1F) / 2F
+    return Offset(
+        x = x.coerceIn(-maxX, maxX),
+        y = y.coerceIn(-maxY, maxY)
+    )
+}
+
+private fun openInImageGallery(context: Context, cardId: Int, imageLocationType: ImageLocationType){
+    val imagePath = Utils.getCardImageFileName(cardId, imageLocationType)
+    val viewInGalleryIntent = Intent(Intent.ACTION_VIEW).apply {
+        setDataAndType(FileProvider.getUriForFile(context, context.packageName, context.getFileStreamPath(imagePath)), "image/*")
+        flags = FLAG_GRANT_READ_URI_PERMISSION
+    }
+    context.startActivity(viewInGalleryIntent)
+}
+
+private const val MAX_IMAGE_SCALE = 5F

app/src/main/java/protect/card_locker/cardview/LoyaltyCardImageNavigator.java

@@ -0,0 +1,103 @@
+package protect.card_locker.cardview;
+
+import java.util.ArrayList;
+import java.util.List;
+
+final class LoyaltyCardImageNavigator {
+    private final List<LoyaltyCardImageType> imageTypes;
+    private int currentIndex;
+
+    LoyaltyCardImageNavigator(List<LoyaltyCardImageType> imageTypes, int currentIndex) {
+        this.imageTypes = new ArrayList<>(imageTypes);
+        this.currentIndex = clampIndex(currentIndex);
+    }
+
+    LoyaltyCardImageType getCurrent() {
+        if (isEmpty()) {
+            return LoyaltyCardImageType.NONE;
+        }
+        return imageTypes.get(currentIndex);
+    }
+
+    boolean isEmpty() {
+        return imageTypes.isEmpty();
+    }
+
+    int size() {
+        return imageTypes.size();
+    }
+
+    boolean remove(LoyaltyCardImageType type) {
+        int removedIndex = imageTypes.indexOf(type);
+        if (removedIndex == -1) {
+            return false;
+        }
+
+        imageTypes.remove(removedIndex);
+        currentIndex = clampIndex(currentIndex);
+        return true;
+    }
+
+    boolean canGoPrevious() {
+        return currentIndex > 0;
+    }
+
+    boolean canGoNext() {
+        return currentIndex < imageTypes.size() - 1;
+    }
+
+    boolean movePrevious() {
+        if (!canGoPrevious()) {
+            return false;
+        }
+        currentIndex--;
+        return true;
+    }
+
+    boolean moveNext(boolean overflow) {
+        if (isEmpty()) {
+            return false;
+        }
+        if (canGoNext()) {
+            currentIndex++;
+            return true;
+        }
+        if (overflow) {
+            currentIndex = 0;
+            return true;
+        }
+        return false;
+    }
+
+    int getCurrentIndex() {
+        return currentIndex;
+    }
+
+    LoyaltyCardImageType peekNext(boolean overflow) {
+        if (isEmpty()) {
+            return LoyaltyCardImageType.NONE;
+        }
+
+        if (canGoNext()) {
+            return imageTypes.get(currentIndex + 1);
+        }
+
+        return overflow ? imageTypes.get(0) : getCurrent();
+    }
+
+    private int clampIndex(int index) {
+        if (imageTypes.isEmpty()) {
+            return 0;
+        }
+
+        return Math.max(0, Math.min(index, imageTypes.size() - 1));
+    }
+}
+
+enum LoyaltyCardImageType {
+    NONE,
+    ICON,
+    BARCODE,
+    IMAGE_FRONT,
+    IMAGE_BACK
+}

app/src/main/java/protect/card_locker/cardview/LoyaltyCardMainImageRenderer.java

@@ -0,0 +1,183 @@
+package protect.card_locker.cardview;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.color.MaterialColors;
+
+import java.nio.charset.Charset;
+
+import protect.card_locker.*;
+import protect.card_locker.async.TaskHandler;
+
+final class LoyaltyCardMainImageRenderer {
+    private final Context context;
+    private final TaskHandler tasks = new TaskHandler();
+    private final BarcodeImageWriterResultCallback barcodeCallback;
+
+    LoyaltyCardMainImageRenderer(
+            Context context,
+            BarcodeImageWriterResultCallback barcodeCallback
+    ) {
+        this.context = context;
+        this.barcodeCallback = barcodeCallback;
+    }
+
+    void renderCurrent(
+            LoyaltyCardImageType imageType,
+            Bitmap frontImageBitmap,
+            Bitmap backImageBitmap,
+            CatimaBarcode format,
+            Charset barcodeEncoding,
+            String cardIdString,
+            String barcodeIdString,
+            ImageView barcodeRenderTarget,
+            TextView mainImageDescription,
+            MaterialCardView mainCardView,
+            boolean isFullscreen,
+            boolean waitForResize
+    ) {
+        if (imageType == LoyaltyCardImageType.NONE) {
+            // With no renderable media left, show the raw card ID instead of an empty card area.
+            barcodeRenderTarget.setVisibility(View.GONE);
+            mainCardView.setCardBackgroundColor(Color.TRANSPARENT);
+            mainImageDescription.setTextColor(
+                    MaterialColors.getColor(
+                            mainImageDescription,
+                            com.google.android.material.R.attr.colorOnSurfaceVariant
+                    )
+            );
+            mainImageDescription.setText(cardIdString);
+            return;
+        }
+
+        if (imageType == LoyaltyCardImageType.BARCODE) {
+            barcodeRenderTarget.setBackgroundColor(Color.WHITE);
+            mainCardView.setCardBackgroundColor(Color.WHITE);
+            mainImageDescription.setTextColor(context.getResources().getColor(R.color.md_theme_light_onSurfaceVariant));
+
+            if (waitForResize) {
+                redrawBarcodeAfterResize(
+                        barcodeRenderTarget,
+                        barcodeIdString,
+                        cardIdString,
+                        format,
+                        barcodeEncoding,
+                        !isFullscreen,
+                        isFullscreen
+                );
+            } else {
+                drawBarcode(
+                        barcodeRenderTarget,
+                        barcodeIdString,
+                        cardIdString,
+                        format,
+                        barcodeEncoding,
+                        !isFullscreen,
+                        isFullscreen
+                );
+            }
+
+            mainImageDescription.setText(cardIdString);
+            barcodeRenderTarget.setContentDescription(
+                    context.getString(R.string.barcodeImageDescriptionWithType, format.prettyName())
+            );
+        } else if (imageType == LoyaltyCardImageType.IMAGE_FRONT) {
+            barcodeRenderTarget.setImageBitmap(frontImageBitmap);
+            barcodeRenderTarget.setBackgroundColor(Color.TRANSPARENT);
+            mainCardView.setCardBackgroundColor(Color.TRANSPARENT);
+            mainImageDescription.setTextColor(
+                    MaterialColors.getColor(
+                            mainImageDescription,
+                            com.google.android.material.R.attr.colorOnSurfaceVariant
+                    )
+            );
+            mainImageDescription.setText(context.getString(R.string.frontImageDescription));
+            barcodeRenderTarget.setContentDescription(context.getString(R.string.frontImageDescription));
+        } else if (imageType == LoyaltyCardImageType.IMAGE_BACK) {
+            barcodeRenderTarget.setImageBitmap(backImageBitmap);
+            barcodeRenderTarget.setBackgroundColor(Color.TRANSPARENT);
+            mainCardView.setCardBackgroundColor(Color.TRANSPARENT);
+            mainImageDescription.setTextColor(
+                    MaterialColors.getColor(
+                            mainImageDescription,
+                            com.google.android.material.R.attr.colorOnSurfaceVariant
+                    )
+            );
+            mainImageDescription.setText(context.getString(R.string.backImageDescription));
+            barcodeRenderTarget.setContentDescription(context.getString(R.string.backImageDescription));
+        } else {
+            throw new IllegalArgumentException("Unknown image type: " + imageType);
+        }
+
+        barcodeRenderTarget.setVisibility(View.VISIBLE);
+    }
+
+    private void redrawBarcodeAfterResize(
+            ImageView barcodeRenderTarget,
+            String barcodeIdString,
+            String cardIdString,
+            CatimaBarcode format,
+            Charset barcodeEncoding,
+            boolean addPadding,
+            boolean isFullscreen
+    ) {
+        if (format == null) {
+            return;
+        }
+
+        // Barcode dimensions depend on the final ImageView size, so wait for layout before rendering.
+        barcodeRenderTarget.getViewTreeObserver().addOnGlobalLayoutListener(
+                new ViewTreeObserver.OnGlobalLayoutListener() {
+                    @Override
+                    public void onGlobalLayout() {
+                        barcodeRenderTarget.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                        drawBarcode(
+                                barcodeRenderTarget,
+                                barcodeIdString,
+                                cardIdString,
+                                format,
+                                barcodeEncoding,
+                                addPadding,
+                                isFullscreen
+                        );
+                    }
+                });
+    }
+
+    private void drawBarcode(
+            ImageView barcodeRenderTarget,
+            String barcodeIdString,
+            String cardIdString,
+            CatimaBarcode format,
+            Charset barcodeEncoding,
+            boolean addPadding,
+            boolean isFullscreen
+    ) {
+        // Barcodes are regenerated eagerly because zoom/fullscreen changes affect the output bitmap.
+        tasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
+        if (format == null) {
+            return;
+        }
+
+        BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(
+                context.getApplicationContext(),
+                barcodeRenderTarget,
+                barcodeIdString != null ? barcodeIdString : cardIdString,
+                format,
+                barcodeEncoding,
+                null,
+                false,
+                barcodeCallback,
+                addPadding,
+                isFullscreen
+        );
+        tasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
+    }
+}

app/src/main/java/protect/card_locker/cardview/LoyaltyCardViewDialogs.java

@@ -0,0 +1,246 @@
+package protect.card_locker.cardview;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.text.InputType;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.method.DigitsKeyListener;
+import android.text.style.ForegroundColorSpan;
+import android.text.util.Linkify;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputEditText;
+
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.function.Predicate;
+
+import protect.card_locker.*;
+
+final class LoyaltyCardViewDialogs {
+    interface BalanceUpdateListener {
+        void onBalanceUpdated(BigDecimal newBalance);
+    }
+
+    void showInfoDialog(Context context, LoyaltyCard loyaltyCard, List<Group> loyaltyCardGroups) {
+        AlertDialog.Builder infoDialog = new MaterialAlertDialogBuilder(context);
+
+        int dialogContentPadding = context.getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        infoDialog.setTitle(loyaltyCard.store);
+
+        TextView infoTextview = new TextView(context);
+        infoTextview.setPadding(
+                dialogContentPadding,
+                dialogContentPadding / 2,
+                dialogContentPadding,
+                0
+        );
+        infoTextview.setAutoLinkMask(Linkify.EMAIL_ADDRESSES | Linkify.PHONE_NUMBERS | Linkify.WEB_URLS);
+        infoTextview.setTextIsSelectable(true);
+
+        SpannableStringBuilder infoText = new SpannableStringBuilder();
+        if (!loyaltyCard.note.isEmpty()) {
+            infoText.append(loyaltyCard.note);
+        }
+
+        if (!loyaltyCardGroups.isEmpty()) {
+            List<String> groupNames = new ArrayList<>();
+            for (Group group : loyaltyCardGroups) {
+                groupNames.add(group._id);
+            }
+
+            padSpannableString(infoText);
+            infoText.append(context.getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
+        }
+
+        if (hasBalance(loyaltyCard)) {
+            padSpannableString(infoText);
+            infoText.append(context.getString(
+                    R.string.balanceSentence,
+                    Utils.formatBalance(context, loyaltyCard.balance, loyaltyCard.balanceType)
+            ));
+        }
+
+        appendDateInfo(
+                context,
+                infoText,
+                loyaltyCard.validFrom,
+                Utils::isNotYetValid,
+                R.string.validFromSentence,
+                R.string.validFromSentence
+        );
+        appendDateInfo(
+                context,
+                infoText,
+                loyaltyCard.expiry,
+                Utils::hasExpired,
+                R.string.expiryStateSentenceExpired,
+                R.string.expiryStateSentence
+        );
+
+        infoTextview.setText(infoText);
+        infoDialog.setView(infoTextview);
+        infoDialog.setPositiveButton(R.string.ok, (dialogInterface, i) -> dialogInterface.dismiss());
+        infoDialog.create().show();
+    }
+
+    void showBalanceUpdateDialog(
+            Context context,
+            LoyaltyCard loyaltyCard,
+            BalanceUpdateListener balanceUpdateListener
+    ) {
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
+        builder.setTitle(R.string.updateBalanceTitle);
+
+        FrameLayout container = new FrameLayout(context);
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        int contentPadding = context.getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        params.leftMargin = contentPadding;
+        params.topMargin = contentPadding / 2;
+        params.rightMargin = contentPadding;
+
+        LinearLayout layout = new LinearLayout(context);
+        layout.setOrientation(LinearLayout.VERTICAL);
+
+        TextView currentTextview = new TextView(context);
+        currentTextview.setText(context.getString(
+                R.string.currentBalanceSentence,
+                Utils.formatBalance(context, loyaltyCard.balance, loyaltyCard.balanceType)
+        ));
+        layout.addView(currentTextview);
+
+        final TextInputEditText input = new TextInputEditText(context);
+        input.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
+        input.setKeyListener(DigitsKeyListener.getInstance("0123456789,."));
+        input.setHint(R.string.updateBalanceHint);
+
+        layout.addView(input);
+        layout.setLayoutParams(params);
+        container.addView(layout);
+        builder.setView(container);
+
+        builder.setPositiveButton(R.string.spend, (dialogInterface, i) -> {
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.subtract(balanceChange).max(new BigDecimal(0));
+                balanceUpdateListener.onBalanceUpdated(newBalance);
+                Toast.makeText(
+                        context,
+                        context.getString(
+                                R.string.newBalanceSentence,
+                                Utils.formatBalance(context, newBalance, loyaltyCard.balanceType)
+                        ),
+                        Toast.LENGTH_LONG
+                ).show();
+            } catch (ParseException e) {
+                Toast.makeText(context, R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
+            }
+        });
+        builder.setNegativeButton(R.string.receive, (dialogInterface, i) -> {
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.add(balanceChange);
+                balanceUpdateListener.onBalanceUpdated(newBalance);
+                Toast.makeText(
+                        context,
+                        context.getString(
+                                R.string.newBalanceSentence,
+                                Utils.formatBalance(context, newBalance, loyaltyCard.balanceType)
+                        ),
+                        Toast.LENGTH_LONG
+                ).show();
+            } catch (ParseException e) {
+                Toast.makeText(context, R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
+            }
+        });
+        builder.setNeutralButton(context.getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        AlertDialog dialog = builder.create();
+
+        // Button state depends on the parsed input, so listeners must be bound after the dialog exists.
+        input.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                BigDecimal balanceChange;
+
+                try {
+                    balanceChange = Utils.parseBalance(s.toString(), loyaltyCard.balanceType);
+                } catch (ParseException e) {
+                    input.setError(context.getString(R.string.amountParsingFailed));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+                    return;
+                }
+
+                input.setError(null);
+                boolean hasNonZeroValue = !balanceChange.equals(new BigDecimal(0));
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(hasNonZeroValue);
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(hasNonZeroValue);
+            }
+        });
+
+        dialog.show();
+        // Touching dialog buttons before show() can crash because they are not created yet.
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+
+        if (dialog.getWindow() != null) {
+            dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        }
+        // Focus immediately so the keyboard opens on the amount field.
+        input.requestFocus();
+    }
+
+    private boolean hasBalance(LoyaltyCard loyaltyCard) {
+        return !loyaltyCard.balance.equals(new BigDecimal(0));
+    }
+
+    private SpannableStringBuilder padSpannableString(SpannableStringBuilder spannableStringBuilder) {
+        if (spannableStringBuilder.length() > 0) {
+            spannableStringBuilder.append("\n\n");
+        }
+
+        return spannableStringBuilder;
+    }
+
+    private void appendDateInfo(
+            Context context,
+            SpannableStringBuilder infoText,
+            Date date,
+            Predicate<Date> dateCheck,
+            @StringRes int dateCheckTrueString,
+            @StringRes int dateCheckFalseString
+    ) {
+        if (date == null) {
+            return;
+        }
+
+        String formattedDate = DateFormat.getDateInstance(DateFormat.LONG).format(date);
+
+        padSpannableString(infoText);
+        if (dateCheck.test(date)) {
+            int start = infoText.length();
+            infoText.append(context.getString(dateCheckTrueString, formattedDate));
+            infoText.setSpan(new ForegroundColorSpan(Color.RED), start, infoText.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+        } else {
+            infoText.append(context.getString(dateCheckFalseString, formattedDate));
+        }
+    }
+}

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

@@ -0,0 +1,100 @@
+package protect.card_locker.compose
+
+import androidx.activity.compose.LocalActivity
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.unit.dp
+import protect.card_locker.OpenWebLinkHandler
+import protect.card_locker.R
+
+@Composable
+fun CatimaAboutSection(
+    title: String,
+    message: String,
+    modifier: Modifier = Modifier,
+    onClickUrl: String? = null,
+    onClickDialogText: AnnotatedString? = null,
+) {
+    val activity = LocalActivity.current
+
+    val openDialog = remember { mutableStateOf(false) }
+
+    Row(
+        modifier = modifier
+            .padding(horizontal = 16.dp, vertical = 8.dp)
+            .clickable {
+                if (onClickDialogText != null) {
+                    openDialog.value = true
+                } else if (onClickUrl != null) {
+                    OpenWebLinkHandler().openBrowser(activity, onClickUrl)
+                }
+            }
+            .semantics(mergeDescendants = true) {}
+    ) {
+        Column(modifier = Modifier.weight(1F)) {
+            Text(
+                text = title,
+                style = MaterialTheme.typography.titleMedium
+            )
+            Text(text = message)
+        }
+        Text(modifier = Modifier.align(Alignment.CenterVertically).semantics() { hideFromAccessibility() },
+            text = ">",
+            style = MaterialTheme.typography.bodyMedium
+        )
+    }
+    if (openDialog.value && onClickDialogText != null) {
+        AlertDialog(
+            icon = {},
+            title = {
+                Text(text = title)
+            },
+            text = {
+                Text(
+                    text = onClickDialogText,
+                    modifier = Modifier.verticalScroll(rememberScrollState())
+                )
+            },
+            onDismissRequest = {
+                openDialog.value = false
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        openDialog.value = false
+                    }
+                ) {
+                    Text(stringResource(R.string.ok))
+                }
+            },
+            dismissButton = {
+                if (onClickUrl != null) {
+                    TextButton(
+                        onClick = {
+                            OpenWebLinkHandler().openBrowser(activity, onClickUrl)
+                        }
+                    ) {
+                        Text(stringResource(R.string.view_online))
+                    }
+                }
+            }
+        )
+    }
+}

app/src/main/java/protect/card_locker/compose/Catima.kt

@@ -0,0 +1,60 @@
+package protect.card_locker.compose
+
+import androidx.activity.OnBackPressedDispatcher
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.stringResource
+import protect.card_locker.R
+import protect.card_locker.preferences.Settings
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CatimaTopAppBar(title: String,
+                    onBackPressedDispatcher: OnBackPressedDispatcher?,
+                    actions : @Composable RowScope.() -> Unit = {}) {
+    // Use pure black in OLED theme
+    val context = LocalContext.current
+    val settings = Settings(context)
+    val isDarkMode = when (settings.theme) {
+        AppCompatDelegate.MODE_NIGHT_NO -> false
+        AppCompatDelegate.MODE_NIGHT_YES -> true
+        else -> isSystemInDarkTheme()
+    }
+
+    val appBarColors = if (isDarkMode && settings.oledDark) {
+        TopAppBarDefaults.topAppBarColors().copy(containerColor = Color.Black)
+    } else {
+        TopAppBarDefaults.topAppBarColors()
+    }
+
+    TopAppBar(
+        modifier = Modifier.testTag("topbar_catima"),
+        title = { Text(text = title) },
+        colors = appBarColors,
+        navigationIcon = {
+            if (onBackPressedDispatcher != null) {
+                IconButton(onClick = { onBackPressedDispatcher.onBackPressed() }) {
+                    Icon(
+                        imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                        contentDescription = stringResource(R.string.back)
+                    )
+                }
+            }
+        },
+        actions = actions
+    )
+}

app/src/main/java/protect/card_locker/compose/theme/Theme.kt

@@ -0,0 +1,51 @@
+package protect.card_locker.compose.theme
+
+import android.os.Build
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
+import protect.card_locker.R
+import protect.card_locker.preferences.Settings
+
+@Composable
+fun CatimaTheme(content: @Composable () -> Unit) {
+    val context = LocalContext.current
+    val settings = Settings(context)
+
+    val isDynamicColorSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+
+    val lightTheme = if (isDynamicColorSupported) {
+        dynamicLightColorScheme(context)
+    } else {
+        lightColorScheme(primary = colorResource(id = R.color.md_theme_light_primary))
+    }
+
+    var darkTheme = if (isDynamicColorSupported) {
+        dynamicDarkColorScheme(context)
+    } else {
+        darkColorScheme(primary = colorResource(id = R.color.md_theme_dark_primary))
+    }
+
+    if (settings.oledDark) {
+        darkTheme = darkTheme.copy(background = Color.Black)
+    }
+
+    val colorScheme = when (settings.theme) {
+        AppCompatDelegate.MODE_NIGHT_NO -> lightTheme
+        AppCompatDelegate.MODE_NIGHT_YES -> darkTheme
+        else -> if (isSystemInDarkTheme()) darkTheme else lightTheme
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        content = content
+    )
+}

app/src/main/java/protect/card_locker/contentprovider/CardsContentProvider.java

@@ -32,7 +32,7 @@ public class CardsContentProvider extends ContentProvider {
         public static final String MAJOR_COLUMN = "major";
         public static final String MINOR_COLUMN = "minor";
         public static final int MAJOR = 1;
-        public static final int MINOR = 0;
+        public static final int MINOR = 1;
     }
 
     private static final int URI_VERSION = 0;
@@ -52,6 +52,7 @@ public class CardsContentProvider extends ContentProvider {
             LoyaltyCardDbIds.CARD_ID,
             LoyaltyCardDbIds.BARCODE_ID,
             LoyaltyCardDbIds.BARCODE_TYPE,
+            LoyaltyCardDbIds.BARCODE_ENCODING,
             LoyaltyCardDbIds.STAR_STATUS,
             LoyaltyCardDbIds.LAST_USED,
             LoyaltyCardDbIds.ARCHIVE_STATUS,
@@ -76,13 +77,6 @@ public class CardsContentProvider extends ContentProvider {
                         @Nullable final String selection,
                         @Nullable final String[] selectionArgs,
                         @Nullable final String sortOrder) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            // Disable the content provider on SDK < 23 since it grants dangerous
-            // permissions at install-time
-            Log.w(TAG, "Content provider read is only available for SDK >= 23");
-            return null;
-        }
-
         final Settings settings = new Settings(getContext());
         if (!settings.getAllowContentProviderRead()) {
             Log.w(TAG, "Content provider read is disabled");

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

@@ -134,6 +134,7 @@ public class CatimaExporter implements Exporter {
                 DBHelper.LoyaltyCardDbIds.CARD_ID,
                 DBHelper.LoyaltyCardDbIds.BARCODE_ID,
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
+                DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING,
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS,
                 DBHelper.LoyaltyCardDbIds.LAST_USED,
@@ -154,6 +155,7 @@ public class CatimaExporter implements Exporter {
                     card.cardId,
                     card.barcodeId,
                     card.barcodeType != null ? card.barcodeType.name() : "",
+                    card.barcodeEncoding.name(),
                     card.headerColor,
                     card.starStatus,
                     card.lastUsed,

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

@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Currency;
@@ -127,10 +128,10 @@ public class CatimaImporter implements Importer {
             LoyaltyCard existing = DBHelper.getLoyaltyCard(context, database, card.id);
             if (existing == null) {
                 DBHelper.insertLoyaltyCard(database, card.id, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                        card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
             } else if (!isDuplicate(context, existing, card, existingImages, imageChecksums)) {
                 long newId = DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                        card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
                 idMap.put(card.id, (int) newId);
             }
         }
@@ -458,6 +459,15 @@ public class CatimaImporter implements Importer {
             barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
         }
 
+        // Barcode encoding information is only supported since Catima 2.41.0, so old exports will lack this field
+        // Database migration 19 forcing ISO-8859-1 on all cards, so we should treat imports from old Catima versions the same and force ISO-8859-1 there too
+        // This limits the risk of breaking cards when importing an old database backup
+        Charset barcodeEncoding = StandardCharsets.ISO_8859_1;
+        String unparsedBarcodeEncoding = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING, record, "");
+        if (!unparsedBarcodeEncoding.isEmpty()) {
+            barcodeEncoding = Charset.forName(unparsedBarcodeEncoding);
+        }
+
         Integer headerColor = null;
         try {
             headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record);
@@ -501,6 +511,7 @@ public class CatimaImporter implements Importer {
                 cardId,
                 barcodeId,
                 barcodeType,
+                barcodeEncoding,
                 headerColor,
                 starStatus,
                 lastUsed,

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

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

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

@@ -0,0 +1,7 @@
+package protect.card_locker.importexport
+
+enum class DataFormat {
+    Catima,
+    Fidme,
+    VoucherVault
+}

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

@@ -1,20 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * 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, SQLiteDatabase database, OutputStream output, char[] password) throws IOException, InterruptedException;
-}

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

@@ -0,0 +1,25 @@
+package protect.card_locker.importexport
+
+import android.content.Context
+import android.database.sqlite.SQLiteDatabase
+import java.io.IOException
+import java.io.OutputStream
+
+/**
+ * Interface for a class which can export the contents of the database
+ * in a given format.
+ */
+interface Exporter {
+    /**
+     * Export the database to the output stream in a given format.
+     *
+     * @throws IOException, InterruptedException
+     */
+    @Throws(IOException::class, InterruptedException::class)
+    fun exportData(
+        context: Context,
+        database: SQLiteDatabase,
+        output: OutputStream,
+        password: CharArray
+    )
+}

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

@@ -160,6 +160,7 @@ public class FidmeImporter implements Importer {
                 cardId,
                 null,
                 barcodeType,
+                StandardCharsets.ISO_8859_1,
                 headerColor,
                 starStatus,
                 Utils.getUnixTime(),
@@ -181,7 +182,7 @@ public class FidmeImporter implements Importer {
         for (LoyaltyCard card : data.cards) {
             // Do not use card.id which is set to -1
             DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                    card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
         }
     }
 }

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

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

app/src/main/java/protect/card_locker/importexport/ImportExportResultType.kt

@@ -0,0 +1,7 @@
+package protect.card_locker.importexport
+
+enum class ImportExportResultType {
+    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 android.database.sqlite.SQLiteDatabase;
-
-import org.json.JSONException;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-
-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, SQLiteDatabase database, File inputFile, char[] password) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
-}

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

@@ -0,0 +1,39 @@
+package protect.card_locker.importexport
+
+import android.content.Context
+import android.database.sqlite.SQLiteDatabase
+import org.json.JSONException
+import protect.card_locker.FormatException
+import java.io.File
+import java.io.IOException
+import java.text.ParseException
+
+/**
+ * Interface for a class which can import the contents of a stream
+ * into the database.
+ */
+interface Importer {
+    /**
+     * Import data from the input stream in a given format into
+     * the database.
+     *
+     * @throws IOException
+     * @throws FormatException
+     * @throws InterruptedException
+     * @throws JSONException
+     * @throws ParseException
+     */
+    @Throws(
+        IOException::class,
+        FormatException::class,
+        InterruptedException::class,
+        JSONException::class,
+        ParseException::class
+    )
+    fun importData(
+        context: Context,
+        database: SQLiteDatabase,
+        inputFile: File,
+        password: CharArray
+    )
+}

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

@@ -37,9 +37,6 @@ public class MultiFormatImporter {
             case Fidme:
                 importer = new FidmeImporter();
                 break;
-            case Stocard:
-                importer = new StocardImporter();
-                break;
             case VoucherVault:
                 importer = new VoucherVaultImporter();
                 break;

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

@@ -1,428 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-
-import com.google.zxing.BarcodeFormat;
-
-import net.lingala.zip4j.ZipFile;
-import net.lingala.zip4j.io.inputstream.ZipInputStream;
-import net.lingala.zip4j.model.FileHeader;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import protect.card_locker.CatimaBarcode;
-import protect.card_locker.DBHelper;
-import protect.card_locker.FormatException;
-import protect.card_locker.ImageLocationType;
-import protect.card_locker.LoyaltyCard;
-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.
- * <p>
- * 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 static class StocardProvider {
-        public String name = null;
-        public String barcodeFormat = null;
-        public Bitmap logo = null;
-    }
-
-    public static class StocardRecord {
-        public String providerId = null;
-        public String store = null;
-        public String label = null;
-        public String note = null;
-        public String cardId = null;
-        public String barcodeType = null;
-        public Long lastUsed = null;
-        public Bitmap frontImage = null;
-        public Bitmap backImage = null;
-
-        @NonNull
-        @Override
-        public String toString() {
-            return String.format(
-                    "StocardRecord{%n  providerId=%s,%n  store=%s,%n  label=%s,%n  note=%s,%n  cardId=%s,%n"
-                            + "  barcodeType=%s,%n  lastUsed=%s,%n  frontImage=%s,%n  backImage=%s%n}",
-                    this.providerId,
-                    this.store,
-                    this.label,
-                    this.note,
-                    this.cardId,
-                    this.barcodeType,
-                    this.lastUsed,
-                    this.frontImage,
-                    this.backImage
-            );
-        }
-    }
-
-    public static class ZIPData {
-        public final Map<String, StocardRecord> cards;
-        public final Map<String, StocardProvider> providers;
-
-        ZIPData(final Map<String, StocardRecord> cards, final Map<String, StocardProvider> providers) {
-            this.cards = cards;
-            this.providers = providers;
-        }
-    }
-
-    public static class ImportedData {
-        public final List<LoyaltyCard> cards;
-        public final Map<Integer, Map<ImageLocationType, Bitmap>> images;
-
-        ImportedData(final List<LoyaltyCard> cards, final Map<Integer, Map<ImageLocationType, Bitmap>> images) {
-            this.cards = cards;
-            this.images = images;
-        }
-    }
-
-    public static final String PROVIDER_PREFIX = "/loyalty-card-providers/";
-
-    private static final String TAG = "Catima";
-
-    public void importData(Context context, SQLiteDatabase database, File inputFile, char[] password) throws IOException, FormatException, JSONException, ParseException {
-        ZIPData zipData = new ZIPData(new HashMap<>(), new HashMap<>());
-
-        final CSVParser parser = new CSVParser(new InputStreamReader(context.getResources().openRawResource(R.raw.stocard_stores), StandardCharsets.UTF_8), CSVFormat.RFC4180.builder().setHeader().build());
-
-        try {
-            for (CSVRecord record : parser) {
-                StocardProvider provider = new StocardProvider();
-                provider.name = record.get("name").trim();
-                provider.barcodeFormat = record.get("barcodeFormat").trim();
-
-                zipData.providers.put(record.get("_id").trim(), provider);
-            }
-
-            parser.close();
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        }
-
-        ZipFile zipFile = new ZipFile(inputFile, password);
-        zipData = importZIP(zipFile, zipData);
-        zipFile.close();
-
-        if (zipData.cards.keySet().size() == 0) {
-            throw new FormatException("Couldn't find any loyalty cards in this Stocard export.");
-        }
-
-        ImportedData importedData = importLoyaltyCardHashMap(context, zipData);
-        saveAndDeduplicate(context, database, importedData);
-    }
-
-    public ZIPData importZIP(ZipFile zipFile, final ZIPData zipData) throws IOException, FormatException, JSONException {
-        Map<String, StocardRecord> cards = zipData.cards;
-        Map<String, StocardProvider> providers = zipData.providers;
-
-        String[] customProvidersBaseName = null;
-        String[] cardBaseName = null;
-        String customProviderId = "";
-        String cardName = "";
-        for (FileHeader fileHeader : zipFile.getFileHeaders()) {
-            String fileName = fileHeader.getFileName();
-            String[] nameParts = fileName.split("/");
-
-            if (nameParts.length < 2) {
-                continue;
-            }
-
-            String userId = nameParts[1];
-            ZipInputStream zipInputStream = zipFile.getInputStream(fileHeader);
-
-            if (customProvidersBaseName == null) {
-                // FIXME: can we use the points-account/statement/content.json balance info somehow?
-                /*
-                  Known files:
-                    extracts/<user-UUID>/users/<user-UUID>/
-                      analytics-properties/content.json
-                      devices/<device-UUID>/
-                        analytics-properties/content.json
-                        content.json
-                        ip-location-wifi/content.json
-                      enabled-regions/<UUID>/content.json
-                      loyalty-card-custom-providers/<provider-UUID>/content.json - custom providers
-                      loyalty-cards/<card-UUID>/
-                        card-linked-coupons/accounts/default/
-                          content.json
-                          user-coupons/<UUID>/content.json
-                        content.json - card itself
-                        images/back.png - back image (legacy)
-                        images/back/back.jpg - back image
-                        images/back/content.json
-                        images/front.png - front image (legacy)
-                        images/front/content.json
-                        images/front/front.jpg - front image
-                        notes/default/content.json - note
-                        points-account/
-                          content.json
-                          statement/content.json
-                        usages/<UUID>/content.json - timestamps
-                        usage-statistics/content.json - timestamps
-                      reward-program-balances/<UUID>/content.json
-                */
-                customProvidersBaseName = new String[]{
-                        "extracts",
-                        userId,
-                        "users",
-                        userId,
-                        "loyalty-card-custom-providers"
-                };
-                cardBaseName = new String[]{
-                        "extracts",
-                        userId,
-                        "users",
-                        userId,
-                        "loyalty-cards"
-                };
-            }
-
-            if (startsWith(nameParts, customProvidersBaseName, 1)) {
-                // Extract providerId
-                customProviderId = nameParts[customProvidersBaseName.length];
-
-                StocardProvider provider = providers.get(customProviderId);
-                if (provider == null) {
-                    provider = new StocardProvider();
-                    providers.put(customProviderId, provider);
-                }
-
-                // Name file
-                if (fileName.endsWith(customProviderId + "/content.json")) {
-                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
-                    provider.name = jsonObject.getString("name");
-                } else if (fileName.endsWith("logo.png")) {
-                    provider.logo = ZipUtils.readImage(zipInputStream);
-                } else if (!fileName.endsWith("/")) {
-                    Log.d(TAG, "Unknown or unused loyalty-card-custom-providers file " + fileName + ", skipping...");
-                }
-            } else if (startsWith(nameParts, cardBaseName, 1)) {
-                // Extract cardName
-                cardName = nameParts[cardBaseName.length];
-
-                StocardRecord record = cards.get(cardName);
-                if (record == null) {
-                    record = new StocardRecord();
-                    cards.put(cardName, record);
-                }
-
-                // This is the card itself
-                if (fileName.endsWith(cardName + "/content.json")) {
-                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
-                    record.cardId = jsonObject.getString("input_id");
-
-                    if (jsonObject.has("input_provider_name")) {
-                        record.store = jsonObject.getString("input_provider_name");
-                    }
-
-                    if (jsonObject.has("label")) {
-                        String label = jsonObject.getString("label");
-                        if (!label.isBlank()) {
-                            record.label = label;
-                        }
-                    }
-
-                    // Provider ID can be either custom or not, extract whatever version is relevant
-                    String customProviderPrefix = "/users/" + userId + "/loyalty-card-custom-providers/";
-                    String providerId = jsonObject
-                            .getJSONObject("input_provider_reference")
-                            .getString("identifier");
-                    if (providerId.startsWith(customProviderPrefix)) {
-                        providerId = providerId.substring(customProviderPrefix.length());
-                    } else if (providerId.startsWith(PROVIDER_PREFIX)) {
-                        providerId = providerId.substring(PROVIDER_PREFIX.length());
-                    } else {
-                        throw new FormatException("Unsupported provider ID format: " + providerId);
-                    }
-
-                    record.providerId = providerId;
-
-                    if (jsonObject.has("input_barcode_format")) {
-                        record.barcodeType = jsonObject.getString("input_barcode_format");
-                    }
-                } else if (fileName.endsWith("notes/default/content.json")) {
-                    record.note = ZipUtils.readJSON(zipInputStream).getString("content");
-                } else if (fileName.endsWith("usage-statistics/content.json")) {
-                    JSONArray usages = ZipUtils.readJSON(zipInputStream).getJSONArray("usages");
-                    for (int i = 0; i < usages.length(); i++) {
-                        JSONObject lastUsedObject = usages.getJSONObject(i);
-                        String lastUsedString = lastUsedObject.getJSONObject("time").getString("value");
-                        long timeStamp = Instant.parse(lastUsedString).getEpochSecond();
-                        if (record.lastUsed == null || timeStamp > record.lastUsed) {
-                            record.lastUsed = timeStamp;
-                        }
-                    }
-                } else if (fileName.matches(".*/usages/[^/]+/content.json")) {
-                    JSONObject lastUsedObject = ZipUtils.readJSON(zipInputStream);
-                    String lastUsedString = lastUsedObject.getJSONObject("time").getString("value");
-                    long timeStamp = Instant.parse(lastUsedString).getEpochSecond();
-                    if (record.lastUsed == null || timeStamp > record.lastUsed) {
-                        record.lastUsed = timeStamp;
-                    }
-                } else if (fileName.endsWith("/images/front.png") || fileName.endsWith("/images/front/front.jpg")) {
-                    record.frontImage = ZipUtils.readImage(zipInputStream);
-                } else if (fileName.endsWith("/images/back.png") || fileName.endsWith("/images/back/back.jpg")) {
-                    record.backImage = ZipUtils.readImage(zipInputStream);
-                } else if (!fileName.endsWith("/")) {
-                    Log.d(TAG, "Unknown or unused loyalty-cards file " + fileName + ", skipping...");
-                }
-            } else if (!fileName.endsWith("/")) {
-                Log.d(TAG, "Unknown or unused file " + fileName + ", skipping...");
-            }
-
-            zipInputStream.close();
-        }
-
-        return new ZIPData(cards, providers);
-    }
-
-    public ImportedData importLoyaltyCardHashMap(Context context, final ZIPData zipData) throws FormatException {
-        ImportedData importedData = new ImportedData(new ArrayList<>(), new HashMap<>());
-        int tempID = 0;
-
-        List<String> cardKeys = new ArrayList<>(zipData.cards.keySet());
-        Collections.sort(cardKeys);
-
-        for (String key : cardKeys) {
-            StocardRecord record = zipData.cards.get(key);
-
-            if (record.providerId == null) {
-                Log.d(TAG, "Missing providerId for card " + record + ", ignoring...");
-                continue;
-            }
-
-            if (record.cardId == null) {
-                throw new FormatException("No card ID listed, but is required");
-            }
-
-            StocardProvider provider = zipData.providers.get(record.providerId);
-
-            // Read store from card, if not available (old export), fall back to providerData
-            String store = record.store != null ? record.store : provider != null ? provider.name : record.providerId;
-            String note = record.note != null ? record.note : "";
-            String barcodeTypeString = record.barcodeType != null ? record.barcodeType : provider != null ? provider.barcodeFormat : null;
-
-            if (record.label != null && !record.label.equals(store) && !record.label.equals(note)) {
-                note = note.isEmpty() ? record.label : note + "\n" + record.label;
-            }
-
-            CatimaBarcode barcodeType = null;
-            if (barcodeTypeString != null && !barcodeTypeString.isEmpty()) {
-                if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
-                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
-                } else if (barcodeTypeString.equals("GS1_128")) {
-                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128);
-                } else {
-                    barcodeType = CatimaBarcode.fromName(barcodeTypeString);
-                }
-            }
-
-            int headerColor = Utils.getRandomHeaderColor(context);
-            if (provider != null && provider.logo != null) {
-                headerColor = Utils.getHeaderColorFromImage(provider.logo, headerColor);
-            }
-
-            long lastUsed = record.lastUsed != null ? record.lastUsed : Utils.getUnixTime();
-
-            LoyaltyCard card = new LoyaltyCard(
-                    tempID,
-                    store,
-                    note,
-                    null,
-                    null,
-                    BigDecimal.valueOf(0),
-                    null,
-                    record.cardId,
-                    null,
-                    barcodeType,
-                    headerColor,
-                    0,
-                    lastUsed,
-                    DBHelper.DEFAULT_ZOOM_LEVEL,
-                    DBHelper.DEFAULT_ZOOM_LEVEL_WIDTH,
-                    0,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null
-            );
-            importedData.cards.add(card);
-
-            Map<ImageLocationType, Bitmap> images = new HashMap<>();
-
-            if (provider != null && provider.logo != null) {
-                images.put(ImageLocationType.icon, provider.logo);
-            }
-            if (record.frontImage != null) {
-                images.put(ImageLocationType.front, record.frontImage);
-            }
-            if (record.backImage != null) {
-                images.put(ImageLocationType.back, record.backImage);
-            }
-
-            importedData.images.put(tempID, images);
-            tempID++;
-        }
-
-        return importedData;
-    }
-
-    public void saveAndDeduplicate(Context context, SQLiteDatabase database, final ImportedData data) throws IOException {
-        // This format does not have IDs that can cause conflicts
-        // Proper deduplication for all formats will be implemented later
-        for (LoyaltyCard card : data.cards) {
-            // card.id is temporary and only used to index the images Map
-            long id = DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
-            for (Map.Entry<ImageLocationType, Bitmap> entry : data.images.get(card.id).entrySet()) {
-                Utils.saveCardImage(context, entry.getValue(), (int) id, entry.getKey());
-            }
-        }
-    }
-
-    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;
-    }
-}

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

@@ -162,6 +162,7 @@ public class VoucherVaultImporter implements Importer {
                     cardId,
                     null,
                     barcodeType,
+                    StandardCharsets.ISO_8859_1,
                     headerColor,
                     0,
                     Utils.getUnixTime(),
@@ -186,7 +187,7 @@ public class VoucherVaultImporter implements Importer {
         for (LoyaltyCard card : data.cards) {
             // Do not use card.id which is set to -1
             DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                    card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
         }
     }
 }

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

@@ -74,10 +74,6 @@ public class Settings {
         return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
     }
 
-    public String getCardViewOrientation() {
-        return getString(R.string.settings_key_card_orientation, getResString(R.string.settings_key_follow_system_orientation));
-    }
-
     public boolean getKeepScreenOn() {
         return getBoolean(R.string.settings_key_keep_screen_on, true);
     }
@@ -86,6 +82,10 @@ public class Settings {
         return getBoolean(R.string.settings_key_disable_lockscreen_while_viewing_card, true);
     }
 
+    public boolean getDisableNfcWhileViewingCard() {
+        return getBoolean(R.string.settings_key_disable_nfc_while_viewing_card, true);
+    }
+
     public boolean getAllowContentProviderRead() {
         return getBoolean(R.string.settings_key_allow_content_provider_read, true);
     }
@@ -94,10 +94,6 @@ public class Settings {
         return getBoolean(R.string.settings_key_oled_dark, false);
     }
 
-    public String getColor() {
-        return getString(R.string.setting_key_theme_color, mContext.getResources().getString(R.string.settings_key_system_theme));
-    }
-
     public int getPreferredColumnCount() {
         var defaultSymbol = mContext.getResources().getString(R.string.settings_key_automatic_column_count);
         var defaultColumnCount = mContext.getResources().getInteger(R.integer.main_view_card_columns);
@@ -116,4 +112,8 @@ public class Settings {
     public boolean useVolumeKeysForNavigation() {
         return getBoolean(R.string.settings_key_use_volume_keys_navigation, false);
     }
+
+    public boolean getWearSyncEnabled() {
+        return getBoolean(R.string.settings_key_wear_sync, false);
+    }
 }

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

@@ -1,206 +0,0 @@
-package protect.card_locker.preferences;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.MenuItem;
-
-import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.os.LocaleListCompat;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-
-import com.google.android.material.color.DynamicColors;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import protect.card_locker.CatimaAppCompatActivity;
-import protect.card_locker.MainActivity;
-import protect.card_locker.R;
-import protect.card_locker.Utils;
-import protect.card_locker.databinding.SettingsActivityBinding;
-
-public class SettingsActivity extends CatimaAppCompatActivity {
-
-    private SettingsActivityBinding binding;
-    private final static String RELOAD_MAIN_STATE = "mReloadMain";
-    private SettingsFragment fragment;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        binding = SettingsActivityBinding.inflate(getLayoutInflater());
-        setTitle(R.string.settings);
-        setContentView(binding.getRoot());
-        Utils.applyWindowInsets(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
-        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
-
-        // Display the fragment as the main content.
-        fragment = new SettingsFragment();
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.settings_container, fragment)
-                .commit();
-
-        // restore reload main state
-        if (savedInstanceState != null) {
-            fragment.mReloadMain = savedInstanceState.getBoolean(RELOAD_MAIN_STATE);
-        }
-
-        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-            @Override
-            public void handleOnBackPressed() {
-                finishSettingsActivity();
-            }
-        });
-    }
-
-    @Override
-    protected void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putBoolean(RELOAD_MAIN_STATE, fragment.mReloadMain);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-
-        if (id == android.R.id.home) {
-            finishSettingsActivity();
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void finishSettingsActivity() {
-        if (fragment.mReloadMain) {
-            Intent intent = new Intent();
-            intent.putExtra(MainActivity.RESTART_ACTIVITY_INTENT, true);
-            setResult(Activity.RESULT_OK, intent);
-        } else {
-            setResult(Activity.RESULT_OK);
-        }
-        finish();
-    }
-
-    public static class SettingsFragment extends PreferenceFragmentCompat {
-        private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
-
-        public boolean mReloadMain;
-
-        @Override
-        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-            // Load the preferences from an XML resource
-            addPreferencesFromResource(R.xml.preferences);
-
-            // Show pretty names and summaries
-            ListPreference 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);
-                }
-
-                return true;
-            });
-
-            ListPreference themeColorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
-            assert themeColorPreference != null;
-            themeColorPreference.setOnPreferenceChangeListener((preference, o) -> {
-                refreshActivity(true);
-                return true;
-            });
-            if (!DynamicColors.isDynamicColorAvailable()) {
-                themeColorPreference.setEntryValues(R.array.color_values_no_dynamic);
-                themeColorPreference.setEntries(R.array.color_value_strings_no_dynamic);
-            }
-
-            Preference oledDarkPreference = findPreference(getResources().getString(R.string.settings_key_oled_dark));
-            assert oledDarkPreference != null;
-            oledDarkPreference.setOnPreferenceChangeListener((preference, newValue) -> {
-                refreshActivity(true);
-                return true;
-            });
-
-            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));
-                }
-            }
-            localePreference.setEntries(entries.toArray(new CharSequence[entryValues.length]));
-            // Make locale picker preference in sync with system settings
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                Locale sysLocale = AppCompatDelegate.getApplicationLocales().get(0);
-                if (sysLocale == null) {
-                    // Corresponds to "System"
-                    localePreference.setValue("");
-                } else {
-                    // Need to set preference's value to one of localePreference.getEntryValues() to match the locale.
-                    // Locale.toLanguageTag() theoretically should be one of the values in localePreference.getEntryValues()...
-                    // But it doesn't work for some locales. so trying something more heavyweight.
-
-                    // Obtain all locales supported by the app.
-                    List<Locale> appLocales = Arrays.stream(localePreference.getEntryValues())
-                            .map(Objects::toString)
-                            .map(Utils::stringToLocale)
-                            .collect(Collectors.toList());
-                    // Get the app locale that best matches the system one
-                    Locale bestMatchLocale = Utils.getBestMatchLocale(appLocales, sysLocale);
-                    // Get its index in supported locales
-                    int index = appLocales.indexOf(bestMatchLocale);
-                    // Set preference value to entry value at that index
-                    localePreference.setValue(localePreference.getEntryValues()[index].toString());
-                }
-            }
-
-            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
-                // See corresponding comment in Utils.updateBaseContextLocale for Android 6- notes
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-                    refreshActivity(true);
-                    return true;
-                }
-                String newLocale = (String) newValue;
-                // If newLocale is empty, that means "System" was selected
-                AppCompatDelegate.setApplicationLocales(newLocale.isEmpty() ? LocaleListCompat.getEmptyLocaleList() : LocaleListCompat.create(Utils.stringToLocale(newLocale)));
-                return true;
-            });
-
-            // Disable content provider on SDK < 23 since dangerous permissions
-            // are granted at install-time
-            Preference contentProviderReadPreference = findPreference(getResources().getString(R.string.settings_key_allow_content_provider_read));
-            assert contentProviderReadPreference != null;
-            contentProviderReadPreference.setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);
-        }
-
-        private void refreshActivity(boolean reloadMain) {
-            mReloadMain = reloadMain || mReloadMain;
-            Activity activity = getActivity();
-            if (activity != null) {
-                activity.recreate();
-            }
-        }
-    }
-}

app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt

@@ -0,0 +1,440 @@
+package protect.card_locker.preferences
+
+import android.annotation.SuppressLint
+import android.bluetooth.BluetoothDevice
+import android.bluetooth.BluetoothManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.view.LayoutInflater
+import android.view.View
+import android.view.MenuItem
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.ContextCompat
+import androidx.core.os.LocaleListCompat
+import androidx.preference.ListPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreferenceCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
+import protect.card_locker.BuildConfig
+import protect.card_locker.CatimaAppCompatActivity
+import protect.card_locker.MainActivity
+import protect.card_locker.R
+import protect.card_locker.Utils
+import protect.card_locker.databinding.SettingsActivityBinding
+import protect.card_locker.shared.BluetoothPermissionHelper
+import protect.card_locker.shared.WearBluetoothSecurity
+import protect.card_locker.wearos.BluetoothPairingNotificationManager
+import protect.card_locker.wearos.WearSyncPermissionRequester
+
+class SettingsActivity : CatimaAppCompatActivity() {
+
+    private lateinit var binding: SettingsActivityBinding
+    private lateinit var fragment: SettingsFragment
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = SettingsActivityBinding.inflate(layoutInflater)
+        setTitle(R.string.settings)
+        setContentView(binding.root)
+        Utils.applyWindowInsets(binding.root)
+        val toolbar = binding.toolbar
+        setSupportActionBar(toolbar)
+        enableToolbarBackButton()
+
+        // Display the fragment as the main content.
+        fragment = SettingsFragment()
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.settings_container, fragment)
+            .commit()
+
+        // restore reload main state
+        if (savedInstanceState != null) {
+            fragment.mReloadMain = savedInstanceState.getBoolean(RELOAD_MAIN_STATE)
+        }
+
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                finishSettingsActivity()
+            }
+        })
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBoolean(RELOAD_MAIN_STATE, fragment.mReloadMain)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
+
+        if (id == android.R.id.home) {
+            finishSettingsActivity()
+            return true
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun finishSettingsActivity() {
+        if (fragment.mReloadMain) {
+            val intent = Intent()
+            intent.putExtra(MainActivity.RESTART_ACTIVITY_INTENT, true)
+            setResult(RESULT_OK, intent)
+        } else {
+            setResult(RESULT_OK)
+        }
+        finish()
+    }
+
+    class SettingsFragment : PreferenceFragmentCompat() {
+        var mReloadMain: Boolean = false
+
+        private lateinit var wearSyncPermissionRequester: WearSyncPermissionRequester
+        private var currentDevicesDialog: AlertDialog? = null
+        private var currentDevicesDialogIsBlocked: Boolean = false
+        private val devicesChangedReceiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context, intent: Intent) {
+                if (intent.action != BluetoothPairingNotificationManager.ACTION_DEVICES_CHANGED) {
+                    return
+                }
+                findPreference<Preference>(getString(R.string.settings_key_wear_sync_devices))?.let { updateWearSyncAllowedDevicesSummary(it) }
+                findPreference<Preference>(getString(R.string.settings_key_wear_sync_blocked_devices))?.let { updateWearSyncBlockedDevicesSummary(it) }
+                if (currentDevicesDialog?.isShowing != true) {
+                    return
+                }
+                val isBlocked = currentDevicesDialogIsBlocked
+                currentDevicesDialog?.dismiss()
+                if (isBlocked) {
+                    showWearSyncBlockedDevicesDialog()
+                } else {
+                    showWearSyncAllowedDevicesDialog()
+                }
+            }
+        }
+
+        override fun onResume() {
+            super.onResume()
+            wearSyncPermissionRequester.synchronize()
+            findPreference<Preference>(getString(R.string.settings_key_wear_sync_devices))?.let { updateWearSyncAllowedDevicesSummary(it) }
+            findPreference<Preference>(getString(R.string.settings_key_wear_sync_blocked_devices))?.let { updateWearSyncBlockedDevicesSummary(it) }
+            ContextCompat.registerReceiver(
+                requireContext(),
+                devicesChangedReceiver,
+                IntentFilter(BluetoothPairingNotificationManager.ACTION_DEVICES_CHANGED),
+                ContextCompat.RECEIVER_NOT_EXPORTED
+            )
+        }
+
+        override fun onPause() {
+            super.onPause()
+            requireContext().unregisterReceiver(devicesChangedReceiver)
+        }
+
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            wearSyncPermissionRequester = WearSyncPermissionRequester(this, requireContext())
+
+            // Load the preferences from an XML resource
+            addPreferencesFromResource(R.xml.preferences)
+
+            setupThemePreference()
+            setupOledDarkPreference()
+            setupLocalePreference()
+            setupCrashReporterPreference()
+            setupWearSyncPreference()
+            setupWearSyncDevicePreferences()
+        }
+
+        private fun setupThemePreference() {
+            val themePreference = findPreference<ListPreference>(getString(R.string.settings_key_theme))
+            themePreference!!.setOnPreferenceChangeListener { _, o ->
+                when (o.toString()) {
+                    getString(R.string.settings_key_light_theme) -> {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+                    }
+                    getString(R.string.settings_key_dark_theme) -> {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+                    }
+                    else -> {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+                    }
+                }
+                true
+            }
+        }
+
+        private fun setupOledDarkPreference() {
+            val oledDarkPreference = findPreference<Preference>(getString(R.string.settings_key_oled_dark))
+            oledDarkPreference!!.setOnPreferenceChangeListener { _, _ ->
+                refreshActivity()
+                true
+            }
+        }
+
+        private fun setupLocalePreference() {
+            val localePreference =
+                findPreference<ListPreference>(getString(R.string.settings_key_locale))!!
+            localePreference.let {
+                val entryValues = it.entryValues
+                val entries = entryValues.map { entry ->
+                    if (entry.isEmpty()) {
+                        getString(R.string.settings_system_locale)
+                    } else {
+                        val entryLocale = Utils.stringToLocale(entry.toString())
+                        entryLocale.getDisplayName(entryLocale)
+                    }
+                }
+                it.entries = entries.toTypedArray()
+
+                // Make locale picker preference in sync with system settings
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    val sysLocale = AppCompatDelegate.getApplicationLocales()[0]
+                    if (sysLocale == null) {
+                        // Corresponds to "System"
+                        it.value = ""
+                    } else {
+                        // Need to set preference's value to one of localePreference.getEntryValues() to match the locale.
+                        // Locale.toLanguageTag() theoretically should be one of the values in localePreference.getEntryValues()...
+                        // But it doesn't work for some locales. so trying something more heavyweight.
+
+                        // Obtain all locales supported by the app.
+                        val appLocales = entryValues.map { entry -> Utils.stringToLocale(entry.toString()) }
+                        // Get the app locale that best matches the system one
+                        val bestMatchLocale = Utils.getBestMatchLocale(appLocales, sysLocale)
+                        // Get its index in supported locales
+                        val index = appLocales.indexOf(bestMatchLocale)
+                        // Set preference value to entry value at that index
+                        it.value = entryValues[index].toString()
+                    }
+                }
+            }
+
+            localePreference.setOnPreferenceChangeListener { _, newValue ->
+                // See corresponding comment in Utils.updateBaseContextLocale for Android 6- notes
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+                    refreshActivity()
+                    return@setOnPreferenceChangeListener true
+                }
+                val newLocale = newValue as String
+                // If newLocale is empty, that means "System" was selected
+                AppCompatDelegate.setApplicationLocales(if (newLocale.isEmpty()) LocaleListCompat.getEmptyLocaleList() else LocaleListCompat.create(Utils.stringToLocale(newLocale)))
+                true
+            }
+        }
+
+        private fun setupCrashReporterPreference() {
+            // Hide crash reporter settings on builds it's not enabled on
+            val crashReporterPreference = findPreference<Preference>("acra.enable")
+            crashReporterPreference!!.isVisible = BuildConfig.useAcraCrashReporter
+        }
+
+        private fun setupWearSyncPreference() {
+            val wearSyncPreference = findPreference<SwitchPreferenceCompat>(getString(R.string.settings_key_wear_sync))
+            wearSyncPreference!!.setOnPreferenceChangeListener { preference, newValue ->
+                val enabled = newValue as Boolean
+                if (enabled) {
+                    wearSyncPermissionRequester.onWearSyncChanged(true) { granted ->
+                        if (granted) {
+                            (preference as? SwitchPreferenceCompat)?.isChecked = true
+                        } else {
+                            showWearSyncPermissionDeniedSnackbar()
+                        }
+                    }
+                    false
+                } else {
+                    wearSyncPermissionRequester.onWearSyncChanged(false)
+                    true
+                }
+            }
+        }
+
+        private fun setupWearSyncDevicePreferences() {
+            val allowedPreference = findPreference<Preference>(getString(R.string.settings_key_wear_sync_devices))
+            allowedPreference!!.setOnPreferenceClickListener {
+                showWearSyncAllowedDevicesDialog()
+                true
+            }
+            updateWearSyncAllowedDevicesSummary(allowedPreference)
+
+            val blockedPreference = findPreference<Preference>(getString(R.string.settings_key_wear_sync_blocked_devices))
+            blockedPreference!!.setOnPreferenceClickListener {
+                showWearSyncBlockedDevicesDialog()
+                true
+            }
+            updateWearSyncBlockedDevicesSummary(blockedPreference)
+        }
+
+        private fun updateWearSyncAllowedDevicesSummary(preference: Preference) {
+            val count = WearBluetoothSecurity.listTrustedDevices(requireContext()).size
+            preference.summary = if (count == 0) {
+                getString(R.string.settings_wear_sync_no_devices)
+            } else {
+                resources.getQuantityString(R.plurals.settings_wear_sync_devices_summary_count, count, count)
+            }
+        }
+
+        private fun updateWearSyncBlockedDevicesSummary(preference: Preference) {
+            val count = WearBluetoothSecurity.listBlockedDevices(requireContext()).size
+            preference.summary = if (count == 0) {
+                getString(R.string.settings_wear_sync_no_blocked_devices)
+            } else {
+                resources.getQuantityString(R.plurals.settings_wear_sync_blocked_devices_summary_count, count, count)
+            }
+        }
+
+        @SuppressLint("MissingPermission")
+        private fun showWearSyncDeviceListDialog(
+            titleRes: Int,
+            noDevicesRes: Int,
+            messageRes: Int,
+            addresses: Set<String>,
+            isBlocked: Boolean,
+            onRemove: (String, String) -> Unit
+        ) {
+            val context = requireContext()
+            if (!BluetoothPermissionHelper.isBluetoothConnectGranted(context)) {
+                showWearSyncPermissionDeniedSnackbar()
+                return
+            }
+            val knownAddresses = addresses.toList()
+            currentDevicesDialog?.dismiss()
+            currentDevicesDialogIsBlocked = isBlocked
+            if (knownAddresses.isEmpty()) {
+                currentDevicesDialog = MaterialAlertDialogBuilder(context)
+                    .setTitle(titleRes)
+                    .setMessage(noDevicesRes)
+                    .setOnDismissListener {
+                        currentDevicesDialog = null
+                        currentDevicesDialogIsBlocked = false
+                    }
+                    .setPositiveButton(android.R.string.ok) { dialog, _ -> dialog.dismiss() }
+                    .show()
+                return
+            }
+
+            val adapter = context.getSystemService(BLUETOOTH_SERVICE) as? BluetoothManager
+            val bondedDevices = try {
+                adapter?.adapter?.bondedDevices ?: emptySet()
+            } catch (_: SecurityException) {
+                emptySet<BluetoothDevice>()
+            }
+            val deviceMap = bondedDevices.associateBy { it.address }
+
+            val content = View.inflate(context, R.layout.wear_sync_device_list, null)
+            content.findViewById<TextView>(R.id.wear_sync_device_list_message).text = getString(messageRes)
+            val container = content.findViewById<LinearLayout>(R.id.wear_sync_device_list_container)
+
+            knownAddresses.forEach { address ->
+                val name = deviceName(deviceMap[address], address)
+                val itemView = LayoutInflater.from(context).inflate(R.layout.wear_sync_device_list_item, container, false) as TextView
+                itemView.text = getString(R.string.settings_wear_sync_device_name, name, address)
+                itemView.setOnClickListener { onRemove(address, name) }
+                container.addView(itemView)
+            }
+
+            currentDevicesDialog = MaterialAlertDialogBuilder(context)
+                .setTitle(titleRes)
+                .setView(content)
+                .setOnDismissListener {
+                    currentDevicesDialog = null
+                    currentDevicesDialogIsBlocked = false
+                }
+                .setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .show()
+        }
+
+        private fun showWearSyncAllowedDevicesDialog() {
+            showWearSyncDeviceListDialog(
+                R.string.settings_wear_sync_devices,
+                R.string.settings_wear_sync_no_devices,
+                R.string.settings_wear_sync_tap_to_remove,
+                WearBluetoothSecurity.listTrustedDevices(requireContext()),
+                isBlocked = false
+            ) { address, name -> confirmRemoveAllowedDevice(address, name) }
+        }
+
+        private fun showWearSyncBlockedDevicesDialog() {
+            showWearSyncDeviceListDialog(
+                R.string.settings_wear_sync_blocked_devices,
+                R.string.settings_wear_sync_no_blocked_devices,
+                R.string.settings_wear_sync_tap_to_remove,
+                WearBluetoothSecurity.listBlockedDevices(requireContext()),
+                isBlocked = true
+            ) { address, name -> confirmRemoveBlockedDevice(address, name) }
+        }
+
+        private fun confirmRemoveAllowedDevice(address: String, name: String) {
+            confirmRemoveDevice(
+                address,
+                name,
+                R.string.settings_wear_sync_unpair_message,
+                onRemove = { WearBluetoothSecurity.untrustDevice(requireContext(), address) }
+            )
+        }
+
+        private fun confirmRemoveBlockedDevice(address: String, name: String) {
+            confirmRemoveDevice(
+                address,
+                name,
+                R.string.settings_wear_sync_unblock_message,
+                onRemove = { WearBluetoothSecurity.unblockDevice(requireContext(), address) }
+            )
+        }
+
+        private fun confirmRemoveDevice(address: String, name: String, messageRes: Int, onRemove: () -> Unit) {
+            val context = requireContext()
+            MaterialAlertDialogBuilder(context)
+                .setTitle(R.string.settings_wear_sync_unpair_title)
+                .setMessage(getString(messageRes, name))
+                .setPositiveButton(R.string.settings_wear_sync_unpair) { dialog, _ ->
+                    onRemove()
+                    BluetoothPairingNotificationManager.cancel(context, address)
+                    BluetoothPairingNotificationManager.notifyDevicesChanged(context)
+                    findPreference<Preference>(getString(R.string.settings_key_wear_sync_devices))?.let { updateWearSyncAllowedDevicesSummary(it) }
+                    findPreference<Preference>(getString(R.string.settings_key_wear_sync_blocked_devices))?.let { updateWearSyncBlockedDevicesSummary(it) }
+                    dialog.dismiss()
+                }
+                .setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .show()
+        }
+
+        private fun deviceName(device: BluetoothDevice?, fallback: String): String {
+            return try { device?.name } catch (_: SecurityException) { null } ?: fallback
+        }
+
+        private fun showWearSyncPermissionDeniedSnackbar() {
+            Snackbar.make(
+                requireView(),
+                R.string.wear_sync_permission_required,
+                Snackbar.LENGTH_LONG
+            ).setAction(R.string.open_settings) {
+                startActivity(
+                    Intent(
+                        Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+                        Uri.fromParts("package", requireContext().packageName, null)
+                    )
+                )
+            }.show()
+        }
+
+        private fun refreshActivity() {
+            mReloadMain = true
+            activity?.recreate()
+        }
+    }
+
+    companion object {
+        private const val RELOAD_MAIN_STATE = "mReloadMain"
+    }
+}

app/src/main/java/protect/card_locker/wearos/BluetoothPairingActivity.kt

@@ -0,0 +1,68 @@
+package protect.card_locker.wearos
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import protect.card_locker.R
+import protect.card_locker.shared.WearBluetoothSecurity
+
+class BluetoothPairingActivity : AppCompatActivity() {
+
+    private var currentDialog: AlertDialog? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        showPairingDialog(intent)
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        showPairingDialog(intent)
+    }
+
+    override fun onDestroy() {
+        currentDialog?.dismiss()
+        currentDialog = null
+        super.onDestroy()
+    }
+
+    private fun showPairingDialog(intent: Intent) {
+        val address = intent.getStringExtra(BluetoothPairingConstants.DEVICE_ADDRESS) ?: return finish()
+        val deviceName = intent.getStringExtra(BluetoothPairingConstants.DEVICE_NAME) ?: address
+        val token = intent.getStringExtra(BluetoothPairingConstants.DEVICE_TOKEN)
+        val isMismatch = intent.getBooleanExtra(BluetoothPairingConstants.IS_MISMATCH, false)
+
+        val titleRes = if (isMismatch) {
+            R.string.wear_bt_pairing_mismatch_title
+        } else {
+            R.string.wear_bt_pairing_title
+        }
+        val messageRes = if (isMismatch) {
+            R.string.wear_bt_pairing_mismatch_message
+        } else {
+            R.string.wear_bt_pairing_message
+        }
+
+        currentDialog?.dismiss()
+        currentDialog = MaterialAlertDialogBuilder(this)
+            .setTitle(getString(titleRes, deviceName))
+            .setMessage(getString(messageRes, deviceName))
+            .setPositiveButton(R.string.wear_bt_pairing_allow) { _, _ ->
+                WearBluetoothSecurity.trustDevice(this, address, token)
+                BluetoothPairingNotificationManager.updateResultNotification(this, address, deviceName, true)
+                BluetoothPairingNotificationManager.notifyDevicesChanged(this)
+                finish()
+            }
+            .setNegativeButton(R.string.wear_bt_pairing_block) { _, _ ->
+                WearBluetoothSecurity.blockDevice(this, address)
+                BluetoothPairingNotificationManager.updateResultNotification(this, address, deviceName, false)
+                BluetoothPairingNotificationManager.notifyDevicesChanged(this)
+                finish()
+            }
+            .setOnCancelListener { finish() }
+            .setCancelable(true)
+            .show()
+    }
+}

app/src/main/java/protect/card_locker/wearos/BluetoothPairingConstants.kt

@@ -0,0 +1,8 @@
+package protect.card_locker.wearos
+
+object BluetoothPairingConstants {
+    const val DEVICE_ADDRESS = "device_address"
+    const val DEVICE_NAME = "device_name"
+    const val DEVICE_TOKEN = "device_token"
+    const val IS_MISMATCH = "is_mismatch"
+}

app/src/main/java/protect/card_locker/wearos/BluetoothPairingNotificationManager.kt

@@ -0,0 +1,122 @@
+package protect.card_locker.wearos
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.widget.Toast
+import androidx.core.app.NotificationCompat
+import protect.card_locker.NotificationInfo
+import protect.card_locker.R
+
+object BluetoothPairingNotificationManager {
+
+    const val ACTION_DEVICES_CHANGED = "protect.card_locker.wearos.ACTION_DEVICES_CHANGED"
+
+    fun notifyDevicesChanged(context: Context) {
+        context.sendBroadcast(Intent(ACTION_DEVICES_CHANGED).apply { setPackage(context.packageName) })
+    }
+
+    fun showAuthorizationNotification(
+        context: Context,
+        deviceName: String,
+        address: String,
+        token: String,
+        isMismatch: Boolean = false
+    ) {
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                NotificationInfo.WearBluetooth.PAIRING_CHANNEL_ID,
+                context.getString(R.string.wear_bt_pairing_channel_name),
+                NotificationManager.IMPORTANCE_HIGH
+            )
+            notificationManager.createNotificationChannel(channel)
+        }
+
+        val titleRes = if (isMismatch) {
+            R.string.wear_bt_pairing_mismatch_title
+        } else {
+            R.string.wear_bt_pairing_title
+        }
+        val messageRes = if (isMismatch) {
+            R.string.wear_bt_pairing_mismatch_message
+        } else {
+            R.string.wear_bt_pairing_message
+        }
+
+        val allowIntent = Intent(context, BluetoothPairingReceiver::class.java).apply {
+            action = BluetoothPairingReceiver.ACTION_ALLOW
+            putExtra(BluetoothPairingConstants.DEVICE_ADDRESS, address)
+            putExtra(BluetoothPairingConstants.DEVICE_NAME, deviceName)
+            putExtra(BluetoothPairingConstants.DEVICE_TOKEN, token)
+        }
+        val blockIntent = Intent(context, BluetoothPairingReceiver::class.java).apply {
+            action = BluetoothPairingReceiver.ACTION_BLOCK
+            putExtra(BluetoothPairingConstants.DEVICE_ADDRESS, address)
+            putExtra(BluetoothPairingConstants.DEVICE_NAME, deviceName)
+            putExtra(BluetoothPairingConstants.IS_MISMATCH, isMismatch)
+        }
+
+        val allowPendingIntent = PendingIntent.getBroadcast(
+            context,
+            address.hashCode(),
+            allowIntent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+        val blockPendingIntent = PendingIntent.getBroadcast(
+            context,
+            address.hashCode() + 1,
+            blockIntent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        val contentIntent = PendingIntent.getActivity(
+            context,
+            address.hashCode() + 2,
+            Intent(context, BluetoothPairingActivity::class.java).apply {
+                putExtra(BluetoothPairingConstants.DEVICE_ADDRESS, address)
+                putExtra(BluetoothPairingConstants.DEVICE_NAME, deviceName)
+                putExtra(BluetoothPairingConstants.DEVICE_TOKEN, token)
+                putExtra(BluetoothPairingConstants.IS_MISMATCH, isMismatch)
+            },
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        val notification = NotificationCompat.Builder(context, NotificationInfo.WearBluetooth.PAIRING_CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_notification_catima)
+            .setContentTitle(context.getString(titleRes, deviceName))
+            .setContentText(context.getString(messageRes, deviceName))
+            .setStyle(NotificationCompat.BigTextStyle().bigText(context.getString(messageRes, deviceName)))
+            .addAction(0, context.getString(R.string.wear_bt_pairing_allow), allowPendingIntent)
+            .addAction(0, context.getString(R.string.wear_bt_pairing_block), blockPendingIntent)
+            .setContentIntent(contentIntent)
+            .setAutoCancel(false)
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setCategory(NotificationCompat.CATEGORY_STATUS)
+            .build()
+
+        notificationManager.notify(notificationId(address), notification)
+    }
+
+    fun cancel(context: Context, address: String) {
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(notificationId(address))
+    }
+
+    fun updateResultNotification(context: Context, address: String, deviceName: String, allowed: Boolean) {
+        cancel(context, address)
+        val message = if (allowed) {
+            context.getString(R.string.wear_bt_pairing_allowed, deviceName)
+        } else {
+            context.getString(R.string.wear_bt_pairing_blocked, deviceName)
+        }
+
+        Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+    }
+
+    fun notificationId(address: String): Int = address.hashCode()
+}