GODT-1260: Renaming

* Renaming GUI, CLI, no-impact config.
* License header and documentation rebranding.
* Rename app title and vendor. Impact: manual install
* Migrating mac keychain and launch on startup.
* Fix linter and linter renaming

.golangci.yml

@@ -56,7 +56,6 @@ linters:
  - godox # Tool for detection of FIXME, TODO and other comment keywords [fast: true, auto-fix: false]
  - gofmt # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification [fast: true, auto-fix: true]
  - goimports # Goimports does everything that gofmt does. Additionally it checks unused imports [fast: true, auto-fix: true]
- - golint # Golint differs from gofmt. Gofmt reformats Go source code, whereas golint prints out style mistakes [fast: true, auto-fix: false]
  - gosec # Inspects source code for security problems [fast: true, auto-fix: false]
  - misspell # Finds commonly misspelled English words in comments [fast: true, auto-fix: true]
  - nakedret # Finds naked returns in functions greater than a specified function length [fast: true, auto-fix: false]

BUILDS.md

@@ -1,4 +1,4 @@
-# Building ProtonMail Bridge and Import-Export app
+# Building Proton Mail Bridge and Import-Export app
 
 ## Prerequisites
 * 64-bit AMD OS:

CONTRIBUTING.md

@@ -2,8 +2,7 @@
 
 By making a contribution to this project:
 
