Merge commit 'cbadff37b9812a03fa2ce05911e871e07e02d08c'

Ron Radtke · Ron Radtke · commit 61615e2eb1dc · 2021-01-18T15:20:49.000+01:00
# Conflicts:
#	android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
@@ -185,7 +185,7 @@ public void run() {
                 if(options.addAndroidDownloads.hasKey("mime")) {
                     req.setMimeType(options.addAndroidDownloads.getString("mime"));
                 }
-                if(options.addAndroidDownloads.hasKey("mediaScannable") && options.addAndroidDownloads.hasKey("mediaScannable")) {
+                if(options.addAndroidDownloads.hasKey("mediaScannable") && options.addAndroidDownloads.getBoolean("mediaScannable")) {
                     req.allowScanningByMediaScanner();
                 }
                 // set headers

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public void run() {`
`185`	`185`	`if(options.addAndroidDownloads.hasKey("mime")) {`
`186`	`186`	`req.setMimeType(options.addAndroidDownloads.getString("mime"));`
`187`	`187`	`}`
`188`		`- if(options.addAndroidDownloads.hasKey("mediaScannable") && options.addAndroidDownloads.hasKey("mediaScannable")) {`
	`188`	`+ if(options.addAndroidDownloads.hasKey("mediaScannable") && options.addAndroidDownloads.getBoolean("mediaScannable")) {`
`189`	`189`	`req.allowScanningByMediaScanner();`
`190`	`190`	`}`
`191`	`191`	`// set headers`