Temporarily opt ucrop activity out of Android 15 edge-to-edge

This should be reverted as soon as
https://github.com/Yalantis/uCrop/issues/913 is fixed

.github/workflows/android.yml

@@ -68,7 +68,7 @@ jobs:
         run: ./gradlew spotbugs${{ matrix.flavor }}Release
       - name: Archive test results
         if: always()
-        uses: actions/upload-artifact@v4.5.0
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: test-results-flavor${{ matrix.flavor }}
           path: app/build/reports

CHANGELOG.md

@@ -1,9 +1,14 @@
 # Changelog
 
-## Unreleased - 145
+## Unreleased - 146
+
+- Ability to sort cards by start of validity
+
+## v2.34.3 - 145 (2025-01-15)
 
 - Target Android 15
 - Fix keyboard covering save button in edit screen
+- Fix some pkpass files not being detected as pkpass (application/vnd-com.apple.pkpass mime type support)
 
 ## v2.34.2 - 144 (2024-12-26)
 

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+catima.g9ex3@hackerchick.me.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

app/build.gradle.kts

@@ -22,8 +22,8 @@ android {
         applicationId = "me.hackerchick.catima"
         minSdk = 21
         targetSdk = 35
-        versionCode = 144
-        versionName = "2.34.2"
+        versionCode = 145
+        versionName = "2.34.3"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
@@ -112,7 +112,7 @@ dependencies {
     // AndroidX
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("androidx.constraintlayout:constraintlayout:2.2.0")
-    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.core:core-ktx:1.15.0")
     implementation("androidx.core:core-splashscreen:1.0.1")
     implementation("androidx.exifinterface:exifinterface:1.3.7")
     implementation("androidx.palette:palette:1.0.0")

app/src/main/AndroidManifest.xml

@@ -49,6 +49,8 @@
                 <data android:mimeType="image/*" />
                 <data android:mimeType="application/pdf" />
                 <data android:mimeType="application/vnd.apple.pkpass" />
+                <data android:mimeType="application/vnd-com.apple.pkpass" />
+                <data android:mimeType="application/vnd.espass-espass" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -58,6 +60,8 @@
                 <data android:mimeType="image/*" />
                 <data android:mimeType="application/pdf" />
                 <data android:mimeType="application/vnd.apple.pkpass" />
+                <data android:mimeType="application/vnd-com.apple.pkpass" />
+                <data android:mimeType="application/vnd.espass-espass" />
             </intent-filter>
         </activity>
         <activity
@@ -175,7 +179,7 @@
 
         <activity
             android:name=".UCropWrapper"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/TempUCropAndroid15WorkaroundTheme" />
 
         <provider
             android:name=".contentprovider.CardsContentProvider"

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

@@ -70,6 +70,7 @@ public class DBHelper extends SQLiteOpenHelper {
     public enum LoyaltyCardOrder {
         Alpha,
         LastUsed,
+        ValidFrom,
         Expiry
     }
 
@@ -916,6 +917,10 @@ public class DBHelper extends SQLiteOpenHelper {
             return LoyaltyCardDbIds.LAST_USED;
         }
 
+        if (order == LoyaltyCardOrder.ValidFrom) {
+            return LoyaltyCardDbIds.VALID_FROM;
+        }
+
         if (order == LoyaltyCardOrder.Expiry) {
             return LoyaltyCardDbIds.EXPIRY;
         }

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

@@ -500,7 +500,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 parseResultList = Utils.retrieveBarcodesFromImage(this, data);
             } else if (receivedType.equals("application/pdf")) {
                 parseResultList = Utils.retrieveBarcodesFromPdf(this, data);
-            } else if (receivedType.equals("application/vnd.apple.pkpass")) {
+            } 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");

app/src/main/res/raw/contributors.txt

@@ -16,38 +16,38 @@ Altonss
 Michael Moroni
 Eric
 GM
-laralem
 Petr Novák
+laralem
 Joel A
 Taco
 pfaffenrodt
-Aayush Gupta
-Scrambled777
 Максим Горпиніч
+Aayush Gupta
 B o d o
+Scrambled777
 Priit Jõerüüt
 Giovanni Donisi
 HudobniVolk
 Nyatsuki
 Jiri Grönroos
+ikanakova
 Samantaz Fox
 Balázs Meskó
 Milo Ivir
 Arno-github
 Ankit Tiwari
-Sergio Paredes
 Cliff Heraldo
+Sergio Paredes
 Jose Delvani
 mdvhimself
 Milan Šalka
-ikanakova
+josé m
 huuhaa
 Skrripy
 Edgars Andersons
 Kachelkaiser
 Projjal Moitra
 Quentin PAGÈS
-josé m
 ngocanhtve
 Silvério Santos
 waffshappen

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="settings_display_barcode_max_brightness">Gör streckkodsvyn ljusare</string>
+    <string name="settings_display_barcode_max_brightness">Gör skärmen ljusare</string>
     <string name="settings_keep_screen_on">Håll skärmen påslagen</string>
     <string name="importFidmeMessage">Välj den exporterade <i>fidme-export-request-xxxxxx.zip</i> från FidMe som du vill importera och välj streckkodstyper manuellt efteråt.
 \nSkapa den från din FidMe-profil först genom att välja \"Data Protection\" och sen trycka på \"Extract my data\".</string>

app/src/main/res/values-v35/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- FIXME: Remove this workaround as soon as uCrop no longer needs it: https://github.com/Yalantis/uCrop/issues/913 -->
+    <style name="TempUCropAndroid15WorkaroundTheme" parent="AppTheme.NoActionBar">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+</resources>

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

@@ -11,6 +11,7 @@
     <string-array name="sort_types_array">
         <item>@string/sort_by_name</item>
         <item>@string/sort_by_most_recently_used</item>
+        <item>@string/sort_by_valid_from</item>
         <item>@string/sort_by_expiry</item>
     </string-array>
 </resources>

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

@@ -255,6 +255,7 @@
     <string name="barcodeLongPressMessage">Only images can be opened in the gallery app</string>
     <string name="sort_by_name">Name</string>
     <string name="sort_by_most_recently_used">Most Recently Used</string>
+    <string name="sort_by_valid_from">Valid From</string>
     <string name="sort_by_expiry">Expiry</string>
     <!-- \"Reversed order\" is also OK. This is an option in the card sorting list -->
     <string name="reverse">…in reversed order</string>

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

@@ -1,4 +1,7 @@
 <resources>
+    <!-- FIXME: Remove this workaround as soon as uCrop no longer needs it: https://github.com/Yalantis/uCrop/issues/913 -->
+    <style name="TempUCropAndroid15WorkaroundTheme" parent="AppTheme.NoActionBar">
+    </style>
 
     <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
         <item name="colorPrimary">@color/md_theme_light_primary</item>

fastlane/metadata/android/cs-CZ/changelogs/145.txt

@@ -0,0 +1 @@
+- Cíl Android 15

fastlane/metadata/android/de-DE/changelogs/145.txt

@@ -0,0 +1,3 @@
+- Ziel Android 15
+- Die Tastatur verdeckt jetzt nicht mehr den "Speichern"-Button im Bearbeitungsbildschirm
+- Einige pkpass-Dateien wurden nicht als pkpass erkannt (Unterstützung des Mime-Typs application/vnd-com.apple.pkpass)

fastlane/metadata/android/en-US/changelogs/145.txt

@@ -1,2 +1,3 @@
 - Target Android 15
-- Fix keyboard covering save button in edit screen
+- Fix keyboard covering save button in edit screen
+- Fix some pkpass files not being detected as pkpass (application/vnd-com.apple.pkpass mime type support)

fastlane/metadata/android/en-US/changelogs/146.txt

@@ -0,0 +1 @@
+- Ability to sort cards by start of validity

fastlane/metadata/android/et/changelogs/139.txt

@@ -0,0 +1,3 @@
+- Lisasime võimaluse liikuda kaartide vahel helivaljuse nuppudega
+- Parandasime Stocardi impordi vead
+- Parandasime "Import on katkestatud" vea peale õnnestunud importi

fastlane/metadata/android/et/changelogs/144.txt

@@ -0,0 +1 @@
+- Parandasime arhiveeritud/lemmik ikoonide kuvamise

fastlane/metadata/android/et/changelogs/145.txt

@@ -0,0 +1,3 @@
+- Alusplatvorm on nüüd Android 15
+- Parandasime olukorra, kus klahvistik kattis muutmisvaates salvestusnupu
+- Parandasime olukorra, kus mõned pkpass failid jäid tuvastamata (application/vnd-com.apple.pkpass mime-tüüpi tugi)

fastlane/metadata/android/et/changelogs/98.txt

@@ -0,0 +1 @@
+- Parandasime erinevad TalkBacki vead

fastlane/metadata/android/et/changelogs/99.txt

@@ -0,0 +1 @@
+- Võtsime kasutusele Material You kujunduskeele

fastlane/metadata/android/gl-ES/changelogs/144.txt

@@ -0,0 +1 @@
+- mellora da aparencia da icona arquivar/estrela

fastlane/metadata/android/gl-ES/changelogs/145.txt

@@ -0,0 +1,3 @@
+- versión obxectivo Android 15
+- solución a teclado que tapa o botón gardar na pantalla de edición
+- solución a que non detectaba algúns ficheiros .pkpass como tales (compatibilidade co tipo mime application/vnd-com.apple.pkpass)

fastlane/metadata/android/gl-ES/changelogs/91.txt

@@ -0,0 +1,4 @@
+- mellora na xestión dos grupos
+- pódense recortar as imaxes
+- solución da perda de datos da imaxe ao gardar despois de rotar na edición
+- pódese poñer unha imaxe persoal como icona da tarxeta

fastlane/metadata/android/gl-ES/changelogs/92.txt

@@ -0,0 +1,2 @@
+- nova disposición da pantalla principal
+- arranxo do tamaño da parte inferior cando se entraba e saía de pantalla completa

fastlane/metadata/android/gl-ES/changelogs/93.txt

@@ -0,0 +1,2 @@
+- Engadir Catima a Quick Access Device Controls (https://developer.android.com/guide/topics/ui/device-control)
+- Arranxo de algúns grupos que non se mostran correctamente na pantalla de xestión dos grupos

fastlane/metadata/android/gl-ES/changelogs/94.txt

@@ -0,0 +1,3 @@
+- arranxo da borrosidade nas iconas de letras na pantalla principal
+- arranxo da desaparición puntual de iconas despois da selección
+- arranxo das iconas na barra de estado non visibles en Android 5

fastlane/metadata/android/gl-ES/changelogs/95.txt

@@ -0,0 +1 @@
+- solución ao problema na tarxeta compartir

fastlane/metadata/android/gl-ES/changelogs/96.txt

@@ -0,0 +1,2 @@
+- engadida compatibilidade con CODE 93
+- arranxos menores e melloras

fastlane/metadata/android/gl-ES/changelogs/97.txt

@@ -0,0 +1,4 @@
+- solución a crear múltiples entradas a premer varias veces o botón gardar
+- menor tamaño da cabeceira das tarxetas en ocultar detalles para que se vexan aínda máis tarxetas
+- reorganización da pantalla de edición
+- mellora do contraste da icona da estrela na pantalla principal

fastlane/metadata/android/lv/changelogs/145.txt

@@ -0,0 +1,3 @@
+- Android 15 atbalsts
+- Labošanas ekrānā novērsta saglabāšanas pogas aizsegšana ar tastatūru
+- Novērsta atsevišķu pkpass datņu neatpazīšana kā pkpass (application/vnd-com.apple.pkpass MIME veida atbalsts)

fastlane/metadata/android/ru-RU/changelogs/145.txt

@@ -0,0 +1,3 @@
+- Ориентация на Android 15
+- Исправлено перекрывание клавиатурой кнопки сохранения на экране редактирования
+- Исправлено нераспознавание некоторых файлов pkpass (поддержка mime-типа application/vnd-com.apple.pkpass)

fastlane/metadata/android/uk/changelogs/145.txt

@@ -0,0 +1,3 @@
+- Цільова версія Android 15
+— Виправлено клавіатуру, яка закриває кнопку збереження на екрані редагування
+— Виправлено деякі файли pkpass, які не виявлялися як pkpass (підтримка типу mime у додатку/vnd-com.apple.pkpass)

fastlane/metadata/android/zh-CN/changelogs/145.txt

@@ -0,0 +1,3 @@
+- 以 Android 15（API 级别35）为目标平台
+- 修复编辑屏中键盘遮住保存按钮的问题
+- 修复一些 pkpass 文件未被检测未pkpass 的问题 （application/vnd-com.apple.pkpass mime 类型支持）