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

GODT-1974: Store everything in v3 path

Browse Source
This commit is contained in:
James Houlahan
2022-10-26 13:18:48 +02:00
parent d4c1016e55
commit d738fdff57
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
internal/constants/constants.go
View File

@ -30,20 +30,11 @@ const VendorName = "protonmail"
//nolint:gochecknoglobals //nolint:gochecknoglobals
var ( var (
// Full app name (to show to the user). // FullAppName is the full app name (to show to the user).
FullAppName = "" FullAppName = ""
// ConfigName determines the name of the location where bridge stores config files.
ConfigName = "bridge"
// UpdateName is the name of the product appearing in the update URL.
UpdateName = "bridge"
// KeyChainName is the name of the entry in the OS keychain.
KeyChainName = "bridge"
// Version of the build. // Version of the build.
Version = "2.4.1+git" Version = ""
// Revision is current hash of the build. // Revision is current hash of the build.
Revision = "" Revision = ""
@ -56,6 +47,20 @@ var (
// DSNSentry client keys to be able to report crashes to Sentry. // DSNSentry client keys to be able to report crashes to Sentry.
DSNSentry = "" DSNSentry = ""
)
const (
// AppName is the name of the product appearing in the request headers.
AppName = "bridge"
// UpdateName is the name of the product appearing in the update URL.
UpdateName = "bridge"
// ConfigName determines the name of the location where bridge stores config/cache files.
ConfigName = "bridge-v3"
// KeyChainName is the name of the entry in the OS keychain.
KeyChainName = "bridge-v3"
// Host is the hostname of the bridge server. // Host is the hostname of the bridge server.
Host = "127.0.0.1" Host = "127.0.0.1"
@ -63,7 +68,7 @@ var (
// AppVersion returns the full rendered version of the app (to be used in request headers). // AppVersion returns the full rendered version of the app (to be used in request headers).
func AppVersion(version string) string { func AppVersion(version string) string {
return getAPIOS() + cases.Title(language.Und).String(ConfigName) + "_" + version return getAPIOS() + cases.Title(language.Und).String(AppName) + "_" + version
} }
func getAPIOS() string { func getAPIOS() string {

2
internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml
View File

@ -766,7 +766,7 @@ Window {
property bool isDiskCacheEnabled: true property bool isDiskCacheEnabled: true
// Qt.resolvedUrl("file:///C:/Users/user/AppData/Roaming/protonmail/bridge/cache/c11/messages") // Qt.resolvedUrl("file:///C:/Users/user/AppData/Roaming/protonmail/bridge-v3/cache/c11/messages")
property url diskCachePath: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0] property url diskCachePath: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]
signal cacheUnavailable() signal cacheUnavailable()
signal cacheCantMove() signal cacheCantMove()

2
internal/frontend/bridge-gui/bridgepp/bridgepp/BridgeUtils.cpp
View File

@ -28,7 +28,7 @@ namespace bridgepp
namespace { namespace {
QString const configFolder = "protonmail/bridge"; QString const configFolder = "protonmail/bridge-v3";
QMutex rngMutex; ///< the mutex to use when accessing the rng. QMutex rngMutex; ///< the mutex to use when accessing the rng.
QStringList const firstNames { QStringList const firstNames {