luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-04-24 07:46:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix format exception getServerStatus

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-11-23 10:29:21 +01:00
parent ccbe0cfd19
commit 791182d9c4
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/services/api_client.dart
View file

@ -59,24 +59,30 @@ class ApiClientV2 {
HttpRequestClient.get(urlPath: "/parental/status", server: server),
HttpRequestClient.get(urlPath: "/clients", server: server),
]);
if (
results.map((e) => e.successful).every((e) => e == true) &&
results.map((e) => e.body).every((e) => e != null)
) {
final Map<String, dynamic> mappedData = {
'stats': jsonDecode(results[0].body!),
'clients': jsonDecode(results[6].body!)['clients'],
'status': jsonDecode(results[1].body!),
'filtering': jsonDecode(results[2].body!),
'safeSearch': jsonDecode(results[3].body!),
'safeBrowsingEnabled': jsonDecode(results[4].body!),
'parentalControlEnabled': jsonDecode(results[5].body!),
};
return ApiResponse(
successful: true,
content: ServerStatus.fromJson(mappedData)
);
try {
final Map<String, dynamic> mappedData = {
'stats': jsonDecode(results[0].body!),
'clients': jsonDecode(results[6].body!)['clients'],
'status': jsonDecode(results[1].body!),
'filtering': jsonDecode(results[2].body!),
'safeSearch': jsonDecode(results[3].body!),
'safeBrowsingEnabled': jsonDecode(results[4].body!),
'parentalControlEnabled': jsonDecode(results[5].body!),
};
return ApiResponse(
successful: true,
content: ServerStatus.fromJson(mappedData)
);
} on FormatException {
return const ApiResponse(successful: false);
} catch (e, stackTrace) {
Sentry.captureException(e, stackTrace: stackTrace);
return const ApiResponse(successful: false);
}
}
else {
return const ApiResponse(successful: false);