Merge pull request anaisbetts#193 from thefex/master

Timeout value is not respected on Android anaisbetts#192
fabionuno · Nov 20, 2015 · a5563a9 · a5563a9
2 parents cec90f3 + a852e77
commit a5563a9
Show file tree

Hide file tree

Showing 11 changed files with 188 additions and 106 deletions.
diff --git a/ModernHttpClient.sln b/ModernHttpClient.sln
diff --git 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<HttpResponseMessage> 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);
 
@@ -160,6 +166,11 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
 
             return ret;
         }
+
+        /// <summary>
+        /// Gets or sets the number of milliseconds to wait before the request times out.
+        /// </summary>
+        public TimeSpan? TimeOut { get; set; }
     }
 
     public static class AwaitableOkHttp

diff --git a/src/ModernHttpClient/Facades.cs b/src/ModernHttpClient/Facades.cs
@@ -20,6 +20,7 @@ public class NativeMessageHandler : HttpClientHandler
         /// </summary>
         public NativeMessageHandler(): base()
         {
+            throw new Exception(wrongVersion);
         }
 
         /// <summary>
@@ -44,6 +45,14 @@ public void RegisterForProgress(HttpRequestMessage request, ProgressDelegate cal
         {
             throw new Exception(wrongVersion);
         }
+
+        /// <summary>
+        /// Gets or sets the number of milliseconds to wait before the request times out.
+        /// </summary>
+        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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,7 +15,7 @@
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
     <AssemblyName>ModernHttpClient</AssemblyName>
-    <TargetFrameworkVersion>v2.3</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,6 +40,14 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Square.OkHttp, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Square.OkHttp.2.5.0.0\lib\MonoAndroid\Square.OkHttp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Square.OkIO, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Square.OkIO.1.6.0.0\lib\MonoAndroid\Square.OkIO.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -49,21 +57,16 @@
     <Compile Include="Android\OkHttpNetworkHandler.cs" />
     <None Include="Resources\AboutResources.txt" />
     <AndroidResource Include="Resources\values\Strings.xml" />
-    <Folder Include="Android\Properties\" />
     <Compile Include="Android\ConcatenatingStream.cs" />
-    <Folder Include="Properties\" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ProgressStreamContent.cs" />
     <Compile Include="Utility.cs" />
     <Compile Include="CaptiveNetworkException.cs" />
     <Compile Include="Android\NativeCookieHandler.cs" />
-    <Reference Include="Square.OkIO">
-      <HintPath>..\..\packages\Square.OkIO.1.5.0.0\lib\MonoAndroid\Square.OkIO.dll</HintPath>
-    </Reference>
     <None Include="packages.config" />
-    <Reference Include="Square.OkHttp">
-      <HintPath>..\..\packages\Square.OkHttp.2.4.0.3\lib\MonoAndroid\Square.OkHttp.dll</HintPath>
-    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Android\Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
-</Project>
+</Project>
diff --git a/src/ModernHttpClient/ModernHttpClient.Portable.csproj b/src/ModernHttpClient/ModernHttpClient.Portable.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -44,4 +44,4 @@
       <HintPath>..\..\ext\portable-headers\System.Net.Http.dll</HintPath>
     </Reference>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/ModernHttpClient/Resources/Resource.designer.cs b/src/ModernHttpClient/Resources/Resource.designer.cs
diff --git a/src/ModernHttpClient/packages.config b/src/ModernHttpClient/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Square.OkHttp" version="2.4.0.3" targetFramework="MonoAndroid23" />
-  <package id="Square.OkIO" version="1.5.0.0" targetFramework="MonoAndroid23" />
+  <package id="Square.OkHttp" version="2.5.0.0" targetFramework="monoandroid23" />
+  <package id="Square.OkIO" version="1.6.0.0" targetFramework="monoandroid23" />
 </packages>
diff --git a/src/Playground.Android/Playground.Android.csproj b/src/Playground.Android/Playground.Android.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -46,28 +46,30 @@
     </CustomCommands>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Square.OkHttp, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Square.OkHttp.2.5.0.0\lib\MonoAndroid\Square.OkHttp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Square.OkIO, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Square.OkIO.1.6.0.0\lib\MonoAndroid\Square.OkIO.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="Square.OkIO">
-      <HintPath>..\..\packages\Square.OkIO.1.5.0.0\lib\MonoAndroid\Square.OkIO.dll</HintPath>
-    </Reference>
-    <Reference Include="Square.OkHttp">
-      <HintPath>..\..\packages\Square.OkHttp.2.4.0.3\lib\MonoAndroid\Square.OkHttp.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
     <None Include="Properties\AndroidManifest.xml" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\Main.axml" />
@@ -81,4 +83,4 @@
       <Name>ModernHttpClient.Android</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Playground.Android/Resources/Resource.designer.cs b/src/Playground.Android/Resources/Resource.designer.cs
diff --git a/src/Playground.Android/packages.config b/src/Playground.Android/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Square.OkHttp" version="2.4.0.3" targetFramework="MonoAndroid403" />
-  <package id="Square.OkIO" version="1.5.0.0" targetFramework="MonoAndroid403" />
+  <package id="Square.OkHttp" version="2.5.0.0" targetFramework="monoandroid403" />
+  <package id="Square.OkIO" version="1.6.0.0" targetFramework="monoandroid403" />
 </packages>
diff --git a/src/Playground.iOS/Playground.iOS.csproj b/src/Playground.iOS/Playground.iOS.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,7 +12,6 @@
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>PlaygroundiOS</AssemblyName>
     <TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -132,4 +131,4 @@
       <Name>ModernHttpClient.iOS64</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
+</Project>