GODT-980: placeholder for user agent

internal/frontend/frontend.go

@@ -22,6 +22,7 @@ import (
 	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/proton-bridge/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/cli"
 	cliie "github.com/ProtonMail/proton-bridge/internal/frontend/cli-ie"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/qt"
@@ -60,6 +61,7 @@ func New(
 	settings *settings.Settings,
 	eventListener listener.Listener,
 	updater types.Updater,
+	userAgent *useragent.UserAgent,
 	bridge *bridge.Bridge,
 	noEncConfirmator types.NoEncConfirmator,
 	autostart *autostart.App,
@@ -77,6 +79,7 @@ func New(
 		settings,
 		eventListener,
 		updater,
+		userAgent,
 		bridgeWrap,
 		noEncConfirmator,
 		autostart,
@@ -95,6 +98,7 @@ func newBridgeFrontend(
 	settings *settings.Settings,
 	eventListener listener.Listener,
 	updater types.Updater,
+	userAgent *useragent.UserAgent,
 	bridge types.Bridger,
 	noEncConfirmator types.NoEncConfirmator,
 	autostart *autostart.App,
@@ -122,6 +126,7 @@ func newBridgeFrontend(
 			settings,
 			eventListener,
 			updater,
+			userAgent,
 			bridge,
 			noEncConfirmator,
 			autostart,

internal/frontend/qt/frontend.go

@@ -39,6 +39,7 @@ import (
 	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/proton-bridge/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
 	"github.com/ProtonMail/proton-bridge/internal/events"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/autoconfig"
 	qtcommon "github.com/ProtonMail/proton-bridge/internal/frontend/qt-common"
@@ -49,7 +50,6 @@ import (
 	"github.com/ProtonMail/proton-bridge/pkg/listener"
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 	"github.com/ProtonMail/proton-bridge/pkg/ports"
-	"github.com/ProtonMail/proton-bridge/pkg/useragent"
 	"github.com/sirupsen/logrus"
 	"github.com/skratchdot/open-golang/open"
 	"github.com/therecipe/qt/core"
@@ -75,6 +75,7 @@ type FrontendQt struct {
 	settings          *settings.Settings
 	eventListener     listener.Listener
 	updater           types.Updater
+	userAgent         *useragent.UserAgent
 	bridge            types.Bridger
 	noEncConfirmator  types.NoEncConfirmator
 
@@ -114,12 +115,15 @@ func New(
 	settings *settings.Settings,
 	eventListener listener.Listener,
 	updater types.Updater,
+	userAgent *useragent.UserAgent,
 	bridge types.Bridger,
 	noEncConfirmator types.NoEncConfirmator,
 	autostart *autostart.App,
 	restarter types.Restarter,
 ) *FrontendQt {
-	tmp := &FrontendQt{
+	userAgent.SetPlatform(core.QSysInfo_PrettyProductName())
+
+	f := &FrontendQt{
 		version:           version,
 		buildVersion:      buildVersion,
 		programName:       programName,
@@ -129,6 +133,7 @@ func New(
 		settings:          settings,
 		eventListener:     eventListener,
 		updater:           updater,
+		userAgent:         userAgent,
 		bridge:            bridge,
 		noEncConfirmator:  noEncConfirmator,
 		programVer:        "v" + version,
@@ -138,13 +143,9 @@ func New(
 
 	// Initializing.Done is only called sync.Once. Please keep the increment
 	// set to 1
-	tmp.initializing.Add(1)
+	f.initializing.Add(1)
 
-	// Nicer string for OS.
-	currentOS := core.QSysInfo_PrettyProductName()
-	bridge.SetCurrentOS(currentOS)
-
-	return tmp
+	return f
 }
 
 // InstanceExistAlert is a global warning window indicating an instance already exists.
@@ -506,7 +507,7 @@ func (s *FrontendQt) sendBug(description, client, address string) (isOK bool) {
 }
 
 func (s *FrontendQt) getLastMailClient() string {
-	return s.bridge.GetCurrentClient()
+	return s.userAgent.String()
 }
 
 func (s *FrontendQt) configureAppleMail(iAccount, iAddress int) {

internal/frontend/qt/frontend_nogui.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
 	"github.com/ProtonMail/proton-bridge/internal/locations"
 	"github.com/ProtonMail/proton-bridge/internal/updater"
@@ -71,6 +72,7 @@ func New(
 	settings *settings.Settings,
 	eventListener listener.Listener,
 	updater types.Updater,
+	userAgent *useragent.UserAgent,
 	bridge types.Bridger,
 	noEncConfirmator types.NoEncConfirmator,
 	autostart *autostart.App,

internal/frontend/types/types.go

@@ -75,8 +75,6 @@ type User interface {
 type Bridger interface {
 	UserManager
 
-	GetCurrentClient() string
-	SetCurrentOS(os string)
 	ReportBug(osType, osVersion, description, accountName, address, emailClient string) error
 	AllowProxy()
 	DisallowProxy()