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

Add an assertion when updating conversations; update cleanData

Browse source
This commit is contained in:
Evan Hahn 2021-02-04 13:54:03 -06:00 • committed by GitHub
parent 73a304faba
commit bc37b5c907
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 749 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

14
preload.js
View file

@ -11,6 +11,12 @@ try {
const client = require('libsignal-client');
const _ = require('lodash');
const { installGetter, installSetter } = require('./preload_utils');
const {
getEnvironment,
setEnvironment,
parseEnvironment,
Environment,
} = require('./ts/environment');
const { remote } = electron;
const { app } = remote;
@ -19,9 +25,11 @@ try {
window.PROTO_ROOT = 'protos';
const config = require('url').parse(window.location.toString(), true).query;
setEnvironment(parseEnvironment(config.environment));
let title = config.name;
if (config.environment !== 'production') {
title += ` - ${config.environment}`;
if (getEnvironment() !== Environment.Production) {
title += ` - ${getEnvironment()}`;
}
if (config.appInstance) {
title += ` - ${config.appInstance}`;
@ -37,7 +45,7 @@ try {
window.platform = process.platform;
window.getTitle = () => title;
window.getEnvironment = () => config.environment;
window.getEnvironment = getEnvironment;
window.getAppInstance = () => config.appInstance;
window.getVersion = () => config.version;
window.getExpiration = () => {