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

Bug fixes

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-05-12 23:11:38 +02:00
parent e795050a95
commit ad27d0c24e
14 changed files with 69 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/base.dart
View file

@ -116,7 +116,9 @@ class _BaseState extends State<Base> with WidgetsBindingObserver {
: screensSelectServer;
if (kDebugMode && dotenv.env['ENABLE_SENTRY'] == "true") {
Sentry.captureMessage("Debug mode");
Sentry.captureException("Debug mode", stackTrace: {
"aaa": "aaa"
});
}
return CustomMenuBar(

41
lib/functions/compare_versions.dart
View file

@ -21,11 +21,14 @@ bool compareVersions({
return false;
}
} catch (e) {
Sentry.captureException(e, hint: Hint.withMap({
"fn": "compareVersions",
"currentVersion": currentVersion,
"newVersion": newVersion,
}));
Sentry.captureException(e);
Sentry.captureMessage("compareVersions error", params: [
{
"fn": "compareVersions",
"currentVersion": currentVersion,
"newVersion": newVersion,
}.toString()
]);
return false;
}
}
@ -57,11 +60,14 @@ bool compareBetaVersions({
return false;
}
} catch (e) {
Sentry.captureException(e, hint: Hint.withMap({
"fn": "compareBetaVersions",
"currentVersion": currentVersion,
"newVersion": newVersion,
}));
Sentry.captureException(e);
Sentry.captureMessage("compareBetaVersions error", params: [
{
"fn": "compareBetaVersions",
"currentVersion": currentVersion,
"newVersion": newVersion,
}.toString()
]);
return false;
}
}
@ -128,12 +134,15 @@ bool serverVersionIsAhead({
}
}
} catch (e) {
Sentry.captureException(e, hint: Hint.withMap({
"fn": "serverVersionIsAhead",
"currentVersion": currentVersion,
"referenceVersion": referenceVersion,
"referenceVersionBeta": referenceVersionBeta ?? ""
}));
Sentry.captureException(e);
Sentry.captureMessage("serverVersionIsAhead error", params: [
{
"fn": "serverVersionIsAhead",
"currentVersion": currentVersion,
"referenceVersion": referenceVersion,
"referenceVersionBeta": referenceVersionBeta ?? ""
}.toString()
]);
return false;
}
}

9
lib/screens/clients/added_client_tile.dart
View file

