From 65847d3ea383693399f05a3aa5f6ed5925a2b27a Mon Sep 17 00:00:00 2001
From: problematicconsumer <problematicconsumer@protonmail.com>
Date: Thu, 28 Dec 2023 10:43:57 +0330
Subject: [PATCH] Fix bugs

---
 lib/features/common/general_pref_tiles.dart               | 5 ++---
 lib/features/settings/widgets/advanced_setting_tiles.dart | 3 +--
 lib/features/settings/widgets/general_setting_tiles.dart  | 3 +--
 lib/features/settings/widgets/settings_input_dialog.dart  | 1 -
 lib/singbox/service/platform_singbox_service.dart         | 8 --------
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/lib/features/common/general_pref_tiles.dart b/lib/features/common/general_pref_tiles.dart
index 8d67c725..904b7bc9 100644
--- a/lib/features/common/general_pref_tiles.dart
+++ b/lib/features/common/general_pref_tiles.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
 import 'package:hiddify/core/analytics/analytics_controller.dart';
 import 'package:hiddify/core/localization/locale_extensions.dart';
 import 'package:hiddify/core/localization/locale_preferences.dart';
@@ -33,7 +32,7 @@ class LocalePrefTile extends HookConsumerWidget {
                       title: Text(e.localeName),
                       value: e,
                       groupValue: locale,
-                      onChanged: (e) => context.pop(e),
+                      onChanged: Navigator.of(context).maybePop,
                     ),
                   )
                   .toList(),
@@ -75,7 +74,7 @@ class RegionPrefTile extends HookConsumerWidget {
                       title: Text(e.present(t)),
                       value: e,
                       groupValue: region,
-                      onChanged: (e) => context.pop(e),
+                      onChanged: Navigator.of(context).maybePop,
                     ),
                   )
                   .toList(),
diff --git a/lib/features/settings/widgets/advanced_setting_tiles.dart b/lib/features/settings/widgets/advanced_setting_tiles.dart
index f82281f9..a88a918a 100644
--- a/lib/features/settings/widgets/advanced_setting_tiles.dart
+++ b/lib/features/settings/widgets/advanced_setting_tiles.dart
@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
 import 'package:hiddify/core/localization/translations.dart';
 import 'package:hiddify/core/preferences/general_preferences.dart';
 import 'package:hiddify/core/router/router.dart';
@@ -78,7 +77,7 @@ class AdvancedSettingTiles extends HookConsumerWidget {
                     content: Text(t.settings.advanced.debugModeMsg),
                     actions: [
                       TextButton(
-                        onPressed: () => context.pop(true),
+                        onPressed: () => Navigator.of(context).maybePop(true),
                         child: Text(
                           MaterialLocalizations.of(context).okButtonLabel,
                         ),
diff --git a/lib/features/settings/widgets/general_setting_tiles.dart b/lib/features/settings/widgets/general_setting_tiles.dart
index b2fc962e..6d80e5a1 100644
--- a/lib/features/settings/widgets/general_setting_tiles.dart
+++ b/lib/features/settings/widgets/general_setting_tiles.dart
@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
 import 'package:hiddify/core/localization/translations.dart';
 import 'package:hiddify/core/preferences/general_preferences.dart';
 import 'package:hiddify/core/theme/app_theme_mode.dart';
@@ -40,7 +39,7 @@ class GeneralSettingTiles extends HookConsumerWidget {
                           title: Text(e.present(t)),
                           value: e,
                           groupValue: themeMode,
-                          onChanged: (e) => context.pop(e),
+                          onChanged: Navigator.of(context).maybePop,
                         ),
                       )
                       .toList(),
diff --git a/lib/features/settings/widgets/settings_input_dialog.dart b/lib/features/settings/widgets/settings_input_dialog.dart
index f65ea0dd..81dcf276 100644
--- a/lib/features/settings/widgets/settings_input_dialog.dart
+++ b/lib/features/settings/widgets/settings_input_dialog.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:go_router/go_router.dart';
 import 'package:hiddify/core/localization/translations.dart';
 import 'package:hiddify/utils/utils.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/singbox/service/platform_singbox_service.dart b/lib/singbox/service/platform_singbox_service.dart
index 11643a4c..4a5f7089 100644
--- a/lib/singbox/service/platform_singbox_service.dart
+++ b/lib/singbox/service/platform_singbox_service.dart
@@ -29,15 +29,7 @@ class PlatformSingboxService with InfraLogger implements SingboxService {
     final alerts =
         _alertsChannel.receiveBroadcastStream().map(SingboxStatus.fromEvent);
 
-    loggy.debug("[TLOG] Status first recieved");
-    final _2 = await alerts.first;
-    loggy.debug("[TLOG] alert First recieved");
-
-    final _1 = await status.first;
-    loggy.debug("[TLOG] Waiting for first entry");
-
     _status = ValueConnectableStream(Rx.merge([status, alerts])).autoConnect();
-    
     await _status.first;
   }