From fb0a98ccb7b19437a5bcda359d2ebd03868b5f93 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 23 Jun 2020 17:38:32 -0700
Subject: [PATCH] Enable support for versioned profiles

---
 js/models/conversations.js | 8 +-------
 preload.js                 | 3 ---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 0a2075ee18..b587dff995 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1952,9 +1952,7 @@
 
         const profileKey = c.get('profileKey');
         const uuid = c.get('uuid');
-        const profileKeyVersionHex = window.VERSIONED_PROFILE_FETCH
-          ? c.get('profileKeyVersion')
-          : null;
+        const profileKeyVersionHex = c.get('profileKeyVersion');
         const existingProfileKeyCredential = c.get('profileKeyCredential');
 
         const weHaveVersion = Boolean(
@@ -2257,10 +2255,6 @@
       if (!profileKey) {
         return;
       }
-      // We won't even save derived profile key versions if we haven't flipped this switch
-      if (!window.VERSIONED_PROFILE_FETCH) {
-        return;
-      }
 
       const uuid = this.get('uuid');
       if (!uuid || this.get('profileKeyVersion')) {
diff --git a/preload.js b/preload.js
index f791b4ce1d..bc9f6cc148 100644
--- a/preload.js
+++ b/preload.js
@@ -13,9 +13,6 @@ try {
   const { app } = remote;
   const { nativeTheme } = remote.require('electron');
 
-  // Derive profile key versions, then use those to fetch versioned profiles from server
-  window.VERSIONED_PROFILE_FETCH = false;
-
   window.PROTO_ROOT = 'protos';
   const config = require('url').parse(window.location.toString(), true).query;