From f7e13e3079421d7ba8a1e17a07bfc7053bd49e7d Mon Sep 17 00:00:00 2001 From: Alpar Szotyori Date: Mon, 19 Aug 2024 12:07:34 +0200 Subject: [PATCH 1/9] feat(bank-api-library): Bump version to 3.2.1 PP-732 --- bank-api-library/library/gradle.properties | 2 +- .../library/src/doc/source/guides/getting-started.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bank-api-library/library/gradle.properties b/bank-api-library/library/gradle.properties index bd9803510..19c127245 100644 --- a/bank-api-library/library/gradle.properties +++ b/bank-api-library/library/gradle.properties @@ -1,7 +1,7 @@ # Maven coordinates # groupId is in the root gradle.properties artifactId=gini-bank-api-lib -version=3.2.0 +version=3.2.1 # Version code is visible only in the generated BuildConfig file versionCode=0 diff --git a/bank-api-library/library/src/doc/source/guides/getting-started.rst b/bank-api-library/library/src/doc/source/guides/getting-started.rst index 8f5f62fc4..64e63e91f 100644 --- a/bank-api-library/library/src/doc/source/guides/getting-started.rst +++ b/bank-api-library/library/src/doc/source/guides/getting-started.rst @@ -13,7 +13,7 @@ build.gradle: .. code-block:: groovy dependencies { - implementation 'net.gini.android:gini-bank-api-lib:3.2.0' + implementation 'net.gini.android:gini-bank-api-lib:3.2.1' } Integrating the Gini Bank API Library From b3cf5c5355bbec74057a7e2a455adf37e16b0cb3 Mon Sep 17 00:00:00 2001 From: Alpar Szotyori Date: Mon, 19 Aug 2024 12:07:51 +0200 Subject: [PATCH 2/9] feat(core-api-library): Bump version to 2.2.1 PP-732 --- core-api-library/library/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-api-library/library/gradle.properties b/core-api-library/library/gradle.properties index ead082cae..a98202897 100644 --- a/core-api-library/library/gradle.properties +++ b/core-api-library/library/gradle.properties @@ -1,7 +1,7 @@ # Maven coordinates # groupId is in the root gradle.properties artifactId=gini-internal-core-api-lib -version=2.2.0 +version=2.2.1 # Version code is visible only in the generated BuildConfig file versionCode=0 From ac2218138b2dc54d47b48a0764d13fded72508c3 Mon Sep 17 00:00:00 2001 From: Alpar Szotyori Date: Mon, 19 Aug 2024 12:08:11 +0200 Subject: [PATCH 3/9] feat(capture-sdk): Bump version to 3.11.1 PP-732 --- capture-sdk/default-network/gradle.properties | 2 +- capture-sdk/sdk/gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/capture-sdk/default-network/gradle.properties b/capture-sdk/default-network/gradle.properties index 26a140c72..2c7f5b758 100644 --- a/capture-sdk/default-network/gradle.properties +++ b/capture-sdk/default-network/gradle.properties @@ -1,7 +1,7 @@ # Maven coordinates # groupId is in the root gradle.properties artifactId=gini-capture-sdk-default-network -version=3.11.0 +version=3.11.1 # Version code is visible only in the generated BuildConfig file versionCode=0 diff --git a/capture-sdk/sdk/gradle.properties b/capture-sdk/sdk/gradle.properties index e144a85d4..78fd088ad 100644 --- a/capture-sdk/sdk/gradle.properties +++ b/capture-sdk/sdk/gradle.properties @@ -1,7 +1,7 @@ # Maven coordinates # groupId is in the root gradle.properties artifactId=gini-capture-sdk -version=3.11.0 +version=3.11.1 # Version code is visible only in the generated BuildConfig file versionCode=0 From 926b1a48ff333bb6d81948522e762d4f2e5e031a Mon Sep 17 00:00:00 2001 From: Alpar Szotyori Date: Mon, 19 Aug 2024 12:08:25 +0200 Subject: [PATCH 4/9] feat(bank-sdk): Bump version to 3.12.1 PP-732 --- bank-sdk/sdk/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bank-sdk/sdk/gradle.properties b/bank-sdk/sdk/gradle.properties index c7c91f878..4a9b0b04c 100644 --- a/bank-sdk/sdk/gradle.properties +++ b/bank-sdk/sdk/gradle.properties @@ -1,7 +1,7 @@ # Maven coordinates # groupId is in the root gradle.properties artifactId=gini-bank-sdk -version=3.12.0 +version=3.12.1 # Version code is visible only in the generated BuildConfig file versionCode=0 From c77a74c068dbbbe140d6d3d122bae26f3a230c78 Mon Sep 17 00:00:00 2001 From: Alpar Szotyori Date: Mon, 19 Aug 2024 12:11:21 +0200 Subject: [PATCH 5/9] feat(health-api-library): Bump version to 4.3.0 IPC-320 --- health-api-library/library/gradle.properties | 2 +- .../library/src/doc/source/guides/getting-started.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/health-api-library/library/gradle.properties b/health-api-library/library/gradle.properties index 5972c6063..7780c8d03 100644 --- a/health-api-library/library/gradle.properties +++ b/health-api-library/library/gradle.properties @@ -1,7 +1,7 @@ # Maven coordinates # groupId is in the root gradle.properties artifactId=gini-health-api-lib -version=4.2.0 +version=4.3.0 # Version code is visible only in the generated BuildConfig file versionCode=0 diff --git a/health-api-library/library/src/doc/source/guides/getting-started.rst b/health-api-library/library/src/doc/source/guides/getting-started.rst index ae43d8a01..c93dae6b0 100644 --- a/health-api-library/library/src/doc/source/guides/getting-started.rst +++ b/health-api-library/library/src/doc/source/guides/getting-started.rst @@ -13,7 +13,7 @@ build.gradle: .. code-block:: groovy dependencies { - implementation 'net.gini.android:gini-health-api-lib:4.2.0' + implementation 'net.gini.android:gini-health-api-lib:4.3.0' } Integrating the Gini Health API Library From 64c72b62029a3eb9e1e3d0c01f41f5b06100922d Mon Sep 17 00:00:00 2001 From: Alpar Szotyori Date: Mon, 19 Aug 2024 12:11:32 +0200 Subject: [PATCH 6/9] feat(health-sdk): Bump version to 4.3.0 IPC-320 --- RELEASE-ORDER.md | 56 ++++++++++++------------- health-sdk/sdk/gradle.properties | 2 +- health-sdk/sdk/src/doc/source/setup.rst | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/RELEASE-ORDER.md b/RELEASE-ORDER.md index 74a766085..421f72401 100644 --- a/RELEASE-ORDER.md +++ b/RELEASE-ORDER.md @@ -1,40 +1,40 @@ DO NOT EDIT MANUALLY! Automatically created by the updateReleaseOrderFile task. -Release order for :capture-sdk:sdk 3.11.0: - 1. :capture-sdk:sdk 3.11.0 +Release order for :capture-sdk:sdk 3.11.1: + 1. :capture-sdk:sdk 3.11.1 -Release order for :core-api-library:library 2.2.0: - 1. :core-api-library:library 2.2.0 +Release order for :core-api-library:library 2.2.1: + 1. :core-api-library:library 2.2.1 -Release order for :bank-api-library:library 3.2.0: - 1. :core-api-library:library 2.2.0 - 2. :bank-api-library:library 3.2.0 +Release order for :bank-api-library:library 3.2.1: + 1. :core-api-library:library 2.2.1 + 2. :bank-api-library:library 3.2.1 -Release order for :health-api-library:library 4.2.0: - 1. :core-api-library:library 2.2.0 - 2. :health-api-library:library 4.2.0 +Release order for :health-api-library:library 4.3.0: + 1. :core-api-library:library 2.2.1 + 2. :health-api-library:library 4.3.0 -Release order for :health-sdk:sdk 4.2.0: - 1. :core-api-library:library 2.2.0 - 2. :health-api-library:library 4.2.0 - 3. :health-sdk:sdk 4.2.0 +Release order for :health-sdk:sdk 4.3.0: + 1. :core-api-library:library 2.2.1 + 2. :health-api-library:library 4.3.0 + 3. :health-sdk:sdk 4.3.0 Release order for :merchant-sdk:sdk 1.0.0: - 1. :core-api-library:library 2.2.0 - 2. :health-api-library:library 4.2.0 + 1. :core-api-library:library 2.2.1 + 2. :health-api-library:library 4.3.0 3. :merchant-sdk:sdk 1.0.0 -Release order for :capture-sdk:default-network 3.11.0: - 1. :core-api-library:library 2.2.0 - 2. :bank-api-library:library 3.2.0 - 3. :capture-sdk:sdk 3.11.0 - 4. :capture-sdk:default-network 3.11.0 - -Release order for :bank-sdk:sdk 3.12.0: - 1. :core-api-library:library 2.2.0 - 2. :bank-api-library:library 3.2.0 - 3. :capture-sdk:sdk 3.11.0 - 4. :capture-sdk:default-network 3.11.0 - 5. :bank-sdk:sdk 3.12.0 +Release order for :capture-sdk:default-network 3.11.1: + 1. :core-api-library:library 2.2.1 + 2. :bank-api-library:library 3.2.1 + 3. :capture-sdk:sdk 3.11.1 + 4. :capture-sdk:default-network 3.11.1 + +Release order for :bank-sdk:sdk 3.12.1: + 1. :core-api-library:library 2.2.1 + 2. :bank-api-library:library 3.2.1 + 3. :capture-sdk:sdk 3.11.1 + 4. :capture-sdk:default-network 3.11.1 + 5. :bank-sdk:sdk 3.12.1 diff --git a/health-sdk/sdk/gradle.properties b/health-sdk/sdk/gradle.properties index 5e2ca2334..8c1137b44 100644 --- a/health-sdk/sdk/gradle.properties +++ b/health-sdk/sdk/gradle.properties @@ -1,7 +1,7 @@ # Maven coordinates # groupId is in the root gradle.properties artifactId=gini-health-sdk -version=4.2.0 +version=4.3.0 # Version code is visible only in the generated BuildConfig file versionCode=1000 diff --git a/health-sdk/sdk/src/doc/source/setup.rst b/health-sdk/sdk/src/doc/source/setup.rst index 9f5918c6a..870792463 100644 --- a/health-sdk/sdk/src/doc/source/setup.rst +++ b/health-sdk/sdk/src/doc/source/setup.rst @@ -11,7 +11,7 @@ build.gradle: .. code-block:: groovy dependencies { - implementation 'net.gini.android:gini-health-sdk:4.2.0' + implementation 'net.gini.android:gini-health-sdk:4.3.0' } Gini Pay Deep Link For Your App From a054773bb67a6521f40721f0a516425075a937e8 Mon Sep 17 00:00:00 2001 From: dani Date: Tue, 20 Aug 2024 13:29:39 +0300 Subject: [PATCH 7/9] fix(merchant-sdk): Added amount verification to SDK using `String.toBackendFormat()` - Set payment provider icon initial state to `gone` EC-128 --- .../java/net/gini/android/merchant/sdk/GiniMerchant.kt | 7 +++++++ .../res/layout/gms_payment_provider_selector_button.xml | 1 + 2 files changed, 8 insertions(+) diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt index d2f7c9b63..964fa2c68 100644 --- a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt +++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt @@ -20,6 +20,7 @@ import net.gini.android.merchant.sdk.integratedFlow.PaymentFlowConfiguration import net.gini.android.merchant.sdk.integratedFlow.PaymentFragment import net.gini.android.merchant.sdk.paymentcomponent.PaymentComponent import net.gini.android.merchant.sdk.util.DisplayedScreen +import net.gini.android.merchant.sdk.util.toBackendFormat import org.slf4j.LoggerFactory /** @@ -110,6 +111,12 @@ class GiniMerchant( fun createFragment(iban: String, recipient: String, amount: String, purpose: String, flowConfiguration: PaymentFlowConfiguration? = null): PaymentFragment { if (iban.isEmpty() || recipient.isEmpty() || amount.isEmpty() || purpose.isEmpty()) throw IllegalStateException("Payment details are incomplete.") + try { + amount.toBackendFormat() + } catch (e: Exception) { + throw IllegalStateException("Amount format is incorrect.") + } + val paymentDetails = PaymentDetails( recipient = recipient, iban = iban, diff --git a/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml b/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml index 7056ae5b4..e2f53b631 100644 --- a/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml +++ b/merchant-sdk/sdk/src/main/res/layout/gms_payment_provider_selector_button.xml @@ -23,6 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/gms_large" + android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" From 98d1deb5fca35a3f6711453d47cfbd5a90eb4201 Mon Sep 17 00:00:00 2001 From: dani Date: Tue, 20 Aug 2024 13:42:42 +0300 Subject: [PATCH 8/9] fix(merchant-sdk): Fix `detekt` issues EC-128 --- .../java/net/gini/android/merchant/sdk/GiniMerchant.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt index 964fa2c68..78bfca10a 100644 --- a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt +++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt @@ -109,12 +109,13 @@ class GiniMerchant( * @param flowConfiguration - optional parameter with the [PaymentFlowConfiguration] */ fun createFragment(iban: String, recipient: String, amount: String, purpose: String, flowConfiguration: PaymentFlowConfiguration? = null): PaymentFragment { - if (iban.isEmpty() || recipient.isEmpty() || amount.isEmpty() || purpose.isEmpty()) throw IllegalStateException("Payment details are incomplete.") + if (iban.isEmpty() || recipient.isEmpty() || amount.isEmpty() || purpose.isEmpty()) + error("Payment details are incomplete.") try { amount.toBackendFormat() - } catch (e: Exception) { - throw IllegalStateException("Amount format is incorrect.") + } catch (e: NumberFormatException) { + error("Amount format is incorrect.") } val paymentDetails = PaymentDetails( From d421b722cadffa2a1da4d5736cc13c46a22d4066 Mon Sep 17 00:00:00 2001 From: dani Date: Tue, 20 Aug 2024 15:27:32 +0300 Subject: [PATCH 9/9] fix(merchant-sdk): Added curly braces EC-128 --- .../main/java/net/gini/android/merchant/sdk/GiniMerchant.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt index 78bfca10a..5a58bf9c4 100644 --- a/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt +++ b/merchant-sdk/sdk/src/main/java/net/gini/android/merchant/sdk/GiniMerchant.kt @@ -109,8 +109,9 @@ class GiniMerchant( * @param flowConfiguration - optional parameter with the [PaymentFlowConfiguration] */ fun createFragment(iban: String, recipient: String, amount: String, purpose: String, flowConfiguration: PaymentFlowConfiguration? = null): PaymentFragment { - if (iban.isEmpty() || recipient.isEmpty() || amount.isEmpty() || purpose.isEmpty()) + if (iban.isEmpty() || recipient.isEmpty() || amount.isEmpty() || purpose.isEmpty()) { error("Payment details are incomplete.") + } try { amount.toBackendFormat()