jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update SQLCipher to 4.3.0

This commit is contained in:
Scott Nonnenberg 2020-02-19 13:11:06 -08:00 committed by GitHub
parent 32c0a8fbf6
commit 68ee557dcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/global_errors.js
View File

@ -10,6 +10,9 @@ let quitText = 'Quit';
let copyErrorAndQuitText = 'Copy error and quit'; let copyErrorAndQuitText = 'Copy error and quit';
function handleError(prefix, error) { function handleError(prefix, error) {
if (console._error) {
console._error(`${prefix}:`, Errors.toLogFormat(error));
}
console.error(`${prefix}:`, Errors.toLogFormat(error)); console.error(`${prefix}:`, Errors.toLogFormat(error));
if (app.isReady()) { if (app.isReady()) {

16
package.json
View File

@ -62,7 +62,7 @@
"fs-xattr": "0.3.0" "fs-xattr": "0.3.0"
}, },
"dependencies": { "dependencies": {
"@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#00fd0f8a6623c6683280976d2a92b41d09c744bc", "@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#b10f232fac62ba7f8775c9e086bb5558fe7d948b",
"@sindresorhus/is": "0.8.0", "@sindresorhus/is": "0.8.0",
"array-move": "2.1.0", "array-move": "2.1.0",
"backbone": "1.3.3", "backbone": "1.3.3",
@ -290,16 +290,6 @@
], ],
"target": [ "target": [
"nsis" "nsis"
],
"extraFiles": [
{
"from": "node_modules/@journeyapps/sqlcipher/build/Release/",
"to": ".",
"filter": [
"msvcp140.dll",
"vcruntime140.dll"
]
}
] ]
}, },
"nsis": { "nsis": {
@ -387,9 +377,7 @@
"node_modules/sharp/build/**", "node_modules/sharp/build/**",
"!node_modules/@journeyapps/sqlcipher/deps/*", "!node_modules/@journeyapps/sqlcipher/deps/*",
"!node_modules/@journeyapps/sqlcipher/build/*", "!node_modules/@journeyapps/sqlcipher/build/*",
"!node_modules/@journeyapps/sqlcipher/lib/binding/node-*", "!node_modules/@journeyapps/sqlcipher/lib/binding/node-*"
"!node_modules/@journeyapps/sqlcipher/lib/binding/electron-*/msvcp140.dll",
"!node_modules/@journeyapps/sqlcipher/lib/binding/electron-*/vcruntime140.dll"
] ]
} }
} }

4
yarn.lock
View File

@ -1264,9 +1264,9 @@
resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8" resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw== integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
"@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#00fd0f8a6623c6683280976d2a92b41d09c744bc": "@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#b10f232fac62ba7f8775c9e086bb5558fe7d948b":
version "4.0.0" version "4.0.0"
resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#00fd0f8a6623c6683280976d2a92b41d09c744bc" resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#b10f232fac62ba7f8775c9e086bb5558fe7d948b"
dependencies: dependencies:
nan "^2.12.1" nan "^2.12.1"
node-pre-gyp "^0.11.0" node-pre-gyp "^0.11.0"