Skip to content

Commit 0988cf4

Browse files
alexblountalexblount
committed
[Mono.Android, Xamarin.Android.Net.AndroidClientHandler] Bug fixing and refactoing
1 parent baa6d1b commit 0988cf4

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

‎src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -209,17 +209,17 @@ protected void AssertSelf ()
209209

210210
async Task<HttpResponseMessage> DoProcessRequest (HttpRequestMessage request, HttpURLConnection httpConnection, CancellationToken cancellationToken)
211211
{
212-
if (true)
213-
System.Console.WriteLine( $"{this}.DoProcessRequest ()");
212+
if (Logger.LogNet)
213+
Logger.Log (LogLevel.Info, LOG_APP, $"{this}.DoProcessRequest ()");
214214
try {
215-
if (true)
216-
System.Console.WriteLine( $" connecting");
215+
if (Logger.LogNet)
216+
Logger.Log (LogLevel.Info, LOG_APP, $" connecting");
217217
await httpConnection.ConnectAsync ().ConfigureAwait(false);
218-
if (true)
219-
System.Console.WriteLine( $" connected");
218+
if (Logger.LogNet)
219+
Logger.Log (LogLevel.Info, LOG_APP, $" connected");
220220
} catch (Java.Net.ConnectException ex) {
221-
if (true)
222-
System.Console.WriteLine( $"Connection exception {ex}");
221+
if (Logger.LogNet)
222+
Logger.Log (LogLevel.Info, LOG_APP, $"Connection exception {ex}");
223223
// Wrap it nicely in a "standard" exception so that it's compatible with HttpClientHandler
224224
throw new WebException (ex.Message, ex, WebExceptionStatus.ConnectFailure, null);
225225
}
@@ -235,8 +235,8 @@ async Task<HttpResponseMessage> DoProcessRequest (HttpRequestMessage request, Ht
235235
StatusCode = statusCode,
236236
};
237237

238-
if (true)
239-
System.Console.WriteLine( $"Status code: {statusCode}");
238+
if (Logger.LogNet)
239+
Logger.Log (LogLevel.Info, LOG_APP, $"Status code: {statusCode}");
240240
if (statusCode == HttpStatusCode.Unauthorized || statusCode == HttpStatusCode.ProxyAuthenticationRequired) {
241241
// We don't resend the request since that would require new set of credentials if the
242242
// ones provided in Credentials are invalid (or null) and that, in turn, may require asking the
@@ -265,8 +265,8 @@ async Task<HttpResponseMessage> DoProcessRequest (HttpRequestMessage request, Ht
265265
}
266266

267267
if (!IsErrorStatusCode (statusCode)) {
268-
if (true)
269-
System.Console.WriteLine( $"Reading...");
268+
if (Logger.LogNet)
269+
Logger.Log (LogLevel.Info, LOG_APP, $"Reading...");
270270
Stream inputStream = new BufferedStream (httpConnection.InputStream);
271271
if (decompress_here) {
272272
string[] encodings = httpConnection.ContentEncoding?.Split (',');
@@ -279,8 +279,8 @@ async Task<HttpResponseMessage> DoProcessRequest (HttpRequestMessage request, Ht
279279
}
280280
ret.Content = new StreamContent (inputStream);
281281
} else {
282-
if (true)
283-
System.Console.WriteLine( $"Status code is {statusCode}, returning empty content");
282+
if (Logger.LogNet)
283+
Logger.Log (LogLevel.Info, LOG_APP, $"Status code is {statusCode}, returning empty content");
284284
// For 400 >= response code <= 599 the Java client throws the FileNotFound exeption when attempting to read from the connection
285285
// Client tests require we return no content here
286286
ret.Content = new StringContent (String.Empty, Encoding.ASCII);
@@ -289,26 +289,26 @@ async Task<HttpResponseMessage> DoProcessRequest (HttpRequestMessage request, Ht
289289

290290
IEnumerable <string> cookieHeaderValue;
291291
if (!UseCookies || CookieContainer == null || !ret.Headers.TryGetValues ("Set-Cookie", out cookieHeaderValue) || cookieHeaderValue == null) {
292-
if (true)
293-
System.Console.WriteLine( $"No cookies");
292+
if (Logger.LogNet)
293+
Logger.Log (LogLevel.Info, LOG_APP, $"No cookies");
294294
return ret;
295295
}
296296

297297
try {
298-
if (true)
299-
System.Console.WriteLine( $"Parsing cookies");
298+
if (Logger.LogNet)
299+
Logger.Log (LogLevel.Info, LOG_APP, $"Parsing cookies");
300300
CookieContainer.SetCookies (connectionUri, String.Join (",", cookieHeaderValue));
301301
} catch (Exception ex) {
302302
// We don't want to terminate the response because of a bad cookie, hence just reporting
303303
// the issue. We might consider adding a virtual method to let the user handle the
304304
// issue, but not sure if it's really needed. Set-Cookie header will be part of the
305305
// header collection so the user can always examine it if they spot an error.
306-
if (true)
307-
System.Console.WriteLine( $"Failed to parse cookies in the server response. {ex.GetType ()}: {ex.Message}");
306+
if (Logger.LogNet)
307+
Logger.Log (LogLevel.Info, LOG_APP, $"Failed to parse cookies in the server response. {ex.GetType ()}: {ex.Message}");
308308
}
309309

310-
if (true)
311-
System.Console.WriteLine( $"Returning");
310+
if (Logger.LogNet)
311+
Logger.Log (LogLevel.Info, LOG_APP, $"Returning");
312312
return ret;
313313
}
314314

‎src/Xamarin.Android.Build.Tasks/Ionic.Zip.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
{
164164
if (filesToZip.Count == 0)
165165
{
166-
System.Console.WriteLine("Nothing to do.");
166+
Logger.Log (LogLevel.Info, LOG_APP,"Nothing to do.");
167167
return;
168168
}
169169

@@ -176,7 +176,7 @@
176176

177177
foreach (string inputFileName in filesToZip)
178178
{
179-
System.Console.WriteLine("file: {0}", inputFileName);
179+
Logger.Log (LogLevel.Info, LOG_APP,"file: {0}", inputFileName);
180180

181181
output.PutNextEntry(inputFileName);
182182
using (var input = File.Open(inputFileName, FileMode.Open, FileAccess.Read, FileShare.Read | FileShare.Write ))
@@ -249,7 +249,7 @@
249249
{
250250
if (filesToZip.Count == 0)
251251
{
252-
System.Console.WriteLine("Nothing to do.");
252+
Logger.Log (LogLevel.Info, LOG_APP,"Nothing to do.");
253253
return;
254254
}
255255

@@ -260,7 +260,7 @@
260260

261261
foreach (string inputFileName in filesToZip)
262262
{
263-
System.Console.WriteLine("file: {0}", inputFileName);
263+
Logger.Log (LogLevel.Info, LOG_APP,"file: {0}", inputFileName);
264264

265265
output.PutNextEntry(inputFileName);
266266
using (var input = File.Open(inputFileName, FileMode.Open, FileAccess.Read,
@@ -10467,17 +10467,17 @@
1046710467
{
1046810468
if (header)
1046910469
{
10470-
System.Console.WriteLine("Zipfile: {0}", zip.Name);
10471-
System.Console.WriteLine("Version Needed: 0x{0:X2}", e.VersionNeeded);
10472-
System.Console.WriteLine("BitField: 0x{0:X2}", e.BitField);
10473-
System.Console.WriteLine("Compression Method: 0x{0:X2}", e.CompressionMethod);
10474-
System.Console.WriteLine("\n{1,-22} {2,-6} {3,4} {4,-8} {0}",
10470+
Logger.Log (LogLevel.Info, LOG_APP,"Zipfile: {0}", zip.Name);
10471+
Logger.Log (LogLevel.Info, LOG_APP,"Version Needed: 0x{0:X2}", e.VersionNeeded);
10472+
Logger.Log (LogLevel.Info, LOG_APP,"BitField: 0x{0:X2}", e.BitField);
10473+
Logger.Log (LogLevel.Info, LOG_APP,"Compression Method: 0x{0:X2}", e.CompressionMethod);
10474+
Logger.Log (LogLevel.Info, LOG_APP,"\n{1,-22} {2,-6} {3,4} {4,-8} {0}",
1047510475
"Filename", "Modified", "Size", "Ratio", "Packed");
10476-
System.Console.WriteLine(new System.String('-', 72));
10476+
Logger.Log (LogLevel.Info, LOG_APP,new System.String('-', 72));
1047710477
header = false;
1047810478
}
1047910479

10480-
System.Console.WriteLine("{1,-22} {2,-6} {3,4:F0}% {4,-8} {0}",
10480+
Logger.Log (LogLevel.Info, LOG_APP,"{1,-22} {2,-6} {3,4:F0}% {4,-8} {0}",
1048110481
e.FileName,
1048210482
e.LastModified.ToString("yyyy-MM-dd HH:mm:ss"),
1048310483
e.UncompressedSize,

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Ionic.Zip.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
{
150150
if (filesToZip.Count == 0)
151151
{
152-
System.Console.WriteLine("Nothing to do.");
152+
Logger.Log (LogLevel.Info, LOG_APP,"Nothing to do.");
153153
return;
154154
}
155155

@@ -162,7 +162,7 @@
162162

163163
foreach (string inputFileName in filesToZip)
164164
{
165-
System.Console.WriteLine("file: {0}", inputFileName);
165+
Logger.Log (LogLevel.Info, LOG_APP,"file: {0}", inputFileName);
166166

167167
output.PutNextEntry(inputFileName);
168168
using (var input = File.Open(inputFileName, FileMode.Open, FileAccess.Read, FileShare.Read | FileShare.Write ))
@@ -229,7 +229,7 @@
229229
{
230230
if (filesToZip.Count == 0)
231231
{
232-
System.Console.WriteLine("Nothing to do.");
232+
Logger.Log (LogLevel.Info, LOG_APP,"Nothing to do.");
233233
return;
234234
}
235235

@@ -240,7 +240,7 @@
240240

241241
foreach (string inputFileName in filesToZip)
242242
{
243-
System.Console.WriteLine("file: {0}", inputFileName);
243+
Logger.Log (LogLevel.Info, LOG_APP,"file: {0}", inputFileName);
244244

245245
output.PutNextEntry(inputFileName);
246246
using (var input = File.Open(inputFileName, FileMode.Open, FileAccess.Read,
@@ -9236,17 +9236,17 @@
92369236
{
92379237
if (header)
92389238
{
9239-
System.Console.WriteLine("Zipfile: {0}", zip.Name);
9240-
System.Console.WriteLine("Version Needed: 0x{0:X2}", e.VersionNeeded);
9241-
System.Console.WriteLine("BitField: 0x{0:X2}", e.BitField);
9242-
System.Console.WriteLine("Compression Method: 0x{0:X2}", e.CompressionMethod);
9243-
System.Console.WriteLine("\n{1,-22} {2,-6} {3,4} {4,-8} {0}",
9239+
Logger.Log (LogLevel.Info, LOG_APP,"Zipfile: {0}", zip.Name);
9240+
Logger.Log (LogLevel.Info, LOG_APP,"Version Needed: 0x{0:X2}", e.VersionNeeded);
9241+
Logger.Log (LogLevel.Info, LOG_APP,"BitField: 0x{0:X2}", e.BitField);
9242+
Logger.Log (LogLevel.Info, LOG_APP,"Compression Method: 0x{0:X2}", e.CompressionMethod);
9243+
Logger.Log (LogLevel.Info, LOG_APP,"\n{1,-22} {2,-6} {3,4} {4,-8} {0}",
92449244
"Filename", "Modified", "Size", "Ratio", "Packed");
9245-
System.Console.WriteLine(new System.String('-', 72));
9245+
Logger.Log (LogLevel.Info, LOG_APP,new System.String('-', 72));
92469246
header = false;
92479247
}
92489248

9249-
System.Console.WriteLine("{1,-22} {2,-6} {3,4:F0}% {4,-8} {0}",
9249+
Logger.Log (LogLevel.Info, LOG_APP,"{1,-22} {2,-6} {3,4:F0}% {4,-8} {0}",
92509250
e.FileName,
92519251
e.LastModified.ToString("yyyy-MM-dd HH:mm:ss"),
92529252
e.UncompressedSize,

0 commit comments

Comments
 (0)