v1.1.1 (#5)

Co-authored-by: matus.choma <matus.choma@upcodee.com>
getneteurope · May 30, 2023 · 4e0ceeb · 4e0ceeb
1 parent 2e82152
commit 4e0ceeb
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 91 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 33
         versionCode 2
-        versionName "1.1.0"
+        versionName "1.1.1"
         flavorDimensions "default"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/libs/card.aar b/app/libs/card.aar
diff --git a/app/libs/core.aar b/app/libs/core.aar
diff --git a/app/src/androidTest/java/com/sdkpay/ecom/examples/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/sdkpay/ecom/examples/ExampleInstrumentedTest.java
diff --git a/app/src/main/java/com/sdkpay/ecom/examples/AnimatedCardFieldActivity.java b/app/src/main/java/com/sdkpay/ecom/examples/AnimatedCardFieldActivity.java
@@ -14,10 +14,8 @@
 
 import com.sdkpay.ecom.Client;
 import com.sdkpay.ecom.card.AnimatedCardFieldFragment;
-import com.sdkpay.ecom.card.model.CardBundle;
-import com.sdkpay.ecom.card.model.CardFieldPayment;
-import com.sdkpay.ecom.model.AccountHolder;
-import com.sdkpay.ecom.model.TransactionType;
+import com.sdkpay.ecom.examples.providers.OptionalFieldsProvider;
+import com.sdkpay.ecom.examples.providers.PaymentObjectProvider;
 import com.sdkpay.ecom.model.PaymentResponse;
 import com.sdkpay.ecom.util.Observer;
 
@@ -30,7 +28,7 @@
 public class AnimatedCardFieldActivity extends AppCompatActivity implements Observer<PaymentResponse> {
     private final Context mContext = this;
     AnimatedCardFieldFragment animatedCardFieldFragment;
-
+    PaymentObjectProvider mPaymentObjectProvider = new PaymentObjectProvider(new OptionalFieldsProvider());
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -57,39 +55,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
     public void onSubmitButtonClicked(View view) {
         if(animatedCardFieldFragment.getCardBundle() != null) {
-            new Client(this, URL_EE_TEST, REQUEST_TIMEOUT).startPayment(getCardFormPayment(animatedCardFieldFragment.getCardBundle()));
+            new Client(this, URL_EE_TEST, REQUEST_TIMEOUT).startPayment(mPaymentObjectProvider.getCardFormPayment(animatedCardFieldFragment.getCardBundle()));
             findViewById(R.id.progress).setVisibility(View.VISIBLE);
         }else {
             Toast.makeText(mContext, "Card bundle is null!", Toast.LENGTH_SHORT).show();
         }
     }
 
-    public CardFieldPayment getCardFormPayment(CardBundle cardBundle) {
-        String timestamp = SignatureHelper.generateTimestamp();
-        String merchantID = "5c4a8a42-04a8-4970-a595-262f0ba0a108";
-        String secretKey = "5ac555d4-e7f7-409f-8147-d82c8c10ed53";
-        String requestID = UUID.randomUUID().toString();
-        TransactionType transactionType = TransactionType.PURCHASE;
-        BigDecimal amount = new BigDecimal(5);
-        String currency = "EUR";
-        String signature = SignatureHelper.generateSignature(timestamp, merchantID, requestID, transactionType.getValue(), amount, currency, secretKey);
-
-        CardFieldPayment cardFieldPayment = new CardFieldPayment.Builder()
-                .setSignature(signature)
-                .setMerchantAccountId(merchantID)
-                .setRequestId(requestID)
-                .setAmount(amount)
-                .setTransactionType(transactionType)
-                .setCurrency(currency)
-                .setCardBundle(cardBundle)
-                .build();
-
-        AccountHolder accountHolder = new AccountHolder("John", "Doe");
-        cardFieldPayment.setAccountHolder(accountHolder);
-
-        return cardFieldPayment;
-    }
-
     @Override
     public void onObserve(PaymentResponse paymentResponse) {
         runOnUiThread(() -> {

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/CardFieldFragmentImplFragment.kt b/app/src/main/java/com/sdkpay/ecom/examples/CardFieldFragmentImplFragment.kt
@@ -62,4 +62,4 @@ class CardFieldFragmentImplFragment: Fragment(), Observer<PaymentResponse> {
             activity?.findViewById<View>(R.id.progress)?.visibility = View.GONE
         }
     }
-}
+}
diff --git a/app/src/main/java/com/sdkpay/ecom/examples/KotlinCardFieldFragmentImplActivity.kt b/app/src/main/java/com/sdkpay/ecom/examples/KotlinCardFieldFragmentImplActivity.kt
@@ -19,4 +19,4 @@ class KotlinCardFieldFragmentImplActivity : AppCompatActivity(){
                 .replace(R.id.container, CardFieldFragmentImplFragment())
                 .commit()
     }
-}
+}
diff --git a/app/src/main/java/com/sdkpay/ecom/examples/KotlinTokenAnimatedCardFieldActivity.kt b/app/src/main/java/com/sdkpay/ecom/examples/KotlinTokenAnimatedCardFieldActivity.kt
@@ -83,7 +83,8 @@ class KotlinTokenAnimatedCardFieldActivity : AppCompatActivity(), Observer<Payme
         cardFieldPayment.accountHolder = accountHolder
 
         val cardToken = CardToken()
-        cardToken.tokenId = "4304509873471003"
+        cardToken.tokenId = "5427317855871006"
+        cardToken.maskedAccountNumber = "541333******1006"
         cardFieldPayment.cardToken = cardToken
 
         return cardFieldPayment

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/TokenAnimatedCardFieldActivity.java b/app/src/main/java/com/sdkpay/ecom/examples/TokenAnimatedCardFieldActivity.java
@@ -92,7 +92,8 @@ public CardFieldPayment getCardFormPayment(CardBundle cardBundle) {
         cardFieldPayment.setAccountHolder(accountHolder);
 
         CardToken cardToken = new CardToken();
-        cardToken.setTokenId("5500971586101006");
+        cardToken.setTokenId("5427317855871006");
+        cardToken.setMaskedAccountNumber("541333******1006");
         cardFieldPayment.setCardToken(cardToken);
 
         return cardFieldPayment;

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/providers/PaymentObjectProvider.java b/app/src/main/java/com/sdkpay/ecom/examples/providers/PaymentObjectProvider.java
@@ -121,7 +121,7 @@ public CardPayment getCardTokenPayment() {
         cardPayment.setRequireManualCardBrandSelection(true);
 
         CardToken cardToken = new CardToken();
-        cardToken.setTokenId("5500971586101006");
+        cardToken.setTokenId("5427317855871006");
         cardToken.setMaskedAccountNumber("541333******1006");
 
         cardPayment.setCardToken(cardToken);

diff --git a/app/src/test/java/com/sdkpay/ecom/examples/ExampleUnitTest.java b/app/src/test/java/com/sdkpay/ecom/examples/ExampleUnitTest.java
-Original file line number
+Diff line change
@@ Expand Up @@
                 activity?.findViewById<View>(R.id.progress)?.visibility = View.GONE
             }
         }
-    }
+    }