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

Fix sticker creator uploads

Browse source
This commit is contained in:
Josh Perez 2021-03-25 19:56:13 -04:00 • committed by GitHub
parent de5943a5fb
commit 67892d838c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sticker-creator/app/stages/UploadStage.tsx
View file

@ -42,6 +42,7 @@ export const UploadStage: React.ComponentType = () => {
actions.setPackMeta(packMeta); actions.setPackMeta(packMeta);
history.push('/share'); history.push('/share');
} catch (e) { } catch (e) {
window.log.error('Error uploading image:', e);
actions.addToast({ actions.addToast({
key: 'StickerCreator--Toasts--errorUploading', key: 'StickerCreator--Toasts--errorUploading',
subs: [e.message], subs: [e.message],

18
sticker-creator/preload.js
View file

@ -9,6 +9,7 @@ const { readFile } = require('fs');
const config = require('url').parse(window.location.toString(), true).query; const config = require('url').parse(window.location.toString(), true).query;
const { noop, uniqBy } = require('lodash'); const { noop, uniqBy } = require('lodash');
const pMap = require('p-map'); const pMap = require('p-map');
const client = require('libsignal-client');
const { deriveStickerPackKey } = require('../ts/Crypto'); const { deriveStickerPackKey } = require('../ts/Crypto');
const { const {
getEnvironment, getEnvironment,
@ -28,6 +29,8 @@ const MAX_ANIMATED_STICKER_BYTE_LENGTH = 300 * 1024;
setEnvironment(parseEnvironment(config.environment)); setEnvironment(parseEnvironment(config.environment));
window.sqlInitializer = require('../ts/sql/initialize');
window.ROOT_PATH = window.location.href.startsWith('file') ? '../../' : '/'; window.ROOT_PATH = window.location.href.startsWith('file') ? '../../' : '/';
window.PROTO_ROOT = '../../protos'; window.PROTO_ROOT = '../../protos';
window.getEnvironment = getEnvironment; window.getEnvironment = getEnvironment;
@ -49,6 +52,20 @@ const Signal = require('../js/modules/signal');
window.Signal = Signal.setup({}); window.Signal = Signal.setup({});
window.textsecure = require('../ts/textsecure').default; window.textsecure = require('../ts/textsecure').default;
window.libsignal = window.libsignal || {};
window.libsignal.HKDF = {};
window.libsignal.HKDF.deriveSecrets = (input, salt, info) => {
const hkdf = client.HKDF.new(3);
const output = hkdf.deriveSecrets(
3 * 32,
Buffer.from(input),
Buffer.from(info),
Buffer.from(salt)
);
return [output.slice(0, 32), output.slice(32, 64), output.slice(64, 96)];
};
window.synchronousCrypto = require('../ts/util/synchronousCrypto');
const { initialize: initializeWebAPI } = require('../ts/textsecure/WebAPI'); const { initialize: initializeWebAPI } = require('../ts/textsecure/WebAPI');
const { const {
getAnimatedPngDataIfExists, getAnimatedPngDataIfExists,
@ -163,6 +180,7 @@ window.encryptAndUpload = async (
cover, cover,
onProgress = noop onProgress = noop
) => { ) => {
window.sqlInitializer.goBackToMainProcess();
const usernameItem = await window.Signal.Data.getItemById('uuid_id'); const usernameItem = await window.Signal.Data.getItemById('uuid_id');
const oldUsernameItem = await window.Signal.Data.getItemById('number_id'); const oldUsernameItem = await window.Signal.Data.getItemById('number_id');
const passwordItem = await window.Signal.Data.getItemById('password'); const passwordItem = await window.Signal.Data.getItemById('password');