- added hide card feature

- update hashing algorithim
- example app bug fixes

Author: Craig Christenson

README.md

@@ -31,7 +31,7 @@ private fun showPaymentOptions() {
 
     **parameters for TwoCheckoutPaymentOptions class:**
 
-    this // activty context
+    this // activity context
     payOptionList // ArrayList that contains the payment options you want to display to the user
     ::onPayMethodSelected // callback method to receive the payment option selected by the user
 
@@ -80,7 +80,7 @@ val customizationParam = loadFormPreferences()
     cardPaymentForm.displayPaymentForm()
 ```
         
-**sample callback method for receiving payment card token (::onCreditCardInput) and startin the card payment flow api call**
+**sample callback method for receiving payment card token (::onCreditCardInput) and starting the card payment flow api call**
 ```kotlin
 private fun onCreditCardInput(cardPaymentToken:String) {
     if (cardPaymentToken.isEmpty()){
@@ -185,7 +185,7 @@ private fun onCreditCardInput(cardPaymentToken:String) {
                 if (result.resultCode == ThreedsManager.threedsResultCode) {
                     if (result.data!=null) {
                         result.data?.let {
-                            //our sdk will return the transaction reference number here after the 3ds is completes
+                            //our sdk will return the transaction reference number here after the 3ds process completes
                             //note that this receiver only indicates that the 3ds flow is over and does not indicate if it was succesfull or not
                             //so another api call to get the status of the transaction is required
                             val refNO = it.getStringExtra(ThreedsManager.keyRefNO)?:""
@@ -204,7 +204,7 @@ private fun onCreditCardInput(cardPaymentToken:String) {
     }
 ```
 
-**explained sample code for extracting the 3ds auth url from carp payment api response:** 
+**explained sample code for extracting the 3ds auth url from card payment api response:** 
 ```kotlin
     private fun getThreedsUrl(response: String): String {
         val responseJson = JSONObject(response)
@@ -235,11 +235,11 @@ The TwoCheckoutPaymentForm class contains a method that can be used to generate
 fun getCardPaymentToken(merchantCode:String,cardInputObject: CreditCardInputResult,onTokenReady: (token:String) -> Unit)
 ```
 
-`merchantCode //your merchant code`
+`merchantCode - your merchant code`
 
-`cardInputObject //data object that contains all the required card data for tokenization(card nr, cvv, expiryData, name)`
+`cardInputObject - data object that contains all the required card data for tokenization(card nr, cvv, expiryData, name)`
 
-`onTokenReady //simple callback funtion that will be called by 2CO sdk with the token parameter once the process is complete`
+`onTokenReady - simple callback funtion that will be called by 2CO sdk with the token parameter once the process is complete`
 
 Please note that this is a blocking function that needs to run on background thread.
 
@@ -252,7 +252,7 @@ The code sample below explains how this function is used:
         cardPayData.creditCard = ""// card nr
         cardPayData.cvv ="" //card cvc cvv
         cardInputObject.cardData = cardPayData
-        TwoCheckoutPaymentForm.getCardPaymentToken(SettingsActivity.getMerchantCode(this),cardInputObject,::onCreditCardInput)
+        TwoCheckoutPaymentForm.getCardPaymentToken(SettingsActivity.getMerchantCode(this,cardInputObject,::onCreditCardInput))
 ```    
 
 **Paypal payment flow** 
@@ -285,16 +285,20 @@ After api call completes with success we can retrieve the paypal authorization l
         //PaypalStarter(ctx: Context, paypalURL: String)
         ctx : Merchant activity context
         paypalURL : paypal authorization url received in the initial api call
+
+        //sample code for starting the paypal screen
+        if(paypalUrl.isEmpty()){
+            progressDialog.dismiss()
+        }
 
         val mPaypalStarter = PaypalStarter(this,paypalUrl)
 
-        //display the paypal authorization screen from 2CO sdk
-        mPaypalStarter.displayPaypalScreen(paypalReceiver)
+        //display the paypal authorization screen from 2CO sdk, use one of the following method signatures
+        mPaypalStarter.displayPaypalScreen(paypalReceiver,"www.2checkout.com","www.2checkout.com")
 
         displayPaypalScreen(resultObject: ActivityResultLauncher<Intent>)
         //resultObject - ActivityResultLauncher<Intent> used to retrieve the result from 2CO sdk
 
-        
         //Sample code for creating the object to receive the result
 
         //since this is an lifecycle owner it needs to be created and registered before merchant activity or fragment is created like in the example below

TwoCheckoutAndroidSDK/src/main/java/com/twocheckout/connectors/datapack/PaymentConfigurationData.kt

@@ -13,6 +13,7 @@ class PaymentConfigurationData(
     var displayPrice:String= price
     var payButtonText:String = ""
     var merchantCodeParam:String = merchantCode
+    var hideCard = false
     var displayCustomization: FormUICustomizationData = displayUICustomization
 
 }

TwoCheckoutAndroidSDK/src/main/java/com/twocheckout/connectors/payments/paypal/PayPalWebClient.kt

@@ -9,13 +9,21 @@ import java.net.URLDecoder
 
 class PayPalWebClient(onConfirmationDone: (MutableMap<String, String>) -> Unit): WebViewClient() {
     val sendConfirmationResult = onConfirmationDone
+    var failUrl = ""
+    var successUrl = ""
     override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
         super.onPageStarted(view, url, favicon)
         val sourceURL = url.toString()
         if (sourceURL.isNotEmpty()&&sourceURL.contains("refNo")) {
             sendConfirmationResult(parseQueryParams(URL(url)))
             return
         }
+        if (sourceURL.isNotEmpty() && successUrl.isNotEmpty() && failUrl.isNotEmpty()){
+            if(sourceURL.contains(successUrl)||sourceURL.contains(failUrl)){
+                sendConfirmationResult(parseQueryParams(URL(url)))
+                return
+            }
+        }
     }
 
     override fun onLoadResource(view: WebView?, url: String?) {
@@ -26,18 +34,28 @@ class PayPalWebClient(onConfirmationDone: (MutableMap<String, String>) -> Unit):
         super.onPageFinished(view, url)
         if(url!=null && url.contains("status")){
             sendConfirmationResult(parseQueryParams(URL(url)))
+            return
+        }
+
+        if (successUrl.isNotEmpty()&&failUrl.isNotEmpty()){
+            if(url!=null && (url.contains(successUrl)||url.contains(failUrl))){
+                sendConfirmationResult(parseQueryParams(URL(url)))
+                return
+            }
         }
     }
 
     private fun parseQueryParams(urlParam: URL):MutableMap<String, String> {
         val queryPairs: MutableMap<String, String> = LinkedHashMap()
-        val query: String = urlParam.query
-        val pairs = query.split("&").toTypedArray()
-        for (pair in pairs) {
-            if (pair.contains("=")){
-            val idx = pair.indexOf("=")
-            queryPairs[URLDecoder.decode(pair.substring(0, idx), "UTF-8")] =
-                URLDecoder.decode(pair.substring(idx + 1), "UTF-8")
+        if (null !== urlParam?.query) {
+            val query: String = urlParam.query
+            val pairs = query.split("&").toTypedArray()
+            for (pair in pairs) {
+                if (pair.contains("=")) {
+                    val idx = pair.indexOf("=")
+                    queryPairs[URLDecoder.decode(pair.substring(0, idx), "UTF-8")] =
+                        URLDecoder.decode(pair.substring(idx + 1), "UTF-8")
+                }
             }
         }
         return queryPairs

TwoCheckoutAndroidSDK/src/main/java/com/twocheckout/connectors/payments/paypal/PaypalStarter.kt

@@ -8,6 +8,8 @@ import androidx.appcompat.app.AppCompatActivity
 class PaypalStarter(ctx: Context, paypalURL: String) {
     companion object{
         const val keyPaypalURL = "threeds_url"
+        const val keyPaymentSuccessURL = "success_url"
+        const val keyPaymentFailURL = "fail_url"
         const val keyRefNO = "ref_no_value"
         const val paypalResultCode = 201
 
@@ -21,6 +23,14 @@ class PaypalStarter(ctx: Context, paypalURL: String) {
         screenURL = paypalURL
     }
 
+    fun displayPaypalScreen(resultReceiver: ActivityResultLauncher<Intent>,successUrl:String,failUrl:String) {
+        val temp = Intent(mCtx, PaypalWebScreen::class.java)
+        temp.putExtra(keyPaypalURL,screenURL)
+        temp.putExtra(keyPaymentSuccessURL,successUrl)
+        temp.putExtra(keyPaymentFailURL,failUrl)
+        resultReceiver.launch(temp)
+    }
+
     fun displayPaypalScreen(resultReceiver: ActivityResultLauncher<Intent>) {
         val temp = Intent(mCtx, PaypalWebScreen::class.java)
         temp.putExtra(keyPaypalURL,screenURL)

TwoCheckoutAndroidSDK/src/main/java/com/twocheckout/connectors/payments/paypal/PaypalWebScreen.kt

@@ -21,6 +21,8 @@ internal class PaypalWebScreen:AppCompatActivity() {
         mPaypalWebClient = PayPalWebClient(::onPaypalFlowDone)
         paypalWebView.webViewClient = mPaypalWebClient
         paypalWebView.settings.javaScriptEnabled = true
+        mPaypalWebClient.successUrl = intent.getStringExtra(PaypalStarter.keyPaymentSuccessURL)?:""
+        mPaypalWebClient.failUrl = intent.getStringExtra(PaypalStarter.keyPaymentFailURL)?:""
         paypalWebView.loadUrl(urlToLoad)
     }
 

TwoCheckoutAndroidSDK/src/main/java/com/twocheckout/connectors/screens/CardFormScreen.kt

@@ -6,10 +6,14 @@ import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.text.*
+import android.text.method.PasswordTransformationMethod
 import android.view.*
 import android.view.View.*
 import android.view.inputmethod.InputMethodManager
-import androidx.appcompat.widget.*
+import androidx.appcompat.widget.AppCompatButton
+import androidx.appcompat.widget.AppCompatEditText
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.DialogFragment
@@ -20,12 +24,42 @@ import com.twocheckout.connectors.datapack.CreditCardInputResult
 import com.twocheckout.connectors.datapack.FormUICustomizationData
 import com.twocheckout.connectors.datapack.PayerCardData
 import com.twocheckout.connectors.payments.TwoCOCardValidator
+import java.io.Serializable
+
+
+class HideInputData : PasswordTransformationMethod() {
+
+    companion object {
+        const val HIDE_CHAR = '*'
+    }
+
+    override fun getTransformation(source: CharSequence, view: View): CharSequence {
+        return DataCharSequence(source)
+    }
+
+    inner class DataCharSequence (private val source: CharSequence) : CharSequence {
+
+        override val length: Int
+            get() = source.length
+
+        override fun get(index: Int): Char = HIDE_CHAR
+
+        override fun subSequence(startIndex: Int, endIndex: Int): CharSequence {
+            return source.subSequence(startIndex, endIndex)
+        }
+    }
+}
 
 
 internal class CardFormScreen():DialogFragment() {
 
+    class CallbackActionKeeper(var onCardInput: (inputResult:CreditCardInputResult) -> Unit):
+        Serializable
+
+
     constructor(ctx: Context,
                 customizationParam: FormUICustomizationData,
+                hideCard:Boolean,
                 displayPrice: String,
                 payButtonLabel:String,
                 onCardInput: (inputResult:CreditCardInputResult) -> Unit
@@ -35,10 +69,12 @@ internal class CardFormScreen():DialogFragment() {
         price = displayPrice
         customizationData = customizationParam
         onCardInputDone = onCardInput
+        callbackKeeper = CallbackActionKeeper(onCardInputDone)
         payButtonText = payButtonLabel
+        hideCardData = hideCard
     }
 
-
+    private var hideCardData = false
     private var colorCodeTitle: Int = -1
     private var colorCodePayBtn: Int = -1
     private var colorCodeHint: Int = Color.BLACK
@@ -50,6 +86,7 @@ internal class CardFormScreen():DialogFragment() {
     private var showFieldErrors:Boolean = false
     private var currentCardExpiryString = ""
     private var payButtonText = ""
+    var callbackKeeper:CallbackActionKeeper? = null
     lateinit var cardNRHintTV:AppCompatTextView
     lateinit var expiryDateHintTV:AppCompatTextView
     lateinit var cvvNRHintTV:AppCompatTextView
@@ -137,6 +174,10 @@ internal class CardFormScreen():DialogFragment() {
         discoverCardTypeIM.visibility = GONE
         jcbCardTypeIM.visibility = GONE
         var showPrice = ""
+
+        if (hideCardData) {
+            setHiddenCardData()
+        }
         if (price.isNotEmpty()){
             showPrice = getString(R.string.submitPay)+" "+ price
             payButton.text = showPrice
@@ -585,6 +626,7 @@ internal class CardFormScreen():DialogFragment() {
             WindowManager.LayoutParams.MATCH_PARENT,
             WindowManager.LayoutParams.MATCH_PARENT
         )
+        if(callbackKeeper == null) dismiss()
     }
 
     private fun customizeForm() {
@@ -680,10 +722,14 @@ internal class CardFormScreen():DialogFragment() {
         outState.putString(TwoCheckoutPaymentForm.keyInputTextColor,customizationData.formInputTextColor)
         outState.putString(TwoCheckoutPaymentForm.keyTitleTextColor,customizationData.formTitleTextColor)
         outState.putString(TwoCheckoutPaymentForm.keyDisplayPrice,price)
+        outState.putBoolean("hideCardData", hideCardData)
     }
 
     override fun onViewStateRestored(savedInstanceState: Bundle?) {
         super.onViewStateRestored(savedInstanceState)
+        if (savedInstanceState != null) {
+            hideCardData = savedInstanceState.getBoolean("hideCardData", false)
+        }
         val temp = savedInstanceState?.getInt(TwoCheckoutPaymentForm.keyTextFontID)?:-1
         if (temp>0) customizationData.userTextFontRes = temp
 
@@ -727,4 +773,16 @@ internal class CardFormScreen():DialogFragment() {
         setupUserFontResource()
         customizeForm()
     }
+
+    fun setHiddenCardData() {
+        cardNumberInput.transformationMethod = HideInputData()
+        cvcNumberInput.transformationMethod = HideInputData()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (hideCardData) {
+            setHiddenCardData()
+        }
+    }
 }

TwoCheckoutAndroidSDK/src/main/java/com/twocheckout/connectors/screens/TwoCheckoutPaymentForm.kt

@@ -17,7 +17,6 @@ class TwoCheckoutPaymentForm(displayData: PaymentConfigurationData,onShowLoading
         val keyPayButtonColor = "payButtonColor"
         val keyTextFontID = "textFontResourceID"
         val keyDisplayPrice = "displayPrice"
-        val keyCallbackCardInputResult = "keyCallbackCardInput"
 
         fun getCardPaymentToken(merchantCode:String,cardInputObject: CreditCardInputResult,onTokenReady: (token:String) -> Unit) {
             val cardPayments = CardPaymentInit(onTokenReady)
@@ -43,7 +42,7 @@ class TwoCheckoutPaymentForm(displayData: PaymentConfigurationData,onShowLoading
         ctx as AppCompatActivity
         mCtx = displayData.activityContext
         merchantCode = displayData.merchantCodeParam
-        cardInputScreen = CardFormScreen(ctx,displayData.displayCustomization,displayData.displayPrice,displayData.payButtonText,::onCardInputComplete)
+        cardInputScreen = CardFormScreen(ctx,displayData.displayCustomization,displayData.hideCard,displayData.displayPrice,displayData.payButtonText,::onCardInputComplete)
         mFragmentManager = ctx.supportFragmentManager
     }
 

app/src/main/java/com/twocheckout/mobile/CheckoutActivity.kt

@@ -1,6 +1,7 @@
 package com.twocheckout.mobile
 
 
+import android.annotation.SuppressLint
 import android.app.ProgressDialog
 import android.content.Context
 import android.content.Intent
@@ -67,6 +68,7 @@ open class CheckoutActivity : AppCompatActivity() {
     private val threedsReceiver = createPaymentsReceiver()
     private val paypalReceiver = createPaypalReceiver()
 
+    @SuppressLint("MissingInflatedId")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_checkout)
@@ -212,6 +214,9 @@ open class CheckoutActivity : AppCompatActivity() {
             customizationParam
         )
 
+        if (SettingsActivity.getHideCardData(this)){
+            formConfigData.hideCard = true
+        }
 
         val cardPaymentForm = TwoCheckoutPaymentForm(
             formConfigData,::showLoadingSpinner,
@@ -331,7 +336,7 @@ open class CheckoutActivity : AppCompatActivity() {
             progressDialog.dismiss()
         }
         val mPaypalStarter = PaypalStarter(this,paypalUrl)
-        mPaypalStarter.displayPaypalScreen(paypalReceiver)
+        mPaypalStarter.displayPaypalScreen(paypalReceiver,"www.2checkout.com","www.2checkout.com")
     }
 
     private fun getThreedsUrl(response: String): String {