Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-17 23:56:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "GODT-2013: CLI flag for frontend is required."

Browse Source 
This reverts commit 4bb29b1b5c.
This commit is contained in:
James Houlahan
2022-11-04 00:53:03 +01:00
parent 7cb9546d21
commit f965d01922
4 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/frontend/bridge-gui/bridge-gui/main.cpp
View File

@ -257,7 +257,7 @@ void launchBridge(QStringList const &args)
else
app().log().debug(QString("Bridge executable path: %1").arg(QDir::toNativeSeparators(bridgeExePath)));
overseer = std::make_unique<Overseer>(new ProcessMonitor(bridgeExePath, QStringList("--grpc") + args, nullptr), nullptr);
overseer = std::make_unique<Overseer>(new ProcessMonitor(bridgeExePath, args, nullptr), nullptr);
overseer->startWorker(true);
}

10
internal/frontend/frontend.go
View File

@ -25,7 +25,6 @@ import (
"github.com/ProtonMail/proton-bridge/v2/internal/locations"
"github.com/ProtonMail/proton-bridge/v2/internal/updater"
"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
"github.com/sirupsen/logrus"
)
// Type describes the available types of frontend.
@ -35,7 +34,6 @@ const (
CLI Type = iota
GRPC
NonInteractive
Unknown
)
type Frontend interface {
@ -47,7 +45,7 @@ type Frontend interface {
WaitUntilFrontendIsReady()
}
// New returns initialized frontend based on `frontendType`, which can be `CLI` or `GRPC`. Non-interactive will return a nil frontend.
// New returns initialized frontend based on `frontendType`, which can be `CLI` or `GRPC`.
func New(
frontendType Type,
showWindowOnStart bool,
@ -77,13 +75,9 @@ func New(
)
case NonInteractive:
return nil
case Unknown:
fallthrough
default:
logrus.Panicf("Unexpected frontend value %v", frontendType)
return nil // return statement is required by compiler, although the above call will panic.
return nil
}
}