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

Remove legacy import flow

Browse source
This commit is contained in:
Scott Nonnenberg 2020-03-03 18:47:01 -08:00
parent 2105b5341a
commit a840e2e5b1
15 changed files with 20 additions and 559 deletions
Download patch file Download diff file Expand all files Collapse all files

34
js/modules/backup.js
View file

@ -866,25 +866,25 @@ async function exportConversations(options) {
window.log.info('Done exporting conversations!');
}
function getDirectory(options = {}) {
return new Promise((resolve, reject) => {
const browserWindow = BrowserWindow.getFocusedWindow();
const dialogOptions = {
title: options.title,
properties: ['openDirectory'],
buttonLabel: options.buttonLabel,
};
async function getDirectory(options = {}) {
const browserWindow = BrowserWindow.getFocusedWindow();
const dialogOptions = {
title: options.title,
properties: ['openDirectory'],
buttonLabel: options.buttonLabel,
};
dialog.showOpenDialog(browserWindow, dialogOptions, directory => {
if (!directory || !directory[0]) {
const error = new Error('Error choosing directory');
error.name = 'ChooseError';
return reject(error);
}
const { canceled, filePaths } = await dialog.showOpenDialog(
browserWindow,
dialogOptions
);
if (canceled || !filePaths || !filePaths[0]) {
const error = new Error('Error choosing directory');
error.name = 'ChooseError';
throw error;
}
return resolve(directory[0]);
});
});
return filePaths[0];
}
function getDirContents(dir) {