Skip to content

Fix public API break introduced in PR #92 #111

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

Merged
merged 1 commit into from
Jul 8, 2016
Merged

Fix public API break introduced in PR #92 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 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 @@ -168,7 +168,7 @@ protected void AssertSelf ()
/// <returns>Task in which the request is executed</returns>
/// <param name="request">Request provided by <see cref="System.Net.Http.HttpClient"/></param>
/// <param name="cancellationToken">Cancellation token.</param>
protected override Task <HttpResponseMessage> SendAsync (HttpRequestMessage request, CancellationToken cancellationToken)
protected override async Task <HttpResponseMessage> SendAsync (HttpRequestMessage request, CancellationToken cancellationToken)
{
AssertSelf ();
if (request == null)
Expand All @@ -179,8 +179,8 @@ protected void AssertSelf ()

URL java_url = new URL (request.RequestUri.ToString ());
URLConnection java_connection = java_url.OpenConnection ();
HttpURLConnection httpConnection = SetupRequestInternal (request, java_connection);
return ProcessRequest (request, java_url, httpConnection, cancellationToken);
HttpURLConnection httpConnection = await SetupRequestInternal (request, java_connection);
return await ProcessRequest (request, java_url, httpConnection, cancellationToken);
}

Task <HttpResponseMessage> ProcessRequest (HttpRequestMessage request, URL javaUrl, HttpURLConnection httpConnection, CancellationToken cancellationToken)
Expand Down Expand Up @@ -361,9 +361,9 @@ void CopyHeaders (HttpURLConnection httpConnection, HttpResponseMessage response
/// </summary>
/// <param name="request">Request data</param>
/// <param name="conn">Pre-configured connection instance</param>
protected virtual void SetupRequest (HttpRequestMessage request, HttpURLConnection conn)
protected virtual Task SetupRequest (HttpRequestMessage request, HttpURLConnection conn)
{
AssertSelf ();
return Task.Factory.StartNew (AssertSelf);
}

/// <summary>
Expand Down Expand Up @@ -422,7 +422,7 @@ void AppendEncoding (string encoding, ref List <string> list)
list.Add (encoding);
}

HttpURLConnection SetupRequestInternal (HttpRequestMessage request, URLConnection conn)
async Task <HttpURLConnection> SetupRequestInternal (HttpRequestMessage request, URLConnection conn)
{
if (conn == null)
throw new ArgumentNullException (nameof (conn));
Expand Down Expand Up @@ -467,7 +467,7 @@ HttpURLConnection SetupRequestInternal (HttpRequestMessage request, URLConnectio
}

HandlePreAuthentication (httpConnection);
SetupRequest (request, httpConnection);
await SetupRequest (request, httpConnection);
SetupRequestBody (httpConnection, request);

return httpConnection;
Expand Down
3 changes: 3 additions & 0 deletions src/Mono.Android/Xamarin.Android.Net/AndroidHttpResponseMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ public class AndroidHttpResponseMessage : HttpResponseMessage
/// <value>The requested authentication.</value>
public IList <AuthenticationData> RequestedAuthentication { get; internal set; }

public AndroidHttpResponseMessage ()
{}

public AndroidHttpResponseMessage (URL javaUrl, HttpURLConnection httpConnection) {
javaUrl = javaUrl;
httpConnection = httpConnection;
Expand Down