make SEPACardInputActivity a BaseFragmentActivity child, Fix SEPACardInputActivity launched from CheckoutActivity not going back to CheckoutActivity

Author: ajungg

kotlin-sample/src/main/res/navigation/mobile_navigation.xml

@@ -83,7 +83,7 @@
 
     <fragment
         android:id="@+id/navigation_payment_status"
-        android:name="io.snabble.sdk.ui.payment.PaymentStatusFragment"
+        android:name="io.snabble.sdk.ui.checkout.PaymentStatusFragment"
         android:label="Payment Status" />
 
     <action

ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutActivity.kt

@@ -22,7 +22,6 @@ class CheckoutActivity : FragmentActivity() {
         @JvmStatic
         fun startCheckoutFlow(context: Context, args: Bundle?) {
             val intent = Intent(context, CheckoutActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
             args?.let {
                 intent.putExtras(args)
             }

ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutGatekeeperView.java

@@ -161,6 +161,7 @@ public void onStateChanged(Checkout.State state) {
                 String id = checkout.getId();
                 if (id != null) {
                     checkoutIdCode.setText("snabble:checkoutProcess:" + id);
+                    Logger.d("QR_CODE = snabble:checkoutProcess:" + id);
                 }
                 break;
             case PAYMENT_PROCESSING:

…/sdk/ui/payment/PaymentStatusFragment.kt …sdk/ui/checkout/PaymentStatusFragment.ktui/src/main/java/io/snabble/sdk/ui/payment/PaymentStatusFragment.kt renamed to ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusFragment.kt ui/src/main/java/io/snabble/sdk/ui/payment/PaymentStatusFragment.kt renamed to ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusFragment.kt

@@ -1,4 +1,4 @@
-package io.snabble.sdk.ui.payment
+package io.snabble.sdk.ui.checkout
 
 import android.os.Bundle
 import android.view.LayoutInflater

ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt

@@ -52,6 +52,7 @@ class PaymentStatusView @JvmOverloads constructor(
     private var paymentOriginCandidate: PaymentOriginCandidate? = null
     private var paymentOriginCandidateHelper: PaymentOriginCandidateHelper
     private var ignoreStateChanges = false
+    private var hasShownSEPAInput = false
 
     init {
         inflate(getContext(), R.layout.snabble_view_payment_status, this)
@@ -111,6 +112,8 @@ class PaymentStatusView @JvmOverloads constructor(
             intent.putExtra(SEPACardInputActivity.ARG_PAYMENT_ORIGIN_CANDIDATE, paymentOriginCandidate)
             intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
             getContext()?.startActivity(intent)
+            binding.addIbanLayout.isVisible = false
+            hasShownSEPAInput = true
         }
 
         val activity = getFragmentActivity()
@@ -229,7 +232,7 @@ class PaymentStatusView @JvmOverloads constructor(
         binding.payment.setText(resources.getString(R.string.Snabble_PaymentStatus_Payment_error))
         binding.payment.setAction(resources.getString(R.string.Snabble_PaymentStatus_Payment_tryAgain)) {
             project.shoppingCart.generateNewUUID()
-            executeUiAction(SnabbleUI.Event.GO_BACK, null)
+            requireFragmentActivity().finish()
         }
         binding.title.text = resources.getString(R.string.Snabble_PaymentStatus_Title_error)
         binding.image.isVisible = true
@@ -241,6 +244,10 @@ class PaymentStatusView @JvmOverloads constructor(
     }
 
     private fun startPollingForPaymentOriginCandidate() {
+        if (hasShownSEPAInput) {
+            return
+        }
+
         paymentOriginCandidateHelper.addPaymentOriginCandidateAvailableListener(this)
         if (checkout.state == Checkout.State.PAYMENT_APPROVED) {
             paymentOriginCandidateHelper.startPollingIfLinkIsAvailable(checkout.checkoutProcess)

ui/src/main/java/io/snabble/sdk/ui/payment/SEPACardInputActivity.kt

@@ -2,29 +2,18 @@ package io.snabble.sdk.ui.payment
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import io.snabble.sdk.PaymentOriginCandidateHelper
+import io.snabble.sdk.ui.BaseFragmentActivity
 
-class SEPACardInputActivity : AppCompatActivity() {
+class SEPACardInputActivity : BaseFragmentActivity() {
     companion object {
-        const val ARG_PAYMENT_ORIGIN_CANDIDATE = "paymentOriginCandidate"
+        const val ARG_PAYMENT_ORIGIN_CANDIDATE = SEPACardInputFragment.ARG_PAYMENT_ORIGIN_CANDIDATE
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val view = SEPACardInputView(this)
-        view.setOnCloseListener {
-            finish()
-        }
-
-        val args = intent.extras
-        val paymentOriginCandidate = args?.getSerializable(ARG_PAYMENT_ORIGIN_CANDIDATE)
-                as? PaymentOriginCandidateHelper.PaymentOriginCandidate
-
-        paymentOriginCandidate?.let {
-            view.setPrefilledPaymentOriginCandidate(paymentOriginCandidate)
-        }
-
-        setContentView(view)
+    override fun onCreateFragment(): Fragment {
+        val fragment = SEPACardInputFragment()
+        fragment.arguments = intent.extras
+        return fragment
     }
 }

ui/src/main/java/io/snabble/sdk/ui/payment/SEPACardInputFragment.kt

@@ -5,19 +5,34 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import io.snabble.sdk.PaymentMethod
+import io.snabble.sdk.PaymentOriginCandidateHelper
 import io.snabble.sdk.ui.R
 
 open class SEPACardInputFragment : Fragment() {
+    companion object {
+        const val ARG_PAYMENT_ORIGIN_CANDIDATE = "paymentOriginCandidate"
+    }
+
+    var paymentOriginCandidate: PaymentOriginCandidateHelper.PaymentOriginCandidate? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
+
+        paymentOriginCandidate = arguments?.getSerializable(SEPACardInputActivity.ARG_PAYMENT_ORIGIN_CANDIDATE)
+                as? PaymentOriginCandidateHelper.PaymentOriginCandidate
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.snabble_fragment_cardinput_sepa, container, false)
+        val v = inflater.inflate(R.layout.snabble_fragment_cardinput_sepa, container, false) as SEPACardInputView
+        paymentOriginCandidate?.let {
+            v.setPrefilledPaymentOriginCandidate(paymentOriginCandidate)
+        }
+        return v
     }
 }

ui/src/main/res/navigation/snabble_nav_checkout.xml

@@ -38,7 +38,7 @@
 
     <fragment
         android:id="@+id/snabble_nav_payment_status"
-        android:name="io.snabble.sdk.ui.payment.PaymentStatusFragment"
+        android:name="io.snabble.sdk.ui.checkout.PaymentStatusFragment"
         android:label="@string/Snabble.Checkout.title">
 
     </fragment>