chore: Fix linter errors

internal/dialer/dialer_proxy_provider.go

@@ -93,6 +93,8 @@ func newProxyProvider(dialer TLSDialer, hostURL string, providers []string, pani
 }
 
 // findReachableServer returns a working API server (either proxy or standard API).
+//
+//nolint:nakedret
 func (p *proxyProvider) findReachableServer() (proxy string, err error) {
 	logrus.Debug("Trying to find a reachable server")
 
@@ -204,6 +206,8 @@ func (p *proxyProvider) canReach(url string) bool {
 // It looks up DNS TXT records for the given query URL using the given DoH provider.
 // It returns a list of all found TXT records.
 // If the whole process takes more than proxyDoHTimeout then an error is returned.
+//
+//nolint:nakedret
 func (p *proxyProvider) defaultDoHLookup(ctx context.Context, query, dohProvider string) (data []string, err error) {
 	ctx, cancel := context.WithTimeout(ctx, p.dohTimeout)
 	defer cancel()

internal/legacy/credentials/store.go

@@ -53,7 +53,7 @@ func (s *Store) List() (userIDs []string, err error) {
 	var allUserIDs []string
 	if allUserIDs, err = s.secrets.List(); err != nil {
 		log.WithError(err).Error("Could not list credentials")
-		return
+		return nil, err
 	}
 
 	credentialList := []*Credentials{}

internal/updater/sync.go

@@ -47,6 +47,7 @@ func syncFolders(localPath, updatePath string) (err error) {
 	return nil
 }
 
+//nolint:nakedret
 func removeMissing(folderToCleanPath, itemsToKeepPath string) (err error) {
 	logrus.WithField("from", folderToCleanPath).Debug("Remove missing")
 	// Create list of files.

internal/user/smtp_prefs.go

@@ -305,7 +305,7 @@ func (b *sendPrefsBuilder) setPGPSettings(
 func (b *sendPrefsBuilder) setInternalPGPSettings(
 	vCardData *contactSettings,
 	apiKeys []proton.PublicKey,
-) (err error) {
+) error {
 	// We're guaranteed to get at least one valid (i.e. not expired, revoked or
 	// marked as verification-only) public key from the server.
 	if len(apiKeys) == 0 {
@@ -327,7 +327,7 @@ func (b *sendPrefsBuilder) setInternalPGPSettings(
 
 	sendingKey, err := pickSendingKey(vCardData, apiKeys)
 	if err != nil {
-		return
+		return err
 	}
 
 	b.withPublicKey(sendingKey)
@@ -349,7 +349,7 @@ func (b *sendPrefsBuilder) setInternalPGPSettings(
 //  3. If there are no pinned keys, then the client should encrypt with the
 //     first valid key served by the API (in principle the server already
 //     validates the keys and the first one provided should be valid).
-func pickSendingKey(vCardData *contactSettings, rawAPIKeys []proton.PublicKey) (kr *crypto.KeyRing, err error) {
+func pickSendingKey(vCardData *contactSettings, rawAPIKeys []proton.PublicKey) (*crypto.KeyRing, error) {
 	contactKeys := make([]*crypto.Key, len(vCardData.Keys))
 	apiKeys := make([]*crypto.Key, len(rawAPIKeys))
 
@@ -357,8 +357,9 @@ func pickSendingKey(vCardData *contactSettings, rawAPIKeys []proton.PublicKey) (
 		var ck *crypto.Key
 
 		// Contact keys are not armored.
+		var err error
 		if ck, err = crypto.NewKey([]byte(key)); err != nil {
-			return
+			return nil, err
 		}
 
 		contactKeys[i] = ck
@@ -368,8 +369,9 @@ func pickSendingKey(vCardData *contactSettings, rawAPIKeys []proton.PublicKey) (
 		var ck *crypto.Key
 
 		// API keys are armored.
+		var err error
 		if ck, err = crypto.NewKeyFromArmored(key.PublicKey); err != nil {
-			return
+			return nil, err
 		}
 
 		apiKeys[i] = ck
@@ -416,7 +418,7 @@ func matchFingerprints(a, b []*crypto.Key) (res []*crypto.Key) {
 func (b *sendPrefsBuilder) setExternalPGPSettingsWithWKDKeys(
 	vCardData *contactSettings,
 	apiKeys []proton.PublicKey,
-) (err error) {
+) error {
 	// We're guaranteed to get at least one valid (i.e. not expired, revoked or
 	// marked as verification-only) public key from the server.
 	if len(apiKeys) == 0 {
@@ -445,7 +447,7 @@ func (b *sendPrefsBuilder) setExternalPGPSettingsWithWKDKeys(
 
 	sendingKey, err := pickSendingKey(vCardData, apiKeys)
 	if err != nil {
-		return
+		return err
 	}
 
 	b.withPublicKey(sendingKey)
@@ -455,7 +457,7 @@ func (b *sendPrefsBuilder) setExternalPGPSettingsWithWKDKeys(
 
 func (b *sendPrefsBuilder) setExternalPGPSettingsWithoutWKDKeys(
 	vCardData *contactSettings,
-) (err error) {
+) error {
 	b.withEncrypt(vCardData.Encrypt)
 
 	if vCardData.SignIsSet {
@@ -487,17 +489,20 @@ func (b *sendPrefsBuilder) setExternalPGPSettingsWithoutWKDKeys(
 	}
 
 	if len(vCardData.Keys) > 0 {
-		var key *crypto.Key
+		var (
+			key *crypto.Key
+			err error
+		)
 
 		// Contact keys are not armored.
 		if key, err = crypto.NewKey([]byte(vCardData.Keys[0])); err != nil {
-			return
+			return err
 		}
 
 		var kr *crypto.KeyRing
 
 		if kr, err = crypto.NewKeyRing(key); err != nil {
-			return
+			return err
 		}
 
 		b.withPublicKey(kr)