Merge pull request #7 from ashrafamin91/3.34.6

Enhanced GPay close button response
FiuuPayment · Jul 12, 2024 · 074c0a1 · 074c0a1
2 parents f9c4cf0 + 841ea78
commit 074c0a1
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 82 deletions.
diff --git a/app/src/main/java/com/molpay/molpayxdkproject/MainActivity.java b/app/src/main/java/com/molpay/molpayxdkproject/MainActivity.java
@@ -95,15 +95,19 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data)
     {
         super.onActivityResult(requestCode, resultCode, data);
 
-        Log.e("logGooglePay" , "onActivityResult requestCode = " + requestCode);
-        Log.e("logGooglePay" , "onActivityResult resultCode = " + resultCode);
+        // Log.e("logGooglePay" , "onActivityResult requestCode = " + requestCode);
+        // Log.e("logGooglePay" , "onActivityResult resultCode = " + resultCode);
 
         if (requestCode == MOLPayActivity.MOLPayXDK && data != null){
             if (data.getStringExtra(MOLPayActivity.MOLPayTransactionResult) != null) {
-                Log.d(MOLPayActivity.MOLPAY, "MOLPay result = " + data.getStringExtra(MOLPayActivity.MOLPayTransactionResult));
+                // Log.d(MOLPayActivity.MOLPAY, "MOLPay result = " + data.getStringExtra(MOLPayActivity.MOLPayTransactionResult));
                 TextView tw = findViewById(R.id.resultTV);
                 tw.setText(data.getStringExtra(MOLPayActivity.MOLPayTransactionResult));
             }
+        } else if (requestCode == MOLPayActivity.MOLPayXDK && resultCode == MainActivity.RESULT_CANCELED && data == null) {
+            // Log.e("logGooglePay" , "RESULT_CANCELED data == null");
+            TextView tw = findViewById(R.id.resultTV);
+            tw.setText("data == null");
         }
 
     }