Skip to content

Commit 89ae4f3

Browse files
committedJan 17, 2022
Fix file name assigning bug.
1 parent 61f7094 commit 89ae4f3

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed
 

‎service-worker/sw.js

+13-4
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,12 @@ const _sodium = require("libsodium-wrappers");
3333

3434
addEventListener("message", (e) => {
3535
switch (e.data.cmd) {
36-
case "prepareFileName":
37-
assignFileName(e.data.fileName, e.source);
36+
case "prepareFileNameEnc":
37+
assignFileNameEnc(e.data.fileName, e.source);
38+
break;
39+
40+
case "prepareFileNameDec":
41+
assignFileNameDec(e.data.fileName, e.source);
3842
break;
3943

4044
case "requestEncryption":
@@ -107,9 +111,14 @@ const _sodium = require("libsodium-wrappers");
107111
}
108112
});
109113

110-
const assignFileName = (name, client) => {
114+
const assignFileNameEnc = (name, client) => {
115+
fileName = name;
116+
client.postMessage({ reply: "filePreparedEnc" })
117+
}
118+
119+
const assignFileNameDec = (name, client) => {
111120
fileName = name;
112-
client.postMessage({ reply: "filePrepared" })
121+
client.postMessage({ reply: "filePreparedDec" })
113122
}
114123

115124
const encKeyPair = (csk, spk, mode, client) => {

‎src/components/DecryptionPanel.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ export default function DecryptionPanel() {
533533
// send file name to sw
534534
let fileName = formatName(files[currFile].name);
535535
navigator.serviceWorker.ready.then((reg) => {
536-
reg.active.postMessage({ cmd: "prepareFileName", fileName });
536+
reg.active.postMessage({ cmd: "prepareFileNameDec", fileName });
537537
});
538538
};
539539

@@ -754,7 +754,7 @@ export default function DecryptionPanel() {
754754
setIsTestingPassword(false);
755755
break;
756756

757-
case "filePrepared":
757+
case "filePreparedDec":
758758
kickOffDecryption();
759759
break;
760760

@@ -1325,6 +1325,7 @@ export default function DecryptionPanel() {
13251325
variant="outlined"
13261326
startIcon={<RefreshIcon />}
13271327
fullWidth
1328+
style={{ textTransform: "none" }}
13281329
>
13291330
{t("decrypt_other_files")}
13301331
</Button>

‎src/components/EncryptionPanel.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ export default function EncryptionPanel() {
449449
// send file name to sw
450450
let fileName = files[currFile].name + ".enc";
451451
navigator.serviceWorker.ready.then((reg) => {
452-
reg.active.postMessage({ cmd: "prepareFileName", fileName });
452+
reg.active.postMessage({ cmd: "prepareFileNameEnc", fileName });
453453
});
454454
};
455455

@@ -585,7 +585,7 @@ export default function EncryptionPanel() {
585585
startEncryption("publicKey");
586586
break;
587587

588-
case "filePrepared":
588+
case "filePreparedEnc":
589589
kickOffEncryption();
590590
break;
591591

0 commit comments

Comments
 (0)
Please sign in to comment.