Skip to content

Commit db9ef11

Browse files
tranb3rtranb3r
committed
update square.*
1 parent 5f4299c commit db9ef11

File tree

7 files changed

+84
-11
lines changed

7 files changed

+84
-11
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
- build: disable AndroidStripILAfterAOT
77
- BouncyCastle.Cryptography 2.6.2
88
- Microsoft.Extensions.Logging.Abstractions 9.0.8
9+
- Square.OkHttp3.JVM 5.1.0.2 (replaces Square.OkHttp3)
10+
- Square.OkHttp3.JavaNetCookieJar 5.1.0.2 (replaces Square.OkHttp3.UrlConnection)
11+
- Square.OkIO 3.16.0
912
- test : Microsoft.Extensions.DependencyInjection 9.0.8
1013
- test : Microsoft.Extensions.Logging 9.0.8
1114
- test : Microsoft.Maui.* 9.0.100

‎SecureHttpClient.OkHttp/SecureHttpClient.OkHttp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Square.OkHttp3" Version="4.12.0.7" />
10+
<PackageReference Include="Square.OkHttp3.JVM" Version="5.1.0.2" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎SecureHttpClient.OkHttp/java/buildjar.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
@echo off
22

33
SETLOCAL
4-
set Version_Okhttp=4.12.0
5-
set Version_Okio=3.9.1
6-
set Version_KotlinStdlib=2.0.21
4+
set Version_Okhttp=5.1.0
5+
set Version_Okio=3.16.0
6+
set Version_KotlinStdlib=2.2.10
77
set Version_Brotli=0.1.2
88

99
echo -- CLEAN ---------------------------------------------------------------------------------------------------------------------------------------------------
1010
for /d /r . %%d in (jars,src) do @if exist "%%d" rd /s/q "%%d"
1111

1212
echo -- DOWNLOAD JARS -------------------------------------------------------------------------------------------------------------------------------------------
1313
mkdir jars
14-
bitsadmin.exe /transfer "Download okhttp %Version_Okhttp%" https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/%Version_Okhttp%/okhttp-%Version_Okhttp%.jar "%~dp0\jars\okhttp-%Version_Okhttp%.jar"
14+
bitsadmin.exe /transfer "Download okhttp-jvm %Version_Okhttp%" https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-jvm/%Version_Okhttp%/okhttp-jvm-%Version_Okhttp%.jar "%~dp0\jars\okhttp-jvm-%Version_Okhttp%.jar"
1515
bitsadmin.exe /transfer "Download okio %Version_Okio%" https://repo1.maven.org/maven2/com/squareup/okio/okio/%Version_Okio%/okio-%Version_Okio%.jar "%~dp0\jars\okio-%Version_Okio%.jar"
1616
bitsadmin.exe /transfer "Download okio-jvm %Version_Okio%" https://repo1.maven.org/maven2/com/squareup/okio/okio-jvm/%Version_Okio%/okio-jvm-%Version_Okio%.jar "%~dp0\jars\okio-jvm-%Version_Okio%.jar"
1717
bitsadmin.exe /transfer "Download kotlin-stdlib %Version_KotlinStdlib%" https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/%Version_KotlinStdlib%/kotlin-stdlib-%Version_KotlinStdlib%.jar "%~dp0\jars\kotlin-stdlib-%Version_KotlinStdlib%.jar"

‎SecureHttpClient/Platforms/Android/CallExtensions.cs‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
#if __ANDROID__
2+
3+
using System;
4+
using System.Threading.Tasks;
5+
6+
namespace Square.OkHttp3
7+
{
8+
public static class CallExtensions
9+
{
10+
public static Task<Response> ExecuteAsync(this ICall call)
11+
{
12+
var tcs = new TaskCompletionSource<Response>();
13+
14+
call.Enqueue(
15+
(c, response) =>
16+
{
17+
tcs.SetResult(response);
18+
},
19+
(c, exception) =>
20+
{
21+
if (call.IsCanceled)
22+
{
23+
tcs.SetCanceled();
24+
}
25+
else
26+
{
27+
tcs.SetException(exception);
28+
}
29+
});
30+
31+
return tcs.Task;
32+
}
33+
34+
public static void Enqueue(this ICall call, Action<ICall, Response> onResponse, Action<ICall, global::Java.IO.IOException> onFailure)
35+
{
36+
call.Enqueue(new ActionCallback(onResponse, onFailure));
37+
}
38+
39+
private class ActionCallback : global::Java.Lang.Object, global::Square.OkHttp3.ICallback
40+
{
41+
private readonly Action<ICall, Response> onResponse;
42+
private readonly Action<ICall, global::Java.IO.IOException> onFailure;
43+
44+
public ActionCallback(Action<ICall, Response> onResponse, Action<ICall, global::Java.IO.IOException> onFailure)
45+
{
46+
this.onResponse = onResponse;
47+
this.onFailure = onFailure;
48+
}
49+
50+
public void OnResponse(ICall call, Response response)
51+
{
52+
if (onResponse != null)
53+
{
54+
onResponse(call, response);
55+
}
56+
}
57+
58+
public void OnFailure(ICall call, global::Java.IO.IOException exception)
59+
{
60+
if (onFailure != null)
61+
{
62+
onFailure(call, exception);
63+
}
64+
}
65+
}
66+
}
67+
}
68+
69+
#endif

‎SecureHttpClient/Platforms/Android/SecureHttpClientHandler.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using System.Security.Authentication;
1919
using Java.Net;
2020
using SecureHttpClient.Extensions;
21+
using Square.OkHttp3.Java.Net.Cookiejar;
2122

2223
namespace SecureHttpClient
2324
{

‎SecureHttpClient/SecureHttpClient.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
3131
<Compile Include="Platforms\Android\**\*.cs" />
3232
<ProjectReference Include="..\SecureHttpClient.OkHttp\SecureHttpClient.OkHttp.csproj" />
33-
<PackageReference Include="Square.OkHttp3" Version="4.12.0.7" />
34-
<PackageReference Include="Square.OkIO" Version="3.9.1.1" />
35-
<PackageReference Include="Square.OkHttp3.UrlConnection" Version="4.12.0.7" />
33+
<PackageReference Include="Square.OkHttp3.JVM" Version="5.1.0.2" />
34+
<PackageReference Include="Square.OkIO" Version="3.16.0" />
35+
<PackageReference Include="Square.OkHttp3.JavaNetCookieJar" Version="5.1.0.2" />
3636
</ItemGroup>
3737

3838
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">

‎build/SecureHttpClient.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</group>
2222
<group targetFramework="net9.0-android35.0">
2323
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="9.0.8" exclude="Build,Analyzers" />
24-
<dependency id="Square.OkHttp3" version="4.12.0.7" exclude="Build,Analyzers" />
25-
<dependency id="Square.OkHttp3.UrlConnection" version="4.12.0.7" exclude="Build,Analyzers" />
26-
<dependency id="Square.OkIO" version="3.9.1.1" exclude="Build,Analyzers" />
24+
<dependency id="Square.OkHttp3.JVM" version="5.1.0.2" exclude="Build,Analyzers" />
25+
<dependency id="Square.OkHttp3.JavaNetCookieJar" version="5.1.0.2" exclude="Build,Analyzers" />
26+
<dependency id="Square.OkIO" version="3.16.0" exclude="Build,Analyzers" />
2727
</group>
2828
<group targetFramework="net9.0-ios18.5">
2929
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="9.0.8" exclude="Build,Analyzers" />

0 commit comments

Comments
 (0)