Merge pull request #1988 from Bilb/disable-settings-video-feature-off

Disable settings video feature off

preload.js

@@ -39,10 +39,6 @@ window.isBehindProxy = () => Boolean(config.proxyUrl);
 
 window.lokiFeatureFlags = {
   useOnionRequests: true,
-  useFileOnionRequests: true,
-  useFileOnionRequestsV2: true, // more compact encoding of files in response
-  padOutgoingAttachments: true,
-  enablePinConversations: true,
   useCallMessage: false,
 };
 

ts/components/session/menu/Menu.tsx

@@ -147,7 +147,7 @@ export const getPinConversationMenuItem = (conversationId: string): JSX.Element
   const isMessagesSection = useSelector(getFocusedSection) === SectionType.Message;
   const nbOfAlreadyPinnedConvos = useSelector(getNumberOfPinnedConversations);
 
-  if (isMessagesSection && window.lokiFeatureFlags.enablePinConversations) {
+  if (isMessagesSection) {
     const conversation = getConversationController().get(conversationId);
     const isPinned = conversation.isPinned();
 

ts/components/session/settings/section/CategoryPrivacy.tsx

@@ -66,15 +66,17 @@ export const SettingsCategoryPrivacy = (props: {
           active={Boolean(window.getSettingValue('media-permissions'))}
         />
 
-        <SessionToggleWithDescription
+        {window.lokiFeatureFlags.useCallMessage && (
-          onClickToggle={async () => {
+          <SessionToggleWithDescription
-            await toggleCallMediaPermissions(forceUpdate);
+            onClickToggle={async () => {
-            forceUpdate();
+              await toggleCallMediaPermissions(forceUpdate);
-          }}
+              forceUpdate();
-          title={window.i18n('callMediaPermissionsTitle')}
+            }}
-          description={window.i18n('callMediaPermissionsDescription')}
+            title={window.i18n('callMediaPermissionsTitle')}
-          active={Boolean(window.getCallMediaPermissions())}
+            description={window.i18n('callMediaPermissionsDescription')}
-        />
+            active={Boolean(window.getCallMediaPermissions())}
+          />
+        )}
         <SessionToggleWithDescription
           onClickToggle={() => {
             const old = Boolean(window.getSettingValue(settingsReadReceipt));

ts/session/snode_api/SNodeAPI.ts

@@ -695,7 +695,7 @@ export const TEST_getMinTimeout = () => 500;
  */
 // tslint:disable-next-line: max-func-body-length
 export const networkDeleteMessages = async (
-  hashes: Array<string>,
+  hashes: Array<string>
 ): Promise<Array<string> | null> => {
   const sodium = await getSodium();
   const userX25519PublicKey = UserUtils.getOurPubKeyStrFromCache();

ts/session/snode_api/onions.ts

@@ -125,7 +125,7 @@ async function buildOnionCtxs(
 
       const isCallToPn =
         finalRelayOptions?.host === hrefPnServerDev || finalRelayOptions?.host === hrefPnServerProd;
-      if (!isCallToPn && window.lokiFeatureFlags.useFileOnionRequestsV2) {
+      if (!isCallToPn) {
         target = '/loki/v3/lsrpc';
       }
 

ts/session/utils/Attachments.ts

@@ -69,10 +69,7 @@ export class AttachmentFsV2Utils {
       pointer.key = new Uint8Array(crypto.randomBytes(64));
       const iv = new Uint8Array(crypto.randomBytes(16));
 
-      const dataToEncrypt =
+      const dataToEncrypt = !shouldPad ? attachment.data : addAttachmentPadding(attachment.data);
-        !shouldPad || !window.lokiFeatureFlags.padOutgoingAttachments
-          ? attachment.data
-          : addAttachmentPadding(attachment.data);
       const data = await window.textsecure.crypto.encryptAttachment(
         dataToEncrypt,
         pointer.key.buffer,

ts/session/utils/AttachmentsV2.ts

@@ -38,10 +38,9 @@ export async function uploadV2(params: UploadParamsV2): Promise<AttachmentPointe
     caption: attachment.caption,
   };
 
-  const paddedAttachment: ArrayBuffer =
+  const paddedAttachment: ArrayBuffer = !openGroup
-    window.lokiFeatureFlags.padOutgoingAttachments && !openGroup
+    ? addAttachmentPadding(attachment.data)
-      ? addAttachmentPadding(attachment.data)
+    : attachment.data;
-      : attachment.data;
 
   const fileDetails = await uploadFileOpenGroupV2(new Uint8Array(paddedAttachment), openGroup);
 

ts/window.d.ts

@@ -43,10 +43,6 @@ declare global {
     log: any;
     lokiFeatureFlags: {
       useOnionRequests: boolean;
-      useFileOnionRequests: boolean;
-      useFileOnionRequestsV2: boolean;
-      padOutgoingAttachments: boolean;
-      enablePinConversations: boolean;
       useCallMessage: boolean;
     };
     lokiSnodeAPI: LokiSnodeAPI;