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

Fix hanging "Clear All Data" on Windows

Browse source
This commit is contained in:
Fedor Indutny 2021-05-13 13:54:54 -07:00 • committed by Scott Nonnenberg
parent 03eaa9eb3e
commit fe505a7f2f
8 changed files with 58 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/modules/logs.js
View file

@ -3,6 +3,8 @@
const { ipcRenderer } = require('electron');
const { beforeRestart } = require('../../ts/logging/set_up_renderer_logging');
/* eslint-env node */
module.exports = {
@ -11,6 +13,9 @@ module.exports = {
function deleteAll() {
return new Promise((resolve, reject) => {
// Restart logging again when the file stream close
beforeRestart();
ipcRenderer.once('delete-all-logs-complete', resolve);
setTimeout(() => {

12
js/views/clear_data_view.js
View file

@ -36,11 +36,23 @@
try {
await Logs.deleteAll();
window.log.info('clearAllData: deleted all logs');
await window.Signal.Data.removeAll();
window.log.info('clearAllData: emptied database');
await window.Signal.Data.close();
window.log.info('clearAllData: closed database');
await window.Signal.Data.removeDB();
window.log.info('clearAllData: removed database');
await window.Signal.Data.removeOtherData();
window.log.info('clearAllData: removed all other data');
} catch (error) {
window.log.error(
'Something went wrong deleting all data:',