Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker

Fix crash on sharing card + release 2.11.2
Merge #643
2025-12-26 08:37:54 -05:00 · 2021-12-04 14:04:01 +01:00 · 2021-12-04 14:03:52 +01:00 · 2021-12-02 11:24:18 +00:00 · 2021-12-02 10:54:32 +01:00 · 2021-12-02 10:54:31 +01:00
12 changed files with 36 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog

+## v2.11.2 - 95 (2021-12-04)
+
+- Fix crash on sharing card
+
 ## v2.11.1 - 94 (2021-11-30)

 - Fix blurriness of main screen letter icons
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
        applicationId "me.hackerchick.catima"
        minSdkVersion 21
        targetSdkVersion 31
-        versionCode 94
-        versionName "2.11.1"
+        versionCode 95
+        versionName "2.11.2"

        vectorDrawables.useSupportLibrary true
        multiDexEnabled true
@@ -106,7 +106,7 @@ dependencies {
 // Testing
    testImplementation 'androidx.test:core:1.4.0'
    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.7.2'
+    testImplementation 'org.robolectric:robolectric:4.7.3'
 }

 tasks.withType(SpotBugsTask) {
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -197,6 +197,7 @@ public class ImportURIHelper {
        sendIntent.setType("text/plain");

        Intent shareIntent = Intent.createChooser(sendIntent, null);
+        shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
        context.startActivity(shareIntent);
    }
 }
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -196,7 +196,7 @@
    <string name="rate_this_app">このアプリを評価する</string>
    <string name="on_github">GitHub</string>
    <string name="source_repository">ソースリポジトリ</string>
-    <string name="exportPassword">パスワードを設定してエクスポートしたファイルを保護する(任意)</string>
+    <string name="exportPassword">パスワードを設定する(不要なら空欄)</string>
    <string name="exportPasswordHint">パスワードを入力してください</string>
    <string name="version_history">更新履歴</string>
    <string name="credits">貢献者</string>
@@ -206,4 +206,13 @@
    <string name="report_error">エラーを報告する</string>
    <string name="reverse">逆順</string>
    <string name="and_data_usage">and data usage</string>
+    <string name="group_updated">グループを更新しました</string>
+    <string name="editGroup">グループ編集: <xliff:g>%s</xliff:g></string>
+    <string name="action_show_details">詳細を表示</string>
+    <string name="action_hide_details">詳細を非表示</string>
+    <string name="selectColor">色を選択</string>
+    <string name="setIcon">アイコン設定</string>
+    <string name="group_edit">グループ編集</string>
+    <string name="group_name_already_in_use">このグループ名は既に使用されています</string>
+    <string name="group_name_is_empty">グループ名を入力してください</string>
 </resources>
--- a/fastlane/metadata/android/nb-NO/full_description.txt
+++ b/fastlane/metadata/android/nb-NO/full_description.txt
@@ -8,7 +8,7 @@ Med dette essensielle verktøyet kan du erstatte unyttig plast med kontanter.
 - Unngå spionasje med veldig få tilganger. Ingen tilgang til Internett, og ingen reklame.
 - Legg til kort eller koder med navn og egne farger.
 - Manuell kodeinnskriving hvis det ikke er noen strekkode å lagre, eller den ikke kan brukes.
- Importer kort og koder fra filer ,Catima, FidMe, Kundekortknippe, Stocard og Voucher Vault.
+- Importer kort og koder fra filer, Catima, FidMe, Kundekortknippe, Stocard og Voucher Vault.
 - Lag en sikkerhetskopi av alle kortene dine og overfør dem til en ny enhet hvis du ønsker det.
 - Del kupponger, eksklusive tilbud, promokoder eller kort og koder ved bruk av ethvert program.
 - Mørk drakt og tilgjengelighetsvalg for synshemmede brukere.
