diff --git a/config.json b/config.json index adfe4eafa..9d181667b 100644 --- a/config.json +++ b/config.json @@ -4591,7 +4591,7 @@ "groupId": "com.squareup.okhttp3", "artifactId": "okhttp", "version": "5.3.2", - "nugetVersion": "5.3.2.2", + "nugetVersion": "5.3.2.3", "nugetId": "Square.OkHttp3", "extraDependencies": "com.squareup.okhttp3.okhttp-android", "type": "androidlibrary", @@ -4601,7 +4601,7 @@ "groupId": "com.squareup.okhttp3", "artifactId": "okhttp-android", "version": "5.3.2", - "nugetVersion": "5.3.2.2", + "nugetVersion": "5.3.2.3", "nugetId": "Square.OkHttp3.Android", "type": "androidlibrary", "mavenRepositoryType": "MavenCentral" @@ -4628,7 +4628,7 @@ "groupId": "com.squareup.okhttp3", "artifactId": "okhttp-jvm", "version": "5.3.2", - "nugetVersion": "5.3.2.2", + "nugetVersion": "5.3.2.3", "nugetId": "Square.OkHttp3.JVM", "type": "androidlibrary", "mavenRepositoryType": "MavenCentral" diff --git a/docs/artifact-list-with-versions.md b/docs/artifact-list-with-versions.md index 9096015b0..7bbf30254 100644 --- a/docs/artifact-list-with-versions.md +++ b/docs/artifact-list-with-versions.md @@ -605,11 +605,11 @@ | 598|com.google.zxing:core |3.5.4 |Xamarin.Google.ZXing.Core |3.5.4.2 | | 599|com.squareup:javapoet |1.13.0 |Square.JavaPoet |1.13.0.19 | | 600|com.squareup.okhttp3:logging-interceptor |5.3.2 |Square.OkHttp3.LoggingInterceptor |5.3.2.2 | -| 601|com.squareup.okhttp3:okhttp |5.3.2 |Square.OkHttp3 |5.3.2.2 | -| 602|com.squareup.okhttp3:okhttp-android |5.3.2 |Square.OkHttp3.Android |5.3.2.2 | +| 601|com.squareup.okhttp3:okhttp |5.3.2 |Square.OkHttp3 |5.3.2.3 | +| 602|com.squareup.okhttp3:okhttp-android |5.3.2 |Square.OkHttp3.Android |5.3.2.3 | | 603|com.squareup.okhttp3:okhttp-brotli |5.3.2 |Square.OkHttp3.OkHttp.Brotli |5.3.2.2 | | 604|com.squareup.okhttp3:okhttp-java-net-cookiejar |5.3.2 |Square.OkHttp3.JavaNetCookieJar |5.3.2.2 | -| 605|com.squareup.okhttp3:okhttp-jvm |5.3.2 |Square.OkHttp3.JVM |5.3.2.2 | +| 605|com.squareup.okhttp3:okhttp-jvm |5.3.2 |Square.OkHttp3.JVM |5.3.2.3 | | 606|com.squareup.okhttp3:okhttp-tls |5.3.2 |Square.OkHttp3.OkHttp.TLS |5.3.2.2 | | 607|com.squareup.okhttp3:okhttp-urlconnection |5.3.2 |Square.OkHttp3.UrlConnection |5.3.2.2 | | 608|com.squareup.okio:okio |3.17.0 |Square.OkIO |3.17.0 | diff --git a/source/com.squareup.okhttp3/okhttp-android/Additions/Call.cs b/source/com.squareup.okhttp3/okhttp-android/Additions/Call.cs new file mode 100644 index 000000000..584ed13ff --- /dev/null +++ b/source/com.squareup.okhttp3/okhttp-android/Additions/Call.cs @@ -0,0 +1,66 @@ +using System; +using Android.Runtime; +using System.Threading.Tasks; + +namespace Square.OkHttp3 +{ + public static class CallExtensions + { + public static Task ExecuteAsync(this ICall call) + { + var tcs = new TaskCompletionSource(); + + call.Enqueue( + (c, response) => + { + tcs.SetResult(response); + }, + (c, exception) => + { + if (call.IsCanceled) + { + tcs.SetCanceled(); + } + else + { + tcs.SetException(exception); + } + }); + + return tcs.Task; + } + + public static void Enqueue(this ICall call, Action onResponse, Action onFailure) + { + call.Enqueue(new ActionCallback(onResponse, onFailure)); + } + + private class ActionCallback : Java.Lang.Object, global::Square.OkHttp3.ICallback + { + private readonly Action onResponse; + private readonly Action onFailure; + + public ActionCallback(Action onResponse, Action onFailure) + { + this.onResponse = onResponse; + this.onFailure = onFailure; + } + + public void OnResponse(ICall call, Response response) + { + if (onResponse != null) + { + onResponse(call, response); + } + } + + public void OnFailure(ICall call, Java.IO.IOException exception) + { + if (onFailure != null) + { + onFailure(call, exception); + } + } + } + } +} diff --git a/source/com.squareup.okhttp3/okhttp-android/Additions/Dispatcher.cs b/source/com.squareup.okhttp3/okhttp-android/Additions/Dispatcher.cs new file mode 100644 index 000000000..877e0222e --- /dev/null +++ b/source/com.squareup.okhttp3/okhttp-android/Additions/Dispatcher.cs @@ -0,0 +1,8 @@ +namespace Square.OkHttp3 +{ + partial class Dispatcher + { + public void SetIdleCallback(Java.Lang.IRunnable idleCallback) => + IdleCallback = idleCallback; + } +} diff --git a/source/com.squareup.okhttp3/okhttp-android/Additions/OkHttpClient.Builder.cs b/source/com.squareup.okhttp3/okhttp-android/Additions/OkHttpClient.Builder.cs new file mode 100644 index 000000000..56495b888 --- /dev/null +++ b/source/com.squareup.okhttp3/okhttp-android/Additions/OkHttpClient.Builder.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using Java.Net; +using Javax.Net.Ssl; + +namespace Square.OkHttp3 +{ + partial class OkHttpClient + { + partial class Builder + { + public Builder AddInterceptor(Func interceptor) + { + return AddInterceptor(new InterceptorImpl(interceptor)); + } + + public Builder AddNetworkInterceptor(Func interceptor) + { + return AddNetworkInterceptor(new InterceptorImpl(interceptor)); + } + + public Builder Authenticator(Func authenticate) + { + return Authenticator(new AuthenticatorImpl(authenticate)); + } + + public Builder ProxyAuthenticator(Func authenticate) + { + return ProxyAuthenticator(new AuthenticatorImpl(authenticate)); + } + + public Builder Dns(Func> lookup) + { + return Dns(new DnsImpl(lookup)); + } + + public Builder HostnameVerifier(Func verify) + { + return HostnameVerifier(new HostnameVerifierImpl(verify)); + } + + private class AuthenticatorImpl : Java.Lang.Object, IAuthenticator + { + private readonly Func authenticate; + + public AuthenticatorImpl(Func authenticate) + { + this.authenticate = authenticate; + } + + public Request Authenticate(Route p0, Response p1) + { + return authenticate(p0, p1); + } + } + + private class InterceptorImpl : Java.Lang.Object, IInterceptor + { + private readonly Func interceptor; + + public InterceptorImpl(Func interceptor) + { + this.interceptor = interceptor; + } + + public Response Intercept(IInterceptorChain p0) + { + return interceptor(p0); + } + } + + private class DnsImpl : Java.Lang.Object, IDns + { + private readonly Func> lookup; + + public DnsImpl(Func> lookup) + { + this.lookup = lookup; + } + + public IList Lookup(string p0) + { + return lookup(p0); + } + } + + private class HostnameVerifierImpl : Java.Lang.Object, IHostnameVerifier + { + private readonly Func verify; + + public HostnameVerifierImpl(Func verify) + { + this.verify = verify; + } + + public bool Verify(string hostname, ISSLSession session) + { + return verify(hostname, session); + } + } + } + } +} diff --git a/source/com.squareup.okhttp3/okhttp-android/Additions/ResponseBody.cs b/source/com.squareup.okhttp3/okhttp-android/Additions/ResponseBody.cs new file mode 100644 index 000000000..ccaee621c --- /dev/null +++ b/source/com.squareup.okhttp3/okhttp-android/Additions/ResponseBody.cs @@ -0,0 +1,19 @@ +using System; +using System.Threading.Tasks; +using Android.Runtime; + +namespace Square.OkHttp3 +{ + partial class ResponseBody + { + public Task BytesAsync() + { + return Task.Run(() => Bytes()); + } + + public Task StringAsync() + { + return Task.Run(() => String()); + } + } +} diff --git a/source/com.squareup.okhttp3/okhttp-android/PublicAPI/PublicAPI.Unshipped.txt b/source/com.squareup.okhttp3/okhttp-android/PublicAPI/PublicAPI.Unshipped.txt index 4c457ab65..f8ff4e967 100644 --- a/source/com.squareup.okhttp3/okhttp-android/PublicAPI/PublicAPI.Unshipped.txt +++ b/source/com.squareup.okhttp3/okhttp-android/PublicAPI/PublicAPI.Unshipped.txt @@ -60,6 +60,7 @@ Square.OkHttp3.CacheControl.NoStore() -> bool Square.OkHttp3.CacheControl.NoTransform() -> bool Square.OkHttp3.CacheControl.OnlyIfCached() -> bool Square.OkHttp3.CacheControl.SMaxAgeSeconds() -> int +Square.OkHttp3.CallExtensions Square.OkHttp3.CertificatePinner Square.OkHttp3.CertificatePinner.Builder Square.OkHttp3.CertificatePinner.Builder.Add(string! pattern, params string![]! pins) -> Square.OkHttp3.CertificatePinner.Builder! @@ -159,6 +160,7 @@ Square.OkHttp3.Dispatcher.QueuedCalls() -> System.Collections.Generic.IList int Square.OkHttp3.Dispatcher.RunningCalls() -> System.Collections.Generic.IList! Square.OkHttp3.Dispatcher.RunningCallsCount() -> int +Square.OkHttp3.Dispatcher.SetIdleCallback(Java.Lang.IRunnable! idleCallback) -> void Square.OkHttp3.Dns Square.OkHttp3.DnsConsts Square.OkHttp3.EventListener @@ -377,8 +379,11 @@ Square.OkHttp3.OkHttpClient.Address(Square.OkHttp3.HttpUrl! url) -> Square.OkHtt Square.OkHttp3.OkHttpClient.Authenticator() -> Square.OkHttp3.IAuthenticator! Square.OkHttp3.OkHttpClient.Builder Square.OkHttp3.OkHttpClient.Builder.AddInterceptor(Square.OkHttp3.IInterceptor! interceptor) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.AddInterceptor(System.Func! interceptor) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.AddNetworkInterceptor(Square.OkHttp3.IInterceptor! interceptor) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.AddNetworkInterceptor(System.Func! interceptor) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Authenticator(Square.OkHttp3.IAuthenticator! authenticator) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.Authenticator(System.Func! authenticate) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Build() -> Square.OkHttp3.OkHttpClient! Square.OkHttp3.OkHttpClient.Builder.Builder() -> void Square.OkHttp3.OkHttpClient.Builder.Cache(Square.OkHttp3.Cache? cache) -> Square.OkHttp3.OkHttpClient.Builder! @@ -394,12 +399,14 @@ Square.OkHttp3.OkHttpClient.Builder.ConnectionSpecs(System.Collections.Generic.I Square.OkHttp3.OkHttpClient.Builder.CookieJar(Square.OkHttp3.ICookieJar! cookieJar) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Dispatcher(Square.OkHttp3.Dispatcher! dispatcher) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Dns(Square.OkHttp3.IDns! dns) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.Dns(System.Func!>! lookup) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.EventListener(Square.OkHttp3.EventListener! eventListener) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.EventListenerFactory(Square.OkHttp3.EventListener.IFactory! eventListenerFactory) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.FastFallback(bool fastFallback) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.FollowRedirects(bool followRedirects) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.FollowSslRedirects(bool followProtocolRedirects) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.HostnameVerifier(Javax.Net.Ssl.IHostnameVerifier! hostnameVerifier) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.HostnameVerifier(System.Func! verify) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Interceptors() -> System.Collections.Generic.IList! Square.OkHttp3.OkHttpClient.Builder.MinWebSocketMessageToCompress(long bytes) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.NetworkInterceptors() -> System.Collections.Generic.IList! @@ -409,6 +416,7 @@ Square.OkHttp3.OkHttpClient.Builder.PingInterval_LRDsOJo(long _v_c_kotlin_time_D Square.OkHttp3.OkHttpClient.Builder.Protocols(System.Collections.Generic.IList! protocols) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Proxy(Java.Net.Proxy? proxy) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.ProxyAuthenticator(Square.OkHttp3.IAuthenticator! proxyAuthenticator) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.ProxyAuthenticator(System.Func! authenticate) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.ProxySelector(Java.Net.ProxySelector! proxySelector) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.ReadTimeout(Java.Time.Duration! duration) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.ReadTimeout(long timeout, Java.Util.Concurrent.TimeUnit! unit) -> Square.OkHttp3.OkHttpClient.Builder! @@ -516,10 +524,12 @@ Square.OkHttp3.ResponseBody Square.OkHttp3.ResponseBody.ByteStream() -> System.IO.Stream! Square.OkHttp3.ResponseBody.ByteString() -> Square.OkIO.ByteString! Square.OkHttp3.ResponseBody.Bytes() -> byte[]! +Square.OkHttp3.ResponseBody.BytesAsync() -> System.Threading.Tasks.Task! Square.OkHttp3.ResponseBody.CharStream() -> Java.IO.Reader! Square.OkHttp3.ResponseBody.ResponseBody() -> void Square.OkHttp3.ResponseBody.ResponseBody(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void Square.OkHttp3.ResponseBody.String() -> string! +Square.OkHttp3.ResponseBody.StringAsync() -> System.Threading.Tasks.Task! Square.OkHttp3.Route Square.OkHttp3.Route.Address() -> Square.OkHttp3.Address! Square.OkHttp3.Route.Proxy() -> Java.Net.Proxy! @@ -611,6 +621,8 @@ static Square.OkHttp3.Cache.Key(Square.OkHttp3.HttpUrl! url) -> string! static Square.OkHttp3.CacheControl.ForceCache.get -> Square.OkHttp3.CacheControl! static Square.OkHttp3.CacheControl.ForceNetwork.get -> Square.OkHttp3.CacheControl! static Square.OkHttp3.CacheControl.Parse(Square.OkHttp3.Headers! headers) -> Square.OkHttp3.CacheControl! +static Square.OkHttp3.CallExtensions.Enqueue(this Square.OkHttp3.ICall! call, System.Action! onResponse, System.Action! onFailure) -> void +static Square.OkHttp3.CallExtensions.ExecuteAsync(this Square.OkHttp3.ICall! call) -> System.Threading.Tasks.Task! static Square.OkHttp3.CertificatePinner.Default.get -> Square.OkHttp3.CertificatePinner! static Square.OkHttp3.CertificatePinner.InvokePin(Java.Security.Cert.Certificate! certificate) -> string! static Square.OkHttp3.CertificatePinner.Sha1Hash(Java.Security.Cert.X509Certificate! obj) -> Square.OkIO.ByteString! diff --git a/source/com.squareup.okhttp3/okhttp-jvm/Additions/Call.cs b/source/com.squareup.okhttp3/okhttp-jvm/Additions/Call.cs new file mode 100644 index 000000000..584ed13ff --- /dev/null +++ b/source/com.squareup.okhttp3/okhttp-jvm/Additions/Call.cs @@ -0,0 +1,66 @@ +using System; +using Android.Runtime; +using System.Threading.Tasks; + +namespace Square.OkHttp3 +{ + public static class CallExtensions + { + public static Task ExecuteAsync(this ICall call) + { + var tcs = new TaskCompletionSource(); + + call.Enqueue( + (c, response) => + { + tcs.SetResult(response); + }, + (c, exception) => + { + if (call.IsCanceled) + { + tcs.SetCanceled(); + } + else + { + tcs.SetException(exception); + } + }); + + return tcs.Task; + } + + public static void Enqueue(this ICall call, Action onResponse, Action onFailure) + { + call.Enqueue(new ActionCallback(onResponse, onFailure)); + } + + private class ActionCallback : Java.Lang.Object, global::Square.OkHttp3.ICallback + { + private readonly Action onResponse; + private readonly Action onFailure; + + public ActionCallback(Action onResponse, Action onFailure) + { + this.onResponse = onResponse; + this.onFailure = onFailure; + } + + public void OnResponse(ICall call, Response response) + { + if (onResponse != null) + { + onResponse(call, response); + } + } + + public void OnFailure(ICall call, Java.IO.IOException exception) + { + if (onFailure != null) + { + onFailure(call, exception); + } + } + } + } +} diff --git a/source/com.squareup.okhttp3/okhttp-jvm/Additions/Dispatcher.cs b/source/com.squareup.okhttp3/okhttp-jvm/Additions/Dispatcher.cs new file mode 100644 index 000000000..877e0222e --- /dev/null +++ b/source/com.squareup.okhttp3/okhttp-jvm/Additions/Dispatcher.cs @@ -0,0 +1,8 @@ +namespace Square.OkHttp3 +{ + partial class Dispatcher + { + public void SetIdleCallback(Java.Lang.IRunnable idleCallback) => + IdleCallback = idleCallback; + } +} diff --git a/source/com.squareup.okhttp3/okhttp-jvm/Additions/OkHttpClient.Builder.cs b/source/com.squareup.okhttp3/okhttp-jvm/Additions/OkHttpClient.Builder.cs new file mode 100644 index 000000000..56495b888 --- /dev/null +++ b/source/com.squareup.okhttp3/okhttp-jvm/Additions/OkHttpClient.Builder.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using Java.Net; +using Javax.Net.Ssl; + +namespace Square.OkHttp3 +{ + partial class OkHttpClient + { + partial class Builder + { + public Builder AddInterceptor(Func interceptor) + { + return AddInterceptor(new InterceptorImpl(interceptor)); + } + + public Builder AddNetworkInterceptor(Func interceptor) + { + return AddNetworkInterceptor(new InterceptorImpl(interceptor)); + } + + public Builder Authenticator(Func authenticate) + { + return Authenticator(new AuthenticatorImpl(authenticate)); + } + + public Builder ProxyAuthenticator(Func authenticate) + { + return ProxyAuthenticator(new AuthenticatorImpl(authenticate)); + } + + public Builder Dns(Func> lookup) + { + return Dns(new DnsImpl(lookup)); + } + + public Builder HostnameVerifier(Func verify) + { + return HostnameVerifier(new HostnameVerifierImpl(verify)); + } + + private class AuthenticatorImpl : Java.Lang.Object, IAuthenticator + { + private readonly Func authenticate; + + public AuthenticatorImpl(Func authenticate) + { + this.authenticate = authenticate; + } + + public Request Authenticate(Route p0, Response p1) + { + return authenticate(p0, p1); + } + } + + private class InterceptorImpl : Java.Lang.Object, IInterceptor + { + private readonly Func interceptor; + + public InterceptorImpl(Func interceptor) + { + this.interceptor = interceptor; + } + + public Response Intercept(IInterceptorChain p0) + { + return interceptor(p0); + } + } + + private class DnsImpl : Java.Lang.Object, IDns + { + private readonly Func> lookup; + + public DnsImpl(Func> lookup) + { + this.lookup = lookup; + } + + public IList Lookup(string p0) + { + return lookup(p0); + } + } + + private class HostnameVerifierImpl : Java.Lang.Object, IHostnameVerifier + { + private readonly Func verify; + + public HostnameVerifierImpl(Func verify) + { + this.verify = verify; + } + + public bool Verify(string hostname, ISSLSession session) + { + return verify(hostname, session); + } + } + } + } +} diff --git a/source/com.squareup.okhttp3/okhttp-jvm/Additions/ResponseBody.cs b/source/com.squareup.okhttp3/okhttp-jvm/Additions/ResponseBody.cs new file mode 100644 index 000000000..ccaee621c --- /dev/null +++ b/source/com.squareup.okhttp3/okhttp-jvm/Additions/ResponseBody.cs @@ -0,0 +1,19 @@ +using System; +using System.Threading.Tasks; +using Android.Runtime; + +namespace Square.OkHttp3 +{ + partial class ResponseBody + { + public Task BytesAsync() + { + return Task.Run(() => Bytes()); + } + + public Task StringAsync() + { + return Task.Run(() => String()); + } + } +} diff --git a/source/com.squareup.okhttp3/okhttp-jvm/PublicAPI/PublicAPI.Unshipped.txt b/source/com.squareup.okhttp3/okhttp-jvm/PublicAPI/PublicAPI.Unshipped.txt index 8d54140d9..cbb861f3d 100644 --- a/source/com.squareup.okhttp3/okhttp-jvm/PublicAPI/PublicAPI.Unshipped.txt +++ b/source/com.squareup.okhttp3/okhttp-jvm/PublicAPI/PublicAPI.Unshipped.txt @@ -82,6 +82,7 @@ Square.OkHttp3.CacheControl._deprecated_noStore() -> bool Square.OkHttp3.CacheControl._deprecated_noTransform() -> bool Square.OkHttp3.CacheControl._deprecated_onlyIfCached() -> bool Square.OkHttp3.CacheControl._deprecated_sMaxAgeSeconds() -> int +Square.OkHttp3.CallExtensions Square.OkHttp3.CertificatePinner Square.OkHttp3.CertificatePinner.Builder Square.OkHttp3.CertificatePinner.Builder.Add(string! pattern, params string![]! pins) -> Square.OkHttp3.CertificatePinner.Builder! @@ -198,6 +199,7 @@ Square.OkHttp3.Dispatcher.QueuedCalls() -> System.Collections.Generic.IList int Square.OkHttp3.Dispatcher.RunningCalls() -> System.Collections.Generic.IList! Square.OkHttp3.Dispatcher.RunningCallsCount() -> int +Square.OkHttp3.Dispatcher.SetIdleCallback(Java.Lang.IRunnable! idleCallback) -> void Square.OkHttp3.Dispatcher._deprecated_executorService() -> Java.Util.Concurrent.IExecutorService! Square.OkHttp3.Dns Square.OkHttp3.DnsConsts @@ -451,8 +453,11 @@ Square.OkHttp3.OkHttpClient.Address(Square.OkHttp3.HttpUrl! url) -> Square.OkHtt Square.OkHttp3.OkHttpClient.Authenticator() -> Square.OkHttp3.IAuthenticator! Square.OkHttp3.OkHttpClient.Builder Square.OkHttp3.OkHttpClient.Builder.AddInterceptor(Square.OkHttp3.IInterceptor! interceptor) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.AddInterceptor(System.Func! interceptor) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.AddNetworkInterceptor(Square.OkHttp3.IInterceptor! interceptor) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.AddNetworkInterceptor(System.Func! interceptor) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Authenticator(Square.OkHttp3.IAuthenticator! authenticator) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.Authenticator(System.Func! authenticate) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Build() -> Square.OkHttp3.OkHttpClient! Square.OkHttp3.OkHttpClient.Builder.Builder() -> void Square.OkHttp3.OkHttpClient.Builder.Cache(Square.OkHttp3.Cache? cache) -> Square.OkHttp3.OkHttpClient.Builder! @@ -468,12 +473,14 @@ Square.OkHttp3.OkHttpClient.Builder.ConnectionSpecs(System.Collections.Generic.I Square.OkHttp3.OkHttpClient.Builder.CookieJar(Square.OkHttp3.ICookieJar! cookieJar) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Dispatcher(Square.OkHttp3.Dispatcher! dispatcher) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Dns(Square.OkHttp3.IDns! dns) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.Dns(System.Func!>! lookup) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.EventListener(Square.OkHttp3.EventListener! eventListener) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.EventListenerFactory(Square.OkHttp3.EventListener.IFactory! eventListenerFactory) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.FastFallback(bool fastFallback) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.FollowRedirects(bool followRedirects) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.FollowSslRedirects(bool followProtocolRedirects) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.HostnameVerifier(Javax.Net.Ssl.IHostnameVerifier! hostnameVerifier) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.HostnameVerifier(System.Func! verify) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Interceptors() -> System.Collections.Generic.IList! Square.OkHttp3.OkHttpClient.Builder.MinWebSocketMessageToCompress(long bytes) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.NetworkInterceptors() -> System.Collections.Generic.IList! @@ -483,6 +490,7 @@ Square.OkHttp3.OkHttpClient.Builder.PingInterval_LRDsOJo(long _v_c_kotlin_time_D Square.OkHttp3.OkHttpClient.Builder.Protocols(System.Collections.Generic.IList! protocols) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.Proxy(Java.Net.Proxy? proxy) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.ProxyAuthenticator(Square.OkHttp3.IAuthenticator! proxyAuthenticator) -> Square.OkHttp3.OkHttpClient.Builder! +Square.OkHttp3.OkHttpClient.Builder.ProxyAuthenticator(System.Func! authenticate) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.ProxySelector(Java.Net.ProxySelector! proxySelector) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.ReadTimeout(Java.Time.Duration! duration) -> Square.OkHttp3.OkHttpClient.Builder! Square.OkHttp3.OkHttpClient.Builder.ReadTimeout(long timeout, Java.Util.Concurrent.TimeUnit! unit) -> Square.OkHttp3.OkHttpClient.Builder! @@ -636,10 +644,12 @@ Square.OkHttp3.ResponseBody Square.OkHttp3.ResponseBody.ByteStream() -> System.IO.Stream! Square.OkHttp3.ResponseBody.ByteString() -> Square.OkIO.ByteString! Square.OkHttp3.ResponseBody.Bytes() -> byte[]! +Square.OkHttp3.ResponseBody.BytesAsync() -> System.Threading.Tasks.Task! Square.OkHttp3.ResponseBody.CharStream() -> Java.IO.Reader! Square.OkHttp3.ResponseBody.ResponseBody() -> void Square.OkHttp3.ResponseBody.ResponseBody(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void Square.OkHttp3.ResponseBody.String() -> string! +Square.OkHttp3.ResponseBody.StringAsync() -> System.Threading.Tasks.Task! Square.OkHttp3.Route Square.OkHttp3.Route.Address() -> Square.OkHttp3.Address! Square.OkHttp3.Route.Proxy() -> Java.Net.Proxy! @@ -735,6 +745,8 @@ static Square.OkHttp3.Cache.Key(Square.OkHttp3.HttpUrl! url) -> string! static Square.OkHttp3.CacheControl.ForceCache.get -> Square.OkHttp3.CacheControl! static Square.OkHttp3.CacheControl.ForceNetwork.get -> Square.OkHttp3.CacheControl! static Square.OkHttp3.CacheControl.Parse(Square.OkHttp3.Headers! headers) -> Square.OkHttp3.CacheControl! +static Square.OkHttp3.CallExtensions.Enqueue(this Square.OkHttp3.ICall! call, System.Action! onResponse, System.Action! onFailure) -> void +static Square.OkHttp3.CallExtensions.ExecuteAsync(this Square.OkHttp3.ICall! call) -> System.Threading.Tasks.Task! static Square.OkHttp3.CertificatePinner.Default.get -> Square.OkHttp3.CertificatePinner! static Square.OkHttp3.CertificatePinner.InvokePin(Java.Security.Cert.Certificate! certificate) -> string! static Square.OkHttp3.CertificatePinner.Sha1Hash(Java.Security.Cert.X509Certificate! obj) -> Square.OkIO.ByteString! diff --git a/source/com.squareup.okhttp3/okhttp/Additions/TypeForwards.cs b/source/com.squareup.okhttp3/okhttp/Additions/TypeForwards.cs index 241a9346f..28b88176c 100644 --- a/source/com.squareup.okhttp3/okhttp/Additions/TypeForwards.cs +++ b/source/com.squareup.okhttp3/okhttp/Additions/TypeForwards.cs @@ -7,6 +7,7 @@ [assembly:TypeForwardedToAttribute(typeof(Square.OkHttp3.AuthenticatorConsts))] [assembly:TypeForwardedToAttribute(typeof(Square.OkHttp3.Cache))] [assembly:TypeForwardedToAttribute(typeof(Square.OkHttp3.CacheControl))] +[assembly:TypeForwardedToAttribute(typeof(Square.OkHttp3.CallExtensions))] [assembly:TypeForwardedToAttribute(typeof(Square.OkHttp3.CertificatePinner))] [assembly:TypeForwardedToAttribute(typeof(Square.OkHttp3.Challenge))] [assembly:TypeForwardedToAttribute(typeof(Square.OkHttp3.CipherSuite))]