From a32ba4614ccb08ef4135f40ddb5b187e85b0398c Mon Sep 17 00:00:00 2001 From: Mahdi Abolfazli Date: Mon, 30 Oct 2023 17:54:05 +0100 Subject: [PATCH] refactor: Resolve rebase conflicts PIA-4595 --- RELEASE-ORDER.md | 1 + .../android/bank/sdk/exampleapp/ui/ExtractionsActivity.kt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE-ORDER.md b/RELEASE-ORDER.md index 541f9b678e..337e78cb88 100644 --- a/RELEASE-ORDER.md +++ b/RELEASE-ORDER.md @@ -32,3 +32,4 @@ Release order for :bank-sdk:sdk 3.6.0: 3. :capture-sdk:sdk 3.6.0 4. :capture-sdk:default-network 3.6.0 5. :bank-sdk:sdk 3.6.0 + diff --git a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ExtractionsActivity.kt b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ExtractionsActivity.kt index e162c9eaf6..4d5de5e14f 100644 --- a/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ExtractionsActivity.kt +++ b/bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/ExtractionsActivity.kt @@ -19,7 +19,7 @@ import com.google.android.material.textfield.TextInputLayout import dagger.hilt.android.AndroidEntryPoint import net.gini.android.bank.sdk.GiniBank import net.gini.android.bank.sdk.exampleapp.R -import net.gini.android.bank.sdk.exampleapp.core.di.GiniCaptureNetworkServiceRelease +import net.gini.android.bank.sdk.exampleapp.core.di.GiniCaptureNetworkServiceDebugEnabled import net.gini.android.bank.sdk.exampleapp.databinding.ActivityExtractionsBinding import net.gini.android.capture.Amount import net.gini.android.capture.AmountCurrency @@ -42,7 +42,7 @@ class ExtractionsActivity : AppCompatActivity(), ExtractionsAdapter.ExtractionsA private lateinit var mExtractionsAdapter: ExtractionsAdapter @Inject - @GiniCaptureNetworkServiceRelease + @GiniCaptureNetworkServiceDebugEnabled lateinit var defaultNetworkService: GiniCaptureDefaultNetworkService // {extraction name} to it's {entity name}