@ -18,6 +18,7 @@ class AddedClientTile extends StatelessWidget {
final void Function(Client) onEdit;
final Client? selectedClient;
final bool? splitView;
final String serverVersion;
const AddedClientTile({
Key? key,
@ -26,12 +27,12 @@ class AddedClientTile extends StatelessWidget {
required this.onLongPress,
required this.onEdit,
this.selectedClient,
required this.splitView
required this.splitView,
required this.serverVersion
}) : super(key: key);
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
if (splitView == true) {
@ -138,7 +139,7 @@ class AddedClientTile extends StatelessWidget {
Icons.search_rounded,
size: 19,
color: serverVersionIsAhead(
currentVersion: serversProvider.serverStatus.data!.serverVersion,
currentVersion: serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true
@ -253,7 +254,7 @@ class AddedClientTile extends StatelessWidget {
Icons.search_rounded,
size: 19,
color: serverVersionIsAhead(
currentVersion: serversProvider.serverStatus.data!.serverVersion,
currentVersion: serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true

1
lib/screens/clients/added_list.dart
View file

@ -240,6 +240,7 @@ class _AddedListState extends State<AddedList> {
onLongPress: openOptionsModal,
onEdit: openClientModal,
splitView: widget.splitView,
serverVersion: serversProvider.serverStatus.data!.serverVersion,
),
noData: SizedBox(
width: double.maxFinite,

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

@ -2,6 +2,7 @@
import 'dart:io';
import 'package:adguard_home_manager/functions/snackbar.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:provider/provider.dart';
@ -270,11 +271,10 @@ class _HomeState extends State<Home> {
}
else {
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.serverStatusNotRefreshed),
backgroundColor: Colors.red,
)
showSnacbkar(
appConfigProvider: appConfigProvider,
label: AppLocalizations.of(context)!.serverStatusNotRefreshed,
color: Colors.red
);
}
},

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

@ -135,7 +135,7 @@ class _ManagementModalState extends State<ManagementModal> with SingleTickerProv
);
if (result != null) {
if (result != false) {
appConfigProvider.addLog(result['log']);
appConfigProvider.addLog(result);
}
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(

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

@ -297,7 +297,7 @@ class LogDetailsScreen extends StatelessWidget {
appBar: AppBar(
title: Text(AppLocalizations.of(context)!.logDetails),
actions: [
IconButton(
if (serversProvider.filteringStatus != null) IconButton(
onPressed: () => blockUnblock(log, getFilteredStatus(context, appConfigProvider, log.reason, true)['filtered'] == true ? 'unblock' : 'block'),
icon: Icon(
getFilteredStatus(context, appConfigProvider, log.reason, true)['filtered'] == true

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

@ -175,7 +175,7 @@ class LogTile extends StatelessWidget {
)
],
),
if (appConfigProvider.showNameTimeLogs == true && log.clientInfo!.name != '') ...[
if (appConfigProvider.showNameTimeLogs == true && log.clientInfo != null && log.clientInfo!.name != '') ...[
const SizedBox(height: 10),
Row(
children: [
@ -350,7 +350,7 @@ class LogTile extends StatelessWidget {
)
],
),
if (appConfigProvider.showNameTimeLogs == true && log.clientInfo!.name != '') ...[
if (appConfigProvider.showNameTimeLogs == true && log.clientInfo != null && log.clientInfo!.name != '') ...[
const SizedBox(height: 10),
Row(
children: [

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

@ -439,6 +439,7 @@ class _LogsWidgetState extends State<LogsWidget> {
onConfirm: updateConfig,
onClear: clearQueries,
dialog: true,
serverVersion: serversProvider.serverStatus.data!.serverVersion,
),
barrierDismissible: false
)
@ -450,6 +451,7 @@ class _LogsWidgetState extends State<LogsWidget> {
onConfirm: updateConfig,
onClear: clearQueries,
dialog: false,
serverVersion: serversProvider.serverStatus.data!.serverVersion,
),
backgroundColor: Colors.transparent,
isScrollControlled: true

13
lib/screens/logs/logs_config_modal.dart
View file

@ -13,12 +13,14 @@ class LogsConfigModal extends StatelessWidget {
final void Function(Map<String, dynamic>) onConfirm;
final void Function() onClear;
final bool dialog;
final String serverVersion;
const LogsConfigModal({
Key? key,
required this.onConfirm,
required this.onClear,
required this.dialog
required this.dialog,
required this.serverVersion
}) : super(key: key);
@override
@ -33,6 +35,7 @@ class LogsConfigModal extends StatelessWidget {
onConfirm: onConfirm,
onClear: onClear,
dialog: dialog,
serverVersion: serverVersion,
);
}
}
@ -44,6 +47,7 @@ class LogsConfigModalWidget extends StatefulWidget {
final void Function(Map<String, dynamic>) onConfirm;
final void Function() onClear;
final bool dialog;
final String serverVersion;
const LogsConfigModalWidget({
Key? key,
@ -52,7 +56,8 @@ class LogsConfigModalWidget extends StatefulWidget {
required this.context,
required this.onConfirm,
required this.onClear,
required this.dialog
required this.dialog,
required this.serverVersion
}) : super(key: key);
@override
@ -70,7 +75,7 @@ class _LogsConfigModalWidgetState extends State<LogsConfigModalWidget> {
void loadData() async {
final result = serverVersionIsAhead(
currentVersion: widget.serversProvider.serverStatus.data!.serverVersion,
currentVersion: widget.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true
@ -95,7 +100,7 @@ class _LogsConfigModalWidgetState extends State<LogsConfigModalWidget> {
@override
void initState() {
retentionItems = serverVersionIsAhead(
currentVersion: widget.serversProvider.serverStatus.data!.serverVersion,
currentVersion: widget.serverVersion,
referenceVersion: 'v0.107.28',
referenceVersionBeta: 'v0.108.0-b.33'
) == true ? [

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

@ -51,7 +51,7 @@ class _UpstreamDnsScreenState extends State<UpstreamDnsScreen> {
@override
void initState() {
for (var item in widget.serversProvider.dnsInfo.data!.upstreamDns) {
if (item[0] == '#') {
if (item == '#') {
dnsServers.add({
'comment': item
});

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

@ -137,11 +137,10 @@ class _TopItemsScreenState extends State<TopItemsScreen> {
}
else {
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.serverStatusNotRefreshed),
backgroundColor: Colors.red,
)
showSnacbkar(
appConfigProvider: appConfigProvider,
label: AppLocalizations.of(context)!.serverStatusNotRefreshed,
color: Colors.red
);
}
},

4
lib/services/http_requests.dart
View file

@ -865,7 +865,9 @@ Future getFiltering({
'result': 'success',
'data': FilteringData.fromJson({
...jsonDecode(result[0]['body']),
"blocked_services": jsonDecode(result[1]['body']),
"blocked_services": result[1]['body'] != null
? jsonDecode(result[1]['body'])
: []
})
};
}

9
lib/widgets/add_server_modal.dart
View file

@ -239,8 +239,6 @@ class _AddServerModalState extends State<AddServerModal> {
? await loginHA(serverObj)
: await login(serverObj);
setState(() => isConnecting = false);
if (result['result'] == 'success') {
if (serverObj.user != null && serverObj.password != null) {
serverObj.authToken = encodeBase64UserPass(serverObj.user!, serverObj.password!);
@ -260,6 +258,7 @@ class _AddServerModalState extends State<AddServerModal> {
Navigator.pop(context);
}
else {
setState(() => isConnecting = false);
appConfigProvider.addLog(
AppLog(
type: 'save_connection_db',
@ -276,6 +275,7 @@ class _AddServerModalState extends State<AddServerModal> {
}
}
else if (result['result'] == 'invalid_username_password') {
setState(() => isConnecting = false);
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
@ -285,6 +285,7 @@ class _AddServerModalState extends State<AddServerModal> {
);
}
else if (result['result'] == 'many_attempts') {
setState(() => isConnecting = false);
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
@ -294,6 +295,7 @@ class _AddServerModalState extends State<AddServerModal> {
);
}
else if (result['result'] == 'no_connection') {
setState(() => isConnecting = false);
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
@ -303,6 +305,7 @@ class _AddServerModalState extends State<AddServerModal> {
);
}
else if (result['result'] == 'ssl_error') {
setState(() => isConnecting = false);
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
@ -312,6 +315,7 @@ class _AddServerModalState extends State<AddServerModal> {
);
}
else if (result['result'] == 'server_error') {
setState(() => isConnecting = false);
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
@ -321,6 +325,7 @@ class _AddServerModalState extends State<AddServerModal> {
);
}
else {
setState(() => isConnecting = false);
appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(