pull/781/head
Ryan Tharp 5 years ago
parent e16cafb7d6
commit d69a0a9fd4

@ -311,7 +311,7 @@ class LokiFileServerFactoryAPI {
if (!thisServer) { if (!thisServer) {
thisServer = new LokiFileServerInstance(this.ourKey); thisServer = new LokiFileServerInstance(this.ourKey);
log.info(`Registering FileServer ${serverUrl}`); log.info(`Registering FileServer ${serverUrl}`);
await thisServer.establishConnection(serverUrl, { skipToken: true } ); await thisServer.establishConnection(serverUrl, { skipToken: true });
this.servers.push(thisServer); this.servers.push(thisServer);
} }
return thisServer; return thisServer;

@ -236,7 +236,7 @@
id: 'maximumAttachments', id: 'maximumAttachments',
}); });
}, },
// Housekeeping // Housekeeping
addAttachment(attachment) { addAttachment(attachment) {
if (attachment.isVoiceNote && this.attachments.length > 0) { if (attachment.isVoiceNote && this.attachments.length > 0) {

@ -156,7 +156,7 @@
.find('.network-status-container') .find('.network-status-container')
.append(this.networkStatusView.render().el); .append(this.networkStatusView.render().el);
extension.expired((expired) => { extension.expired(expired => {
if (expired) { if (expired) {
const banner = new Whisper.ExpiredAlertBanner().render(); const banner = new Whisper.ExpiredAlertBanner().render();
banner.$el.prependTo(this.$el); banner.$el.prependTo(this.$el);

@ -702,8 +702,6 @@ MessageReceiver.prototype.extend({
this.activeSessionBaseKey = await getCurrentSessionBaseKey(sessionCipher); this.activeSessionBaseKey = await getCurrentSessionBaseKey(sessionCipher);
}; };
const handleSessionReset = async result => result;
switch (envelope.type) { switch (envelope.type) {
case textsecure.protobuf.Envelope.Type.CIPHERTEXT: case textsecure.protobuf.Envelope.Type.CIPHERTEXT:
window.log.info('message from', this.getEnvelopeId(envelope)); window.log.info('message from', this.getEnvelopeId(envelope));
@ -745,7 +743,7 @@ MessageReceiver.prototype.extend({
); );
}); });
break; break;
case textsecure.protobuf.Envelope.Type.UNIDENTIFIED_SENDER: case textsecure.protobuf.Envelope.Type.UNIDENTIFIED_SENDER: {
window.log.info('received unidentified sender message'); window.log.info('received unidentified sender message');
const secretSessionCipher = new window.Signal.Metadata.SecretSessionCipher( const secretSessionCipher = new window.Signal.Metadata.SecretSessionCipher(
@ -823,6 +821,7 @@ MessageReceiver.prototype.extend({
} }
); );
break; break;
}
default: default:
promise = Promise.reject(new Error('Unknown message type')); promise = Promise.reject(new Error('Unknown message type'));
} }
@ -845,12 +844,18 @@ MessageReceiver.prototype.extend({
window.log.info('Error getting conversation: ', envelope.source); window.log.info('Error getting conversation: ', envelope.source);
} }
/// *** BEGIN: session reset *** // lint hates anything after // (so /// is no good)
// *** BEGIN: session reset ***
// we have address in scope from parent scope
// seems to be the same input parameters
// going to comment out due to lint complaints
/*
const address = new libsignal.SignalProtocolAddress( const address = new libsignal.SignalProtocolAddress(
envelope.source, envelope.source,
envelope.sourceDevice envelope.sourceDevice
); );
*/
const restoreActiveSession = async () => { const restoreActiveSession = async () => {
const record = await sessionCipher.getRecord(address.toString()); const record = await sessionCipher.getRecord(address.toString());
@ -902,7 +907,8 @@ MessageReceiver.prototype.extend({
} }
} }
/// *** END *** // lint hates anything after // (so /// is no good)
// *** END ***
// Type here can actually be UNIDENTIFIED_SENDER even if // Type here can actually be UNIDENTIFIED_SENDER even if
// the underlying message is FRIEND_REQUEST // the underlying message is FRIEND_REQUEST

@ -626,7 +626,7 @@ $session-compose-margin: 20px;
background-color: $session-background; background-color: $session-background;
color: $session-color-light-grey; color: $session-color-light-grey;
border: 1px solid $session-color-dark-grey; border: 1px solid $session-color-dark-grey;
font-family: "SF Pro Text"; font-family: 'SF Pro Text';
font-size: $session-font-sm; font-size: $session-font-sm;
} }
} }

Loading…
Cancel
Save