Skip to content

Commit d9418f4

Browse files
committed
Revert "Add expolib_v1 prefix to okhttp3"
This reverts commit 8c4811a.
1 parent 8c4811a commit d9418f4

File tree

6 files changed

+35
-29
lines changed

6 files changed

+35
-29
lines changed

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

+2-2
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 expolib_v1.okhttp3.OkHttpClient;
24-
import expolib_v1.okhttp3.JavaNetCookieJar;
23+
import okhttp3.OkHttpClient;
24+
import okhttp3.JavaNetCookieJar;
2525

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

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
package com.RNFetchBlob;
22

33
import android.util.Base64;
4+
45
import com.facebook.react.bridge.Arguments;
56
import com.facebook.react.bridge.ReactApplicationContext;
67
import com.facebook.react.bridge.ReadableArray;
78
import com.facebook.react.bridge.ReadableMap;
89
import com.facebook.react.bridge.WritableMap;
10+
import com.facebook.react.modules.core.DeviceEventManagerModule;
11+
912
import java.io.ByteArrayInputStream;
1013
import java.io.File;
1114
import java.io.FileInputStream;
1215
import java.io.FileOutputStream;
1316
import java.io.IOException;
1417
import java.io.InputStream;
1518
import java.util.ArrayList;
16-
import expolib_v1.okhttp3.MediaType;
17-
import okio.BufferedSink;
18-
19-
2019

20+
import okhttp3.MediaType;
21+
import okhttp3.RequestBody;
22+
import okio.BufferedSink;
2123

2224
public class RNFetchBlobBody extends RequestBody{
2325

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@
4343

4444
import java.util.concurrent.TimeUnit;
4545

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;
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;
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 expolib_v1.okhttp3.Callback() {
383+
call.enqueue(new okhttp3.Callback() {
384384

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

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

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

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

1920
public class RNFetchBlobUtils {
2021

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
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+
911
import java.io.IOException;
1012
import java.nio.charset.Charset;
11-
import expolib_v1.okhttp3.MediaType;
12-
import expolib_v1.okhttp3.ResponseBody;
13+
14+
import okhttp3.MediaType;
15+
import okhttp3.ResponseBody;
1316
import okio.Buffer;
1417
import okio.BufferedSource;
1518
import okio.Okio;
1619
import okio.Source;
1720
import okio.Timeout;
1821

19-
20-
2122
/**
2223
* Created by wkh237 on 2016/7/11.
2324
*/

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
package com.RNFetchBlob.Response;
22

3+
import android.util.Log;
4+
35
import com.RNFetchBlob.RNFetchBlobConst;
46
import com.RNFetchBlob.RNFetchBlobProgressConfig;
57
import com.RNFetchBlob.RNFetchBlobReq;
68
import com.facebook.react.bridge.Arguments;
79
import com.facebook.react.bridge.ReactApplicationContext;
810
import com.facebook.react.bridge.WritableMap;
11+
import com.facebook.react.modules.core.DeviceEventManagerModule;
12+
913
import java.io.File;
1014
import java.io.FileOutputStream;
1115
import java.io.IOException;
12-
import expolib_v1.okhttp3.MediaType;
13-
import expolib_v1.okhttp3.ResponseBody;
16+
17+
import okhttp3.MediaType;
18+
import okhttp3.ResponseBody;
1419
import okio.Buffer;
1520
import okio.BufferedSource;
1621
import okio.Okio;
1722
import okio.Source;
1823
import okio.Timeout;
1924

20-
21-
22-
2325
/**
2426
* Created by wkh237 on 2016/7/11.
2527
*/

0 commit comments

Comments
 (0)