Changed api requests

This commit is contained in:
Juan Gilsanz Polo 2023-11-19 22:52:40 +01:00
parent f14828ae19
commit e161cfb594
32 changed files with 1376 additions and 740 deletions

View file

@ -8,6 +8,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/add_server/add_server_functions.dart';
import 'package:adguard_home_manager/widgets/servers_list/delete_modal.dart';
import 'package:adguard_home_manager/models/server_status.dart';
import 'package:adguard_home_manager/services/api_client.dart';
import 'package:adguard_home_manager/classes/process_modal.dart';
import 'package:adguard_home_manager/functions/snackbar.dart';
import 'package:adguard_home_manager/constants/enums.dart';
@ -104,23 +106,21 @@ class _ServersListItemState extends State<ServersListItem> with SingleTickerProv
if (result['result'] == 'success') {
final ApiClient apiClient = ApiClient(server: server);
serversProvider.setApiClient(apiClient);
final ApiClientV2 apiClient2 = ApiClientV2(server: server);
serversProvider.setApiClient2(apiClient2);
serversProvider.setSelectedServer(server);
statusProvider.setServerStatusLoad(LoadStatus.loading);
final serverStatus = await apiClient.getServerStatus();
if (serverStatus['result'] == 'success') {
final serverStatus = await apiClient2.getServerStatus();
if (serverStatus.successful == true) {
statusProvider.setServerStatusData(
data: serverStatus['data']
data: serverStatus.content as ServerStatus
);
serversProvider.checkServerUpdatesAvailable(
server: server,
);
statusProvider.setServerStatusLoad(LoadStatus.loaded);
}
else {
appConfigProvider.addLog(serverStatus['log']);
statusProvider.setServerStatusLoad(LoadStatus.error);
}
process.close();
}

View file

@ -7,6 +7,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/add_server/add_server_functions.dart';
import 'package:adguard_home_manager/widgets/servers_list/delete_modal.dart';
import 'package:adguard_home_manager/models/server_status.dart';
import 'package:adguard_home_manager/services/api_client.dart';
import 'package:adguard_home_manager/classes/process_modal.dart';
import 'package:adguard_home_manager/functions/snackbar.dart';
import 'package:adguard_home_manager/constants/enums.dart';
@ -73,13 +75,15 @@ class _ServersTileItemState extends State<ServersTileItem> with SingleTickerProv
if (result['result'] == 'success') {
final ApiClient apiClient = ApiClient(server: server);
serversProvider.setApiClient(apiClient);
final ApiClientV2 apiClient2 = ApiClientV2(server: server);
serversProvider.setApiClient2(apiClient2);
serversProvider.setSelectedServer(server);
statusProvider.setServerStatusLoad(LoadStatus.loading);
final serverStatus = await apiClient.getServerStatus();
if (serverStatus['result'] == 'success') {
final serverStatus = await apiClient2.getServerStatus();
if (serverStatus.successful == true) {
statusProvider.setServerStatusData(
data: serverStatus['data']
data: serverStatus.content as ServerStatus
);
serversProvider.checkServerUpdatesAvailable(
server: server,
@ -87,7 +91,6 @@ class _ServersTileItemState extends State<ServersTileItem> with SingleTickerProv
statusProvider.setServerStatusLoad(LoadStatus.loaded);
}
else {
appConfigProvider.addLog(serverStatus['log']);
statusProvider.setServerStatusLoad(LoadStatus.error);
}