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

better error parsing

Browse source
This commit is contained in:
Kyle Spearrin 2017-02-06 09:15:10 -05:00
parent 0a3c83288e
commit 54f8771a9c
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ using Plugin.Connectivity.Abstractions;
using Bit.App.Abstractions; using Bit.App.Abstractions;
using System.Net; using System.Net;
using XLabs.Ioc; using XLabs.Ioc;
using Newtonsoft.Json.Linq;
namespace Bit.App.Repositories namespace Bit.App.Repositories
{ {
@ -191,7 +192,17 @@ namespace Bit.App.Repositories
if(statusCode >= 400 && statusCode <= 500) if(statusCode >= 400 && statusCode <= 500)
{ {
var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false); var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
var errorResponseModel = JsonConvert.DeserializeObject<ErrorResponse>(responseContent);
ErrorResponse errorResponseModel = null;
var errorResponse = JObject.Parse(responseContent);
if(errorResponse["ErrorModel"] != null && errorResponse["ErrorModel"]["Message"] != null)
{
errorResponseModel = errorResponse["ErrorModel"].ToObject<ErrorResponse>();
}
else if(errorResponse["Message"] != null)
{
errorResponseModel = errorResponse.ToObject<ErrorResponse>();
}
if(errorResponseModel != null) if(errorResponseModel != null)
{ {
@ -210,10 +221,11 @@ namespace Bit.App.Repositories
errors.Add(new ApiError { Message = errorResponseModel.Message }); errors.Add(new ApiError { Message = errorResponseModel.Message });
} }
} }
else }
{
errors.Add(new ApiError { Message = "An unknown error has occured." }); if(errors.Count == 0)
} {
errors.Add(new ApiError { Message = "An unknown error has occured." });
} }
return errors; return errors;