426dab85a2
- A new design for the import flow. It features: - Icons at the top of every screen - Gray background, blue buttons, thinner text - Simpler copy - A new design for the install flow. It features: - Immediate entry into the QR code screen - Animated dots to show that we're loading the QR code from the server - Fewer screens: 1) QR 2) device name 3) sync-in-progress - When not set up, the app opens directly into the install screen, which has been streamlined. The `--import` command-line argument will cause the app to open directly into the import flow. - Support for two different flavors of builds - the normal build will open into the standard registration flow, and the import flavor will be exactly the same except during setup it will open directly into the import flow. - A new design for the (dev-only) standalone registration view - When these install sequences are active, the OS File menu has entries to allow you to switch the method of setup you'd like to use. These go away as soon as the first step is taken in any of these flows. - The device name (chosen on initial setup) is now shown in the settings panel - At the end of a light import, we hand off to the normal device link screen, starting at the QR code. On a full import, we remove the sensitive encryption information in the export to prevent conflicts on multiple imports. - `Whisper.Backup.exportToDirectory()` takes an options object so you can tell it to do a light export. - `Whisper.Backup.importFromDirectory()` takes an options object so you can force it to load only the light components found on disk. It also returns an object so you can tell whether a given import was a full import or light import. - On start of import, we build a list of all the ids present in the messages, conversations, and groups stores in IndexedDB. This can take some time if a lot of data is in the database already, but it makes the subsequent deduplicated import very fast. - Disappearing messages are now excluded when exporting - Remove some TODOs in the tests
66 lines
2 KiB
JavaScript
66 lines
2 KiB
JavaScript
const fs = require('fs');
|
|
const _ = require('lodash');
|
|
|
|
const packageJson = require('./package.json');
|
|
|
|
|
|
const { version } = packageJson;
|
|
const beta = /beta/;
|
|
|
|
// You might be wondering why this file is necessary. It comes down to our desire to allow
|
|
// side-by-side installation of production and beta builds. Electron-Builder uses
|
|
// top-level data from package.json for many things, like the executable name, the
|
|
// debian package name, the install directory under /opt on linux, etc. We tried
|
|
// adding the ${channel} macro to these values, but Electron-Builder didn't like that.
|
|
|
|
if (!beta.test(version)) {
|
|
process.exit();
|
|
}
|
|
|
|
console.log('prepare_beta_build: updating package.json');
|
|
|
|
// -------
|
|
|
|
const NAME_PATH = 'name';
|
|
const PRODUCTION_NAME = 'signal-desktop';
|
|
const BETA_NAME = 'signal-desktop-beta';
|
|
|
|
const PRODUCT_NAME_PATH = 'productName';
|
|
const PRODUCTION_PRODUCT_NAME = 'Signal';
|
|
const BETA_PRODUCT_NAME = 'Signal Beta';
|
|
|
|
const APP_ID_PATH = 'build.appId';
|
|
const PRODUCTION_APP_ID = 'org.whispersystems.signal-desktop';
|
|
const BETA_APP_ID = 'org.whispersystems.signal-desktop-beta';
|
|
|
|
const STARTUP_WM_CLASS_PATH = 'build.linux.desktop.StartupWMClass';
|
|
const PRODUCTION_STARTUP_WM_CLASS = 'Signal';
|
|
const BETA_STARTUP_WM_CLASS = 'Signal Beta';
|
|
|
|
|
|
// -------
|
|
|
|
function checkValue(object, objectPath, expected) {
|
|
const actual = _.get(object, objectPath);
|
|
if (actual !== expected) {
|
|
throw new Error(`${objectPath} was ${actual}; expected ${expected}`);
|
|
}
|
|
}
|
|
|
|
// ------
|
|
|
|
checkValue(packageJson, NAME_PATH, PRODUCTION_NAME);
|
|
checkValue(packageJson, PRODUCT_NAME_PATH, PRODUCTION_PRODUCT_NAME);
|
|
checkValue(packageJson, APP_ID_PATH, PRODUCTION_APP_ID);
|
|
checkValue(packageJson, STARTUP_WM_CLASS_PATH, PRODUCTION_STARTUP_WM_CLASS);
|
|
|
|
// -------
|
|
|
|
_.set(packageJson, NAME_PATH, BETA_NAME);
|
|
_.set(packageJson, PRODUCT_NAME_PATH, BETA_PRODUCT_NAME);
|
|
_.set(packageJson, APP_ID_PATH, BETA_APP_ID);
|
|
_.set(packageJson, STARTUP_WM_CLASS_PATH, BETA_STARTUP_WM_CLASS);
|
|
|
|
// -------
|
|
|
|
fs.writeFileSync('./package.json', JSON.stringify(packageJson, null, ' '));
|