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

Fixed whois issue logs

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-11-30 23:35:31 +01:00
parent c03d536bc8
commit a3e3c67c1c
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/models/logs.dart
View file

@ -148,7 +148,7 @@ class ClientInfo {
});
factory ClientInfo.fromJson(Map<String, dynamic> json) => ClientInfo(
whois: Whois.fromJson(json["whois"]),
whois: Whois.fromJson(Map<String, dynamic>.from(json["whois"])),
name: json["name"],
disallowedRule: json["disallowed_rule"],
disallowed: json["disallowed"],

34
lib/screens/logs/log_details_screen.dart
View file

@ -1,11 +1,11 @@
// ignore_for_file: use_build_context_synchronously
import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
import 'package:adguard_home_manager/widgets/section_label.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/widgets/section_label.dart';
import 'package:adguard_home_manager/screens/logs/log_list_tile.dart';
import 'package:adguard_home_manager/classes/process_modal.dart';
@ -30,10 +30,14 @@ class LogDetailsScreen extends StatelessWidget {
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
Filter getList(int id) {
return serversProvider.filteringStatus!.filters.firstWhere((filter) => filter.id == id, orElse: () {
return serversProvider.filteringStatus!.whitelistFilters.firstWhere((filter) => filter.id == id);
});
Filter? getList(int id) {
try {
return serversProvider.filteringStatus!.filters.firstWhere((filter) => filter.id == id, orElse: () {
return serversProvider.filteringStatus!.whitelistFilters.firstWhere((filter) => filter.id == id);
});
} catch (_) {
return null;
}
}
Widget getResult() {
@ -202,11 +206,19 @@ class LogDetailsScreen extends StatelessWidget {
),
if (log.rules.isNotEmpty) ...[
SectionLabel(label: AppLocalizations.of(context)!.rules),
...log.rules.map((rule) => LogListTile(
icon: Icons.rule_rounded,
title: rule.text,
subtitle: getList(rule.filterListId).name,
)).toList()
...log.rules.map((rule) {
final Filter? list = getList(rule.filterListId);
if (list != null) {
return LogListTile(
icon: Icons.rule_rounded,
title: rule.text,
subtitle: list.name
);
}
else {
return const SizedBox();
}
}).toList()
],
if (log.answer.isNotEmpty) ...[
SectionLabel(label: AppLocalizations.of(context)!.answers),