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

await `goBackToMainProcess` in sticker-creator

This commit is contained in:
Fedor Indutny 2021-05-19 15:01:32 -07:00 committed by Scott Nonnenberg
parent be087c3498
commit bc146a54af
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sticker-creator/index.html
View File

@ -12,9 +12,9 @@
<script type="text/javascript" src="../../ts/backbonejQuery.js"></script>
<script type="text/javascript" src="../../js/storage.js"></script>
<script type='text/javascript' src='libtextsecure/protocol_wrapper.js'></script>
<script type='text/javascript' src='libtextsecure/storage/user.js'></script>
<script type='text/javascript' src='libtextsecure/storage/unprocessed.js'></script>
<script type='text/javascript' src='libtextsecure/protobufs.js'></script>
<script type='text/javascript' src='../../libtextsecure/protocol_wrapper.js'></script>
<script type='text/javascript' src='../../libtextsecure/storage/user.js'></script>
<script type='text/javascript' src='../../libtextsecure/storage/unprocessed.js'></script>
<script type='text/javascript' src='../../libtextsecure/protobufs.js'></script>
</body>
</html>

2
sticker-creator/preload.js
View File

@ -180,7 +180,7 @@ window.encryptAndUpload = async (
cover,
onProgress = noop
) => {
window.sqlInitializer.goBackToMainProcess();
await window.sqlInitializer.goBackToMainProcess();
const usernameItem = await window.Signal.Data.getItemById('uuid_id');
const oldUsernameItem = await window.Signal.Data.getItemById('number_id');
const passwordItem = await window.Signal.Data.getItemById('password');

2
ts/sql/Interface.ts
View File

@ -585,7 +585,7 @@ export type ClientInterface = DataInterface & {
// These are defined on the server-only and used in the client to determine
// whether we should use IPC to use the database in the main process or
// use the db already running in the renderer.
goBackToMainProcess: () => void;
goBackToMainProcess: () => Promise<void>;
};
export type ClientJobType = {

4
ts/sql/initialize.ts
View File

@ -26,6 +26,6 @@ export async function initialize(isTesting = false): Promise<void> {
await sql.initializeRenderer({ configDir, key });
}
export function goBackToMainProcess(): void {
window.Signal.Data.goBackToMainProcess();
export async function goBackToMainProcess(): Promise<void> {
return window.Signal.Data.goBackToMainProcess();
}

2
ts/window.d.ts vendored
View File

@ -263,7 +263,7 @@ declare global {
updateTrayIcon: (count: number) => void;
sqlInitializer: {
initialize: () => Promise<void>;
goBackToMainProcess: () => void;
goBackToMainProcess: () => Promise<void>;
};
Backbone: typeof Backbone;