Update paydirect descriptions and icons to griopay (#163)

### What's new?

Changed the old paydirekt description and icons to giropay description and logo. 
Changed classes and functions naming from paydirekt to giropay.
Fixed bug causing the app to crash due to a missing project id, then navigation to the GiropayInputFragment

Author: Fabtron

CHANGELOG.md

@@ -3,10 +3,22 @@ All notable changes to this project will be documented in this file.
 
 ## UNRELEASED
 ### Added
-### Changed
+### Changed 
 ### Removed
 ### Fixed
 
+## [0.72.0]
+### Changed
+* core/ui : Update icons and description from paydirekt to GiroPay
+  * The use of the following functions changed:
+    * PaydirektInputActivity/Fragment/View changed to GirpayInputActivity/Fragment/View
+    * PaymentCredentials.fromPaydirekt(...)  changed to PaymentCredentials.fromGiropay(...)
+    * PaydirektAuthorizationData changed to GiropayAuthorizationData and is now a data class
+    * PaydirektData changed to GiropayData and is now a data class
+    * The UI event for paydirekt changed from SHOW_PAYDIREKT_INPUT to SHOW_GIROPAY_INPUT
+* ### Fixed
+* ui: Fixed crash caused by missing project id when calling the PaydirektInputFragment via the PaymentInputViewHelper
+
 ## [0.71.8]
 ### Changed
 * Use nio API desugaring instead of the default variant (#159)

core/src/main/java/io/snabble/sdk/PaymentMethod.kt

@@ -124,7 +124,7 @@ enum class PaymentMethod(
     ),
 
     @SerializedName("paydirektOneKlick")
-    PAYDIREKT(
+    GIROPAY(
         id = "paydirektOneKlick",
         isOfflineMethod = false,
         isRequiringCredentials = true,

core/src/main/java/io/snabble/sdk/Snabble.kt

@@ -221,7 +221,7 @@ object Snabble {
     /**
      * Url for generating payone web form authentication challenges
      */
-    var paydirektAuthUrl: String? = null
+    var giropayAuthUrl: String? = null
         private set
 
     /**
@@ -525,7 +525,7 @@ object Snabble {
             createAppUserUrl = getUrl(jsonObject, "createAppUser")
             telecashSecretUrl = getUrl(jsonObject, "telecashSecret")
             telecashPreAuthUrl = getUrl(jsonObject, "telecashPreauth")
-            paydirektAuthUrl = getUrl(jsonObject, "paydirektCustomerAuthorization")
+            giropayAuthUrl = getUrl(jsonObject, "paydirektCustomerAuthorization")
             if (jsonObject.has("brands")) {
                 parseBrands(jsonObject)
             }

core/src/main/java/io/snabble/sdk/checkout/DefaultCheckoutApi.kt

@@ -228,7 +228,7 @@ class DefaultCheckoutApi(private val project: Project,
                         cardNumber = paymentCredentials.obfuscatedId,
                     )
                 }
-                PaymentCredentials.Type.PAYDIREKT -> {
+                PaymentCredentials.Type.GIROPAY -> {
                     PaymentInformation(
                         originType = paymentCredentials.type.originType,
                         encryptedOrigin = paymentCredentials.encryptedData,

core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java

@@ -38,6 +38,8 @@
 import io.snabble.sdk.PaymentMethod;
 import io.snabble.sdk.R;
 import io.snabble.sdk.Snabble;
+import io.snabble.sdk.payment.data.GiropayAuthorizationData;
+import io.snabble.sdk.payment.data.GiropayData;
 import io.snabble.sdk.payment.externalbilling.data.ExternalBillingPaymentCredentials;
 import io.snabble.sdk.payment.payone.sepa.PayoneSepaData;
 import io.snabble.sdk.utils.GsonHolder;
@@ -57,7 +59,7 @@ public enum Type {
         @Deprecated
         CREDIT_CARD(null, true, Arrays.asList(PaymentMethod.VISA, PaymentMethod.MASTERCARD, PaymentMethod.AMEX)),
         CREDIT_CARD_PSD2(null, true, Arrays.asList(PaymentMethod.VISA, PaymentMethod.MASTERCARD, PaymentMethod.AMEX)),
-        PAYDIREKT(null, false, Collections.singletonList(PaymentMethod.PAYDIREKT)),
+        GIROPAY(null, false, Collections.singletonList(PaymentMethod.GIROPAY)),
         TEGUT_EMPLOYEE_CARD("tegutEmployeeID", false, Collections.singletonList(PaymentMethod.TEGUT_EMPLOYEE_CARD)),
         LEINWEBER_CUSTOMER_ID("leinweberCustomerID", false, Collections.singletonList(PaymentMethod.LEINWEBER_CUSTOMER_ID)),
         DATATRANS("datatransAlias", true, Arrays.asList(PaymentMethod.TWINT, PaymentMethod.POST_FINANCE_CARD)),
@@ -146,12 +148,6 @@ private static class CreditCardData {
         private String cardType;
     }
 
-    private static class PaydirektData {
-        private String clientID;
-        private String customerAuthorizationURI;
-        private PaydirektAuthorizationData authorizationData;
-    }
-
     private static class DatatransData {
         private String alias;
         private String expiryMonth;
@@ -170,17 +166,6 @@ private static class PayoneData {
         private final String userID;
     }
 
-    @RestrictTo(RestrictTo.Scope.LIBRARY)
-    public static class PaydirektAuthorizationData {
-        public String id;
-        public String name;
-        public String ipAddress;
-        public String fingerprint;
-        public String redirectUrlAfterSuccess;
-        public String redirectUrlAfterCancellation;
-        public String redirectUrlAfterFailure;
-    }
-
     private static class TegutEmployeeCard {
         private String cardNumber;
     }
@@ -395,27 +380,28 @@ private static long parseValidTo(String format, String expirationDate) {
     /**
      * Encrypts and stores a paydirekt authorization token.
      */
-    public static PaymentCredentials fromPaydirekt(PaydirektAuthorizationData authorizationData, String customerAuthorizationURI) {
+    public static PaymentCredentials fromGiropay(GiropayAuthorizationData authorizationData, String customerAuthorizationURI) {
         if (customerAuthorizationURI == null) {
             return null;
         }
 
         PaymentCredentials pc = new PaymentCredentials();
         pc.generateId();
-        pc.type = Type.PAYDIREKT;
+        pc.type = Type.GIROPAY;
 
         List<X509Certificate> certificates = Snabble.getInstance().getPaymentCertificates();
         if (certificates.size() == 0) {
             return null;
         }
 
-        pc.obfuscatedId = "paydirekt";
-
-        PaydirektData paydirektData = new PaydirektData();
-        paydirektData.clientID = Snabble.getInstance().getClientId();
-        paydirektData.customerAuthorizationURI = customerAuthorizationURI;
+        pc.obfuscatedId = "giropay";
+        GiropayData data = new GiropayData(
+                Snabble.getInstance().getClientId(),
+                customerAuthorizationURI,
+                null
+        );
 
-        String json = GsonHolder.get().toJson(paydirektData, PaydirektData.class);
+        String json = GsonHolder.get().toJson(data, GiropayData.class);
 
         X509Certificate certificate = certificates.get(0);
         pc.rsaEncryptedData = pc.rsaEncrypt(certificate, json.getBytes());
@@ -908,8 +894,8 @@ public PaymentMethod getPaymentMethod() {
             return PaymentMethod.TEGUT_EMPLOYEE_CARD;
         } else if (type == Type.LEINWEBER_CUSTOMER_ID) {
             return PaymentMethod.LEINWEBER_CUSTOMER_ID;
-        } else if (type == Type.PAYDIREKT) {
-            return PaymentMethod.PAYDIREKT;
+        } else if (type == Type.GIROPAY) {
+            return PaymentMethod.GIROPAY;
         } else if (type == Type.EXTERNAL_BILLING) {
             return PaymentMethod.EXTERNAL_BILLING;
         } else if (type == Type.CREDIT_CARD_PSD2

core/src/main/java/io/snabble/sdk/payment/data/GiropayAuthorizationData.kt

@@ -0,0 +1,11 @@
+package io.snabble.sdk.payment.data
+
+data class GiropayAuthorizationData(
+    @JvmField val id: String,
+    @JvmField val name: String,
+    @JvmField val ipAddress: String,
+    @JvmField val fingerprint: String,
+    @JvmField val redirectUrlAfterSuccess: String,
+    @JvmField val redirectUrlAfterCancellation: String,
+    @JvmField val redirectUrlAfterFailure: String
+)

core/src/main/java/io/snabble/sdk/payment/data/GiropayData.kt

@@ -0,0 +1,8 @@
+package io.snabble.sdk.payment.data
+
+data class GiropayData(
+    @JvmField val clientID: String?,
+    @JvmField val customerAuthorizationURI: String,
+    @JvmField val authorizationData: GiropayAuthorizationData? = null,
+)
+

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 compileSdk = "33"
 targetSdk = "32"
 minSdk = "21"
-gradlePlugin = "8.1.1"
+gradlePlugin = "8.1.4"
 desugarVersion = "1.1.5"
 okhttpVersion = "4.10.0"
 # @pin always, manually updated to ensure overall dependency support

kotlin-sample/src/main/java/io/snabble/sdk/sample/SnabbleUiEventHandler.kt

@@ -44,9 +44,9 @@ fun setUpUiEvents(activity: AppCompatActivity, navController: NavController, bot
     }
     SnabbleUI.setUiAction(
         activity,
-        SnabbleUI.Event.SHOW_PAYDIREKT_INPUT
+        SnabbleUI.Event.SHOW_GIROPAY_INPUT
     ) { _, args ->
-        navController.navigate(R.id.navigation_paydirekt_input, args)
+        navController.navigate(R.id.navigation_giropay_input, args)
     }
     SnabbleUI.setUiAction(
         activity,

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

@@ -156,9 +156,9 @@
         android:label="Checkout" />
 
     <fragment
-        android:id="@+id/navigation_paydirekt_input"
-        android:name="io.snabble.sdk.ui.payment.PaydirektInputFragment"
-        android:label="Paydirekt" />
+        android:id="@+id/navigation_giropay_input"
+        android:name="io.snabble.sdk.ui.payment.GiropayInputFragment"
+        android:label="@string/Snabble.Giropay.title" />
     <fragment
         android:id="@+id/navigation_payone_input"
         android:name="io.snabble.sdk.ui.payment.PayoneInputFragment"