fix app start delete db when passowrd error

oxen-io · Sep 14, 2021 · deaeb27 · deaeb27
1 parent 537d7c4
commit deaeb27
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 20 deletions.
diff --git a/main.js b/main.js
@@ -662,6 +662,7 @@ function getDefaultSQLKey() {
 }
 
 async function removeDB() {
+  // this don't remove attachments and stuff like that...
   const userDir = await getRealPath(app.getPath('userData'));
   await sql.removeDB(userDir);
 

diff --git a/password_preload.js b/password_preload.js
@@ -21,9 +21,6 @@ window.getEnvironment = () => config.environment;
 window.getVersion = () => config.version;
 window.getAppInstance = () => config.appInstance;
 
-const electron = require('electron');
-
-const ipc = electron.ipcRenderer;
 const { SessionPasswordPrompt } = require('./ts/components/session/SessionPasswordPrompt');
 
 window.Signal = {
@@ -34,21 +31,11 @@ window.Signal = {
 
 window.Signal.Logs = require('./js/modules/logs');
 
-window.resetDatabase = () => {
+window.clearLocalData = async () => {
   window.log.info('reset database');
   ipcRenderer.send('resetDatabase');
 };
 
-window.restart = () => {
-  window.log.info('restart');
-  ipc.send('restart');
-};
-
-window.clearLocalData = async () => {
-  window.resetDatabase();
-  window.restart();
-};
-
 window.onLogin = passPhrase =>
   new Promise((resolve, reject) => {
     ipcRenderer.once('password-window-login-response', (event, error) => {

diff --git a/preload.js b/preload.js
@@ -156,11 +156,6 @@ window.restart = () => {
   ipc.send('restart');
 };
 
-window.resetDatabase = () => {
-  window.log.info('reset database');
-  ipc.send('resetDatabase');
-};
-
 ipc.on('mediaPermissionsChanged', () => {
   Whisper.events.trigger('mediaPermissionsChanged');
 });

diff --git a/ts/window.d.ts b/ts/window.d.ts
@@ -51,7 +51,6 @@ declare global {
     lokiSnodeAPI: LokiSnodeAPI;
     onLogin: any;
     persistStore?: Persistor;
-    resetDatabase: any;
     restart: any;
     getSeedNodeList: () => Array<any> | undefined;
     setPassword: any;