Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove okhttp internal util usage #37843

Closed
wants to merge 3 commits into from
Closed

Remove okhttp internal util usage #37843

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3936453
remove okhttp internal util
adrianha Jun 13, 2023
7730b9d
silence exception
adrianha Jun 14, 2023
3ca819b
adjust implementation and add reference
adrianha Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions ...native/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import java.util.zip.GZIPOutputStream;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import okhttp3.internal.Util;
import okio.BufferedSink;
import okio.ByteString;
import okio.Okio;
Expand Down Expand Up @@ -128,6 +127,20 @@ private static InputStream getDownloadFileInputStream(Context context, Uri uri)
return RequestBody.create(mediaType, gzipByteArrayOutputStream.toByteArray());
}

/**
* Reference: https://github.com/square/okhttp/blob/8c8c3dbcfa91e28de2e13975ec414e07f153fde4/okhttp/src/commonMain/kotlin/okhttp3/internal/-UtilCommon.kt#L281-L288
* Checked exceptions will be ignored
*/
private static void closeQuietly(Source source) {
try {
source.close();
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
// noop.
}
}

/** Creates a RequestBody from a mediaType and inputStream given. */
public static RequestBody create(final MediaType mediaType, final InputStream inputStream) {
return new RequestBody() {
Expand All @@ -152,7 +165,7 @@ public void writeTo(BufferedSink sink) throws IOException {
source = Okio.source(inputStream);
sink.writeAll(source);
} finally {
Util.closeQuietly(source);
closeQuietly(source);
}
}
};
Expand Down