-1. I assign any and all copyright related to the contribution to
- Proton Technologies AG;
+1. I assign any and all copyright related to the contribution to Proton AG;
 2. I certify that the contribution was created in whole by me;
 3. I understand and agree that this project and the contribution are public
  and that a record of the contribution (including all personal information I

COPYING_NOTES.md

@@ -1,17 +1,17 @@
 # Copying
-Copyright (c) 2022 Proton Technologies AG
+Copyright (c) 2022 Proton AG
 
-ProtonMail Bridge is free software: you can redistribute it and/or modify it
+Proton Mail Bridge is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
 Software Foundation, either version 3 of the License, or (at your option) any
 later version.
 
-ProtonMail Bridge is distributed in the hope that it will be useful, but WITHOUT ANY
+Proton Mail Bridge is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
-ProtonMail Bridge. If not, see https://www.gnu.org/licenses.
+Proton Mail Bridge. If not, see https://www.gnu.org/licenses.
 
 
 # Dependencies

Changelog.md

@@ -1,4 +1,4 @@
-# ProtonMail Bridge and Import-Export app Changelog
+# Proton Mail Bridge and Import-Export app Changelog
 
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 

README.md

@@ -1,22 +1,22 @@
-# ProtonMail Bridge and Import Export app
-Copyright (c) 2020 Proton Technologies AG
+# Proton Mail Bridge and Import Export app
+Copyright (c) 2022 Proton AG
 
-This repository holds the ProtonMail Bridge and the ProtonMail Import-Export applications.
+This repository holds the Proton Mail Bridge and the Proton Mail Import-Export applications.
 For a detailed build information see [BUILDS](./BUILDS.md).
 The license can be found in [LICENSE](./LICENSE) file, for more licensing information see [COPYING_NOTES](./COPYING_NOTES.md).
 For contribution policy see [CONTRIBUTING](./CONTRIBUTING.md).
 
 
 ## Description Bridge
-ProtonMail Bridge for e-mail clients.
+Proton Mail Bridge for e-mail clients.
 
 When launched, Bridge will initialize local IMAP/SMTP servers and render 
 its GUI.
 
-To configure an e-mail client, firstly log in using your ProtonMail credentials. 
+To configure an e-mail client, firstly log in using your Proton Mail credentials. 
 Open your e-mail client and add a new account using the settings which are 
 located in the Bridge GUI. The client will only be able to sync with 
-your ProtonMail account when the Bridge is running, thus the option 
+your Proton Mail account when the Bridge is running, thus the option 
 to start Bridge on startup is enabled by default.
 
 When the main window is closed, Bridge will continue to run in the
@@ -25,9 +25,9 @@ background.
 More details [on the public website](https://protonmail.com/bridge).
 
 ## Description Import-Export app
-ProtonMail Import-Export app for importing and exporting messages.
+Proton Mail Import-Export app for importing and exporting messages.
 
-To transfer messages, firstly log in using your ProtonMail credentials.
+To transfer messages, firstly log in using your Proton Mail credentials.
 For import, expand your account, and pick the address to which to import
 messages from IMAP server or local EML or MBOX files. For export, pick
 the whole account or only a specific address. Then, in both cases,
@@ -40,9 +40,9 @@ More details [on the public website](https://protonmail.com/import-export).
 The Import-Export app is developed in separate branch `master-ie`.
 
 ## Launchers
-Launchers are binaries used to run the ProtonMail Bridge or Import-Export apps.
+Launchers are binaries used to run the Proton Mail Bridge or Import-Export apps.
 
-Official distributions of the ProtonMail Bridge and Import-Export apps contain
+Official distributions of the Proton Mail Bridge and Import-Export apps contain
 both a launcher and the app itself. The launcher is installed in a protected
 area of the system (i.e. an area accessible only with admin privileges) and is
 used to run the app. The launcher ensures that nobody tampered with the app's
@@ -52,7 +52,7 @@ feature enables the app to securely update itself automatically without asking
 the user for a password.
 
 ## Keychain
-You need to have a keychain in order to run the ProtonMail Bridge. On Mac or
+You need to have a keychain in order to run the Proton Mail Bridge. On Mac or
 Windows, Bridge uses native credential managers. On Linux, use `secret-service` freedesktop.org API
 (e.g. [Gnome keyring](https://wiki.gnome.org/Projects/GnomeKeyring/))
 or

cmd/Desktop-Bridge/main.go

@@ -1,19 +1,19 @@
-// Copyright (c) 2022 Proton Technologies AG
+// Copyright (c) 2022 Proton AG
 //
-// This file is part of ProtonMail Bridge.
+// This file is part of Proton Mail Bridge.
 //
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// Proton Mail Bridge is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// ProtonMail Bridge is distributed in the hope that it will be useful,
+// Proton Mail Bridge is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 package main
 
@@ -43,8 +43,8 @@ import (
 )
 
 const (
- appName = "ProtonMail Bridge"
- appUsage = "ProtonMail IMAP and SMTP Bridge"
+ appName = "Proton Mail Bridge"
+ appUsage = "Proton Mail IMAP and SMTP Bridge"
  configName = "bridge"
  updateURLName = "bridge"
  keychainName = "bridge"

cmd/launcher/main.go

@@ -1,19 +1,19 @@
-// Copyright (c) 2022 Proton Technologies AG
+// Copyright (c) 2022 Proton AG
 //
-// This file is part of ProtonMail Bridge.
+// This file is part of Proton Mail Bridge.
 //
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// Proton Mail Bridge is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// ProtonMail Bridge is distributed in the hope that it will be useful,
+// Proton Mail Bridge is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 package main
 
@@ -39,12 +39,12 @@ import (
 )
 
 const (
- appName = "ProtonMail Launcher"
+ appName = "Proton Mail Launcher"
  configName = "bridge"
  exeName = "proton-bridge"
 )
 
-func main() { // nolint[funlen]
+func main() { //nolint:funlen
  reporter := sentry.NewReporter(appName, constants.Version, useragent.New())
 
  crashHandler := crash.NewHandler(reporter.ReportException)
@@ -98,7 +98,7 @@ func main() { // nolint[funlen]
  logrus.WithError(err).Fatal("Failed to determine path to launcher")
  }
 
- cmd := exec.Command(exe, appendLauncherPath(launcher, os.Args[1:])...) // nolint[gosec]
+ cmd := exec.Command(exe, appendLauncherPath(launcher, os.Args[1:])...) //nolint:gosec
 
  cmd.Stdin = os.Stdin
  cmd.Stdout = os.Stdout

dist/proton-bridge.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Version=1.1
-Name=ProtonMail Bridge
-GenericName=ProtonMail Bridge for Linux
+Name=Proton Mail Bridge
+GenericName=Proton Mail Bridge for Linux
 Comment=The Bridge is an application that runs on your computer in the background and seamlessly encrypts and decrypts your mail as it enters and leaves your computer.
 Icon=protonmail-bridge
 Exec=protonmail-bridge

doc/bridge.md

@@ -51,7 +51,7 @@ PMAPI directly.
 graph TD
 
  C["Client (e.g. Thunderbird)"]
- PM[ProtonMail Server]
+ PM[Proton Mail Server]
 
  subgraph "Bridge app"
  subgraph "Bridge core"

internal/api/api.go

@@ -1,19 +1,19 @@
-// Copyright (c) 2022 Proton Technologies AG
+// Copyright (c) 2022 Proton AG
 //
-// This file is part of ProtonMail Bridge.
+// This file is part of Proton Mail Bridge.
 //
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// Proton Mail Bridge is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// ProtonMail Bridge is distributed in the hope that it will be useful,
+// Proton Mail Bridge is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 // Package api provides HTTP API of the Bridge.
 //
@@ -34,7 +34,7 @@ import (
 )
 
 var (
- log = logrus.WithField("pkg", "api") //nolint[gochecknoglobals]
+ log = logrus.WithField("pkg", "api") //nolint:gochecknoglobals
 )
 
 type apiServer struct {
@@ -44,7 +44,7 @@ type apiServer struct {
 }
 
 // NewAPIServer returns prepared API server struct.
-func NewAPIServer(settings *settings.Settings, eventListener listener.Listener) *apiServer { //nolint[golint]
+func NewAPIServer(settings *settings.Settings, eventListener listener.Listener) *apiServer { //nolint:revive
  return &apiServer{
  host: bridge.Host,
  settings: settings,
@@ -68,7 +68,7 @@ func (api *apiServer) ListenAndServe() {
  api.eventListener.Emit(events.ErrorEvent, "API failed: "+err.Error())
  log.Error("API failed: ", err)
  }
- defer server.Close() //nolint[errcheck]
+ defer server.Close() //nolint:errcheck
 }
 
 func (api *apiServer) getAddress() string {

internal/api/ctx.go

@@ -1,19 +1,19 @@
-// Copyright (c) 2022 Proton Technologies AG
+// Copyright (c) 2022 Proton AG
 //
-// This file is part of ProtonMail Bridge.
+// This file is part of Proton Mail Bridge.
 //
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// Proton Mail Bridge is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// ProtonMail Bridge is distributed in the hope that it will be useful,
+// Proton Mail Bridge is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 package api
 

internal/api/focus.go

@@ -1,19 +1,19 @@
-// Copyright (c) 2022 Proton Technologies AG
+// Copyright (c) 2022 Proton AG
 //
-// This file is part of ProtonMail Bridge.
+// This file is part of Proton Mail Bridge.
 //
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// Proton Mail Bridge is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// ProtonMail Bridge is distributed in the hope that it will be useful,
+// Proton Mail Bridge is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 package api
 
@@ -42,7 +42,7 @@ func CheckOtherInstanceAndFocus(port int) error {
  if err != nil {
  return err
  }
- defer resp.Body.Close() //nolint[errcheck]
+ defer resp.Body.Close() //nolint:errcheck
 
  if resp.StatusCode != 200 {
  log.Error("Focus error: ", resp.StatusCode)

internal/app/base/args.go

@@ -1,19 +1,19 @@
-// Copyright (c) 2022 Proton Technologies AG
+// Copyright (c) 2022 Proton AG
 //
-// This file is part of ProtonMail Bridge.
+// This file is part of Proton Mail Bridge.
 //
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// Proton Mail Bridge is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
-// ProtonMail Bridge is distributed in the hope that it will be useful,
+// Proton Mail Bridge is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 package base