Release Catima 2.34.1

Merge pull request #2224 from CatimaLoyalty/create-pull-request/patch-1734020723
Update Fastlane changelogs
2025-12-24 23:57:53 -05:00 · 2024-12-12 17:27:24 +01:00 · 2024-12-12 17:25:36 +01:00 · 2024-12-12 17:25:23 +01:00 · 2024-12-12 16:25:22 +00:00 · 2024-12-12 17:25:07 +01:00
10 changed files with 60 additions and 21 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog

+## v2.34.1 - 143 (2024-12-12)
+
+- Fix crash when opening invalid pkpass files
+
 ## v2.34.0 - 142 (2024-12-10)

 - Add Passbook (.pkpass) support
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,16 +10,16 @@ GEM
    artifactory (3.0.17)
    atomos (0.1.3)
    aws-eventstream (1.3.0)
-    aws-partitions (1.998.0)
-    aws-sdk-core (3.211.0)
+    aws-partitions (1.1020.0)
+    aws-sdk-core (3.214.0)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.992.0)
      aws-sigv4 (~> 1.9)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.95.0)
+    aws-sdk-kms (1.96.0)
      aws-sdk-core (~> 3, >= 3.210.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.169.0)
+    aws-sdk-s3 (1.176.0)
      aws-sdk-core (~> 3, >= 3.210.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.5)
@@ -68,7 +68,7 @@ GEM
    faraday_middleware (1.2.1)
      faraday (~> 1.0)
    fastimage (2.3.1)
-    fastlane (2.225.0)
+    fastlane (2.226.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -108,7 +108,7 @@ GEM
      tty-spinner (>= 0.8.0, < 1.0.0)
      word_wrap (~> 1.0.0)
      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.0)
      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
    fastlane-sirp (1.0.0)
      sysrandom (~> 1.0)
@@ -150,11 +150,11 @@ GEM
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
    highline (2.0.3)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
      domain_name (~> 0.5)
    httpclient (2.8.3)
    jmespath (1.6.2)
-    json (2.7.5)
+    json (2.9.0)
    jwt (2.9.3)
      base64
    mini_magick (4.13.2)
@@ -164,7 +164,7 @@ GEM
    nanaimo (0.4.0)
    naturally (2.2.1)
    nkf (0.2.0)
-    optparse (0.5.0)
+    optparse (0.6.0)
    os (1.1.4)
    plist (3.7.1)
    public_suffix (6.0.1)
@@ -175,7 +175,7 @@ GEM
      uber (< 0.2.0)
    retriable (3.1.2)
    rexml (3.3.9)
-    rouge (2.0.7)
+    rouge (3.28.0)
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    security (0.1.5)
@@ -199,15 +199,15 @@ GEM
    uber (0.1.0)
    unicode-display_width (2.6.0)
    word_wrap (1.0.0)
