luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-04 20:30:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugs fixed

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-11-15 18:16:43 +01:00
parent c1950fdc2b
commit 1ea71265e2
6 changed files with 54 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

75
lib/services/http_requests.dart
View file

@ -1330,55 +1330,68 @@ class ApiClient {
}
Future getDhcpData() async {
final result = await Future.wait([
apiRequest(
urlPath: '/dhcp/interfaces',
method: 'get',
server: server,
type: 'get_dhcp_data'
),
apiRequest(
urlPath: '/dhcp/status',
method: 'get',
server: server,
type: 'get_dhcp_data'
),
]);
try {
final result = await Future.wait([
apiRequest(
urlPath: '/dhcp/interfaces',
method: 'get',
server: server,
type: 'get_dhcp_data'
),
apiRequest(
urlPath: '/dhcp/status',
method: 'get',
server: server,
type: 'get_dhcp_data'
),
]);
if (result[0]['hasResponse'] == true && result[1]['hasResponse'] == true) {
if (result[0]['statusCode'] == 200 && result[1]['statusCode'] == 200) {
List<NetworkInterface> interfaces = List<NetworkInterface>.from(jsonDecode(result[0]['body']).entries.map((entry) => NetworkInterface.fromJson(entry.value)));
if (result[0]['hasResponse'] == true && result[1]['hasResponse'] == true) {
if (result[0]['statusCode'] == 200 && result[1]['statusCode'] == 200) {
List<NetworkInterface> interfaces = List<NetworkInterface>.from(jsonDecode(result[0]['body']).entries.map((entry) => NetworkInterface.fromJson(entry.value)));
return {
'result': 'success',
'data': DhcpModel(
networkInterfaces: interfaces,
dhcpStatus: DhcpStatus.fromJson(jsonDecode(result[1]['body']))
)
};
return {
'result': 'success',
'data': DhcpModel(
networkInterfaces: interfaces,
dhcpStatus: DhcpStatus.fromJson(jsonDecode(result[1]['body']))
)
};
}
else {
return {
'result': 'error',
'log': AppLog(
type: 'get_dhcp_data',
dateTime: DateTime.now(),
message: 'error_code_not_expected',
statusCode: result.map((res) => res['statusCode'] ?? 'null').toString(),
resBody: result.map((res) => res['body'] ?? 'null').toString(),
)
};
}
}
else {
return {
'result': 'error',
'log': AppLog(
type: 'get_dhcp_data',
type: 'get_dhpc_data',
dateTime: DateTime.now(),
message: 'error_code_not_expected',
message: [result[0]['log'].message, result[1]['log'].message].toString(),
statusCode: result.map((res) => res['statusCode'] ?? 'null').toString(),
resBody: result.map((res) => res['body'] ?? 'null').toString(),
)
};
}
}
else {
} catch (e) {
Sentry.captureException(e);
return {
'result': 'error',
'log': AppLog(
type: 'get_dhpc_data',
dateTime: DateTime.now(),
message: [result[0]['log'].message, result[1]['log'].message].toString(),
statusCode: result.map((res) => res['statusCode'] ?? 'null').toString(),
resBody: result.map((res) => res['body'] ?? 'null').toString(),
message: 'error_code_not_expected',
resBody: e.toString(),
)
};
}