Skip to content

Commit 50a5f4a

Browse files
committed
feat: export getClient for use with ui-image plugin
1 parent dff1c3a commit 50a5f4a

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/request.android.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ export function setCache(options?: CacheOptions) {
3030
cache = null;
3131
}
3232
if (Client) {
33-
getClient(true);
33+
//we need to force a new client for the builder to use cache
34+
getClient(undefined, true);
3435
}
3536
}
3637
export function clearCache() {
@@ -221,18 +222,18 @@ export function enableSSLPinning(options: HttpsSSLPinningOptions) {
221222
}
222223
}
223224
peer.enabled = true;
224-
getClient(true);
225+
getClient(undefined, true);
225226
}
226227

227228
export function disableSSLPinning() {
228229
peer.enabled = false;
229-
getClient(true);
230+
getClient(undefined, true);
230231
}
231232

232233
let Client: okhttp3.OkHttpClient;
233234
let cookieJar: com.nativescript.https.QuotePreservingCookieJar;
234235
let cookieManager: java.net.CookieManager;
235-
function getClient(reload: boolean = false, opts: Partial<HttpsRequestOptions> = {}): okhttp3.OkHttpClient {
236+
export function getClient(opts: Partial<HttpsRequestOptions> = {}, reload: boolean = false): okhttp3.OkHttpClient {
236237
if (!Client) {
237238
// ssl error fix on KitKat. Only need to be done once.
238239
// client will be null only onced so will run only once
@@ -409,7 +410,7 @@ const runningClients: { [k: string]: okhttp3.OkHttpClient } = {};
409410

410411
let OkHttpResponse: typeof com.nativescript.https.OkHttpResponse;
411412
export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = true): HttpsRequest {
412-
const client = getClient(false, opts);
413+
const client = getClient(opts, false);
413414

414415
const request = new okhttp3.Request.Builder();
415416
request.url(opts.url);

src/request.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,6 @@ export function clearCache();
110110
export function createRequest(opts: HttpsRequestOptions): HttpsRequest;
111111
export function cancelRequest(tag: string);
112112
export function addNetworkInterceptor(interceptor);
113+
114+
export function getClient(opts: Partial<HttpsRequestOptions>);
113115
export * from './request.common';

src/request.ios.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,3 +488,7 @@ export function request(opts: HttpsRequestOptions, useLegacy: boolean = true) {
488488
}
489489
});
490490
}
491+
//Android only
492+
export function getClient(opts: Partial<HttpsRequestOptions>) {
493+
return undefined;
494+
}

0 commit comments

Comments
 (0)