Skip to content

Commit 19e30c9

Browse files
committed
upgrade okhttp
1 parent 1105519 commit 19e30c9

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

android/src/main/java/com/pw/droplet/braintree/Braintree.java

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,32 @@ public void setToken(String token) {
7474

7575
@ReactMethod
7676
public void setup(final String url, final Callback successCallback, final Callback errorCallback) {
77-
78-
79-
OkHttpClient client = new OkHttpClient.newBuilder()
77+
String res = "";
78+
try {
79+
OkHttpClient client = new OkHttpClient.Builder()
8080
.connectTimeout(30, TimeUnit.SECONDS)
8181
.writeTimeout(30, TimeUnit.SECONDS)
8282
.readTimeout(30, TimeUnit.SECONDS)
8383
.build();
8484
Request request = new Request.Builder()
8585
.url(url)
8686
.build();
87-
try {
87+
8888
Response response = client.newCall(request).execute();
89-
String res = response.body().string();
89+
90+
res= response.body().string();
91+
}catch(IOException e){
92+
Log.e("PAYMENT_REQUEST", "I got an error", e);
93+
errorCallback.invoke(e.getMessage());
94+
}
95+
try{
9096
this.mBraintreeFragment = BraintreeFragment.newInstance((AppCompatActivity) getCurrentActivity(), res);
91-
}catch(IOException e){
97+
}catch(InvalidArgumentException e){
9298
Log.e("PAYMENT_REQUEST", "I got an error", e);
99+
errorCallback.invoke(e.getMessage());
93100
}
94101
if(this.mBraintreeFragment instanceof BraintreeFragment){
95-
try {
102+
// try {
96103
this.mBraintreeFragment.addListener(new BraintreeCancelListener() {
97104
@Override
98105
public void onCancel(int requestCode) {
@@ -159,10 +166,10 @@ public void onError(Exception error) {
159166
});
160167
this.setToken(token);
161168
successCallback.invoke(this.getToken());
162-
} catch (InvalidArgumentException e) {
163-
Log.e("PAYMENT_REQUEST", "I got an error", e);
164-
errorCallback.invoke(e.getMessage());
165-
}
169+
// } catch (IOException e) {
170+
// Log.e("PAYMENT_REQUEST", "I got an error", e);
171+
// errorCallback.invoke(e.getMessage());
172+
// }
166173
}
167174
}
168175

0 commit comments

Comments
 (0)