mirror/Android
1
0 Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-09-12 22:33:37 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,407 Commits 31 Branches 165 Tags
e68dbe255f3eae7d8a9d004d149a5ac85a4ede5f
Commit Graph
8407 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os e68dbe255f Merge pull request #3319 from CatimaLoyalty/fix/pkpasses_import 
Fix importing pkpasses file from network location
 2026-09-08 19:28:00 +02:00
Sylvia van Os 3fffc83c08 Fix importing pkpasses file from network location 
In the scan activity, the mime type info is not always available. This
made pkpasses files fail to parse, because they only went down the
pkpass path
 2026-09-07 21:23:34 +02:00
Sylvia van Os 03e1f5c672 Merge pull request #3318 from CatimaLoyalty/create-pull-request/patch-1788682987 
Update contributors
 2026-09-06 11:00:15 +02:00
TheLastProject 40295f7f37 Update contributors 2026-09-06 08:23:06 +00:00
Sylvia van Os bbf00e1d90 Merge pull request #3317 from CatimaLoyalty/create-pull-request/patch-1788604415 
Update Fastlane changelogs
 2026-09-05 12:37:56 +02:00
TheLastProject 61637599e3 Update Fastlane changelogs 2026-09-05 10:33:35 +00:00
Sylvia van Os b748f2e002 Update CHANGELOG 2026-09-05 12:32:28 +02:00
Matt Van HornandMatt Van Horn f3424b716d fix: Import cloud-backed PKPASS files off the main thread (#3282) 
* fix: Import cloud-backed PKPASS files off the main thread

Fixes #2464

* Address review: move all import parsing off the main thread, restore failure toasts

- Route image/PDF/pkpass/espass imports through one background importFile
- Restore errorReadingFile / errorReadingImage / noBarcodeFound toasts via a
  main-looper-marshalling showToast helper
- Replace fixed-timeout awaits in the activity tests with a waitFor predicate

* Start the import coroutine on the main dispatcher, hop to IO for the read

launch(Dispatchers.IO) starts the coroutine on a background thread immediately,
so a paused Robolectric main looper never drives it and the activity tests time
out. Launch on the lifecycle scope's default (main) dispatcher and wrap only the
blocking read in withContext(Dispatchers.IO).

* Fix the two failing import tests

Two separate bugs, both in the tests I added:

- new Intent(ACTION_VIEW, uri).setType(...) clears the data URI (setType and
  setData clear each other), so the activity received a null Uri and the read
  never started. Use setDataAndType.
- The intermediate-state assertions (no started activity / RESULT_CANCELED)
  are not observable: waiting on the main looper drains it, and Robolectric
  drains it again during .visible(), so the import has already run to
  completion by the time the test regains control. Assert the off-main-thread
  read directly instead, which is the property these tests exist to prove.

* fix: make showToast reusable with a caller-supplied duration

Take the toast length as a parameter instead of hardcoding LENGTH_LONG, so
the helper can serve short toasts too, and document why it exists: it shows
the toast directly when already on the main looper and otherwise posts it
there, which is what the off-main-thread import path needs.

Reorders the modifiers to the file's `static private` convention.

All existing call sites pass LENGTH_LONG, so behavior is unchanged.

---------

Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
 2026-09-05 12:31:04 +02:00
Sylvia van Os 3a413127a5 Merge pull request #3315 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-09-05 00:53:23 +02:00
NooB9496 352086887d Translated using Weblate (Polish) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pl/
 2026-09-03 10:54:23 +02:00
Sylvia van Os 2e3770706c Merge pull request #3314 from CatimaLoyalty/dependabot/gradle/com.android.application-9.4.0 
Bump com.android.application from 9.3.2 to 9.4.0
 2026-09-02 08:11:23 +02:00
dependabot[bot] 92abf69236 Bump com.android.application from 9.3.2 to 9.4.0 
Bumps com.android.application from 9.3.2 to 9.4.0.

---
updated-dependencies:
- dependency-name: com.android.application
  dependency-version: 9.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-09-02 05:57:27 +00:00
Sylvia van Os c9e6606524 Merge pull request #3313 from CatimaLoyalty/dependabot/gradle/com.android.library-9.4.0 
Bump com.android.library from 9.3.2 to 9.4.0
 2026-09-02 07:55:20 +02:00
dependabot[bot] 9e58c9da44 Bump com.android.library from 9.3.2 to 9.4.0 
Bumps com.android.library from 9.3.2 to 9.4.0.

---
updated-dependencies:
- dependency-name: com.android.library
  dependency-version: 9.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-09-02 02:54:29 +00:00
Sylvia van Os b99204c55b Merge pull request #3312 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-09-01 23:12:13 +02:00
Liner Seven 15035fe38e Translated using Weblate (Japanese) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/ja/
 2026-09-01 20:52:39 +02:00
Sylvain Pichon 5d58fae618 Translated using Weblate (French) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/fr/
 2026-09-01 20:52:39 +02:00
Sylvia van Os 363fce3064 Merge pull request #3311 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-08-31 20:33:32 +02:00
Gabriel 868f12f072 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pt_BR/
 2026-08-31 19:01:57 +02:00
Hosted Weblate user 54392 3332cf732e Translated using Weblate (Chinese (Simplified Han script)) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
 2026-08-31 19:01:56 +02:00
Fjuro abec7ea821 Translated using Weblate (Czech) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
 2026-08-31 19:01:55 +02:00
Stephan Paternotte 555f3dff46 Translated using Weblate (Dutch) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/nl/
 2026-08-31 19:01:55 +02:00
solokot 59e14a516f Translated using Weblate (Russian) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/ru/
 2026-08-31 19:01:54 +02:00
B o d o 6fc798dfc6 Translated using Weblate (German) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
 2026-08-31 19:01:53 +02:00
Sylvia van Os b9462df24a Merge pull request #3310 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-08-30 20:40:58 +02:00
Arif Budiman 9344df33d7 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (359 of 359 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/id/
 2026-08-30 17:52:49 +02:00
泥鰍 fbec74ae54 Translated using Weblate (Chinese (Traditional Han script)) 
Currently translated at 90.8% (326 of 359 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/zh_Hant/
 2026-08-30 17:52:48 +02:00
Joel A d493733abd Translated using Weblate (Swedish) 
Currently translated at 95.2% (342 of 359 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
 2026-08-30 17:52:47 +02:00
solokot dbae33492d Translated using Weblate (Russian) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/ru/
 2026-08-30 17:52:47 +02:00
Sylvia van Os 2b8b48afdc Merge pull request #3309 from CatimaLoyalty/create-pull-request/patch-1788083003 
Update contributors
 2026-08-30 11:46:00 +02:00
TheLastProject 3bb8b94c6d Update contributors 2026-08-30 09:43:23 +00:00
Sylvia van Os 3b0f3b3a5b Merge pull request #3011 from hidrohase/patch-1 
Add Obtainum Link and Pic
 2026-08-30 11:13:16 +02:00
Sylvia van Os 2885357b80 Move Obtainium button above Google Play button 
I still would much rather people use IzzyOnDroid or F-Droid than
Obtainium, as Obtainium has 0 security measures against me getting
hacked and publishing a malicious release. However, many Obtainium users
exist and right now adding Catima is just broken due to the Wear OS
releases.

Also, Google just constantly treats me horrendously so.... yeah.
Anything is better than Google Play.
 2026-08-30 11:12:49 +02:00
hidrohase d08bbb5e3c Add Obtainum Link and Pic 
The button filters out Wear OS releases
 2026-08-30 11:08:00 +02:00
Sylvia van Os 1da01b846a Merge pull request #3308 from CatimaLoyalty/TheLastProject-patch-1 
Split GitHub badge into core and Wear OS
 2026-08-29 11:28:27 +02:00
Sylvia van Os 1f2870d3d8 Split GitHub badge into core and Wear OS 2026-08-29 11:06:00 +02:00
Sylvia van Os a0a2f061bd Release Catima Wear OS 1.0.1 v1.0.1-wearos 2026-08-28 17:09:28 +02:00
Sylvia van Os c70b3ec172 Merge pull request #3306 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-08-28 17:08:26 +02:00
Sylvia van Os a3ad6a8568 Merge pull request #3305 from CatimaLoyalty/create-pull-request/patch-1787928982 
Update Fastlane changelogs
 2026-08-28 17:07:33 +02:00
Hosted Weblate 1a9d162370 Update translation files 
Updated by "Remove blank strings" hook in Weblate.

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/
 2026-08-28 17:06:43 +02:00
Sylvia van Os 950d19ce8c Translated using Weblate (Persian) 
Currently translated at 81.8% (294 of 359 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fa/
 2026-08-28 17:06:43 +02:00
Sylvain Pichon b531081806 Translated using Weblate (French) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/fr/
 2026-08-28 17:06:43 +02:00
TheLastProject b46313a112 Update Fastlane changelogs 2026-08-28 14:56:22 +00:00
Sylvia van Os b54fc85fdb Update CHANGELOG 2026-08-28 16:56:09 +02:00
Sylvia van Os b71a2a0bbf Merge pull request #3303 from CatimaLoyalty/feature/update_wearos_screenshots 
Update WearOS screenshots based on current state
 2026-08-28 16:55:29 +02:00
Sylvia van Os 8ba44eeba5 Update WearOS screenshots based on current state 2026-08-28 16:25:41 +02:00
Sylvia van Os 8ef9f39fb7 Merge pull request #3302 from CatimaLoyalty/fix/hide_barcode_wearos 
WearOS: Hide barcode as a hack for Google approval
 2026-08-28 16:21:28 +02:00
Sylvia van Os 86543c8fb9 WearOS: Hide barcode as a hack for Google approval 2026-08-28 15:56:24 +02:00
Sylvia van Os 3c8bae3acc Merge pull request #3300 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-08-27 23:32:07 +02:00
Sylvia van Os 0a19db7c7e Merge pull request #3301 from CatimaLoyalty/dependabot/gradle/gradle-wrapper-9.7.1 
Bump gradle-wrapper from 9.7.0 to 9.7.1
 2026-08-27 11:24:32 +02:00