diff --git a/app/src/main/java/protect/card_locker/ImportExportActivity.java b/app/src/main/java/protect/card_locker/ImportExportActivity.java index 27fa2baa3..f9d6116c0 100644 --- a/app/src/main/java/protect/card_locker/ImportExportActivity.java +++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java @@ -20,6 +20,8 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.InputStream; import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; @@ -117,9 +119,22 @@ public class ImportExportActivity extends AppCompatActivity } private void chooseImportType(Intent baseIntent) { + List betaImportOptions = new ArrayList<>(); + betaImportOptions.add("Fidme"); + betaImportOptions.add("Stocard"); + List importOptions = new ArrayList<>(); + + for (String importOption : getResources().getStringArray(R.array.import_types_array)) { + if (betaImportOptions.contains(importOption)) { + importOption = importOption + " (BETA)"; + } + + importOptions.add(importOption); + } + AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.chooseImportType) - .setItems(R.array.import_types_array, (dialog, which) -> { + .setItems(importOptions.toArray(new CharSequence[importOptions.size()]), (dialog, which) -> { switch (which) { // Catima case 0: @@ -139,8 +154,14 @@ public class ImportExportActivity extends AppCompatActivity importAlertMessage = getString(R.string.importLoyaltyCardKeychainMessage); importDataFormat = DataFormat.Catima; break; - // Voucher Vault + // Stocard case 3: + importAlertTitle = getString(R.string.importStocard); + importAlertMessage = getString(R.string.importStocardMessage); + importDataFormat = DataFormat.Stocard; + break; + // Voucher Vault + case 4: importAlertTitle = getString(R.string.importVoucherVault); importAlertMessage = getString(R.string.importVoucherVaultMessage); importDataFormat = DataFormat.VoucherVault; diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 504bd052d..725535f19 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -4,6 +4,7 @@ Catima Fidme @string/app_loyalty_card_keychain + Stocard Voucher Vault \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2b53da67b..4d5588a33 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -168,6 +168,8 @@ Find a file likely named fidme-export-request-xxxxxx.zip to import, and then select the barcode types manually afterwards.\nOr create it from your FidMe profile by choosing "Data Protection" and then pressing "Extract my data" first. Import from Loyalty Card Keychain Find a file most likely named LoyaltyCardKeychain.csv to import.\nOr create it from the Import/Export menu in Loyalty Card Keychain by pressing "Export" first. + Import from Stocard + Find your Stocard .zip file to import, and then select the barcode types manually afterwards.\nOr get it by emailing support@stocardapp.com and asking for an export of your data first. Import from Voucher Vault Find a file likely named vouchervault.json to import.\nOr create it by pressing "Export" in Voucher Vault first. Barcode value