mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-12 03:17:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Read input_provider_name in field if available

Browse Source
This commit is contained in:
Sylvia van Os
2023-07-23 14:05:36 +02:00
parent a9ced56023
commit 7a7a2f8361
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/protect/card_locker/importexport/StocardImporter.java
View File

@@ -183,6 +183,15 @@ public class StocardImporter implements Importer {
jsonObject.getString("input_id")
);
if (jsonObject.has("input_provider_name")) {
loyaltyCardHashMap = appendToHashMap(
loyaltyCardHashMap,
cardName,
"store",
jsonObject.getString("input_provider_name")
);
}
// Provider ID can be either custom or not, extract whatever version is relevant
String customProviderPrefix = "/users/" + nameParts[1] + "/loyalty-card-custom-providers/";
String providerId = jsonObject
@@ -252,7 +261,14 @@ public class StocardImporter implements Importer {
HashMap<String, Object> providerData = zipData.providers.get(providerId);
String store = providerData != null ? providerData.get("name").toString() : providerId;
// Read store from card, if not available (old export), fall back to providerData
String store;
if (loyaltyCardData.containsKey("store")) {
store = (String) loyaltyCardData.get("store");
} else {
store = providerData != null ? providerData.get("name").toString() : providerId;
}
String note = (String) Utils.mapGetOrDefault(loyaltyCardData, "note", "");
String cardId = (String) loyaltyCardData.get("cardId");
String barcodeTypeString = (String) Utils.mapGetOrDefault(loyaltyCardData, "barcodeType", providerData != null ? providerData.get("barcodeFormat") : null);