Skip to content

Commit 2b10502

Browse files
author
Erika Perugachi
authored
Merge pull request #1214 from erikaperugachi/electron
Update packages
2 parents 750fbda + babefb9 commit 2b10502

37 files changed

+857
-445
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ We use Lokalise for translations. If you are interested in helping please write
2323

2424
To build Criptext on your machine you'll need:
2525

26-
* Node.js (Recommended 8.15+)
27-
* Yarn (Recommended 1.13+)
26+
* Node.js (Recommended 12.12+)
27+
* Yarn (Recommended 1.19.1+)
2828

2929
## Run locally
3030

electron_app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "criptext",
3-
"version": "0.24.1",
3+
"version": "0.25.0",
44
"author": {
55
"name": "Criptext Inc",
66
"email": "[email protected]",
@@ -135,14 +135,14 @@
135135
},
136136
"devDependencies": {
137137
"criptext-js-tools": "0.5.0",
138-
"electron": "3.1.10",
138+
"electron": "6.1.4",
139139
"electron-builder": "21.2.0",
140140
"electron-notarize": "^0.1.1"
141141
},
142142
"dependencies": {
143143
"@criptext/api": "^0.15.22",
144144
"@criptext/data-transfer-client": "^0.1.1",
145-
"@criptext/electron-better-ipc": "^0.1.2-rc5",
145+
"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
146146
"@criptext/electron-push-receiver": "^2.1.2-rc1",
147147
"@criptext/news-api-client": "^1.0.1",
148148
"dotenv": "^6.2.0",
@@ -159,7 +159,7 @@
159159
"recursive-copy": "^2.0.10",
160160
"rimraf": "^2.6.3",
161161
"rmdir-recursive": "^0.0.1",
162-
"sqlite3": "4.0.2",
162+
"sqlite3": "^4.1.0",
163163
"unused-filename": "^2.1.0",
164164
"websocket": "^1.0.28"
165165
}

electron_app/src/dbExporter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const {
1515
const myAccount = require('./Account');
1616
const { APP_DOMAIN, LINK_DEVICES_FILE_VERSION } = require('./utils/const');
1717

18-
const CIPHER_ALGORITHM = 'aes128';
18+
const CIPHER_ALGORITHM = 'aes-128-cbc';
1919
const STREAM_SIZE = 512 * 1024;
2020
const DEFAULT_KEY_LENGTH = 16;
2121

electron_app/src/ipc/backup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const ipc = require('@criptext/electron-better-ipc');
1+
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
22
const { shell } = require('electron');
33
const moment = require('moment');
44
const {

electron_app/src/ipc/client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const ipc = require('@criptext/electron-better-ipc');
1+
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
22
const clientManager = require('./../clientManager');
33

44
ipc.answerRenderer('client-acknowledge-events', params =>

electron_app/src/ipc/composer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const ipc = require('@criptext/electron-better-ipc');
1+
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
22
const composerWindowManager = require('../windows/composer');
33

44
ipc.answerRenderer(

electron_app/src/ipc/dataTransfer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const ipc = require('@criptext/electron-better-ipc');
1+
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
22
const dataTransferManager = require('../dataTransferClient');
33

44
ipc.answerRenderer('data-transfer-clear-sync-data', () =>

electron_app/src/ipc/database.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const ipc = require('@criptext/electron-better-ipc');
1+
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
22
const dbManager = require('./../DBManager');
33

44
ipc.answerRenderer('db-clean-data-logout', recipientId =>

electron_app/src/ipc/loading.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const ipc = require('@criptext/electron-better-ipc');
1+
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
22
const loadingWindow = require('../windows/loading');
33
const globalManager = require('../globalManager');
44

electron_app/src/ipc/login.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const ipc = require('@criptext/electron-better-ipc');
1+
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
22
const loginWindow = require('../windows/login');
33

44
ipc.answerRenderer('close-login', ({ forceClose }) => {

0 commit comments

Comments
 (0)