Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ We use Lokalise for translations. If you are interested in helping please write

To build Criptext on your machine you'll need:

* Node.js (Recommended 8.15+)
* Yarn (Recommended 1.13+)
* Node.js (Recommended 12.12+)
* Yarn (Recommended 1.19.1+)

## Run locally

Expand Down
8 changes: 4 additions & 4 deletions electron_app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "criptext",
"version": "0.24.1",
"version": "0.25.0",
"author": {
"name": "Criptext Inc",
"email": "support@criptext.com",
Expand Down Expand Up @@ -135,14 +135,14 @@
},
"devDependencies": {
"criptext-js-tools": "0.5.0",
"electron": "3.1.10",
"electron": "6.1.4",
"electron-builder": "21.2.0",
"electron-notarize": "^0.1.1"
},
"dependencies": {
"@criptext/api": "^0.15.22",
"@criptext/data-transfer-client": "^0.1.1",
"@criptext/electron-better-ipc": "^0.1.2-rc5",
"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
"@criptext/electron-push-receiver": "^2.1.2-rc1",
"@criptext/news-api-client": "^1.0.1",
"dotenv": "^6.2.0",
Expand All @@ -159,7 +159,7 @@
"recursive-copy": "^2.0.10",
"rimraf": "^2.6.3",
"rmdir-recursive": "^0.0.1",
"sqlite3": "4.0.2",
"sqlite3": "^4.1.0",
"unused-filename": "^2.1.0",
"websocket": "^1.0.28"
}
Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/dbExporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const {
const myAccount = require('./Account');
const { APP_DOMAIN, LINK_DEVICES_FILE_VERSION } = require('./utils/const');

const CIPHER_ALGORITHM = 'aes128';
const CIPHER_ALGORITHM = 'aes-128-cbc';
const STREAM_SIZE = 512 * 1024;
const DEFAULT_KEY_LENGTH = 16;

Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/backup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const { shell } = require('electron');
const moment = require('moment');
const {
Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/client.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const clientManager = require('./../clientManager');

ipc.answerRenderer('client-acknowledge-events', params =>
Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/composer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const composerWindowManager = require('../windows/composer');

ipc.answerRenderer(
Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/dataTransfer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const dataTransferManager = require('../dataTransferClient');

ipc.answerRenderer('data-transfer-clear-sync-data', () =>
Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/database.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const dbManager = require('./../DBManager');

ipc.answerRenderer('db-clean-data-logout', recipientId =>
Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/loading.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const loadingWindow = require('../windows/loading');
const globalManager = require('../globalManager');

Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/login.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const loginWindow = require('../windows/login');

ipc.answerRenderer('close-login', ({ forceClose }) => {
Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/mailbox.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const { app } = require('electron');
const unusedFilename = require('unused-filename');
const { download } = require('electron-dl');
Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const dbManager = require('./../DBManager');
const fileUtils = require('./../utils/FileUtils');
const myAccount = require('../../src/Account');
Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/nucleus.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const { addEventError, NUCLEUS_EVENTS } = require('./../nucleusManager');

ipc.answerRenderer('nucleups-report-content-unencrypted', error =>
Expand Down
2 changes: 1 addition & 1 deletion electron_app/src/ipc/utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const { app, dialog } = require('electron');
const {
getComputerName,
Expand Down
5 changes: 4 additions & 1 deletion electron_app/src/windows/composer.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ const createComposerWindow = () => {
show: false,
title: ` ${windowTitle}`,
minWidth: composerSize.minWidth,
minHeight: composerSize.minHeight
minHeight: composerSize.minHeight,
webPreferences: {
nodeIntegration: true
}
});
globalManager.composerData.set(window.id, {});
window.loadURL(composerUrl);
Expand Down
5 changes: 4 additions & 1 deletion electron_app/src/windows/loading.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ const create = () => {
show: false,
frame: false,
transparent: true,
center: true
center: true,
webPreferences: {
nodeIntegration: true
}
});
loadingWindow.loadURL(loadingUrl);
loadingWindow.setMenu(null);
Expand Down
5 changes: 4 additions & 1 deletion electron_app/src/windows/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ const create = () => {
center: true,
frame: false,
show: false,
transparent: true
transparent: true,
webPreferences: {
nodeIntegration: true
}
});
loginWindow.loadURL(loginUrl);
loginWindow.setResizable(false);
Expand Down
4 changes: 2 additions & 2 deletions electron_app/src/windows/mailbox.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { app, BrowserWindow, shell } = require('electron');
const pushReceiver = require('@criptext/electron-push-receiver');
const ipc = require('@criptext/electron-better-ipc');
const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
const windowStateManager = require('electron-window-state');
const path = require('path');
const { mailboxUrl } = require('./../window_routing');
Expand Down Expand Up @@ -45,7 +45,7 @@ const create = () => {
show: false,
title: 'Criptext',
frame: !isWindows(),
webPreferences: { webSecurity: !isDev }
webPreferences: { webSecurity: !isDev, nodeIntegration: true }
});
mailboxWindow.loadURL(mailboxUrl);
if (isWindows()) mailboxWindow.setMenuBarVisibility(false);
Expand Down
Loading