From ed4071c7d463ab252017d10e45732b6a528db53b Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Thu, 24 Oct 2024 12:06:08 -0400
Subject: [PATCH] Revert [PM-11312] Add "prevent screenshot" setting (#11685)

This reverts commit 1b7bb014d203d23e9ac391382941a563cf0132b7.
---
 .../src/app/accounts/settings.component.html  | 17 -----------------
 .../src/app/accounts/settings.component.ts    |  6 ------
 apps/desktop/src/locales/en/messages.json     |  6 ------
 apps/desktop/src/main/window.main.ts          | 15 ---------------
 .../services/desktop-settings.service.ts      | 19 -------------------
 5 files changed, 63 deletions(-)

diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html
index 02b64a757a..76cf98b1b2 100644
--- a/apps/desktop/src/app/accounts/settings.component.html
+++ b/apps/desktop/src/app/accounts/settings.component.html
@@ -419,23 +419,6 @@
                   "enableHardwareAccelerationDesc" | i18n
                 }}</small>
               </div>
-              <div class="form-group" *ngIf="!isLinux">
-                <div class="checkbox">
-                  <label for="allowScreenshots">
-                    <input
-                      id="allowScreenshots"
-                      type="checkbox"
-                      aria-describedby="allowScreenshotsHelp"
-                      formControlName="allowScreenshots"
-                      (change)="saveAllowScreenshots()"
-                    />
-                    {{ "allowScreenshots" | i18n }}
-                  </label>
-                </div>
-                <small id="allowScreenshotsHelp" class="help-block">{{
-                  "allowScreenshotsDesc" | i18n
-                }}</small>
-              </div>
               <div class="form-group" *ngIf="showDuckDuckGoIntegrationOption">
                 <div class="checkbox">
                   <label for="enableDuckDuckGoBrowserIntegration">
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index efe7cfa8e2..f7cd2bdc4d 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -108,7 +108,6 @@ export class SettingsComponent implements OnInit, OnDestroy {
       disabled: true,
     }),
     enableHardwareAcceleration: true,
-    allowScreenshots: false,
     enableDuckDuckGoBrowserIntegration: false,
     theme: [null as ThemeType | null],
     locale: [null as string | null],
@@ -274,7 +273,6 @@ export class SettingsComponent implements OnInit, OnDestroy {
       enableHardwareAcceleration: await firstValueFrom(
         this.desktopSettingsService.hardwareAcceleration$,
       ),
-      allowScreenshots: await firstValueFrom(this.desktopSettingsService.allowScreenshots$),
       theme: await firstValueFrom(this.themeStateService.selectedTheme$),
       locale: await firstValueFrom(this.i18nService.userSetLocale$),
     };
@@ -725,10 +723,6 @@ export class SettingsComponent implements OnInit, OnDestroy {
     );
   }
 
-  async saveAllowScreenshots() {
-    await this.desktopSettingsService.setAllowScreenshots(this.form.value.allowScreenshots);
-  }
-
   private async generateVaultTimeoutOptions(): Promise<VaultTimeoutOption[]> {
     let vaultTimeoutOptions: VaultTimeoutOption[] = [
       { name: this.i18nService.t("oneMinute"), value: 1 },
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index e04941bdb9..a654bf7408 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -3187,12 +3187,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "allowScreenshots": {
-    "message": "Allow screen capture"
-  },
-  "allowScreenshotsDesc": {
-    "message": "Allow screen capture of the Bitwarden desktop application."
-  },
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
diff --git a/apps/desktop/src/main/window.main.ts b/apps/desktop/src/main/window.main.ts
index 229bd1135c..276a2bdc97 100644
--- a/apps/desktop/src/main/window.main.ts
+++ b/apps/desktop/src/main/window.main.ts
@@ -69,13 +69,6 @@ export class WindowMain {
       this.logService.info("Render process reloaded");
     });
 
-    this.desktopSettingsService.allowScreenshots$.subscribe((allowed) => {
-      if (this.win == null) {
-        return;
-      }
-      this.win.setContentProtection(!allowed);
-    });
-
     return new Promise<void>((resolve, reject) => {
       try {
         if (!isMacAppStore() && !isSnapStore()) {
@@ -277,14 +270,6 @@ export class WindowMain {
       });
     });
 
-    firstValueFrom(this.desktopSettingsService.allowScreenshots$)
-      .then((allowScreenshots) => {
-        this.win.setContentProtection(!allowScreenshots);
-      })
-      .catch((e) => {
-        this.logService.error(e);
-      });
-
     if (this.createWindowCallback) {
       this.createWindowCallback(this.win);
     }
diff --git a/apps/desktop/src/platform/services/desktop-settings.service.ts b/apps/desktop/src/platform/services/desktop-settings.service.ts
index 6a8dd009f4..ff29ce50a0 100644
--- a/apps/desktop/src/platform/services/desktop-settings.service.ts
+++ b/apps/desktop/src/platform/services/desktop-settings.service.ts
@@ -71,10 +71,6 @@ const MINIMIZE_ON_COPY = new UserKeyDefinition<boolean>(DESKTOP_SETTINGS_DISK, "
   clearOn: [], // User setting, no need to clear
 });
 
-const ALLOW_SCREENSHOTS = new KeyDefinition<boolean>(DESKTOP_SETTINGS_DISK, "allowScreenshots", {
-  deserializer: (b) => b,
-});
-
 /**
  * Various settings for controlling application behavior specific to the desktop client.
  */
@@ -143,13 +139,6 @@ export class DesktopSettingsService {
   browserIntegrationFingerprintEnabled$ =
     this.browserIntegrationFingerprintEnabledState.state$.pipe(map(Boolean));
 
-  private readonly allowScreenshotState = this.stateProvider.getGlobal(ALLOW_SCREENSHOTS);
-
-  /**
-   * The application setting for whether or not to allow screenshots of the app.
-   */
-  allowScreenshots$ = this.allowScreenshotState.state$.pipe(map(Boolean));
-
   private readonly minimizeOnCopyState = this.stateProvider.getActive(MINIMIZE_ON_COPY);
 
   /**
@@ -266,12 +255,4 @@ export class DesktopSettingsService {
   async setMinimizeOnCopy(value: boolean, userId: UserId) {
     await this.stateProvider.getUser(userId, MINIMIZE_ON_COPY).update(() => value);
   }
-
-  /**
-   * Sets the setting for whether or not the screenshot protection is enabled.
-   * @param value `true` if the screenshot protection is enabled, `false` if it is not.
-   */
-  async setAllowScreenshots(value: boolean) {
-    await this.allowScreenshotState.update(() => value);
-  }
 }