Skip to content

Commit 2ba49fe

Browse files
committed
chore: refactor
1 parent 426740f commit 2ba49fe

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/https.android.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,17 @@ function getClient(reload: boolean = false, timeout: number = 10): okhttp3.OkHtt
267267
cookieJar = new com.nativescript.https.QuotePreservingCookieJar(cookieManager);
268268
}
269269

270-
const client = new okhttp3.OkHttpClient.Builder();
271-
Https.interceptors.forEach((interceptor) => client.addInterceptor(interceptor));
272-
Https.networkInterceptors.forEach((interceptor) => client.addNetworkInterceptor(interceptor));
270+
const builder = new okhttp3.OkHttpClient.Builder();
271+
Https.interceptors.forEach((interceptor) => builder.addInterceptor(interceptor));
272+
Https.networkInterceptors.forEach((interceptor) => builder.addNetworkInterceptor(interceptor));
273273
if (peer.enabled === true) {
274274
if (peer.host || peer.certificate) {
275275
const spec = okhttp3.ConnectionSpec.MODERN_TLS;
276-
client.connectionSpecs(java.util.Collections.singletonList(spec));
276+
builder.connectionSpecs(java.util.Collections.singletonList(spec));
277277

278278
const pinner = new okhttp3.CertificatePinner.Builder();
279279
pinner.add(peer.host, [peer.certificate]);
280-
client.certificatePinner(pinner.build());
280+
builder.certificatePinner(pinner.build());
281281

282282
if (peer.allowInvalidCertificates === false) {
283283
try {
@@ -299,15 +299,15 @@ function getClient(reload: boolean = false, timeout: number = 10): okhttp3.OkHtt
299299

300300
const sslContext = javax.net.ssl.SSLContext.getInstance('TLS');
301301
sslContext.init(keyManagers, trustManagerFactory.getTrustManagers(), new java.security.SecureRandom());
302-
client.sslSocketFactory(sslContext.getSocketFactory());
302+
builder.sslSocketFactory(sslContext.getSocketFactory());
303303
} catch (error) {
304304
console.error('@nativescript-community/https > client.allowInvalidCertificates error', error);
305305
}
306306
}
307307

308308
if (peer.validatesDomainName === true) {
309309
try {
310-
client.hostnameVerifier(
310+
builder.hostnameVerifier(
311311
new javax.net.ssl.HostnameVerifier({
312312
verify: (hostname: string, session: javax.net.ssl.SSLSession): boolean => {
313313
const pp = session.getPeerPrincipal().getName();
@@ -330,19 +330,19 @@ function getClient(reload: boolean = false, timeout: number = 10): okhttp3.OkHtt
330330
}
331331

332332
_timeout = timeout;
333-
client.connectTimeout(timeout, java.util.concurrent.TimeUnit.SECONDS).writeTimeout(timeout, java.util.concurrent.TimeUnit.SECONDS).readTimeout(timeout, java.util.concurrent.TimeUnit.SECONDS);
333+
builder.connectTimeout(timeout, java.util.concurrent.TimeUnit.SECONDS).writeTimeout(timeout, java.util.concurrent.TimeUnit.SECONDS).readTimeout(timeout, java.util.concurrent.TimeUnit.SECONDS);
334334

335335
if (cache) {
336-
client.cache(cache);
336+
builder.cache(cache);
337337
if (forceCache) {
338-
client.addInterceptor(new com.nativescript.https.CacheInterceptor());
338+
builder.addInterceptor(new com.nativescript.https.CacheInterceptor());
339339
}
340340
}
341341
if (cookieJar) {
342-
client.cookieJar(cookieJar);
342+
builder.cookieJar(cookieJar);
343343
}
344344

345-
Client = client.build();
345+
Client = builder.build();
346346
return Client;
347347
}
348348

0 commit comments

Comments
 (0)