The year already contains 4 digits, remove the unnecessary formatting

Author: JlUgia

java/app/src/main/java/com/google/android/gms/samples/wallet/activity/CheckoutActivity.java

@@ -20,7 +20,6 @@
 import android.app.AlertDialog;
 import android.app.PendingIntent;
 import android.content.Intent;
-import android.content.IntentSender;
 import android.content.IntentSender.SendIntentException;
 import android.os.Bundle;
 import android.text.Html;
@@ -39,14 +38,11 @@
 import com.google.android.gms.samples.wallet.util.Json;
 import com.google.android.gms.samples.wallet.util.PaymentsUtil;
 import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.wallet.AutoResolveHelper;
 import com.google.android.gms.wallet.CreditCardExpirationDate;
 import com.google.android.gms.wallet.IsReadyToPayRequest;
 import com.google.android.gms.wallet.PaymentCardRecognitionIntentRequest;
-import com.google.android.gms.wallet.PaymentCardRecognitionIntentResponse;
 import com.google.android.gms.wallet.PaymentCardRecognitionResult;
 import com.google.android.gms.wallet.PaymentData;
 import com.google.android.gms.wallet.PaymentDataRequest;
@@ -170,21 +166,10 @@ private void initializeUi() {
 
     // The Google Pay button is a layout file – take the root view
     googlePayButton = layoutBinding.googlePayButton.getRoot();
-    googlePayButton.setOnClickListener(
-        new View.OnClickListener() {
-          @Override
-          public void onClick(View view) {
-            requestPayment(view);
-          }
-        });
+    googlePayButton.setOnClickListener(this::requestPayment);
 
     paymentCardOcrButton = layoutBinding.paymentCardOcrButton;
-    paymentCardOcrButton.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        startPaymentCardOcr(view);
-      }
-    });
+    paymentCardOcrButton.setOnClickListener(this::startPaymentCardOcr);
   }
 
   private void displayGarment(JSONObject garment) throws JSONException {
@@ -220,16 +205,13 @@ private void possiblyShowGooglePayButton() {
     // The call to isReadyToPay is asynchronous and returns a Task. We need to provide an
     // OnCompleteListener to be triggered when the result of the call is known.
     IsReadyToPayRequest request = IsReadyToPayRequest.fromJson(isReadyToPayJson.get().toString());
-    Task<Boolean> task = paymentsClient.isReadyToPay(request);
-    task.addOnCompleteListener(this,
-        new OnCompleteListener<Boolean>() {
-          @Override
-          public void onComplete(@NonNull Task<Boolean> task) {
-            if (task.isSuccessful()) {
-              setGooglePayAvailable(task.getResult());
-            } else {
-              Log.w("isReadyToPay failed", task.getException());
-            }
+    Task<Boolean> requestTask = paymentsClient.isReadyToPay(request);
+    requestTask.addOnCompleteListener(this,
+        task -> {
+          if (task.isSuccessful()) {
+            setGooglePayAvailable(task.getResult());
+          } else {
+            Log.w("isReadyToPay failed", task.getException());
           }
         });
   }
@@ -307,7 +289,7 @@ private void handleCardRecognitionSuccess(PaymentCardRecognitionResult cardResul
     CreditCardExpirationDate cardExpirationDate = cardResult.getCreditCardExpirationDate();
     if(cardExpirationDate != null) {
       expirationDate = String.format(locale,
-          "%02d/%02d", cardExpirationDate.getMonth(), cardExpirationDate.getYear());
+          "%02d/%d", cardExpirationDate.getMonth(), cardExpirationDate.getYear());
     }
 
     String cardResultString = String.format(locale,

kotlin/app/src/main/java/com/google/android/gms/samples/wallet/CheckoutActivity.kt

@@ -34,6 +34,7 @@ import kotlinx.android.synthetic.main.activity_checkout.*
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
+import kotlin.math.roundToInt
 import kotlin.math.roundToLong
 
 
@@ -288,7 +289,7 @@ class CheckoutActivity : Activity() {
             )
 
         } catch (e: JSONException) {
-            Log.e("handlePaymentSuccess", "Error: " + e.toString())
+            Log.e("handlePaymentSuccess", "Error: $e")
         }
 
     }
@@ -309,13 +310,13 @@ class CheckoutActivity : Activity() {
     /**
      * Parses the results from the payment card recognition API and displays a toast.
      *
-     * @param paymentCardRecognitionResult Result object from the payment card recognition API.
+     * @param cardRecognitionResult Result object from the payment card recognition API.
      */
     private fun handlePaymentCardRecognitionSuccess(
         cardRecognitionResult: PaymentCardRecognitionResult
     ) {
         val creditCardExpirationDate = cardRecognitionResult.creditCardExpirationDate
-        val expirationDate = creditCardExpirationDate?.let { "%02d/%02d".format(it.month, it.year) }
+        val expirationDate = creditCardExpirationDate?.let { "%02d/%d".format(it.month, it.year) }
         val cardResultText = "PAN: ${cardRecognitionResult.pan}\nExpiration date: $expirationDate"
         Toast.makeText(this, cardResultText, Toast.LENGTH_LONG).show()
     }
@@ -333,7 +334,7 @@ class CheckoutActivity : Activity() {
             garmentList = Json.readFromResources(this, R.raw.tshirts)
         }
 
-        val randomIndex: Int = Math.round(Math.random() * (garmentList.length() - 1)).toInt()
+        val randomIndex: Int = (Math.random() * (garmentList.length() - 1)).roundToInt()
         return garmentList.getJSONObject(randomIndex)
     }