Merge pull request #294 from BlinkID/release/v6.1.2

Release/v6.1.2
BlinkID · Apr 5, 2023 · 252cb2f · 252cb2f
2 parents 5e47bb0 + 35ead11
commit 252cb2f
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 60 deletions.
diff --git a/BlinkIDSample/LibUtils/src/main/java/com/microblink/blinkid/util/FileUtils.java b/BlinkIDSample/LibUtils/src/main/java/com/microblink/blinkid/util/FileUtils.java
@@ -28,10 +28,10 @@ public static byte[] loadBytesFromFileUri(Uri fileUri, Context context) {
             return buffer.toByteArray();
         } catch (FileNotFoundException e) {
             e.printStackTrace();
-            Toast.makeText(context, R.string.toast_error_open_file, Toast.LENGTH_SHORT).show();
+            Toast.makeText(context, com.microblink.libutils.R.string.toast_error_open_file, Toast.LENGTH_SHORT).show();
         } catch (IOException e) {
             e.printStackTrace();
-            Toast.makeText(context, R.string.toast_error_read_file, Toast.LENGTH_SHORT).show();
+            Toast.makeText(context, com.microblink.libutils.R.string.toast_error_read_file, Toast.LENGTH_SHORT).show();
         } finally {
             try {
                 fileStream.close();

diff --git a/BlinkIDSample/LibUtils/src/main/res/values-de/strings.xml b/BlinkIDSample/LibUtils/src/main/res/values-de/strings.xml
@@ -3,7 +3,7 @@
 
     <!-- PaymentData stuff NOTUPTODATE -->
     <string name="PPAmount">Betrag</string>
-    <string name="PPCurrency">W??hrung</string>
+    <string name="PPCurrency">Währung</string>
     <string name="PPAccount">Kontonr.</string>
     <string name="PPReference">Referenznr.</string>
     <string name="PPReferenceModel">Modell</string>
@@ -12,17 +12,17 @@
     <string name="PPIBAN">IBAN</string>
     <string name="PPBIC">BIC</string>
     <string name="PPFormID">Belegart</string>
-    <string name="PPSlipID">??berweisung ID</string>
-    <string name="PPPayerID">Empf??nger ID</string>
+    <string name="PPSlipID">Überweisung ID</string>
+    <string name="PPPayerID">Empfänger ID</string>
     <string name="PPPayerName">Auftraggeber</string>
     <string name="PPPayerAddress">Auftraggeber Adresse</string>
     <string name="PPPayerDetailedAddress">Auftraggeber noch Adresse</string>
-    <string name="PPRecipientName">Empf??nger</string>
+    <string name="PPRecipientName">Empfänger</string>
     <string name="PPRecipientAddress">Adresse</string>
     <string name="PPRecipientDetailedAddress">Noch Adresse</string>
     <string name="PPPaymentDescriptionCode">Verwendungszweck ID</string>
     <string name="PPPaymentDescription">Verwendungszweck</string>
-    <string name="PPDueDate">F??lligkeit</string>
+    <string name="PPDueDate">Fälligkeit</string>
     <string name="PPPaymentStatus">Status</string>
     <string name="PPPayerAccount">Kontonr.</string>
     <string name="PPPayerReference">Referenznr.</string>
@@ -31,25 +31,25 @@
     <string name="PPPayerBankName">Name der Bank</string>
     <string name="PPPayerIBAN">IBAN</string>
     <string name="PPPaymentDataType">Datentyp</string>
-    <string name="PPPurposeCode">Gesch??ftscode</string>
+    <string name="PPPurposeCode">Geschäftscode</string>
     <string name="PPTaxNumber">Steuernummer</string>
     <string name="PPCustomerData">Kundendaten</string>
-    <string name="PPPrufziffer">Pr??fziffer</string>
+    <string name="PPPrufziffer">Prüfziffer</string>
     <string name="PPBelegnummer">Belegnr.</string>
     <string name="PPContractAccount">Vertragskonto</string>
     <string name="PPDisplayData">Anzeige</string>
     <string name="PPAuthorityType">Art der Vorlage</string>
-    <string name="PPExecutionDate">Datum der Ausf??hrung</string>
-    <string name="PPCreditorId">Gl??ubiger-ID</string>
+    <string name="PPExecutionDate">Datum der Ausführung</string>
+    <string name="PPCreditorId">Gläubiger-ID</string>
     <string name="PPDateOfSignature">Datum der Unterschrift</string>
     <string name="PPFormFunction">Formularfunktion</string>
     <string name="PPFormType">Formulartyp</string>
     <string name="PPFormVersion">Formularversion</string>
     <string name="PPMandateId">Mandats-ID</string>
-    <string name="PPPeriodicFirstExecutionDate">Periodisches erstes Ausf??hrungsdatum</string>
-    <string name="PPPeriodicLastExecutionDate">Datum der letzten Ausf??hrung</string>
+    <string name="PPPeriodicFirstExecutionDate">Periodisches erstes Ausführungsdatum</string>
+    <string name="PPPeriodicLastExecutionDate">Datum der letzten Ausführung</string>
     <string name="PPPeriodicTimeUnit">Periodische Zeiteinheit</string>
     <string name="PPPeriodicTimeUnitRotation">Zeitraum Dauer</string>
-    <string name="PPPostingKey">Buchungsschl??ssel</string>
+    <string name="PPPostingKey">Buchungsschlüssel</string>
 
 </resources>
diff --git a/BlinkIDSample/LibUtils/src/main/res/values-hr/strings.xml b/BlinkIDSample/LibUtils/src/main/res/values-hr/strings.xml
@@ -3,8 +3,8 @@
     <!-- PaymentData stuff UpToDate -->
     <string name="PPAmount">Iznos</string>
     <string name="PPCurrency">Valuta</string>
-    <string name="PPAccount">Broj ra??una</string>
-    <string name="PPRecipientAccount">Broj ra??una primatelja</string>
+    <string name="PPAccount">Broj računa</string>
+    <string name="PPRecipientAccount">Broj računa primatelja</string>
     <string name="PPReference">Broj odobrenja</string>
     <string name="PPReferenceModel">Model</string>
     <string name="PPReferenceStatus">PNB status</string>
@@ -21,24 +21,24 @@
     <string name="PPRecipientName">Ime primatelja</string>
     <string name="PPRecipientAddress">Adresa primatelja</string>
     <string name="PPRecipientDetailedAddress">Dodatna adresa primatelja</string>
-    <string name="PPPaymentCode">Kod pla??anja</string>
-    <string name="PPPaymentDescriptionCode">Kod opisa pla??anja</string>
-    <string name="PPPaymentDescription">Opis pla??anja</string>
-    <string name="PPDueDate">Dospije??e pla??anja</string>
-    <string name="PPPaymentStatus">Status pla??anja</string>
-    <string name="PPPayerAccount">Broj ra??una platitelja</string>
+    <string name="PPPaymentCode">Kod plaćanja</string>
+    <string name="PPPaymentDescriptionCode">Kod opisa plaćanja</string>
+    <string name="PPPaymentDescription">Opis plaćanja</string>
+    <string name="PPDueDate">Dospijeće plaćanja</string>
+    <string name="PPPaymentStatus">Status plaćanja</string>
+    <string name="PPPayerAccount">Broj računa platitelja</string>
     <string name="PPPayerReference">Broj odobrenja platitelja</string>
     <string name="PPPayerReferenceModel">Model platitelja</string>
     <string name="PPPayerBankCode">Banka platitelja</string>
     <string name="PPPayerBankName">Ime banke platitelja</string>
     <string name="PPPayerIBAN">IBAN platitelja</string>
     <string name="PPPaymentDataType">Tip podataka</string>
-    <string name="PPPurposeCode">??ifra namjene</string>
+    <string name="PPPurposeCode">Šifra namjene</string>
     <string name="PPTaxNumber">Porezni broj</string>
     <string name="PPCustomerData">Korisnik</string>
     <string name="PPPrufziffer">Kontrolne znamenke</string>
     <string name="PPBelegnummer">Podtip uplatnice</string>
-    <string name="PPContractAccount">Ra??un po ugovoru</string>
+    <string name="PPContractAccount">Račun po ugovoru</string>
     <string name="PPDisplayData">Podaci za prikaz</string>
     <string name="PPOptionalData">Dodatni podaci</string>
     <string name="PPIdentificationCode">Identifikacijski kod</string>
@@ -50,10 +50,10 @@
     <string name="PPFormFunction">Funkcija obrasca</string>
     <string name="PPFormType">Tip obrasca</string>
     <string name="PPFormVersion">Verzija obrasca</string>
-    <string name="PPMandateId">ID ovla??tenja</string>
-    <string name="PPPeriodicFirstExecutionDate">Datum prvog izvr??enja</string>
-    <string name="PPPeriodicLastExecutionDate">Datum posljednjeg izvr??enja</string>
+    <string name="PPMandateId">ID ovlaštenja</string>
+    <string name="PPPeriodicFirstExecutionDate">Datum prvog izvršenja</string>
+    <string name="PPPeriodicLastExecutionDate">Datum posljednjeg izvršenja</string>
     <string name="PPPeriodicTimeUnit">Vremenska jedinica perioda</string>
     <string name="PPPeriodicTimeUnitRotation">Trajanje perioda</string>
-    <string name="PPPostingKey">Klju?? knji??enja</string>
+    <string name="PPPostingKey">Ključ knjiženja</string>
 </resources>
diff --git a/BlinkIDSample/build.gradle b/BlinkIDSample/build.gradle
@@ -25,7 +25,7 @@ allprojects {
 // versions of libraries that all modules require
 
 project.ext {
-    blinkIdVersion = '6.1.1'
+    blinkIdVersion = '6.1.2'
     compileSdkVersion = 33
     targetSdkVersion = 33
     appCompatVersion = '1.4.0'

diff --git a/LibBlinkID-javadoc.jar b/LibBlinkID-javadoc.jar
diff --git a/LibBlinkID.aar b/LibBlinkID.aar