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

Replaced old http service with new one

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-11-20 15:00:07 +01:00
parent 39cdcf648d
commit 48f33eee9b
14 changed files with 466 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/screens/clients/client/logs_list_client.dart
View file

@ -67,7 +67,7 @@ class _LogsListClientState extends State<LogsListClient> {
if (cancelableRequest != null) cancelableRequest!.cancel();
cancelableRequest = CancelableOperation.fromFuture(
serversProvider.apiClient!.getLogs(
serversProvider.apiClient2!.getLogs(
count: logsQuantity,
offset: offst,
search: '"${widget.ip}"'

4
lib/screens/settings/dhcp/dhcp.dart
View file

@ -260,11 +260,11 @@ class _DhcpScreenState extends State<DhcpScreen> {
ProcessModal processModal = ProcessModal(context: context);
processModal.open(AppLocalizations.of(context)!.restoringLeases);
final result = await serversProvider.apiClient!.restoreAllLeases();
final result = await serversProvider.apiClient2!.restoreAllLeases();
processModal.close();
if (result['result'] == 'success') {
if (result.successful == true) {
DhcpModel data = dhcpProvider.dhcp!;
data.dhcpStatus.staticLeases = [];
data.dhcpStatus.leases = [];

58
lib/screens/settings/server_info/server_info.dart
View file

@ -1,61 +1,37 @@
import 'package:adguard_home_manager/constants/enums.dart';
import 'package:adguard_home_manager/functions/desktop_mode.dart';
import 'package:animations/animations.dart';
import 'package:flutter/material.dart';
import 'package:animations/animations.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/settings/server_info/dns_addresses_modal.dart';
import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/constants/enums.dart';
import 'package:adguard_home_manager/functions/desktop_mode.dart';
import 'package:adguard_home_manager/models/server_info.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
class ServerInformation extends StatelessWidget {
const ServerInformation({Key? key}) : super(key: key);
class ServerInformation extends StatefulWidget {
const ServerInformation({super.key});
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
return ServerInformationWidget(
serversProvider: serversProvider,
appConfigProvider: appConfigProvider,
);
}
State<ServerInformation> createState() => _ServerInformationState();
}
class ServerInformationWidget extends StatefulWidget {
final ServersProvider serversProvider;
final AppConfigProvider appConfigProvider;
const ServerInformationWidget({
Key? key,
required this.serversProvider,
required this.appConfigProvider,
}) : super(key: key);
@override
State<ServerInformationWidget> createState() => _ServerInformationWidgetState();
}
class _ServerInformationWidgetState extends State<ServerInformationWidget> {
class _ServerInformationState extends State<ServerInformation> {
ServerInfo serverInfo = ServerInfo(loadStatus: LoadStatus.loading);
void fetchServerInfo() async {
final result = await Provider.of<ServersProvider>(context, listen: false).apiClient!.getServerInfo();
if (mounted) {
if (result['result'] == 'success') {
setState(() {
serverInfo.data = result['data'];
serverInfo.loadStatus = LoadStatus.loaded;
});
}
else {
setState(() => serverInfo.loadStatus = LoadStatus.error);
}
final result = await Provider.of<ServersProvider>(context, listen: false).apiClient2!.getServerInfo();
if (!mounted) return;
if (result.successful == true) {
setState(() {
serverInfo.data = result.content as ServerInfoData;
serverInfo.loadStatus = LoadStatus.loaded;
});
}
else {
setState(() => serverInfo.loadStatus = LoadStatus.error);
}
}

2
lib/screens/settings/settings.dart
View file

@ -166,7 +166,7 @@ class _SettingsWidgetState extends State<SettingsWidget> {
if (
serversProvider.selectedServer != null &&
statusProvider.serverStatus != null &&
serversProvider.apiClient != null
serversProvider.apiClient2 != null
) ...[
SectionLabel(label: AppLocalizations.of(context)!.serverSettings),
settingsTile(