From 3eff5b73d27494924f964ceb502a3eedeac47910 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Tue, 5 Oct 2021 12:04:28 -0500
Subject: [PATCH] Enable storage service for everyone

---
 ts/components/leftPane/LeftPaneComposeHelper.tsx |  3 +--
 ts/groups.ts                                     |  7 -------
 ts/services/storage.ts                           | 15 ---------------
 ts/storage/isFeatureEnabled.ts                   | 12 ------------
 4 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 ts/storage/isFeatureEnabled.ts

diff --git a/ts/components/leftPane/LeftPaneComposeHelper.tsx b/ts/components/leftPane/LeftPaneComposeHelper.tsx
index e51680ff02..ef4037057f 100644
--- a/ts/components/leftPane/LeftPaneComposeHelper.tsx
+++ b/ts/components/leftPane/LeftPaneComposeHelper.tsx
@@ -16,7 +16,6 @@ import {
 } from '../../util/libphonenumberInstance';
 import { assert } from '../../util/assert';
 import { missingCaseError } from '../../util/missingCaseError';
-import { isStorageWriteFeatureEnabled } from '../../storage/isFeatureEnabled';
 
 export type LeftPaneComposePropsType = {
   composeContacts: ReadonlyArray<ContactListItemPropsType>;
@@ -229,7 +228,7 @@ export class LeftPaneComposeHelper extends LeftPaneHelper<LeftPaneComposePropsTy
     if (this.phoneNumber) {
       return TopButton.StartNewConversation;
     }
-    if (this.searchTerm || !isStorageWriteFeatureEnabled()) {
+    if (this.searchTerm) {
       return TopButton.None;
     }
     return TopButton.CreateNewGroup;
diff --git a/ts/groups.ts b/ts/groups.ts
index 09be22266a..43b7310d1b 100644
--- a/ts/groups.ts
+++ b/ts/groups.ts
@@ -19,7 +19,6 @@ import {
   GROUP_CREDENTIALS_KEY,
   maybeFetchNewCredentials,
 } from './services/groupCredentialFetcher';
-import { isStorageWriteFeatureEnabled } from './storage/isFeatureEnabled';
 import dataInterface from './sql/Client';
 import { toWebSafeBase64, fromWebSafeBase64 } from './util/webSafeBase64';
 import { assert, strictAssert } from './util/assert';
@@ -1500,12 +1499,6 @@ export async function createGroupV2({
   // Ensure we have the credentials we need before attempting GroupsV2 operations
   await maybeFetchNewCredentials();
 
-  if (!isStorageWriteFeatureEnabled()) {
-    throw new Error(
-      'createGroupV2: storage service write is not enabled. Cannot create the group'
-    );
-  }
-
   const ACCESS_ENUM = Proto.AccessControl.AccessRequired;
   const MEMBER_ROLE_ENUM = Proto.Member.Role;
 
diff --git a/ts/services/storage.ts b/ts/services/storage.ts
index 7feddb05fa..a9fe7a2e0b 100644
--- a/ts/services/storage.ts
+++ b/ts/services/storage.ts
@@ -32,7 +32,6 @@ import { storageJobQueue } from '../util/JobQueue';
 import { sleep } from '../util/sleep';
 import { isMoreRecentThan } from '../util/timestamp';
 import { normalizeNumber } from '../util/normalizeNumber';
-import { isStorageWriteFeatureEnabled } from '../storage/isFeatureEnabled';
 import { ourProfileKeyService } from './ourProfileKey';
 import {
   ConversationTypes,
@@ -1019,12 +1018,6 @@ async function processRemoteRecords(
 async function sync(
   ignoreConflicts = false
 ): Promise<Proto.ManifestRecord | undefined> {
-  if (!isStorageWriteFeatureEnabled()) {
-    log.info('storageService.sync: Not starting desktop.storage is falsey');
-
-    return undefined;
-  }
-
   if (!window.storage.get('storageKey')) {
     throw new Error('storageService.sync: Cannot start; no storage key!');
   }
@@ -1081,14 +1074,6 @@ async function sync(
 }
 
 async function upload(fromSync = false): Promise<void> {
-  if (!isStorageWriteFeatureEnabled()) {
-    log.info(
-      'storageService.upload: Not starting because the feature is not enabled'
-    );
-
-    return;
-  }
-
   if (!window.textsecure.messaging) {
     throw new Error('storageService.upload: We are offline!');
   }
diff --git a/ts/storage/isFeatureEnabled.ts b/ts/storage/isFeatureEnabled.ts
deleted file mode 100644
index 0874e84a05..0000000000
--- a/ts/storage/isFeatureEnabled.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2021 Signal Messenger, LLC
-// SPDX-License-Identifier: AGPL-3.0-only
-
-import { isEnabled } from '../RemoteConfig';
-
-function isStorageFeatureEnabled(): boolean {
-  return isEnabled('desktop.storage');
-}
-
-export function isStorageWriteFeatureEnabled(): boolean {
-  return isStorageFeatureEnabled() && isEnabled('desktop.storageWrite3');
-}