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

Bug fixes

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-05-13 14:50:19 +02:00
parent b27fc7eb0f
commit 2d0b71720e
4 changed files with 47 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/base.dart
View file

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

2
lib/l10n/app_en.arb
View file

@ -23,7 +23,7 @@
"invalidUsernamePassword": "Invalid username or password", "invalidUsernamePassword": "Invalid username or password",
"tooManyAttempts": "Too many attempts. Try again later.", "tooManyAttempts": "Too many attempts. Try again later.",
"cantReachServer": "Can't reach server. Check connection data.", "cantReachServer": "Can't reach server. Check connection data.",
"sslError": "SSL error", "sslError": "SSL error. Go to Settings > Advanced settings and enable Override SSL validation.",
"unknownError": "Unknown error", "unknownError": "Unknown error",
"connectionNotCreated": "Connection couldn't be created", "connectionNotCreated": "Connection couldn't be created",
"connecting": "Connecting...", "connecting": "Connecting...",

2
lib/l10n/app_es.arb
View file

@ -23,7 +23,7 @@
"invalidUsernamePassword": "Usuario o contraseña no válidos.", "invalidUsernamePassword": "Usuario o contraseña no válidos.",
"tooManyAttempts": "Demasiados intentos. Prueba de nuevo más tarde.", "tooManyAttempts": "Demasiados intentos. Prueba de nuevo más tarde.",
"cantReachServer": "No se puede alcanzar el servidor. Comprueba los datos de conexión.", "cantReachServer": "No se puede alcanzar el servidor. Comprueba los datos de conexión.",
"sslError": "Error de SSL", "sslError": "Error de SSL. Ve a Ajustes > Ajustes avanzados y activa No comprobar SSL.",
"unknownError": "Error desconocido", "unknownError": "Error desconocido",
"connectionNotCreated": "No se pudo crear la conexión", "connectionNotCreated": "No se pudo crear la conexión",
"connecting": "Conectando...", "connecting": "Conectando...",

85
lib/widgets/add_server_modal.dart
View file

@ -6,6 +6,7 @@ import 'package:uuid/uuid.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.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/app_config_provider.dart';
import 'package:adguard_home_manager/functions/snackbar.dart';
import 'package:adguard_home_manager/functions/base64.dart'; import 'package:adguard_home_manager/functions/base64.dart';
import 'package:adguard_home_manager/services/http_requests.dart'; import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:adguard_home_manager/models/app_log.dart'; import 'package:adguard_home_manager/models/app_log.dart';
@ -218,6 +219,15 @@ class _AddServerModalState extends State<AddServerModal> {
final mediaQuery = MediaQuery.of(context); final mediaQuery = MediaQuery.of(context);
void cancelConnecting() {
if (mounted) {
setState(() => isConnecting = false);
}
else {
isConnecting = false;
}
}
void connect() async { void connect() async {
Server serverObj = Server( Server serverObj = Server(
id: uuid.v4(), id: uuid.v4(),
@ -266,72 +276,65 @@ class _AddServerModalState extends State<AddServerModal> {
message: serverCreated.toString() message: serverCreated.toString()
) )
); );
ScaffoldMessenger.of(context).showSnackBar( showSnacbkar(
SnackBar( appConfigProvider: appConfigProvider,
content: Text(AppLocalizations.of(context)!.connectionNotCreated), label: AppLocalizations.of(context)!.connectionNotCreated,
backgroundColor: Colors.red, color: Colors.red
)
); );
} }
} }
else if (result['result'] == 'invalid_username_password') { else if (result['result'] == 'invalid_username_password') {
setState(() => isConnecting = false); cancelConnecting();
appConfigProvider.addLog(result['log']); appConfigProvider.addLog(result['log']);
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
)
); );
} }
else if (result['result'] == 'many_attempts') { else if (result['result'] == 'many_attempts') {
setState(() => isConnecting = false); cancelConnecting();
appConfigProvider.addLog(result['log']); appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar( showSnacbkar(
SnackBar( appConfigProvider: appConfigProvider,
content: Text(AppLocalizations.of(context)!.tooManyAttempts), label: AppLocalizations.of(context)!.tooManyAttempts,
backgroundColor: Colors.red, color: Colors.red
)
); );
} }
else if (result['result'] == 'no_connection') { else if (result['result'] == 'no_connection') {
setState(() => isConnecting = false); cancelConnecting();
appConfigProvider.addLog(result['log']); appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar( showSnacbkar(
SnackBar( appConfigProvider: appConfigProvider,
content: Text(AppLocalizations.of(context)!.cantReachServer), label: AppLocalizations.of(context)!.cantReachServer,
backgroundColor: Colors.red, color: Colors.red
)
); );
} }
else if (result['result'] == 'ssl_error') { else if (result['result'] == 'ssl_error') {
setState(() => isConnecting = false); cancelConnecting();
appConfigProvider.addLog(result['log']); appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar( showSnacbkar(
SnackBar( appConfigProvider: appConfigProvider,
content: Text(AppLocalizations.of(context)!.sslError), label: AppLocalizations.of(context)!.sslError,
backgroundColor: Colors.red, color: Colors.red
)
); );
} }
else if (result['result'] == 'server_error') { else if (result['result'] == 'server_error') {
setState(() => isConnecting = false); cancelConnecting();
appConfigProvider.addLog(result['log']); appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar( showSnacbkar(
SnackBar( appConfigProvider: appConfigProvider,
content: Text(AppLocalizations.of(context)!.serverError), label: AppLocalizations.of(context)!.serverError,
backgroundColor: Colors.red, color: Colors.red
)
); );
} }
else { else {
setState(() => isConnecting = false); cancelConnecting();
appConfigProvider.addLog(result['log']); appConfigProvider.addLog(result['log']);
ScaffoldMessenger.of(context).showSnackBar( showSnacbkar(
SnackBar( appConfigProvider: appConfigProvider,
content: Text(AppLocalizations.of(context)!.unknownError), label: AppLocalizations.of(context)!.unknownError,
backgroundColor: Colors.red, color: Colors.red
)
); );
} }
} }