--- a/fastlane/metadata/android/tr-TR/changelogs/10.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/10.txt
@@ -0,0 +1,3 @@
+- Öntanımlı içe/dışa aktarma dosya adı değiştirildi. (https://github.com/brarcher/loyalty-card-locker/pull/84)
+- İçe/dışa aktarma sayfasındaki dizge düzeltildi. (https://github.com/brarcher/loyalty-card-locker/pull/87)
+- Kart görünümü sayfasının düzeni iyileştirildi. Metnin okunması daha kolay olmalı ve uzun bir tıklama ile seçilebilir olmalıdır. https://github.com/brarcher/loyalty-card-locker/pull/91)
--- a/fastlane/metadata/android/tr-TR/changelogs/12.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/12.txt
@@ -0,0 +1 @@
+- İlk çalıştırma giriş sihirbazında ekranı döndürürken oluşan çökmeyi önle.
--- a/fastlane/metadata/android/tr-TR/changelogs/19.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/19.txt
@@ -0,0 +1,3 @@
+- Belirli türdeki bozuk CSV dosyalarını içe aktarırken oluşan çökme düzeltildi. (https://github.com/brarcher/loyalty-card-locker/pull/177)
+- Yedekleri doğrudan dosya sisteminden içe aktarma düzeltildi. (https://github.com/brarcher/loyalty-card-locker/pull/180)
+- Belirli içerik sağlayıcı türlerinden yedekleri içe aktarma düzeltildi. (https://github.com/brarcher/loyalty-card-locker/pull/179)
--- a/fastlane/metadata/android/tr-TR/changelogs/2.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/2.txt
@@ -0,0 +1,3 @@
+- İtalyanca çeviri
+- Tüm 1B barkod türleri için destek. (Başlangıçta yalnızca ürün 1B barkodları destekleniyordu)
+- Başlangıçta eksik olan gerekli kamera izni eklendi.
--- a/fastlane/metadata/android/tr-TR/changelogs/21.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/21.txt
@@ -0,0 +1,2 @@
+- Kart listesi düzeni iyileştirildi. (https://github.com/brarcher/loyalty-card-locker/pull/188)
+- Kartı görüntüleme düzeni iyileştirildi. (https://github.com/brarcher/loyalty-card-locker/pull/190)
--- a/fastlane/metadata/android/tr-TR/changelogs/93.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/93.txt
@@ -0,0 +1,2 @@
+- Catima'yı Hızlı Erişim Aygıt Denetimlerine ekle (https://developer.android.com/guide/topics/ui/device-control)
+- Grup yönetimi ekranında bazı grupların doğru görünmemesini düzelt
--- a/fastlane/metadata/android/tr-TR/changelogs/94.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/94.txt
@@ -0,0 +1,3 @@
+- Ana ekran harf simgelerinin bulanıklığını düzelt
+- Simgelerin seçtikten sonra bazen kaybolmasını düzelt
+- Android 5'te bazen görünmez olan durum çubuğu simgelerini düzelt
Author	SHA1	Message	Date
Sylvia van Os	d2a500824a	Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker	2021-12-04 14:04:01 +01:00
Sylvia van Os	6a91d59050	Fix crash on sharing card + release 2.11.2	2021-12-04 14:03:52 +01:00
bors[bot]	451c49d05f	Merge #643 643: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Catima](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Fastlane](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: Allan Nordhøy <epost@anotheragency.no> Co-authored-by: Nyatsuki <Odamaki@yandex.ru> Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>	2021-12-02 11:24:18 +00:00
Oğuz Ersen	b4ec4b74ca	Translated using Weblate (Turkish) Currently translated at 26.8% (25 of 93 strings) Translation: Catima/Fastlane Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/	2021-12-02 10:54:32 +01:00
Nyatsuki	6c254315af	Translated using Weblate (Japanese) Currently translated at 99.1% (230 of 232 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/ja/	2021-12-02 10:54:31 +01:00
Allan Nordhøy	dfaf61722f	Translated using Weblate (Norwegian Bokmål) Currently translated at 20.4% (19 of 93 strings) Translation: Catima/Fastlane Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/nb_NO/	2021-12-02 10:54:30 +01:00
bors[bot]	2dbebea884	Merge #642 642: Bump robolectric from 4.7.2 to 4.7.3 r=TheLastProject a=dependabot[bot] Bumps [robolectric](https://github.com/robolectric/robolectric) from 4.7.2 to 4.7.3. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/robolectric/robolectric/releases">robolectric's releases</a>.</em></p> <blockquote> <h2>Robolectric 4.7.3</h2> <p>This is a minor release that fixes <a href="https://github-redirect.dependabot.com/robolectric/robolectric/issues/6883">#6883</a>, a NoClassDefError that can occur if the <code>compileSdk</code> < 31. Thanks for <a href="https://github.com/ninniuz"><code>`@ninniuz</code></a>` for reporting and <a href="https://github.com/utzcoz"><code>`@utzcoz</code></a>` for the fix (<a href="https://github-redirect.dependabot.com/robolectric/robolectric/issues/6884">#6884</a>).</p> <p>It also fixes a minor case of test pollution, where a single Activity could leak across tests (see 5a1f02aaf37f425f8938ae41df5d7aa1b72bba9c for details).</p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="`3e1d0a34a1`"><code>3e1d0a3</code></a> Bump version to 4.7.3.</li> <li><a href="`aab519415e`"><code>aab5194</code></a> Use 'processResources' task instead of 'jar' task for nativeruntime</li> <li><a href="`66829f64e1`"><code>66829f6</code></a> Clear InputMethodManager.sInstance for SDK > P</li> <li><a href="`3e596affab`"><code>3e596af</code></a> Only using AttributionSource for compile SDK 31 and above</li> <li>See full diff in <a href="https://github.com/robolectric/robolectric/compare/robolectric-4.7.2...robolectric-4.7.3">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.robolectric:robolectric&package-manager=gradle&previous-version=4.7.2&new-version=4.7.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-12-02 07:09:06 +00:00
dependabot[bot]	d7da942481	Bump robolectric from 4.7.2 to 4.7.3 Bumps [robolectric](https://github.com/robolectric/robolectric) from 4.7.2 to 4.7.3. - [Release notes](https://github.com/robolectric/robolectric/releases) - [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.7.2...robolectric-4.7.3) --- updated-dependencies: - dependency-name: org.robolectric:robolectric dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-12-02 02:22:33 +00:00
				`@@ -0,0 +1 @@`
				`- İlk çalıştırma giriş sihirbazında ekranı döndürürken oluşan çökmeyi önle.`