From a84af15c93a835d1fd74b16fbfb8f7999ace5dfe Mon Sep 17 00:00:00 2001
From: Elias Papavasileiou <eliaspap@pm.me>
Date: Tue, 14 Apr 2020 23:11:41 +0300
Subject: [PATCH] Add minimize when copying to clipboard option (#390)

* Add minimize when copying to clipboard option

* Change minimizeOnCopyToClipboardKey constant reference and fix whitespace

* Extend feature to context menus and view component

* Cleanup and refactor methods

* Refactor copy method and add minimizeOnCopyToClipboardKey constant to electronConstants.ts

* Use window.main subclass and fix formatting

* Revert "Use window.main subclass and fix formatting"

This reverts commit 0159613751a54bc886fac0b34bd09d3a26498924.

* Reimplement part of 0159613751a54bc886fac0b34bd09d3a26498924

* Add null check to VaultComponent::copyValue

* Remove unused import
---
 src/app/accounts/settings.component.html | 10 ++++++++++
 src/app/accounts/settings.component.ts   |  8 ++++++++
 src/app/vault/vault.component.ts         |  3 +++
 src/app/vault/view.component.ts          | 20 +++++++++++++++++++-
 src/locales/en/messages.json             |  6 ++++++
 src/main/messaging.main.ts               |  5 +++++
 6 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index c2608bed..44f9a713 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -59,6 +59,16 @@
                             </select>
                             <small class="help-block">{{'clearClipboardDesc' | i18n}}</small>
                         </div>
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <label for="minimizeOnCopyToClipboard">
+                                    <input id="minimizeOnCopyToClipboard" type="checkbox" name="MinimizeOnCopyToClipboard"
+                                        [(ngModel)]="minimizeOnCopyToClipboard" (change)="saveMinOnCopyToClipboard()">
+                                    {{'minimizeOnCopyToClipboard' | i18n}}
+                                </label>
+                            </div>
+                            <small class="help-block">{{'minimizeOnCopyToClipboardDesc' | i18n}}</small>
+                        </div>
                         <div class="form-group">
                             <div class="checkbox">
                                 <label for="disableFavicons">
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index 94af59a9..b190e425 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -38,6 +38,7 @@ export class SettingsComponent implements OnInit {
     enableTray: boolean = false;
     showMinToTray: boolean = false;
     startToTray: boolean = false;
+    minimizeOnCopyToClipboard: boolean = false;
     locale: string;
     vaultTimeouts: any[];
     localeOptions: any[];
@@ -122,6 +123,8 @@ export class SettingsComponent implements OnInit {
         this.locale = await this.storageService.get<string>(ConstantsService.localeKey);
         this.theme = await this.storageService.get<string>(ConstantsService.themeKey);
         this.clearClipboard = await this.storageService.get<number>(ConstantsService.clearClipboardKey);
+        this.minimizeOnCopyToClipboard = await this.storageService.get<boolean>(
+            ElectronConstants.minimizeOnCopyToClipboardKey);
     }
 
     async saveVaultTimeoutOptions() {
@@ -227,6 +230,11 @@ export class SettingsComponent implements OnInit {
         window.setTimeout(() => window.location.reload(), 200);
     }
 
+    async saveMinOnCopyToClipboard() {
+        await this.storageService.save(ElectronConstants.minimizeOnCopyToClipboardKey, this.minimizeOnCopyToClipboard);
+        this.callAnalytics('MinOnCopyToClipboard', this.minimizeOnCopyToClipboard);
+    }
+
     async saveClearClipboard() {
         await this.storageService.save(ConstantsService.clearClipboardKey, this.clearClipboard);
         this.analytics.eventTrack.next({
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts
index ef28bb59..299abf0e 100644
--- a/src/app/vault/vault.component.ts
+++ b/src/app/vault/vault.component.ts
@@ -660,6 +660,9 @@ export class VaultComponent implements OnInit, OnDestroy {
             this.platformUtilsService.copyToClipboard(value);
             this.toasterService.popAsync('info', null,
                 this.i18nService.t('valueCopied', this.i18nService.t(labelI18nKey)));
+            if (this.viewComponent != null && this.action === 'view') {
+                this.viewComponent.minimizeIfNeeded();
+            }
         });
     }
 
diff --git a/src/app/vault/view.component.ts b/src/app/vault/view.component.ts
index 9d0a840f..dc329d43 100644
--- a/src/app/vault/view.component.ts
+++ b/src/app/vault/view.component.ts
@@ -12,7 +12,9 @@ import { CipherService } from 'jslib/abstractions/cipher.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
 import { EventService } from 'jslib/abstractions/event.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
+import { MessagingService } from 'jslib/abstractions/messaging.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { StorageService } from 'jslib/abstractions/storage.service';
 import { TokenService } from 'jslib/abstractions/token.service';
 import { TotpService } from 'jslib/abstractions/totp.service';
 import { UserService } from 'jslib/abstractions/user.service';
@@ -23,6 +25,8 @@ import { ViewComponent as BaseViewComponent } from 'jslib/angular/components/vie
 
 import { CipherView } from 'jslib/models/view/cipherView';
 
+import { ElectronConstants } from 'jslib/electron/electronConstants';
+
 @Component({
     selector: 'app-vault-view',
     templateUrl: 'view.component.html',
@@ -35,7 +39,8 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
         cryptoService: CryptoService, platformUtilsService: PlatformUtilsService,
         auditService: AuditService, broadcasterService: BroadcasterService,
         ngZone: NgZone, changeDetectorRef: ChangeDetectorRef,
-        userService: UserService, eventService: EventService) {
+        userService: UserService, eventService: EventService,
+        private messagingService: MessagingService, private storageService: StorageService) {
         super(cipherService, totpService, tokenService, i18nService, cryptoService, platformUtilsService,
             auditService, window, broadcasterService, ngZone, changeDetectorRef, userService, eventService);
     }
@@ -48,4 +53,17 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
         this.platformUtilsService.eventTrack('View Password History');
         this.onViewCipherPasswordHistory.emit(this.cipher);
     }
+
+    copy(value: string, typeI18nKey: string, aType: string) {
+        super.copy(value, typeI18nKey, aType);
+        this.minimizeIfNeeded();
+    }
+
+    async minimizeIfNeeded(): Promise<void> {
+        const shouldMinimize = await this.storageService.get<boolean>(
+            ElectronConstants.minimizeOnCopyToClipboardKey);
+        if (shouldMinimize) {
+            this.messagingService.send('minimize');
+        }
+    }
 }
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 2fe5e3eb..a1e3a319 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -112,6 +112,12 @@
     "message": "Copy Value",
     "description": "Copy value to clipboard"
   },
+  "minimizeOnCopyToClipboard": {
+    "message": "Minimize when copying to clipboard"
+  },
+  "minimizeOnCopyToClipboardDesc": {
+    "message": "Bitwarden will minimize when credentials are copied to clipboard."
+  },
   "toggleVisibility": {
     "message": "Toggle Visibility"
   },
diff --git a/src/main/messaging.main.ts b/src/main/messaging.main.ts
index 8a6e2546..cc9781a5 100644
--- a/src/main/messaging.main.ts
+++ b/src/main/messaging.main.ts
@@ -23,6 +23,11 @@ export class MessagingMain {
                 this.main.menuMain.updateApplicationMenuState(message.isAuthenticated, message.isLocked);
                 this.updateTrayMenu(message.isAuthenticated, message.isLocked);
                 break;
+            case 'minimize':
+                if (this.main.windowMain.win != null) {
+                    this.main.windowMain.win.minimize();
+                }
+                break;
             case 'showTray':
                 this.main.trayMain.showTray();
                 break;