Skip to content

Fix decrypt changes #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2018
Merged

Fix decrypt changes #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion electron_app/src/DBManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ const createSignedPreKeyRecord = params => {

const getSignedPreKey = params => {
return db
.select('signedPrivKey', 'signedPubKey')
.select('signedPreKeyPrivKey', 'signedPreKeyPubKey')
.from(Table.SIGNEDPREKEYRECORD)
.where(params);
};
Expand Down
4 changes: 2 additions & 2 deletions electron_app/src/utils/consts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const PROD_SOCKET_URL = 'ws://54.245.42.9:3001';
const PROD_SERVER_URL = 'http://54.245.42.9:8000';
const PROD_SOCKET_URL = 'ws://stage.socket.criptext.com';
const PROD_SERVER_URL = 'https://stage.mail.criptext.com';

module.exports = {
PROD_SERVER_URL,
Expand Down
6 changes: 3 additions & 3 deletions email_mailbox/src/utils/EmailUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ const formRecipients = recipientString => {
};

export const formIncomingEmailFromData = async (data, deviceId) => {
const bodyKey = data.bodyKey;
const messageId = data.messageId;
const recipientId = getRecipientIdFromEmailAddressTag(data.from);
const { content, preview } = await getContentMessage(
bodyKey,
messageId,
recipientId,
deviceId
);
const email = {
key: data.metadataKey,
threadId: data.threadId,
s3Key: bodyKey,
s3Key: messageId,
content,
preview,
subject: data.subject,
Expand Down