-    xcodeproj (1.26.0)
+    xcodeproj (1.27.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
      nanaimo (~> 0.4.0)
      rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+    xcpretty (0.4.0)
+      rouge (~> 3.28.0)
    xcpretty-travis-formatter (1.0.1)
      xcpretty (~> 0.2, >= 0.0.7)

@@ -218,4 +218,4 @@ DEPENDENCIES
  fastlane

 BUNDLED WITH
-   2.5.16
+   2.5.22
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -22,8 +22,8 @@ android {
        applicationId = "me.hackerchick.catima"
        minSdk = 21
        targetSdk = 34
-        versionCode = 142
-        versionName = "2.34.0"
+        versionCode = 143
+        versionName = "2.34.1"

        vectorDrawables.useSupportLibrary = true
        multiDexEnabled = true
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -180,10 +180,17 @@ public class Utils {
        if (uri == null) {
            Log.e(TAG, "Pkpass did not contain any data");
            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
-            return null;
+            return new ArrayList<>();
        }

-        PkpassParser pkpassParser = new PkpassParser(context, uri);
+        PkpassParser pkpassParser;
+        try {
+             pkpassParser = new PkpassParser(context, uri);
+        } catch (Exception e) {
+            Log.e(TAG, "Error reading pkpass file", e);
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }

        List<String> locales = pkpassParser.listLocales();
        if (locales.isEmpty()) {
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -50,11 +50,11 @@
    <string name="settings">اعدادات</string>
    <string name="settings_light_theme">فاتح</string>
    <string name="settings_dark_theme">داكن</string>
-    <string name="settings_card_orientation">اتجاه الباركود</string>
+    <string name="settings_card_orientation">اتجاه الشاشة</string>
    <string name="settings_portrait_orientation">الوضع الرأسي</string>
    <string name="settings_landscape_orientation">الوضع الأفقي</string>
    <string name="settings_theme">مظهر</string>
-    <string name="settings_display_barcode_max_brightness">عرض مشرق علي الباركود</string>
+    <string name="settings_display_barcode_max_brightness">عرض مشرق علي الشاشة</string>
    <string name="importSuccessful">تم استيراد البيانات</string>
    <string name="exportSuccessful">تم تصدير البيانات</string>
    <string name="enter_group_name">أدخل اسم المجموعة</string>
@@ -277,7 +277,7 @@
    <string name="action_display_options">خيارات العرض</string>
    <string name="settings_oled_dark_summary">يقلل من استخدام البطارية على شاشات OLED</string>
    <string name="icon_header_click_text">اضغط لفترة طويلة لتحرير الصورة المصغرة</string>
-    <string name="settings_category_title_cards">البطاقات</string>
+    <string name="settings_category_title_cards">البطاقات الظاهرة</string>
    <string name="show_note">إظهار الملاحظة</string>
    <string name="switchToBackImage">التبديل إلى الصورة الخلفية</string>
    <string name="switchToFrontImage">التبديل إلى الصورة الأمامية</string>
@@ -316,4 +316,20 @@
    <string name="exportCancelled">تم الغاء الاستخراج</string>
    <string name="useFrontImage">استخدام صورة أمامية</string>
    <string name="useBackImage">استخدم صورة خلفية</string>
+    <string name="addFromPkpass">اختر ملف الدفتر(.pkpass)</string>
+    <string name="unsupportedFile">هذا الملف غير مدعوم</string>
+    <string name="generic_error_please_retry">نعتذر، حدث خطأ ما، حاول مرة أخرى...</string>
+    <string name="settings_use_volume_keys_navigation">تبديل البطاقات باستخدام أزرار الصوت</string>
+    <string name="settings_use_volume_keys_navigation_summary">تبديل البطاقات الظاهرة باستخدام أزرار الصوت</string>
+    <string name="settings_category_title_cards_overview">نظرة عامة على البطاقات</string>
+    <string name="settings_column_count_portrait">الأعمدة في الوضع الرأسي</string>
+    <string name="settings_column_count_landscape">الأعمدة في الوضع الأفقي</string>
+    <string name="settings_automatic_column_count">تلقائي</string>
+    <string name="settings_column_count_1">١</string>
+    <string name="settings_column_count_2">٢</string>
+    <string name="settings_column_count_3">٣</string>
+    <string name="settings_column_count_4">٤</string>
+    <string name="settings_column_count_5">٥</string>
+    <string name="settings_column_count_6">٦</string>
+    <string name="settings_column_count_7">٧</string>
 </resources>
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -305,4 +305,7 @@
    <string name="settings_column_count_7">7</string>
    <string name="settings_automatic_column_count">Otomatik</string>
    <string name="settings_column_count_portrait">Portre modundaki sutunlar</string>
+    <string name="unsupportedFile">Bu dosya desteklenmiyor</string>
+    <string name="generic_error_please_retry">Üzgünüz, bir şeyler ters gitti, lütfen tekrar deneyin...</string>
+    <string name="addFromPkpass">Bir Passbook dosyası seçin (.pkpass)</string>
 </resources>
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -148,6 +148,7 @@
        <item>sl</item>
        <item>sr</item>
        <item>sv</item>
+        <!-- <item>ta</item> -->
        <!-- <item>ti</item> -->
        <item>tr</item>
        <item>uk</item>
--- a/fastlane/metadata/android/en-US/changelogs/143.txt
+++ b/fastlane/metadata/android/en-US/changelogs/143.txt
@@ -0,0 +1 @@
+- Fix crash when opening invalid pkpass files
--- a/fastlane/metadata/android/tr-TR/changelogs/11.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/11.txt
@@ -0,0 +1,5 @@
+- Bir kart kimliğini düzenlerken, başlamak için mevcut kimliği önceden doldurun. (pull #94 (https://github.com/brarcher/loyalty-card-locker/pull/94))
+- Bellek kullanımını ve bellek yetersizliği hatalarını azaltmak için oluşturulan barkodların genişliğini sınırlayın. (pull #103 (https://github.com/brarcher/loyalty-card-locker/pull/103))
+- Bir kartı düzenlerken, bir kart kimliği zaten varsa "Kartı Gir" düğmesini "Kartı Düzenle" olarak değiştirin. (pull #104 (https://github.com/brarcher/loyalty-card-locker/pull/104))
+- Renk şemasını daha yumuşak ve uygulama simgesiyle uyumlu olacak şekilde değiştirin ve bir kartı görüntülerken düzeni daha temiz olacak şekilde değiştirin. (pull #107 (https://github.com/brarcher/loyalty-card-locker/pull/107))
+- Uygulamanın ilk başlatılışında başlatılan bir giriş sihirbazı ekleyin. (pull #108 (https://github.com/brarcher/loyalty-card-locker/pull/108))
Author	SHA1	Message	Date
Sylvia van Os	19bccc0c82	Release Catima 2.34.1	2024-12-12 17:27:24 +01:00
Sylvia van Os	04905edab4	Merge pull request #2224 from CatimaLoyalty/create-pull-request/patch-1734020723 Update Fastlane changelogs	2024-12-12 17:25:36 +01:00
Sylvia van Os	179a9adbe5	Merge pull request #2222 from CatimaLoyalty/create-pull-request/patch-1734019804 Update locales	2024-12-12 17:25:23 +01:00
TheLastProject	3925a79158	Update Fastlane changelogs	2024-12-12 16:25:22 +00:00
Sylvia van Os	71de6f8c99	Update CHANGELOG	2024-12-12 17:25:07 +01:00
Sylvia van Os	9d81ca5c9b	Merge pull request #2223 from CatimaLoyalty/fix/crashOnInvalidPkpassFile Fix crash when trying to load invalid pkpass file	2024-12-12 17:24:08 +01:00
Sylvia van Os	75c393af92	Fix crash when trying to load invalid pkpass file	2024-12-12 17:13:49 +01:00
TheLastProject	3e16515b6c	Update locales	2024-12-12 16:10:04 +00:00
Sylvia van Os	3e9857f14f	Merge pull request #2221 from weblate/weblate-catima-catima Translations update from Hosted Weblate	2024-12-12 17:09:38 +01:00
தமிழ்நேரம்	20ee7c9324	Added translation using Weblate (Tamil)	2024-12-12 16:29:00 +01:00
Hamza Mohamed	fa6ee155ac	Translated using Weblate (Arabic) Currently translated at 99.6% (331 of 332 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/ar/	2024-12-12 01:01:11 +01:00
goknarbahceli	c186e53eab	Translated using Weblate (Turkish) Currently translated at 70.7% (99 of 140 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/	2024-12-12 01:01:09 +01:00
goknarbahceli	75abd6f80c	Translated using Weblate (Turkish) Currently translated at 100.0% (332 of 332 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/	2024-12-12 01:01:08 +01:00
Sylvia van Os	0a98e6154c	Update Fastlane	2024-12-11 17:11:13 +01:00
				`@@ -0,0 +1 @@`
				`- Fix crash when opening invalid pkpass files`