From f4c9a1a8ae29eaee31836ca820849768b1ccf36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Raciborski?= Date: Mon, 9 Nov 2015 14:04:37 +0100 Subject: [PATCH 1/2] Updated Square.OkHttp to v2.5 --- .../ModernHttpClient.Android.csproj | 23 +++++++++++-------- src/ModernHttpClient/packages.config | 4 ++-- .../Playground.Android.csproj | 20 ++++++++-------- src/Playground.Android/packages.config | 4 ++-- src/Playground.iOS/Playground.iOS.csproj | 5 ++-- 5 files changed, 30 insertions(+), 26 deletions(-) diff --git a/src/ModernHttpClient/ModernHttpClient.Android.csproj b/src/ModernHttpClient/ModernHttpClient.Android.csproj index 45a94fe..3bf778c 100644 --- a/src/ModernHttpClient/ModernHttpClient.Android.csproj +++ b/src/ModernHttpClient/ModernHttpClient.Android.csproj @@ -1,4 +1,4 @@ - + Debug @@ -40,6 +40,14 @@ false + + ..\..\packages\Square.OkHttp.2.5.0.0\lib\MonoAndroid\Square.OkHttp.dll + True + + + ..\..\packages\Square.OkIO.1.6.0.0\lib\MonoAndroid\Square.OkIO.dll + True + @@ -49,21 +57,16 @@ - - - - ..\..\packages\Square.OkIO.1.5.0.0\lib\MonoAndroid\Square.OkIO.dll - - - ..\..\packages\Square.OkHttp.2.4.0.3\lib\MonoAndroid\Square.OkHttp.dll - + + + - + \ No newline at end of file diff --git a/src/ModernHttpClient/packages.config b/src/ModernHttpClient/packages.config index 683dfae..b3478f0 100644 --- a/src/ModernHttpClient/packages.config +++ b/src/ModernHttpClient/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/Playground.Android/Playground.Android.csproj b/src/Playground.Android/Playground.Android.csproj index f1a135d..b5dcea2 100644 --- a/src/Playground.Android/Playground.Android.csproj +++ b/src/Playground.Android/Playground.Android.csproj @@ -1,4 +1,4 @@ - + Debug @@ -46,17 +46,19 @@ + + ..\..\packages\Square.OkHttp.2.5.0.0\lib\MonoAndroid\Square.OkHttp.dll + True + + + ..\..\packages\Square.OkIO.1.6.0.0\lib\MonoAndroid\Square.OkIO.dll + True + - - ..\..\packages\Square.OkIO.1.5.0.0\lib\MonoAndroid\Square.OkIO.dll - - - ..\..\packages\Square.OkHttp.2.4.0.3\lib\MonoAndroid\Square.OkHttp.dll - @@ -64,10 +66,10 @@ + - @@ -81,4 +83,4 @@ ModernHttpClient.Android - + \ No newline at end of file diff --git a/src/Playground.Android/packages.config b/src/Playground.Android/packages.config index 5125da1..7356c6e 100644 --- a/src/Playground.Android/packages.config +++ b/src/Playground.Android/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/Playground.iOS/Playground.iOS.csproj b/src/Playground.iOS/Playground.iOS.csproj index 7a155b4..d383fc4 100644 --- a/src/Playground.iOS/Playground.iOS.csproj +++ b/src/Playground.iOS/Playground.iOS.csproj @@ -1,4 +1,4 @@ - + Debug @@ -12,7 +12,6 @@ Resources PlaygroundiOS Xamarin.iOS - v1.0 true @@ -132,4 +131,4 @@ ModernHttpClient.iOS64 - + \ No newline at end of file From a852e77ed56eb8986bcace9bd433827d36697edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Raciborski?= Date: Mon, 9 Nov 2015 14:29:04 +0100 Subject: [PATCH 2/2] Timeout value is not respected on Android #192 Android fix. --- ModernHttpClient.sln | 172 ++++++++++++------ .../Android/OkHttpNetworkHandler.cs | 11 ++ src/ModernHttpClient/Facades.cs | 9 + .../ModernHttpClient.Android.csproj | 2 +- .../ModernHttpClient.Portable.csproj | 4 +- .../Resources/Resource.designer.cs | 20 +- .../Resources/Resource.designer.cs | 20 +- 7 files changed, 158 insertions(+), 80 deletions(-) diff --git a/ModernHttpClient.sln b/ModernHttpClient.sln index d3f45ce..7932c3b 100644 --- a/ModernHttpClient.sln +++ b/ModernHttpClient.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.iOS", "src\ModernHttpClient\ModernHttpClient.iOS.csproj", "{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.Android", "src\ModernHttpClient\ModernHttpClient.Android.csproj", "{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}" @@ -15,20 +17,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.iOS64", "s EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Ad-Hoc|Any CPU = Ad-Hoc|Any CPU + Ad-Hoc|iPhone = Ad-Hoc|iPhone + Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator + AppStore|Any CPU = AppStore|Any CPU + AppStore|iPhone = AppStore|iPhone + AppStore|iPhoneSimulator = AppStore|iPhoneSimulator Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Release|iPhoneSimulator = Release|iPhoneSimulator Debug|iPhone = Debug|iPhone + Debug|iPhoneSimulator = Debug|iPhoneSimulator + Release|Any CPU = Release|Any CPU Release|iPhone = Release|iPhone - Ad-Hoc|iPhone = Ad-Hoc|iPhone - AppStore|iPhone = AppStore|iPhone + Release|iPhoneSimulator = Release|iPhoneSimulator EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.AppStore|Any CPU.Build.0 = Release|Any CPU {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.AppStore|iPhone.ActiveCfg = Debug|Any CPU {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.AppStore|iPhone.Build.0 = Debug|Any CPU + {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Debug|iPhone.ActiveCfg = Debug|Any CPU @@ -41,10 +55,68 @@ Global {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Release|iPhone.Build.0 = Release|Any CPU {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.AppStore|Any CPU.Build.0 = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.AppStore|iPhone.Build.0 = Debug|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhone.Build.0 = Debug|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|Any CPU.Build.0 = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhone.ActiveCfg = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhone.Build.0 = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.AppStore|Any CPU.Build.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.AppStore|Any CPU.Deploy.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.AppStore|iPhone.Build.0 = Debug|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|iPhone.Build.0 = Debug|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|Any CPU.Build.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhone.ActiveCfg = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhone.Build.0 = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {2CE837CD-9B97-4058-9156-339697EEE228}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhoneSimulator {2CE837CD-9B97-4058-9156-339697EEE228}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone {2CE837CD-9B97-4058-9156-339697EEE228}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone + {2CE837CD-9B97-4058-9156-339697EEE228}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator + {2CE837CD-9B97-4058-9156-339697EEE228}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator + {2CE837CD-9B97-4058-9156-339697EEE228}.AppStore|Any CPU.ActiveCfg = AppStore|iPhoneSimulator {2CE837CD-9B97-4058-9156-339697EEE228}.AppStore|iPhone.ActiveCfg = AppStore|iPhone {2CE837CD-9B97-4058-9156-339697EEE228}.AppStore|iPhone.Build.0 = AppStore|iPhone + {2CE837CD-9B97-4058-9156-339697EEE228}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator + {2CE837CD-9B97-4058-9156-339697EEE228}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator {2CE837CD-9B97-4058-9156-339697EEE228}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator {2CE837CD-9B97-4058-9156-339697EEE228}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator {2CE837CD-9B97-4058-9156-339697EEE228}.Debug|iPhone.ActiveCfg = Debug|iPhone @@ -57,26 +129,18 @@ Global {2CE837CD-9B97-4058-9156-339697EEE228}.Release|iPhone.Build.0 = Release|iPhone {2CE837CD-9B97-4058-9156-339697EEE228}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {2CE837CD-9B97-4058-9156-339697EEE228}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.AppStore|iPhone.Build.0 = Debug|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhone.Build.0 = Debug|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|Any CPU.Build.0 = Release|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhone.ActiveCfg = Release|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhone.Build.0 = Release|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {6DD98593-4498-463D-B16E-F6CC5A928B79}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {6DD98593-4498-463D-B16E-F6CC5A928B79}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {6DD98593-4498-463D-B16E-F6CC5A928B79}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU {6DD98593-4498-463D-B16E-F6CC5A928B79}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {6DD98593-4498-463D-B16E-F6CC5A928B79}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {6DD98593-4498-463D-B16E-F6CC5A928B79}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {6DD98593-4498-463D-B16E-F6CC5A928B79}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {6DD98593-4498-463D-B16E-F6CC5A928B79}.AppStore|Any CPU.Build.0 = Debug|Any CPU {6DD98593-4498-463D-B16E-F6CC5A928B79}.AppStore|iPhone.ActiveCfg = Release|Any CPU {6DD98593-4498-463D-B16E-F6CC5A928B79}.AppStore|iPhone.Build.0 = Release|Any CPU + {6DD98593-4498-463D-B16E-F6CC5A928B79}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {6DD98593-4498-463D-B16E-F6CC5A928B79}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU {6DD98593-4498-463D-B16E-F6CC5A928B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6DD98593-4498-463D-B16E-F6CC5A928B79}.Debug|Any CPU.Build.0 = Debug|Any CPU {6DD98593-4498-463D-B16E-F6CC5A928B79}.Debug|iPhone.ActiveCfg = Debug|Any CPU @@ -89,45 +153,40 @@ Global {6DD98593-4498-463D-B16E-F6CC5A928B79}.Release|iPhone.Build.0 = Release|Any CPU {6DD98593-4498-463D-B16E-F6CC5A928B79}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {6DD98593-4498-463D-B16E-F6CC5A928B79}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.AppStore|iPhone.Build.0 = Debug|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|iPhone.Build.0 = Debug|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|Any CPU.Build.0 = Release|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhone.ActiveCfg = Release|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhone.Build.0 = Release|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.AppStore|iPhone.Build.0 = Debug|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhone.Build.0 = Debug|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|Any CPU.Build.0 = Release|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhone.ActiveCfg = Release|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhone.Build.0 = Release|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.AppStore|Any CPU.Build.0 = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.AppStore|iPhone.Build.0 = Debug|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhone.Build.0 = Debug|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|Any CPU.Build.0 = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhone.ActiveCfg = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhone.Build.0 = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 $0.DotNetNamingPolicy = $1 $1.DirectoryNamespaceAssociation = PrefixedHierarchical $1.ResourceNamePolicy = FileFormatDefault - $0.TextStylePolicy = $2 + $0.TextStylePolicy = $4 $2.inheritsSet = null $2.scope = text/x-csharp $0.CSharpFormattingPolicy = $3 @@ -150,7 +209,6 @@ Global $3.inheritsSet = Mono $3.inheritsScope = text/x-csharp $3.scope = text/x-csharp - $0.TextStylePolicy = $4 $4.FileWidth = 120 $4.inheritsSet = VisualStudio $4.inheritsScope = text/plain diff --git a/src/ModernHttpClient/Android/OkHttpNetworkHandler.cs b/src/ModernHttpClient/Android/OkHttpNetworkHandler.cs index 6839410..10a74df 100644 --- a/src/ModernHttpClient/Android/OkHttpNetworkHandler.cs +++ b/src/ModernHttpClient/Android/OkHttpNetworkHandler.cs @@ -12,6 +12,7 @@ using System.Security.Cryptography.X509Certificates; using System.Globalization; using Android.OS; +using Java.Util.Concurrent; namespace ModernHttpClient { @@ -79,6 +80,11 @@ string getHeaderSeparator(string name) protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) { + var timeOut = TimeOut?.TotalMilliseconds ?? 90*1000; // 90 sec is default value provided by orginal HttpClient in .NET + client.SetConnectTimeout((long)timeOut, TimeUnit.Milliseconds); + client.SetWriteTimeout((long) timeOut, TimeUnit.Milliseconds); + client.SetReadTimeout((long)timeOut, TimeUnit.Milliseconds); + var java_uri = request.RequestUri.GetComponents(UriComponents.AbsoluteUri, UriFormat.UriEscaped); var url = new Java.Net.URL(java_uri); @@ -158,6 +164,11 @@ protected override async Task SendAsync(HttpRequestMessage return ret; } + + /// + /// Gets or sets the number of milliseconds to wait before the request times out. + /// + public TimeSpan? TimeOut { get; set; } } public static class AwaitableOkHttp diff --git a/src/ModernHttpClient/Facades.cs b/src/ModernHttpClient/Facades.cs index 114b221..3ef847a 100644 --- a/src/ModernHttpClient/Facades.cs +++ b/src/ModernHttpClient/Facades.cs @@ -20,6 +20,7 @@ public class NativeMessageHandler : HttpClientHandler /// public NativeMessageHandler(): base() { + throw new Exception(wrongVersion); } /// @@ -44,6 +45,14 @@ public void RegisterForProgress(HttpRequestMessage request, ProgressDelegate cal { throw new Exception(wrongVersion); } + + /// + /// Gets or sets the number of milliseconds to wait before the request times out. + /// + public TimeSpan? TimeOut { + get { throw new Exception(wrongVersion);} + set { throw new Exception(wrongVersion);} + } } public class ProgressStreamContent : StreamContent diff --git a/src/ModernHttpClient/ModernHttpClient.Android.csproj b/src/ModernHttpClient/ModernHttpClient.Android.csproj index 3bf778c..aaa7f0f 100644 --- a/src/ModernHttpClient/ModernHttpClient.Android.csproj +++ b/src/ModernHttpClient/ModernHttpClient.Android.csproj @@ -15,7 +15,7 @@ Assets False ModernHttpClient - v2.3 + v4.0.3 true diff --git a/src/ModernHttpClient/ModernHttpClient.Portable.csproj b/src/ModernHttpClient/ModernHttpClient.Portable.csproj index 7612313..6bc557b 100644 --- a/src/ModernHttpClient/ModernHttpClient.Portable.csproj +++ b/src/ModernHttpClient/ModernHttpClient.Portable.csproj @@ -1,4 +1,4 @@ - + Debug @@ -44,4 +44,4 @@ ..\..\ext\portable-headers\System.Net.Http.dll - + \ No newline at end of file diff --git a/src/ModernHttpClient/Resources/Resource.designer.cs b/src/ModernHttpClient/Resources/Resource.designer.cs index 19c6965..861eaa2 100644 --- a/src/ModernHttpClient/Resources/Resource.designer.cs +++ b/src/ModernHttpClient/Resources/Resource.designer.cs @@ -1,15 +1,15 @@ #pragma warning disable 1591 -// ------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.17020 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ -[assembly: Android.Runtime.ResourceDesignerAttribute("ModernHttpClient.Resource", IsApplication=false)] +[assembly: global::Android.Runtime.ResourceDesignerAttribute("ModernHttpClient.Resource", IsApplication=false)] namespace ModernHttpClient { diff --git a/src/Playground.Android/Resources/Resource.designer.cs b/src/Playground.Android/Resources/Resource.designer.cs index b947db6..8105f80 100644 --- a/src/Playground.Android/Resources/Resource.designer.cs +++ b/src/Playground.Android/Resources/Resource.designer.cs @@ -1,15 +1,15 @@ #pragma warning disable 1591 -// ------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.17020 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ -[assembly: Android.Runtime.ResourceDesignerAttribute("Playground.Android.Resource", IsApplication=true)] +[assembly: global::Android.Runtime.ResourceDesignerAttribute("Playground.Android.Resource", IsApplication=true)] namespace Playground.Android {