From a29edd90acfef8be3c2f58d56b3b90eefdb9bd15 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sat, 24 Oct 2020 14:27:33 +0200
Subject: [PATCH] Support importing cards shared from loyalty-card-locker

---
 app/src/main/AndroidManifest.xml       | 5 ++++-
 app/src/main/res/values-it/strings.xml | 1 -
 app/src/main/res/values-nl/strings.xml | 1 -
 app/src/main/res/values-pl/strings.xml | 1 -
 app/src/main/res/values-ru/strings.xml | 1 -
 app/src/main/res/values/strings.xml    | 3 ++-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f2c246535..553882949 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,7 @@
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"
             android:exported="true">
-            <intent-filter android:label="@string/intent_import_card_from_url">
+            <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -53,6 +53,9 @@
                 <data android:scheme="https"
                     android:host="@string/intent_import_card_from_url_host"
                     android:pathPrefix="@string/intent_import_card_from_url_path_prefix" />
+                <data android:scheme="https"
+                    android:host="@string/intent_import_card_from_url_host_old"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_old" />
             </intent-filter>
         </activity>
         <activity
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a7cba28d6..926d3dd8c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -109,6 +109,5 @@
     <string name="settings_card_note_font_size">Dimensione testo delle note carta</string>
     <string name="settings_display_barcode_max_brightness">Aumenta luminosità dello schermo quando apro un codice a barre</string>
     <string name="settings_lock_barcode_orientation">Blocca orientamento del codice a barre</string>
-    <string name="intent_import_card_from_url">Importa carte fedeltà</string>
     <string name="intent_import_card_from_url_share_text">Voglio condividere una carta fedeltà con te</string>
     </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index dd7af601e..afd604962 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -112,6 +112,5 @@
     <string name="settings_card_note_font_size">Lettergrootte van aantekeningen</string>
     <string name="settings_display_barcode_max_brightness">Scherm helderder maken bij tonen van barcode</string>
     <string name="settings_lock_barcode_orientation">Barcode-oriëntatie vergrendelen</string>
-    <string name="intent_import_card_from_url">Klantenkaart importeren</string>
     <string name="intent_import_card_from_url_share_text">Ik wil een klantenkaart met je delen</string>
     </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8971c1cd4..b97d447e4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -109,6 +109,5 @@
     <string name="settings_card_note_font_size">Rozmiar czcionki notatki karty</string>
     <string name="settings_display_barcode_max_brightness">Rozjaśnij widok kodu kreskowego</string>
     <string name="settings_lock_barcode_orientation">Zablokuj autoobracanie kodów kreskowych</string>
-    <string name="intent_import_card_from_url">Importuj kartę lojalnościową</string>
     <string name="intent_import_card_from_url_share_text">Chcę udostępnić Ci kartę lojalnościową</string>
     </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8dc56490e..143bf0c59 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -112,6 +112,5 @@
     <string name="settings_card_note_font_size">Размер шрифта примечания</string>
     <string name="settings_display_barcode_max_brightness">Максимальная яркость при показе карты</string>
     <string name="settings_lock_barcode_orientation">Портретная ориентация экрана при показе карты</string>
-    <string name="intent_import_card_from_url">Импортировать карту</string>
     <string name="intent_import_card_from_url_share_text">Я хочу поделиться картой с вами</string>
     </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0ca1cc77e..d2a488d53 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -126,10 +126,11 @@
     <string name="settings_lock_barcode_orientation">Lock barcode orientation</string>
     <string name="settings_key_lock_barcode_orientation" translatable="false">pref_lock_barcode_orientation</string>
 
-    <string name="intent_import_card_from_url">Import into Catima</string>
     <string name="intent_import_card_from_url_share_text">I want to share a card with you</string>
     <string name="intent_import_card_from_url_host" translatable="false">thelastproject.github.io</string>
     <string name="intent_import_card_from_url_path_prefix" translatable="false">/Catima/share</string>
+    <string name="intent_import_card_from_url_host_old" translatable="false">brarcher.github.io</string>
+    <string name="intent_import_card_from_url_path_prefix_old" translatable="false">/loyalty-card-locker/share</string>
     <string name="importSuccessful">Successfully imported loyalty card data</string>
     <string name="exportSuccessful">Successfully exported loyalty card data</string>
 </resources>