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

Added log generation for all requests

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-10-03 22:41:19 +02:00
parent 82e8b0d9d3
commit 511f86e336
11 changed files with 39 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/providers/servers_provider.dart
View file

@ -178,7 +178,7 @@ class ServersProvider with ChangeNotifier {
}
}
Future<bool> updateBlocking(Server server, String block, bool newStatus) async {
Future<dynamic> updateBlocking(Server server, String block, bool newStatus) async {
switch (block) {
case 'general':
_protectionsManagementProcess.add('general');
@ -195,7 +195,7 @@ class ServersProvider with ChangeNotifier {
}
else {
notifyListeners();
return false;
return result['log'];
}
case 'filtering':
@ -212,8 +212,9 @@ class ServersProvider with ChangeNotifier {
return true;
}
else {
notifyListeners();
return false;
return result['log'];
}
case 'safeSearch':
@ -231,7 +232,7 @@ class ServersProvider with ChangeNotifier {
}
else {
notifyListeners();
return false;
return result['log'];
}
case 'safeBrowsing':
@ -249,7 +250,7 @@ class ServersProvider with ChangeNotifier {
}
else {
notifyListeners();
return false;
return result['log'];
}
case 'parentalControl':
@ -267,7 +268,7 @@ class ServersProvider with ChangeNotifier {
}
else {
notifyListeners();
return false;
return result['log'];
}
default:

6
lib/screens/clients/blocked_allowed_list.dart
View file

@ -1,12 +1,13 @@
// ignore_for_file: use_build_context_synchronously
import 'package:adguard_home_manager/models/clients_allowed_blocked.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/clients/remove_domain_modal.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/models/clients_allowed_blocked.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:adguard_home_manager/classes/process_modal.dart';
@ -26,6 +27,7 @@ class BlockedAllowedList extends StatelessWidget {
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
void confirmRemoveDomain(String domain) async {
Map<String, List<String>> body = {};
@ -62,6 +64,7 @@ class BlockedAllowedList extends StatelessWidget {
);
}
else if (result['result'] == 'error' && result['message'] == 'client_another_list') {
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.clientAnotherList),
@ -70,6 +73,7 @@ class BlockedAllowedList extends StatelessWidget {
);
}
else {
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.clientNotRemoved),

7
lib/screens/clients/clients.dart
View file

@ -5,6 +5,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/clients/clients_list.dart';
import 'package:adguard_home_manager/screens/clients/blocked_allowed_list.dart';
import 'package:adguard_home_manager/models/app_log.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/models/server.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
@ -24,6 +25,7 @@ class Clients extends StatelessWidget {
setLoadingStatus: serversProvider.setClientsLoadStatus,
setClientsData: serversProvider.setClientsData,
setSelectedClientsTab: appConfigProvider.setSelectedClientsTab,
addLog: appConfigProvider.addLog,
);
}
}
@ -33,13 +35,15 @@ class ClientsWidget extends StatefulWidget {
final void Function(int, bool) setLoadingStatus;
final void Function(ClientsData) setClientsData;
final void Function(int) setSelectedClientsTab;
final void Function(AppLog) addLog;
const ClientsWidget({
Key? key,
required this.server,
required this.setLoadingStatus,
required this.setClientsData,
required this.setSelectedClientsTab
required this.setSelectedClientsTab,
required this.addLog,
}) : super(key: key);
@override
@ -57,6 +61,7 @@ class _ClientsWidgetState extends State<ClientsWidget> with TickerProviderStateM
widget.setLoadingStatus(1, true);
}
else {
widget.addLog(result['log']);
widget.setLoadingStatus(2, true);
}
}

2
lib/screens/clients/fab.dart
View file

@ -63,6 +63,7 @@ class ClientsFab extends StatelessWidget {
);
}
else if (result['result'] == 'error' && result['message'] == 'client_another_list') {
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.clientAnotherList),
@ -71,6 +72,7 @@ class ClientsFab extends StatelessWidget {
);
}
else {
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.clientNotAdded),

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

@ -7,6 +7,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/home/server_status.dart';
import 'package:adguard_home_manager/screens/home/top_items.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';
@ -16,6 +17,7 @@ class Home extends StatelessWidget {
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
Widget status() {
switch (serversProvider.serverStatus.loadStatus) {
@ -126,6 +128,7 @@ class Home extends StatelessWidget {
serversProvider.setServerStatusData(result['data']);
}
else {
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.serverStatusNotRefreshed),

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

@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
class ManagementModal extends StatelessWidget {
@ -12,6 +13,7 @@ class ManagementModal extends StatelessWidget {
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
void updateBlocking(bool value, String filter) async {
final result = await serversProvider.updateBlocking(
@ -19,7 +21,10 @@ class ManagementModal extends StatelessWidget {
filter,
value
);
if (result == false) {
if (result != null ) {
if (result != false) {
appConfigProvider.addLog(result['log']);
}
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.invalidUsernamePassword),

4
lib/screens/logs/log_tile.dart
View file

@ -6,6 +6,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/logs/log_details_modal.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/functions/get_filtered_status.dart';
import 'package:adguard_home_manager/models/filtering_status.dart';
import 'package:adguard_home_manager/classes/process_modal.dart';
@ -29,6 +30,7 @@ class LogTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
final width = MediaQuery.of(context).size.width;
@ -99,6 +101,7 @@ class LogTile extends StatelessWidget {
);
}
else {
appConfigProvider.addLog(result['log']);
serversProvider.setFilteringStatus(oldStatus);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
@ -109,6 +112,7 @@ class LogTile extends StatelessWidget {
}
}
else {
appConfigProvider.addLog(rules['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.userFilteringRulesNotUpdated),

1
lib/screens/logs/logs.dart
View file

@ -97,6 +97,7 @@ class _LogsWidgetState extends State<LogsWidget> {
widget.serversProvider.setFilteringStatus(result['data']);
}
else {
widget.appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.couldntGetFilteringStatus),

3
lib/screens/top_items/top_items.dart
View file

@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/functions/number_format.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
@ -23,6 +24,7 @@ class TopItemsScreen extends StatelessWidget {
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
List<Map<String, dynamic>> data = [];
switch (type) {
@ -58,6 +60,7 @@ class TopItemsScreen extends StatelessWidget {
serversProvider.setServerStatusData(result['data']);
}
else {
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.serverStatusNotRefreshed),

2
lib/widgets/add_server_modal.dart
View file

@ -270,12 +270,12 @@ class _AddServerModalState extends State<AddServerModal> {
serversProvider.setServerStatusLoad(1);
}
else {
appConfigProvider.addLog(serverStatus['log']);
serversProvider.setServerStatusLoad(2);
}
Navigator.pop(context);
}
else {
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.connectionNotCreated),

2
lib/widgets/servers_list/servers_list.dart
View file

@ -72,7 +72,7 @@ class ServersList extends StatelessWidget {
serversProvider.setServerStatusLoad(1);
}
else {
appConfigProvider.addLog(result['log']);
appConfigProvider.addLog(serverStatus['log']);
serversProvider.setServerStatusLoad(2);
}