Skip to content

Commit 610064c

Browse files
authored
Merge pull request #205 from spoonconsulting/fix-note8
Fix note8
2 parents 87f37c4 + f72e9f0 commit 610064c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<dependency id="cordova-plugin-file" version="6.0.2"/>
1717
<platform name="android">
1818
<framework src="androidx.work:work-runtime:2.7.1" />
19-
<framework src="com.squareup.okhttp3:okhttp:4.9.0" />
19+
<framework src="com.squareup.okhttp3:okhttp:4.9.3" />
2020
<framework src="androidx.room:room-runtime:2.4.2" />
2121
<framework src="src/android/config.gradle" custom="true" type="gradleReference"/>
2222
<config-file target="res/xml/config.xml" parent="/*">

src/android/UploadTask.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,14 @@ private Request createRequest() throws FileNotFoundException {
328328

329329
// Build file reader
330330
String extension = MimeTypeMap.getFileExtensionFromUrl(filepath);
331-
MediaType mediaType = MediaType.parse(MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension));
331+
MediaType mediaType;
332+
if (extension.equals("json")) {
333+
// Does not support devices less than Android 10 (Stop Execution)
334+
// https://stackoverflow.com/questions/44667125/getmimetypefromextension-returns-null-when-i-pass-json-as-extension
335+
mediaType = MediaType.parse(MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension) + "; charset=utf-8");
336+
} else {
337+
mediaType = MediaType.parse(MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension));
338+
}
332339
File file = new File(filepath);
333340
ProgressRequestBody fileRequestBody = new ProgressRequestBody(mediaType, file.length(), new FileInputStream(file), this::handleProgress);
334341

0 commit comments

Comments
 (0)