Skip to content

Commit 8c4811a

Browse files
committed
Add expolib_v1 prefix to okhttp3
1 parent fa38cd5 commit 8c4811a

File tree

6 files changed

+29
-35
lines changed

6 files changed

+29
-35
lines changed

android/src/main/java/com/RNFetchBlob/RNFetchBlob.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import com.facebook.react.modules.network.ForwardingCookieHandler;
2121
import com.facebook.react.modules.network.CookieJarContainer;
2222
import com.facebook.react.modules.network.OkHttpClientProvider;
23-
import okhttp3.OkHttpClient;
24-
import okhttp3.JavaNetCookieJar;
23+
import expolib_v1.okhttp3.OkHttpClient;
24+
import expolib_v1.okhttp3.JavaNetCookieJar;
2525

2626
import java.util.HashMap;
2727
import java.util.Map;

android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
package com.RNFetchBlob;
22

33
import android.util.Base64;
4-
54
import com.facebook.react.bridge.Arguments;
65
import com.facebook.react.bridge.ReactApplicationContext;
76
import com.facebook.react.bridge.ReadableArray;
87
import com.facebook.react.bridge.ReadableMap;
98
import com.facebook.react.bridge.WritableMap;
10-
import com.facebook.react.modules.core.DeviceEventManagerModule;
11-
129
import java.io.ByteArrayInputStream;
1310
import java.io.File;
1411
import java.io.FileInputStream;
1512
import java.io.FileOutputStream;
1613
import java.io.IOException;
1714
import java.io.InputStream;
1815
import java.util.ArrayList;
19-
20-
import okhttp3.MediaType;
21-
import okhttp3.RequestBody;
16+
import expolib_v1.okhttp3.MediaType;
2217
import okio.BufferedSink;
2318

19+
20+
21+
2422
public class RNFetchBlobBody extends RequestBody{
2523

2624
InputStream requestStream;

android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@
4343

4444
import java.util.concurrent.TimeUnit;
4545

46-
import okhttp3.Call;
47-
import okhttp3.ConnectionPool;
48-
import okhttp3.ConnectionSpec;
49-
import okhttp3.Headers;
50-
import okhttp3.Interceptor;
51-
import okhttp3.MediaType;
52-
import okhttp3.OkHttpClient;
53-
import okhttp3.Request;
54-
import okhttp3.RequestBody;
55-
import okhttp3.Response;
56-
import okhttp3.ResponseBody;
57-
import okhttp3.TlsVersion;
46+
import expolib_v1.okhttp3.Call;
47+
import expolib_v1.okhttp3.ConnectionPool;
48+
import expolib_v1.okhttp3.ConnectionSpec;
49+
import expolib_v1.okhttp3.Headers;
50+
import expolib_v1.okhttp3.Interceptor;
51+
import expolib_v1.okhttp3.MediaType;
52+
import expolib_v1.okhttp3.OkHttpClient;
53+
import expolib_v1.okhttp3.Request;
54+
import expolib_v1.okhttp3.RequestBody;
55+
import expolib_v1.okhttp3.Response;
56+
import expolib_v1.okhttp3.ResponseBody;
57+
import expolib_v1.okhttp3.TlsVersion;
5858

5959

6060
public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
@@ -380,7 +380,7 @@ public Response intercept(Chain chain) throws IOException {
380380

381381
Call call = client.newCall(req);
382382
taskTable.put(taskId, call);
383-
call.enqueue(new okhttp3.Callback() {
383+
call.enqueue(new expolib_v1.okhttp3.Callback() {
384384

385385
@Override
386386
public void onFailure(Call call, IOException e) {

android/src/main/java/com/RNFetchBlob/RNFetchBlobUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
import javax.net.ssl.TrustManager;
1515
import javax.net.ssl.X509TrustManager;
1616

17-
import okhttp3.OkHttpClient;
18-
17+
import expolib_v1.okhttp3.OkHttpClient;
1918

2019
public class RNFetchBlobUtils {
2120

android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobDefaultResp.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@
66
import com.facebook.react.bridge.Arguments;
77
import com.facebook.react.bridge.ReactApplicationContext;
88
import com.facebook.react.bridge.WritableMap;
9-
import com.facebook.react.modules.core.DeviceEventManagerModule;
10-
119
import java.io.IOException;
1210
import java.nio.charset.Charset;
13-
14-
import okhttp3.MediaType;
15-
import okhttp3.ResponseBody;
11+
import expolib_v1.okhttp3.MediaType;
12+
import expolib_v1.okhttp3.ResponseBody;
1613
import okio.Buffer;
1714
import okio.BufferedSource;
1815
import okio.Okio;
1916
import okio.Source;
2017
import okio.Timeout;
2118

19+
20+
2221
/**
2322
* Created by wkh237 on 2016/7/11.
2423
*/

android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
package com.RNFetchBlob.Response;
22

3-
import android.util.Log;
4-
53
import com.RNFetchBlob.RNFetchBlobConst;
64
import com.RNFetchBlob.RNFetchBlobProgressConfig;
75
import com.RNFetchBlob.RNFetchBlobReq;
86
import com.facebook.react.bridge.Arguments;
97
import com.facebook.react.bridge.ReactApplicationContext;
108
import com.facebook.react.bridge.WritableMap;
11-
import com.facebook.react.modules.core.DeviceEventManagerModule;
12-
139
import java.io.File;
1410
import java.io.FileOutputStream;
1511
import java.io.IOException;
16-
17-
import okhttp3.MediaType;
18-
import okhttp3.ResponseBody;
12+
import expolib_v1.okhttp3.MediaType;
13+
import expolib_v1.okhttp3.ResponseBody;
1914
import okio.Buffer;
2015
import okio.BufferedSource;
2116
import okio.Okio;
2217
import okio.Source;
2318
import okio.Timeout;
2419

20+
21+
22+
2523
/**
2624
* Created by wkh237 on 2016/7/11.
2725
*/

0 commit comments

Comments
 (0)