mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Enable support for versioned profiles

Browse source
This commit is contained in:
Scott Nonnenberg 2020-06-23 17:38:32 -07:00
parent 6aedb30905
commit fb0a98ccb7
2 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/models/conversations.js
View file

@ -1952,9 +1952,7 @@
const profileKey = c.get('profileKey'); const profileKey = c.get('profileKey');
const uuid = c.get('uuid'); const uuid = c.get('uuid');
const profileKeyVersionHex = window.VERSIONED_PROFILE_FETCH const profileKeyVersionHex = c.get('profileKeyVersion');
? c.get('profileKeyVersion')
: null;
const existingProfileKeyCredential = c.get('profileKeyCredential'); const existingProfileKeyCredential = c.get('profileKeyCredential');
const weHaveVersion = Boolean( const weHaveVersion = Boolean(
@ -2257,10 +2255,6 @@
if (!profileKey) { if (!profileKey) {
return; 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'); const uuid = this.get('uuid');
if (!uuid || this.get('profileKeyVersion')) { if (!uuid || this.get('profileKeyVersion')) {

3
preload.js
View file

@ -13,9 +13,6 @@ try {
const { app } = remote; const { app } = remote;
const { nativeTheme } = remote.require('electron'); 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'; window.PROTO_ROOT = 'protos';
const config = require('url').parse(window.location.toString(), true).query; const config = require('url').parse(window.location.toString(), true).query;