Merge pull request #17 from snabble/datatrans-update

Update Datatrans SDK and other dependencies

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.60.2]
+
+### Changed
+- Updated Datatrans SDK and other dependencies
+
 ## [0.60.1]
 
 ### Added

build.gradle

@@ -27,11 +27,11 @@ allprojects {
         google()
         mavenCentral()
         maven { url 'https://jitpack.io' }
-        maven { url 'https://datatrans.jfrog.io/artifactory/mobile-sdk/'}
+        maven { url 'https://datatrans.jfrog.io/artifactory/mobile-sdk/' }
     }
 
     project.ext {
-        sdkVersion='0.60.1'
+        sdkVersion='0.60.2'
         versionCode=1
 
         compileSdkVersion=31

settings.gradle

@@ -1,6 +1,6 @@
 pluginManagement {
     plugins {
-        id "org.jetbrains.dokka" version "1.5.30"
+        id "org.jetbrains.dokka" version "1.6.10"
     }
 }
 

ui/build.gradle

@@ -54,19 +54,19 @@ dependencies {
     implementation project(':core')
 
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.webkit:webkit:1.4.0'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    implementation 'com.google.android.material:material:1.5.0-beta01'
+    implementation 'com.google.android.material:material:1.5.0'
     implementation 'com.github.google:flexbox-layout:2.0.1'
     implementation 'me.relex:circleindicator:2.1.6'
-    implementation 'ch.datatrans:android-sdk:1.4.3'
-    implementation 'com.google.android.gms:play-services-wallet:18.1.3'
+    implementation 'ch.datatrans:android-sdk:1.5.0'
+    implementation 'com.google.android.gms:play-services-wallet:19.1.0'
     implementation 'eu.rekisoft.android.util:LazyWorker:2.1.0'
-    implementation 'androidx.biometric:biometric:1.2.0-alpha03'
+    implementation 'androidx.biometric:biometric:1.2.0-alpha04'
 
     def camerax_version = '1.0.2'
     implementation "androidx.camera:camera-core:${camerax_version}"
@@ -75,7 +75,7 @@ dependencies {
     implementation "androidx.camera:camera-view:1.0.0-alpha30"
     implementation "androidx.camera:camera-extensions:1.0.0-alpha30"
 
-    def navigation_version = '2.3.5'
+    def navigation_version = '2.4.0'
     implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"

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

@@ -74,7 +74,7 @@ class CheckoutActivity : FragmentActivity() {
             finish()
             return
         } else {
-            navGraph.startDestination = startDestinationId
+            navGraph.setStartDestination(startDestinationId)
         }
 
         navController.graph = navGraph

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

@@ -10,8 +10,8 @@ import ch.datatrans.payment.api.TransactionListener
 import ch.datatrans.payment.api.TransactionRegistry
 import ch.datatrans.payment.api.TransactionSuccess
 import ch.datatrans.payment.exception.TransactionException
-import ch.datatrans.payment.paymentmethods.CardToken
-import ch.datatrans.payment.paymentmethods.PostFinanceCardToken
+import ch.datatrans.payment.paymentmethods.SavedCard
+import ch.datatrans.payment.paymentmethods.SavedPostFinanceCard
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
@@ -111,18 +111,18 @@ object Datatrans {
         transaction.listener = object : TransactionListener {
             override fun onTransactionSuccess(result: TransactionSuccess) {
                 activity.runOnUiThreadWhenResumed {
-                    val token = result.paymentMethodToken
+                    val token = result.savedPaymentMethod
                     var month = ""
                     var year = ""
 
                     when (token) {
-                        is PostFinanceCardToken -> {
+                        is SavedPostFinanceCard -> {
                             token.cardExpiryDate?.let {
                                 month = it.formattedMonth
                                 year = it.formattedYear
                             }
                         }
-                        is CardToken -> {
+                        is SavedCard -> {
                             token.cardExpiryDate?.let {
                                 month = it.formattedMonth
                                 year = it.formattedYear
@@ -135,9 +135,9 @@ object Datatrans {
                             override fun success() {
                                 val store = Snabble.getInstance().paymentCredentialsStore
                                 val credentials = PaymentCredentials.fromDatatrans(
-                                    token.token,
+                                    token.alias,
                                     PaymentCredentials.Brand.fromPaymentMethod(paymentMethod),
-                                    result.paymentMethodToken?.getDisplayTitle(activity),
+                                    result.savedPaymentMethod?.getDisplayTitle(activity),
                                     month,
                                     year,
                                     project.id,

ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java

@@ -7,6 +7,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -198,7 +199,7 @@ private static class Entry {
         }
     }
 
-    private class ViewHolder extends RecyclerView.ViewHolder {
+    private static class ViewHolder extends RecyclerView.ViewHolder {
         TextView text;
         ImageView image;
 
@@ -211,14 +212,15 @@ private class ViewHolder extends RecyclerView.ViewHolder {
     }
 
     private class Adapter extends RecyclerView.Adapter<SelectPaymentMethodFragment.ViewHolder> {
+        @NonNull
         @Override
-        public SelectPaymentMethodFragment.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        public SelectPaymentMethodFragment.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
             View v = LayoutInflater.from(getContext()).inflate(R.layout.snabble_item_payment_credentials_select, parent, false);
-            return new SelectPaymentMethodFragment.ViewHolder(v);
+            return new ViewHolder(v);
         }
 
         @Override
-        public void onBindViewHolder(final SelectPaymentMethodFragment.ViewHolder holder, final int position) {
+        public void onBindViewHolder(@NonNull final SelectPaymentMethodFragment.ViewHolder holder, final int position) {
             SelectPaymentMethodFragment.Entry e = entries.get(position);
 
             if (e.drawableRes != 0) {
@@ -234,5 +236,4 @@ public int getItemCount() {
             return entries.size();
         }
     }
-}
-
+}