Skip to content

[Xamarin.Android.Net] Changes to CancellationToken support in AndroidClientHandler #321

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

Closed
leonluc-dev wants to merge 2 commits into from
Closed

[Xamarin.Android.Net] Changes to CancellationToken support in AndroidClientHandler #321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03604e0
[Xamarin.Android.Net] Extra AndroidClientHandler cancellationToken ch…
leonluc-dev Nov 29, 2016
d7a023e
Exposed Content as stream to support CancellationToken
leonluc-dev Nov 29, 2016
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
13 changes: 11 additions & 2 deletions src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ string EncodeUrl (Uri url)
try {
if (Logger.LogNet)
Logger.Log (LogLevel.Info, LOG_APP, $" connecting");
await httpConnection.ConnectAsync ().ConfigureAwait (false);
await Task.WhenAny(httpConnection.ConnectAsync(),Task.Run(()=> { cancellationToken.WaitHandle.WaitOne(); })).ConfigureAwait(false);
if (Logger.LogNet)
Logger.Log (LogLevel.Info, LOG_APP, $" connected");
} catch (Java.Net.ConnectException ex) {
Expand All @@ -265,7 +265,16 @@ string EncodeUrl (Uri url)
cancellationToken.Register (httpConnection.Disconnect);

if (httpConnection.DoOutput) {
await request.Content.CopyToAsync (httpConnection.OutputStream).ConfigureAwait (false);
using (var stream = await request.Content.ReadAsStreamAsync())
{
await stream.CopyToAsync(httpConnection.OutputStream, 4096, cancellationToken).ConfigureAwait(false);
}
}

if (cancellationToken.IsCancellationRequested)
{
httpConnection.Disconnect();
Copy link
Copy Markdown
Contributor

@jonpryor jonpryor Nov 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation here is weird. Is there an extra tab on this line and the following?

cancellationToken.ThrowIfCancellationRequested();
}

var statusCode = await Task.Run (() => (HttpStatusCode)httpConnection.ResponseCode).ConfigureAwait (false);
Expand Down