From 69db5e78bc5b23524694f00c75c04701b6b368c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mustafa=20ic=CC=A7men?= <mustafaicmen@gmail.com>
Date: Mon, 4 Sep 2023 23:35:36 +0200
Subject: [PATCH] hostname verifier fixx 2023 for braintree paypal

---
 .idea/jarRepositories.xml                                 | 5 +++++
 app/build.gradle                                          | 8 +++-----
 .../pizzalemon/android/activity/CreateOrderActivity.java  | 2 +-
 .../fragment/createOrder/CreateOrderSummaryFragment.java  | 3 ++-
 build.gradle                                              | 7 +++++++
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 4bce59a..d347497 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -46,5 +46,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://www.jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://cardinalcommerceprod.jfrog.io/artifactory/android" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index cda433d..75208a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,7 +18,7 @@ android {
     compileSdkVersion 33
     defaultConfig {
         applicationId "ch.pizzalemon.android"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode  27// play store'daki version --> canlı: 0  - dahili test: 17
         versionName "2.07"   // play store'daki version --> canlı: 0.00 -  dahili test: 1.17
@@ -77,12 +77,10 @@ dependencies {
     implementation 'io.github.inflationx:viewpump:2.0.3'
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
     implementation 'q.rorbin:badgeview:1.1.3'
-    implementation 'com.braintreepayments.api:braintree:2.22.0'
     implementation 'org.jsoup:jsoup:1.14.2'
     implementation 'me.relex:circleindicator:2.1.6'
-    implementation('com.braintreepayments.api:drop-in:3.7.1') {
-        exclude group: 'com.braintreepayments.api', module: 'braintree'
-    }
+    implementation 'com.braintreepayments.api:braintree:3.20.1'
+    implementation 'com.braintreepayments.api:drop-in:5.4.1'
 
     testImplementation 'junit:junit:4.13.2'
 }
diff --git a/app/src/main/java/ch/pizzalemon/android/activity/CreateOrderActivity.java b/app/src/main/java/ch/pizzalemon/android/activity/CreateOrderActivity.java
index f77a451..ed16bfc 100644
--- a/app/src/main/java/ch/pizzalemon/android/activity/CreateOrderActivity.java
+++ b/app/src/main/java/ch/pizzalemon/android/activity/CreateOrderActivity.java
@@ -218,7 +218,7 @@ public class CreateOrderActivity extends BaseActivity {
             case PAYPAL:
                 paymentMethodCode = ApiConstants.PAYMENT_METHOD_CODE_PAYPAL;
                 break;
-            case ANDROID_PAY:
+            case GOOGLE_PAYMENT:
                 paymentMethodCode = ApiConstants.PAYMENT_METHOD_CODE_ANDROID_PAY;
                 break;
             default:
diff --git a/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java
index 1c2f45d..7722510 100644
--- a/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -933,8 +933,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                 .clientToken(braintreePaymentTokenModel.getToken())
                 .requestThreeDSecureVerification(true)
                 .amount(amountStringForBraintree)
-                .disableAndroidPay()
+                .disableGooglePayment()
                 //.paypalRequest(paypalRequest)
+                .disablePayPal()
                 .disableVenmo();
 
 
diff --git a/build.gradle b/build.gradle
index 4382f1a..775dfe6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,6 +24,13 @@ allprojects {
         //maven { url 'https://jitpack.io' } https://stackoverflow.com/questions/50791632/could-not-find-any-version-that-matches-com-google-android-gmsplay-services-bas
         maven { url "https://www.jitpack.io" }
         maven { url "https://maven.google.com" }
+        maven {
+            url "https://cardinalcommerceprod.jfrog.io/artifactory/android"
+            credentials {
+                username 'braintree_team_sdk'
+                password 'AKCp8jQcoDy2hxSWhDAUQKXLDPDx6NYRkqrgFLRc3qDrayg6rrCbJpsKKyMwaykVL8FWusJpp'
+            }
+        }
         flatDir {
             dirs 'libs'
         }