Merge pull request #646 from chaits98/master

rpenfold · web-flow · commit 8876c3c192a4 · 2022-04-04T08:04:07.000-06:00
Added support for Android API 29 and API 30
diff --git a/android/.project b/android/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1634215444278</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true
diff --git a/android/build.gradle b/android/build.gradle
@@ -15,16 +15,16 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
     }
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 28)
+    compileSdkVersion safeExtGet('compileSdkVersion', 30)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 28)
+        targetSdkVersion safeExtGet('targetSdkVersion', 30)
         versionCode 1
         versionName "1.0"
     }
@@ -40,6 +40,8 @@ android {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    //compile 'com.squareup.okhttp3:okhttp:+'
-    //{RNFetchBlob_PRE_0.28_DEPDENDENCY}
+    implementation "com.squareup.okhttp3:okhttp:${safeExtGet('okhttp', '+')}"
+    implementation "com.squareup.okhttp3:logging-interceptor:${safeExtGet('okhttp', '+')}"
+    implementation "com.squareup.okhttp3:okhttp-urlconnection:${safeExtGet('okhttp', '+')}"
+//    {RNFetchBlob_PRE_0.28_DEPDENDENCY}
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 01 10:33:07 BRT 2018
+#Fri Aug 07 22:58:34 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
@@ -24,8 +24,9 @@
 import com.facebook.react.modules.network.ForwardingCookieHandler;
 import com.facebook.react.modules.network.CookieJarContainer;
 import com.facebook.react.modules.network.OkHttpClientProvider;
-import okhttp3.OkHttpClient;
+
 import okhttp3.JavaNetCookieJar;
+import okhttp3.OkHttpClient;
 
 import java.io.File;
 import java.util.Map;
@@ -108,7 +109,7 @@ public void run() {
     @ReactMethod
     public void actionViewIntent(String path, String mime, final Promise promise) {
         try {
-            Uri uriForFile = FileProvider.getUriForFile(getCurrentActivity(),
+            Uri uriForFile = FileProvider.getUriForFile(this.getReactApplicationContext(),
                     this.getReactApplicationContext().getPackageName() + ".provider", new File(path));
 
             // Create the intent with data and type
@@ -331,7 +332,7 @@ public void df(final Callback callback) {
         fsThreadPool.execute(new Runnable() {
             @Override
             public void run() {
-                RNFetchBlobFS.df(callback);
+                RNFetchBlobFS.df(callback, getReactApplicationContext());
             }
         });
     }
@@ -399,7 +400,7 @@ public void addCompleteDownload (ReadableMap config, Promise promise) {
 
     @ReactMethod
     public void getSDCardDir(Promise promise) {
-        RNFetchBlobFS.getSDCardDir(promise);
+        RNFetchBlobFS.getSDCardDir(this.getReactApplicationContext(), promise);
     }
 
     @ReactMethod
diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
@@ -252,16 +252,16 @@ static Map<String, Object> getSystemfolders(ReactApplicationContext ctx) {
 
         res.put("DocumentDir", ctx.getFilesDir().getAbsolutePath());
         res.put("CacheDir", ctx.getCacheDir().getAbsolutePath());
-        res.put("DCIMDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath());
-        res.put("PictureDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath());
-        res.put("MusicDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath());
-        res.put("DownloadDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
-        res.put("MovieDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES).getAbsolutePath());
-        res.put("RingtoneDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_RINGTONES).getAbsolutePath());
+        res.put("DCIMDir", ctx.getExternalFilesDir(Environment.DIRECTORY_DCIM).getAbsolutePath());
+        res.put("PictureDir", ctx.getExternalFilesDir(Environment.DIRECTORY_PICTURES).getAbsolutePath());
+        res.put("MusicDir", ctx.getExternalFilesDir(Environment.DIRECTORY_MUSIC).getAbsolutePath());
+        res.put("DownloadDir", ctx.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
+        res.put("MovieDir", ctx.getExternalFilesDir(Environment.DIRECTORY_MOVIES).getAbsolutePath());
+        res.put("RingtoneDir", ctx.getExternalFilesDir(Environment.DIRECTORY_RINGTONES).getAbsolutePath());
         String state;
         state = Environment.getExternalStorageState();
         if (state.equals(Environment.MEDIA_MOUNTED)) {
-            res.put("SDCardDir", Environment.getExternalStorageDirectory().getAbsolutePath());
+            res.put("SDCardDir", ctx.getExternalFilesDir(null).getAbsolutePath());
 
             File externalDirectory = ctx.getExternalFilesDir(null);
 
@@ -276,9 +276,9 @@ static Map<String, Object> getSystemfolders(ReactApplicationContext ctx) {
         return res;
     }
 
-    static public void getSDCardDir(Promise promise) {
+    static public void getSDCardDir(ReactApplicationContext ctx, Promise promise) {
         if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            promise.resolve(Environment.getExternalStorageDirectory().getAbsolutePath());
+            promise.resolve(ctx.getExternalFilesDir(null).getAbsolutePath());
         } else {
             promise.reject("RNFetchBlob.getSDCardDir", "External storage not mounted");
         }
@@ -986,13 +986,13 @@ static void createFileASCII(String path, ReadableArray data, Promise promise) {
         }
     }
 
-    static void df(Callback callback) {
-        StatFs stat = new StatFs(Environment.getDataDirectory().getPath());
+    static void df(Callback callback, ReactApplicationContext ctx) {
+        StatFs stat = new StatFs(ctx.getFilesDir().getPath());
         WritableMap args = Arguments.createMap();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
             args.putString("internal_free", String.valueOf(stat.getFreeBytes()));
             args.putString("internal_total", String.valueOf(stat.getTotalBytes()));
-            StatFs statEx = new StatFs(Environment.getExternalStorageDirectory().getPath());
+            StatFs statEx = new StatFs(ctx.getExternalFilesDir(null).getPath());
             args.putString("external_free", String.valueOf(statEx.getFreeBytes()));
             args.putString("external_total", String.valueOf(statEx.getTotalBytes()));
 
diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
@@ -392,8 +392,9 @@ public Response intercept(Chain chain) throws IOException {
             clientBuilder.addInterceptor(new Interceptor() {
                 @Override
                 public Response intercept(@NonNull Chain chain) throws IOException {
+                    Response originalResponse = null;
                     try {
-                        Response originalResponse = chain.proceed(req);
+                        originalResponse = chain.proceed(req);
                         ResponseBody extended;
                         switch (responseType) {
                             case KeepInMemory:
@@ -423,13 +424,21 @@ public Response intercept(@NonNull Chain chain) throws IOException {
                     }
                     catch(SocketException e) {
                         timeout = true;
-                    }
-                    catch (SocketTimeoutException e ){
+                        if (originalResponse != null) {
+                            originalResponse.close();
+                        }
+                    } catch (SocketTimeoutException e) {
                         timeout = true;
-                        //RNFetchBlobUtils.emitWarningEvent("RNFetchBlob error when sending request : " + e.getLocalizedMessage());
-                    } catch(Exception ex) {
-
+                        if (originalResponse != null) {
+                            originalResponse.close();
+                        }
+                        //ReactNativeBlobUtilUtils.emitWarningEvent("ReactNativeBlobUtil error when sending request : " + e.getLocalizedMessage());
+                    } catch (Exception ex) {
+                        if (originalResponse != null) {
+                            originalResponse.close();
+                        }
                     }
+
                     return chain.proceed(chain.request());
                 }
             });
diff --git a/android/src/main/java/com/RNFetchBlob/Utils/PathResolver.java b/android/src/main/java/com/RNFetchBlob/Utils/PathResolver.java
@@ -8,7 +8,6 @@
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.content.ContentUris;
-import android.os.Environment;
 import android.content.ContentResolver;
 import com.RNFetchBlob.RNFetchBlobUtils;
 import java.io.File;
@@ -30,7 +29,7 @@ public static String getRealPathFromURI(final Context context, final Uri uri) {
                 final String type = split[0];
 
                 if ("primary".equalsIgnoreCase(type)) {
-                    return Environment.getExternalStorageDirectory() + "/" + split[1];
+                    return context.getExternalFilesDir(null) + "/" + split[1];
                 }
 
                 // TODO handle non-primary volumes

Original file line number	Diff line number	Diff line change
`@@ -15,16 +15,16 @@ buildscript {`
`15`	`15`	`google()`
`16`	`16`	`}`
`17`	`17`	`dependencies {`
`18`		`- classpath 'com.android.tools.build:gradle:3.2.1'`
	`18`	`+ classpath 'com.android.tools.build:gradle:4.0.1'`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`android {`
`23`		`- compileSdkVersion safeExtGet('compileSdkVersion', 28)`
	`23`	`+ compileSdkVersion safeExtGet('compileSdkVersion', 30)`
`24`	`24`	`buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')`
`25`	`25`	`defaultConfig {`
`26`	`26`	`minSdkVersion safeExtGet('minSdkVersion', 16)`
`27`		`- targetSdkVersion safeExtGet('targetSdkVersion', 28)`
	`27`	`+ targetSdkVersion safeExtGet('targetSdkVersion', 30)`
`28`	`28`	`versionCode 1`
`29`	`29`	`versionName "1.0"`
`30`	`30`	`}`
`@@ -40,6 +40,8 @@ android {`
`40`	`40`
`41`	`41`	`dependencies {`
`42`	`42`	`implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"`
`43`		`- //compile 'com.squareup.okhttp3:okhttp:+'`
`44`		`- //{RNFetchBlob_PRE_0.28_DEPDENDENCY}`
	`43`	`+ implementation "com.squareup.okhttp3:okhttp:${safeExtGet('okhttp', '+')}"`
	`44`	`+ implementation "com.squareup.okhttp3:logging-interceptor:${safeExtGet('okhttp', '+')}"`
	`45`	`+ implementation "com.squareup.okhttp3:okhttp-urlconnection:${safeExtGet('okhttp', '+')}"`
	`46`	`+// {RNFetchBlob_PRE_0.28_DEPDENDENCY}`
`45`	`47`	`}`