fix tray merge

qpep-tray/notify/notify_linux.go

@@ -5,7 +5,7 @@ package notify
 import (
 	"fmt"
 	platformnotify "github.com/martinlindhe/notify"
-	"github.com/parvit/qpep/logger"
+	"github.com/parvit/qpep/shared/logger"
 	"github.com/project-faster/dialog"
 )
 

qpep-tray/notify/notify_windows.go

@@ -2,8 +2,8 @@ package notify
 
 import (
 	"fmt"
-	"github.com/parvit/qpep/logger"
 	"github.com/parvit/qpep/qpep-tray/notify/toast"
+	"github.com/parvit/qpep/shared/logger"
 	"github.com/project-faster/dialog"
 )
 

workers/client/client_impl_linux.go

@@ -1,18 +1,22 @@
 package client
 
 import (
+	"github.com/parvit/qpep/shared/configuration"
 	"github.com/parvit/qpep/workers/gateway"
 )
 
 // initDiverter method wraps the logic for initializing the windiverter engine, returns true if the diverter
 // succeeded initialization and false otherwise
 func initDiverter() bool {
-	return shared.SetConnectionDiverter(true, "", shared.QPepConfig.ListenHost, 0, shared.QPepConfig.ListenPort, 0, 0)
+	return gateway.SetConnectionDiverter(true, "",
+		configuration.QPepConfig.Client.LocalListeningAddress, 0,
+		configuration.QPepConfig.Client.LocalListenPort, 0,
+		0)
 }
 
 // stopDiverter method wraps the calls for stopping the diverter
 func stopDiverter() {
-	shared.SetConnectionDiverter(false, "", "", 0, 0, 0, 0)
+	gateway.SetConnectionDiverter(false, "", "", 0, 0, 0, 0)
 }
 
 // initProxy method wraps the calls for initializing the proxy