diff --git a/js/models/conversations.js b/js/models/conversations.js index 0a2075ee18e..b587dff9954 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 f791b4ce1dc..bc9f6cc148d 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;