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

Changed http requests to http client class

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-05-25 15:06:21 +02:00
parent 9e0eae7c57
commit 90fa963cfc
66 changed files with 3584 additions and 3477 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/screens/home/home.dart
View file

@ -18,9 +18,7 @@ import 'package:adguard_home_manager/functions/number_format.dart';
import 'package:adguard_home_manager/constants/enums.dart';
import 'package:adguard_home_manager/providers/status_provider.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:adguard_home_manager/functions/snackbar.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
class Home extends StatefulWidget {
const Home({Key? key}) : super(key: key);
@ -35,6 +33,8 @@ class _HomeState extends State<Home> {
@override
initState(){
Provider.of<StatusProvider>(context, listen: false).getServerStatus();
super.initState();
isVisible = true;
@ -56,7 +56,6 @@ class _HomeState extends State<Home> {
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final statusProvider = Provider.of<StatusProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
@ -280,14 +279,8 @@ class _HomeState extends State<Home> {
builder: (context) => RefreshIndicator(
color: Theme.of(context).colorScheme.primary,
onRefresh: () async {
final result = await getServerStatus(serversProvider.selectedServer!);
if (result['result'] == 'success') {
statusProvider.setServerStatusData(
data: result['data']
);
}
else {
appConfigProvider.addLog(result['log']);
final result = await statusProvider.getServerStatus();
if (result == false) {
showSnacbkar(
appConfigProvider: appConfigProvider,
label: AppLocalizations.of(context)!.serverStatusNotRefreshed,

18
lib/screens/home/management_modal.dart
View file

@ -13,8 +13,6 @@ import 'package:adguard_home_manager/functions/compare_versions.dart';
import 'package:adguard_home_manager/providers/status_provider.dart';
import 'package:adguard_home_manager/functions/time_server_disabled.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
class ManagementModal extends StatefulWidget {
final bool dialog;
@ -74,7 +72,6 @@ class _ManagementModalState extends State<ManagementModal> with SingleTickerProv
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final statusProvider = Provider.of<StatusProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
@ -92,16 +89,12 @@ class _ManagementModalState extends State<ManagementModal> with SingleTickerProv
setState(() {
timer.cancel();
});
final result = await getServerStatus(serversProvider.selectedServer!);
if (result['result'] == 'success') {
statusProvider.setServerStatusData(
data: result['data']
);
final result = await statusProvider.getServerStatus();
if (result == false) {
setState(() {
start = start - 1;
});
}
} else {
setState(() {
start = start - 1;
});
}
},
);
@ -133,7 +126,6 @@ class _ManagementModalState extends State<ManagementModal> with SingleTickerProv
int? time
}) async {
final result = await statusProvider.updateBlocking(
server: serversProvider.selectedServer!,
block: filter,
newStatus: value,
time: time

73
lib/screens/home/top_items.dart
View file

@ -9,17 +9,14 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/domain_options.dart';
import 'package:adguard_home_manager/screens/top_items/top_items_modal.dart';
import 'package:adguard_home_manager/widgets/options_modal.dart';
import 'package:adguard_home_manager/screens/top_items/top_items.dart';
import 'package:adguard_home_manager/models/applied_filters.dart';
import 'package:adguard_home_manager/functions/snackbar.dart';
import 'package:adguard_home_manager/providers/status_provider.dart';
import 'package:adguard_home_manager/models/menu_option.dart';
import 'package:adguard_home_manager/providers/logs_provider.dart';
import 'package:adguard_home_manager/classes/process_modal.dart';
import 'package:adguard_home_manager/models/filtering_status.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
class TopItems extends StatelessWidget {
final String type;
@ -37,7 +34,6 @@ class TopItems extends StatelessWidget {
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final statusProvider = Provider.of<StatusProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
final logsProvider = Provider.of<LogsProvider>(context);
@ -60,52 +56,26 @@ class TopItems extends StatelessWidget {
final ProcessModal processModal = ProcessModal(context: context);
processModal.open(AppLocalizations.of(context)!.savingUserFilters);
final rules = await getFilteringRules(server: serversProvider.selectedServer!);
final rules = await statusProvider.blockUnblockDomain(
domain: domain,
newStatus: newStatus
);
if (rules['result'] == 'success') {
FilteringStatus oldStatus = statusProvider.serverStatus!.filteringStatus;
processModal.close();
List<String> newRules = rules['data'].userRules.where((d) => !d.contains(domain)).toList();
if (newStatus == 'block') {
newRules.add("||$domain^");
}
else if (newStatus == 'unblock') {
newRules.add("@@||$domain^");
}
FilteringStatus newObj = statusProvider.serverStatus!.filteringStatus;
newObj.userRules = newRules;
statusProvider.setFilteringStatus(newObj);
final result = await postFilteringRules(server: serversProvider.selectedServer!, data: {'rules': newRules});
processModal.close();
if (result['result'] == 'success') {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.userFilteringRulesUpdated),
backgroundColor: Colors.green,
)
);
}
else {
appConfigProvider.addLog(result['log']);
statusProvider.setFilteringStatus(oldStatus);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.userFilteringRulesNotUpdated),
backgroundColor: Colors.red,
)
);
}
if (rules == true) {
showSnacbkar(
appConfigProvider: appConfigProvider,
label: AppLocalizations.of(context)!.userFilteringRulesUpdated,
color: Colors.green
);
}
else {
appConfigProvider.addLog(rules['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.userFilteringRulesNotUpdated),
backgroundColor: Colors.red,
)
showSnacbkar(
appConfigProvider: appConfigProvider,
label: AppLocalizations.of(context)!.userFilteringRulesNotUpdated,
color: Colors.red
);
}
}
@ -143,15 +113,6 @@ class TopItems extends StatelessWidget {
];
}
void openOptionsModal(String domain, String type) {
showDialog(
context: context,
builder: (context) => OptionsModal(
options: generateOptions(domain),
)
);
}
Widget rowItem(Map<String, dynamic> item) {
String? name;
if (clients != null && clients == true) {