Skip to content
This repository has been archived by the owner on May 22, 2021. It is now read-only.

fixes issues 195 and 192 #197

Merged
merged 6 commits into from
Jul 17, 2017
Merged

fixes issues 195 and 192 #197

merged 6 commits into from
Jul 17, 2017

Conversation

abhinadduri
Copy link
Collaborator

@abhinadduri abhinadduri commented Jul 13, 2017

Fixes #192
Fixes #195

server/server.js Outdated
!meta.hasOwnProperty('aad') ||
!meta.hasOwnProperty('id') ||
!meta.hasOwnProperty('filename')
!meta.hasOwnProperty('filename' ||
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think... this is wrong.

!meta.hasOwnProperty('filename') ||
!validateIV(meta.id)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, nice catch! Messed up some indenting and ended up with that.

@@ -65,7 +65,7 @@ $(document).ready(function() {
return;
})
.then(([decrypted, fname]) => {
name.innerText = fname;
name.innerText = decodeURIComponent(fname);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we move the decode into fileReceiver.js?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, will do.

@abhinadduri abhinadduri merged commit 729f716 into master Jul 17, 2017
@abhinadduri abhinadduri deleted the fixes195and192 branch July 17, 2017 23:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants