code review updates

getlantern · May 24, 2024 · be7f24c · be7f24c
1 parent 8b47d3a
commit be7f24c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/lib/common/tray_handler.dart b/lib/common/tray_handler.dart
@@ -18,14 +18,24 @@ String systemTrayIcon(bool connected) {
 
 
 class TrayHandler with TrayListener {
-  TrayHandler() {
+  factory TrayHandler() => _getInstance();
+
+  static TrayHandler get instance => _getInstance();
+  static TrayHandler? _instance;
+
+  static TrayHandler _getInstance() {
+    _instance ??= TrayHandler._internal();
+    return _instance!;
+  }
+
+  TrayHandler._internal() {
     if (isDesktop()) {
       setupTray(false);
     }
   }
 
   Future<void> setupTray(bool isConnected) async {
-    await trayManager.setIcon(systemTrayIcon(isConnected));    
+    await trayManager.setIcon(systemTrayIcon(isConnected));
     Menu menu = Menu(
       items: [
         MenuItem(
@@ -56,7 +66,7 @@ class TrayHandler with TrayListener {
   void onTrayMenuItemClick(MenuItem menuItem) {
     switch (menuItem.key) {
       case 'show':
-        windowManager.show();
+        windowManager.focus();
         windowManager.setSkipTaskbar(false);
       case 'exit':
         windowManager.destroy();

diff --git a/lib/home.dart b/lib/home.dart
@@ -25,7 +25,7 @@ class HomePage extends StatefulWidget {
   _HomePageState createState() => _HomePageState();
 }
 
-class _HomePageState extends State<HomePage> with WindowListener {
+class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
 
   Function()? _cancelEventSubscription;
 
@@ -40,6 +40,8 @@ class _HomePageState extends State<HomePage> with WindowListener {
       // This is a mobile device
       channelListener();
     } else {
+      // This is a desktop device
+      setupTrayManager();
       _initWindowManager();
     }
   }
@@ -94,6 +96,10 @@ class _HomePageState extends State<HomePage> with WindowListener {
     setState(() {});
   }
 
+  void setupTrayManager() async {
+    trayManager.addListener(TrayHandler.instance);
+  }
+
   @override
   void onWindowClose() async {
     bool _isPreventClose = await windowManager.isPreventClose();
@@ -143,6 +149,7 @@ class _HomePageState extends State<HomePage> with WindowListener {
   @override
   void dispose() {
     if (isDesktop()) {
+      trayManager.removeListener(TrayHandler.instance);
       windowManager.removeListener(this);
     }
     if (_cancelEventSubscription != null) {

diff --git a/lib/vpn/vpn_switch.dart b/lib/vpn/vpn_switch.dart
@@ -2,8 +2,6 @@ import 'package:lantern/ad_helper.dart';
 import 'package:lantern/common/common.dart';
 import 'package:lantern/common/common_desktop.dart';
 import 'package:lantern/vpn/vpn.dart';
-import 'package:tray_manager/tray_manager.dart';
-import 'package:window_manager/window_manager.dart';
 
 class VPNSwitch extends StatefulWidget {
   const VPNSwitch({super.key});
@@ -12,25 +10,7 @@ class VPNSwitch extends StatefulWidget {
   State<VPNSwitch> createState() => _VPNSwitchState();
 }
 
-class _VPNSwitchState extends State<VPNSwitch> with TrayListener, WindowListener {
-
-  TrayHandler trayHandler = TrayHandler();
-
-  @override
-  void initState() {
-    if (isDesktop()) {
-      trayManager.addListener(trayHandler);
-    }
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    if (isDesktop()) {
-      trayManager.removeListener(trayHandler);
-    }
-  }
-
+class _VPNSwitchState extends State<VPNSwitch> {
   final adHelper = AdHelper();
   String vpnStatus = 'disconnected';
 
@@ -41,10 +21,10 @@ class _VPNSwitchState extends State<VPNSwitch> with TrayListener, WindowListener
     bool isConnected = vpnStatus == 'connected';
     if (isConnected) {
       sysProxyOff();
-      await trayHandler.setupTray(false);
+      await TrayHandler.instance.setupTray(false);
     } else {
       sysProxyOn();
-      await trayHandler.setupTray(true);
+      await TrayHandler.instance.setupTray(true);
     }
   }