Release Catima 2.16.3

Stocard appears to keep images for deleted cards, which causes some
cards to have only images and no data, making them impossible to import.

This is most likely a bug on Stocard's side. As a workaround, we ignore
cards with no data file.

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.16.3 - 107 (2022-04-15)
+
+- Stocard import fixes
+
 ## v2.16.2 - 106 (2022-03-31)
 
 - Fix some character sequences being shown as a single character

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 106
-        versionName "2.16.2"
+        versionCode 107
+        versionName "2.16.3"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true

app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java

@@ -55,7 +55,7 @@ public class MultiFormatImporter {
                 return new ImportExportResult(ImportExportResultType.Success);
             } catch (ZipException e) {
                 return new ImportExportResult(ImportExportResultType.BadPassword);
-            } catch (IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e) {
+            } catch (Exception e) {
                 Log.e(TAG, "Failed to import data", e);
                 error = e.toString();
             } finally {

app/src/main/java/protect/card_locker/importexport/StocardImporter.java

@@ -3,6 +3,7 @@ package protect.card_locker.importexport;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
+import android.util.Log;
 
 import com.google.zxing.BarcodeFormat;
 
@@ -39,6 +40,8 @@ import protect.card_locker.ZipUtils;
  * A header is expected for the each table showing the names of the columns.
  */
 public class StocardImporter implements Importer {
+    private static final String TAG = "Catima";
+
     public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
         HashMap<String, HashMap<String, Object>> loyaltyCardHashMap = new HashMap<>();
         HashMap<String, HashMap<String, Object>> providers = new HashMap<>();
@@ -201,6 +204,12 @@ public class StocardImporter implements Importer {
 
         for (HashMap<String, Object> loyaltyCardData : loyaltyCardHashMap.values()) {
             String providerId = (String) loyaltyCardData.get("_providerId");
+
+            if (providerId == null) {
+                Log.d(TAG, "Missing providerId for card " + loyaltyCardData + ", ignoring...");
+                continue;
+            }
+
             HashMap<String, Object> providerData = providers.get(providerId);
 
             String store = providerData != null ? providerData.get("name").toString() : providerId;
@@ -211,6 +220,8 @@ public class StocardImporter implements Importer {
             if (barcodeTypeString != null && !barcodeTypeString.isEmpty()) {
                 if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
                     barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
+                } else if (barcodeTypeString.equals("GS1_128")) {
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128);
                 } else {
                     barcodeType = CatimaBarcode.fromName(barcodeTypeString);
                 }

app/src/main/res/raw/contributors.txt

@@ -9,8 +9,8 @@ mondstern
 Oğuz Ersen
 Altonss
 IllusiveMan196
-Petr Novák
 StoyanDimitrov
+Petr Novák
 Joel A
 Taco
 Gediminas Murauskas
@@ -23,12 +23,12 @@ Sergio Paredes
 huuhaa
 laralem
 arshbeerSingh
+Quentin PAGÈS
 Miha Frangež
 sr093906
 mdvhimself
 Maciej Błędkowski
 Olivia (Zoe)
-Quentin PAGÈS
 betsythefc
 Silvério Santos
 waffshappen
@@ -83,10 +83,11 @@ Ronak Upadhyay
 Rose Liverman
 Simone Dotto
 Subhashish Anand
+darkodo
 Tymofii Lytvynenko
 Tjipke van der Heide
 Yevgeny M
-avikkundu
+Avik Kundu
 opsik
 psa-jforestier
 Robin

app/src/main/res/values-oc/strings.xml

@@ -66,4 +66,6 @@
     <string name="groups">Grops</string>
     <string name="groupsList">Grops : <xliff:g>%s</xliff:g></string>
     <string name="settings_max_font_size_scale">Talha max. de la poliça</string>
+    <string name="settings_theme_color">Color del tèma</string>
+    <string name="settings_locale">Lenga</string>
 </resources>

fastlane/metadata/android/bg/short_description.txt

@@ -1 +1 @@
-За щрихкодове, членства, програми за лоялност, талони и билети.
+За щрихкодове, карти за членства и лоялност, талони и билети.

fastlane/metadata/android/bg/title.txt

@@ -1 +1 @@
-Catima
+Catima – портфейл за карти

fastlane/metadata/android/en-US/changelogs/107.txt

@@ -0,0 +1 @@
+- Stocard import fixes