mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-24 18:08:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

better error handling in base repo

Browse source
This commit is contained in:
Kyle Spearrin 2016-12-24 11:47:29 -05:00
parent 9682abdded
commit 8b10ee0028
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/App/Repositories/BaseApiRepository.cs
View file

@ -52,7 +52,7 @@ namespace Bit.App.Repositories
var errors = await ParseErrorsAsync(response).ConfigureAwait(false); var errors = await ParseErrorsAsync(response).ConfigureAwait(false);
return ApiResult<T>.Failed(response.StatusCode, errors.ToArray()); return ApiResult<T>.Failed(response.StatusCode, errors.ToArray());
} }
catch(JsonReaderException) catch
{ } { }
return ApiResult<T>.Failed(response.StatusCode, return ApiResult<T>.Failed(response.StatusCode,
@ -66,7 +66,7 @@ namespace Bit.App.Repositories
var errors = await ParseErrorsAsync(response).ConfigureAwait(false); var errors = await ParseErrorsAsync(response).ConfigureAwait(false);
return ApiResult.Failed(response.StatusCode, errors.ToArray()); return ApiResult.Failed(response.StatusCode, errors.ToArray());
} }
catch(JsonReaderException) catch
{ } { }
return ApiResult.Failed(response.StatusCode, return ApiResult.Failed(response.StatusCode,
@ -82,19 +82,26 @@ namespace Bit.App.Repositories
var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false); var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
var errorResponseModel = JsonConvert.DeserializeObject<ErrorResponse>(responseContent); var errorResponseModel = JsonConvert.DeserializeObject<ErrorResponse>(responseContent);
if(errorResponseModel.ValidationErrors.Count > 0) if(errorResponseModel != null)
{ {
foreach(var valError in errorResponseModel.ValidationErrors) if((errorResponseModel.ValidationErrors?.Count ?? 0) > 0)
{ {
foreach(var errorMessage in valError.Value) foreach(var valError in errorResponseModel.ValidationErrors)
{ {
errors.Add(new ApiError { Message = errorMessage }); foreach(var errorMessage in valError.Value)
{
errors.Add(new ApiError { Message = errorMessage });
}
} }
} }
else
{
errors.Add(new ApiError { Message = errorResponseModel.Message });
}
} }
else else
{ {
errors.Add(new ApiError { Message = errorResponseModel.Message }); errors.Add(new ApiError { Message = "An unknown error has occured." });
} }
} }