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

Fixed some issues

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-05-20 01:16:33 +02:00
parent ecd9b4fc89
commit 8d7beae328
4 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,7 @@ class _LogsListClientState extends State<LogsListClient> {
final result = await cancelableRequest?.value; final result = await cancelableRequest?.value;
if (result != null) { if (result != null) {
if (loadingMore != null && loadingMore == true) { if (loadingMore != null && loadingMore == true && mounted) {
setState(() => isLoadingMore = false); setState(() => isLoadingMore = false);
} }

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

@ -8,6 +8,7 @@ import 'package:provider/provider.dart';
import 'package:expandable/expandable.dart'; import 'package:expandable/expandable.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/functions/snackbar.dart';
import 'package:adguard_home_manager/functions/compare_versions.dart'; import 'package:adguard_home_manager/functions/compare_versions.dart';
import 'package:adguard_home_manager/functions/time_server_disabled.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/providers/app_config_provider.dart';
@ -137,11 +138,10 @@ class _ManagementModalState extends State<ManagementModal> with SingleTickerProv
if (result != false) { if (result != false) {
appConfigProvider.addLog(result); appConfigProvider.addLog(result);
} }
ScaffoldMessenger.of(context).showSnackBar( showSnacbkar(
SnackBar( appConfigProvider: appConfigProvider,
content: Text(AppLocalizations.of(context)!.invalidUsernamePassword), label: AppLocalizations.of(context)!.invalidUsernamePassword,
backgroundColor: Colors.red, color: Colors.red
)
); );
} }
} }

30
lib/screens/settings/encryption/encryption.dart
View file

@ -187,25 +187,7 @@ class _EncryptionSettingsWidgetState extends State<EncryptionSettingsWidget> {
tlsPortController.text != '' && tlsPortController.text != '' &&
tlsPortError == null && tlsPortError == null &&
dnsOverQuicPortController.text != '' && dnsOverQuicPortController.text != '' &&
dnsOverQuicPortError == null && dnsOverQuicPortError == null
((
certificateOption == 0 &&
certificatePathController.text != '' &&
certificatePathError == null
) || (
certificateOption == 1 &&
certificateContentController.text != '' &&
certificateContentError == null
)) &&
((
privateKeyOption == 0 &&
privateKeyPathController.text != '' &&
privateKeyPathError == null
) || (
privateKeyOption == 1 &&
pastePrivateKeyController.text != '' &&
pastePrivateKeyError == null
))
) { ) {
setState(() => localValidationValid = true); setState(() => localValidationValid = true);
return true; return true;
@ -246,9 +228,9 @@ class _EncryptionSettingsWidgetState extends State<EncryptionSettingsWidget> {
"enabled": enabled, "enabled": enabled,
"server_name": domainNameController.text, "server_name": domainNameController.text,
"force_https": redirectHttps, "force_https": redirectHttps,
"port_https": int.parse(httpsPortController.text), "port_https": int.tryParse(httpsPortController.text),
"port_dns_over_tls": int.parse(tlsPortController.text), "port_dns_over_tls": int.tryParse(tlsPortController.text),
"port_dns_over_quic": int.parse(dnsOverQuicPortController.text), "port_dns_over_quic": int.tryParse(dnsOverQuicPortController.text),
"certificate_chain": encodeBase64(certificateContentController.text), "certificate_chain": encodeBase64(certificateContentController.text),
"private_key": encodeBase64(pastePrivateKeyController.text), "private_key": encodeBase64(pastePrivateKeyController.text),
"private_key_saved": usePreviouslySavedKey, "private_key_saved": usePreviouslySavedKey,
@ -672,7 +654,9 @@ class _EncryptionSettingsWidgetState extends State<EncryptionSettingsWidget> {
tooltip: generateStatusString(context, localValidationValid, certKeyValidApi) tooltip: generateStatusString(context, localValidationValid, certKeyValidApi)
), ),
IconButton( IconButton(
onPressed: saveData, onPressed: localValidationValid ?
() => saveData()
: null,
icon: const Icon(Icons.save), icon: const Icon(Icons.save),
tooltip: AppLocalizations.of(context)!.save, tooltip: AppLocalizations.of(context)!.save,
), ),

2
pubspec.yaml
View file

@ -67,7 +67,7 @@ dependencies:
git: git:
url: https://github.com/JGeek00/flutter_split_view url: https://github.com/JGeek00/flutter_split_view
ref: master-alt ref: master-alt
url_launcher: ^6.1.10 url_launcher: ^6.1.11
contextmenu: ^3.0.0 contextmenu: ^3.0.0
async: ^2.10.0 async: ^2.10.0
sentry_flutter: ^7.5.2 sentry_flutter: ^7.5.2