mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-04-20 22:09:11 +00:00
Bug fixes
This commit is contained in:
parent
51b8a6b610
commit
a666d109d9
8 changed files with 54 additions and 20 deletions
|
@ -5,6 +5,15 @@ import 'package:url_launcher/url_launcher.dart' as url_launcher;
|
|||
import 'package:sentry_flutter/sentry_flutter.dart';
|
||||
|
||||
void openUrl(String url) async {
|
||||
if (!(url.startsWith("http") || url.startsWith("https"))) {
|
||||
try {
|
||||
url_launcher.launchUrl(Uri.parse(url));
|
||||
} catch (e, stackTrace) {
|
||||
Sentry.captureException(e, stackTrace: stackTrace);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (Platform.isAndroid || Platform.isIOS) {
|
||||
try {
|
||||
await flutter_custom_tabs.launchUrl(
|
||||
|
@ -20,6 +29,7 @@ void openUrl(String url) async {
|
|||
),
|
||||
);
|
||||
} catch (e, stackTrace) {
|
||||
url_launcher.launchUrl(Uri.parse(url));
|
||||
Sentry.captureException(e, stackTrace: stackTrace);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -168,11 +168,22 @@ void main() async {
|
|||
return null;
|
||||
}
|
||||
|
||||
if (event.message?.formatted.contains("HttpException") == true) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (
|
||||
event.message?.formatted.contains("Unexpected character") ?? false ||
|
||||
(event.throwable != null && event.throwable!.toString().contains("Unexpected character"))
|
||||
) {
|
||||
return null; // Exclude this event
|
||||
return null;
|
||||
}
|
||||
|
||||
if (
|
||||
event.message?.formatted.contains("Unexpected end of input") ?? false ||
|
||||
(event.throwable != null && event.throwable!.toString().contains("Unexpected end of input"))
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return event;
|
||||
|
|
|
@ -43,9 +43,9 @@ class DnsStatistics {
|
|||
|
||||
factory DnsStatistics.fromJson(Map<String, dynamic> json) => DnsStatistics(
|
||||
timeUnits: json["time_units"],
|
||||
topQueriedDomains: List<Map<String, int>>.from(json["top_queried_domains"].map((x) => Map.from(x).map((k, v) => MapEntry<String, int>(k, v)))),
|
||||
topClients: List<Map<String, int>>.from(json["top_clients"].map((x) => Map.from(x).map((k, v) => MapEntry<String, int>(k, v)))),
|
||||
topBlockedDomains: List<Map<String, int>>.from(json["top_blocked_domains"].map((x) => Map.from(x).map((k, v) => MapEntry<String, int>(k, v)))),
|
||||
topQueriedDomains: json["top_queried_domains"] != null ? List<Map<String, int>>.from(json["top_queried_domains"].map((x) => Map.from(x).map((k, v) => MapEntry<String, int>(k, v)))) : [],
|
||||
topClients: json["top_clients"] != null ? List<Map<String, int>>.from(json["top_clients"].map((x) => Map.from(x).map((k, v) => MapEntry<String, int>(k, v)))) : [],
|
||||
topBlockedDomains: json["top_blocked_domains"] != null ? List<Map<String, int>>.from(json["top_blocked_domains"].map((x) => Map.from(x).map((k, v) => MapEntry<String, int>(k, v)))): [],
|
||||
topUpstreamResponses: json["top_upstreams_responses"] != null ? List<Map<String, int>>.from(json["top_upstreams_responses"].map((x) => Map.from(x).map((k, v) => MapEntry<String, int>(k, v)))) : null,
|
||||
topUpstreamsAvgTime: json["top_upstreams_avg_time"] != null ? List<Map<String, double>>.from(json["top_upstreams_avg_time"].map((x) => Map.from(x).map((k, v) => MapEntry<String, double>(k, v)))) : null,
|
||||
dnsQueries: List<int>.from(json["dns_queries"].map((x) => x)),
|
||||
|
|
|
@ -25,10 +25,14 @@ class ClientsFab extends StatelessWidget {
|
|||
final width = MediaQuery.of(context).size.width;
|
||||
|
||||
void confirmAddClient(Client client) async {
|
||||
if (!context.mounted) return;
|
||||
|
||||
ProcessModal processModal = ProcessModal();
|
||||
processModal.open(AppLocalizations.of(context)!.addingClient);
|
||||
|
||||
final result = await clientsProvider.addClient(client);
|
||||
|
||||
if (!context.mounted) return;
|
||||
|
||||
processModal.close();
|
||||
|
||||
|
|
|
@ -33,6 +33,8 @@ class AddFiltersButton extends StatelessWidget {
|
|||
final width = MediaQuery.of(context).size.width;
|
||||
|
||||
void confirmAddRule(String rule) async {
|
||||
if (!context.mounted) return;
|
||||
|
||||
ProcessModal processModal = ProcessModal();
|
||||
processModal.open(AppLocalizations.of(context)!.addingRule);
|
||||
|
||||
|
@ -58,6 +60,8 @@ class AddFiltersButton extends StatelessWidget {
|
|||
}
|
||||
|
||||
void confirmEditCustomRules(List<String> rules) async {
|
||||
if (!context.mounted) return;
|
||||
|
||||
ProcessModal processModal = ProcessModal();
|
||||
processModal.open(AppLocalizations.of(context)!.savingCustomRules);
|
||||
|
||||
|
|
|
@ -154,6 +154,8 @@ class LogTile extends StatelessWidget {
|
|||
}
|
||||
|
||||
void blockUnblockRuleClient() async {
|
||||
if (!context.mounted) return;
|
||||
|
||||
ProcessModal processModal = ProcessModal();
|
||||
processModal.open(AppLocalizations.of(context)!.addingRule);
|
||||
|
||||
|
|
|
@ -89,6 +89,7 @@ class LogsListAppBar extends StatelessWidget {
|
|||
}
|
||||
|
||||
void openLiveLogsScreen() {
|
||||
if (!context.mounted) return;
|
||||
Navigator.of(context).push(
|
||||
MaterialPageRoute(
|
||||
builder: (context) => MultiProvider(
|
||||
|
|
|
@ -175,6 +175,8 @@ class _AddServerModalState extends State<AddServerModal> {
|
|||
final ApiClientV2 apiClient2 = ApiClientV2(server: serverObj);
|
||||
final serverStatus = await apiClient2.getServerStatus();
|
||||
|
||||
if (!context.mounted) return;
|
||||
|
||||
// If something goes wrong when fetching server status
|
||||
if (serverStatus.successful == false) {
|
||||
statusProvider.setServerStatusLoad(LoadStatus.error);
|
||||
|
@ -203,16 +205,16 @@ class _AddServerModalState extends State<AddServerModal> {
|
|||
|
||||
final serverCreated = await serversProvider.createServer(serverObj);
|
||||
|
||||
if (!context.mounted) return;
|
||||
|
||||
// If something goes wrong when saving the connection on the db
|
||||
if (serverCreated != null) {
|
||||
if (mounted) setState(() => isConnecting = false);
|
||||
if (mounted) {
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.connectionNotCreated,
|
||||
color: Colors.red
|
||||
);
|
||||
}
|
||||
setState(() => isConnecting = false);
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.connectionNotCreated,
|
||||
color: Colors.red
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -295,10 +297,12 @@ class _AddServerModalState extends State<AddServerModal> {
|
|||
}
|
||||
|
||||
final serverSaved = await serversProvider.editServer(serverObj);
|
||||
|
||||
if (!mounted) return;
|
||||
|
||||
// If something goes wrong when saving the connection on the db
|
||||
if (serverSaved != null) {
|
||||
if (mounted) setState(() => isConnecting = false);
|
||||
setState(() => isConnecting = false);
|
||||
appConfigProvider.addLog(
|
||||
AppLog(
|
||||
type: 'save_connection_db',
|
||||
|
@ -306,13 +310,11 @@ class _AddServerModalState extends State<AddServerModal> {
|
|||
message: serverSaved.toString()
|
||||
)
|
||||
);
|
||||
if (mounted) {
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.connectionNotCreated,
|
||||
color: Colors.red
|
||||
);
|
||||
}
|
||||
showSnackbar(
|
||||
appConfigProvider: appConfigProvider,
|
||||
label: AppLocalizations.of(context)!.connectionNotCreated,
|
||||
color: Colors.red
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue