More string & error handling improvements (microsoft#186183)

Author: TylerLeonhardt

src/vs/platform/encryption/electron-main/encryptionMainService.ts

@@ -26,7 +26,15 @@ export class EncryptionMainService implements IEncryptionMainService {
 	) { }
 
 	async encrypt(value: string): Promise<string> {
-		return JSON.stringify(safeStorage.encryptString(value));
+		try {
+			this.logService.trace('[EncryptionMainService] Encrypting value.');
+			const result = JSON.stringify(safeStorage.encryptString(value));
+			this.logService.trace('[EncryptionMainService] Encrypted value.');
+			return result;
+		} catch (e) {
+			this.logService.error(e);
+			throw e;
+		}
 	}
 
 	async decrypt(value: string): Promise<string> {

src/vs/platform/secrets/electron-sandbox/secretStorageService.ts

@@ -62,9 +62,9 @@ export class NativeSecretStorageService extends BaseSecretStorageService {
 
 		const provider = await this._encryptionService.getKeyStorageProvider();
 		if (isGnome(provider)) {
-			errorMessage = localize('isGnome', "You're running in a GNOME environment but encryption is not available. Ensure you have gnome-keyring or another libsecret compatible implementation installed and running.");
+			errorMessage = localize('isGnome', "You're running in a GNOME environment but the OS keyring is not available for encryption. Ensure you have gnome-keyring or another libsecret compatible implementation installed and running.");
 		} else if (isKwallet(provider)) {
-			errorMessage = localize('isKwallet', "You're running in a KDE environment but encryption is not available. Ensure you have kwallet running.");
+			errorMessage = localize('isKwallet', "You're running in a KDE environment but the OS keyring is not available for encryption. Ensure you have kwallet running.");
 		} else if (provider === KnownStorageProvider.basicText) {
 			errorMessage += ' ' + localize('usePlainTextExtraSentence', "Open the troubleshooting guide to address this or you can use weaker encryption that doesn't use the OS keyring.");
 			const usePlainTextButton: IPromptChoice = {