mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Use SignalService vs textsecure for protobuf

Browse source
This commit is contained in:
Daniel Gasienica 2018-05-07 12:52:27 -04:00
parent 6589247750
commit 38f3ad6518
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/models/messages.js
View file

@ -33,9 +33,6 @@
this.on('change:expireTimer', this.setToExpire); this.on('change:expireTimer', this.setToExpire);
this.on('unload', this.unload); this.on('unload', this.unload);
this.setToExpire(); this.setToExpire();
this.VOICE_FLAG =
textsecure.protobuf.AttachmentPointer.Flags.VOICE_MESSAGE;
}, },
idForLogging() { idForLogging() {
return `${this.get('source')}.${this.get('sourceDevice')} ${this.get( return `${this.get('source')}.${this.get('sourceDevice')} ${this.get(
@ -248,8 +245,7 @@
}); });
return Object.assign({}, attachment, { return Object.assign({}, attachment, {
// eslint-disable-next-line no-bitwise isVoiceMessage: Signal.Types.Attachment.isVoiceMessage(attachment),
isVoiceMessage: Boolean(attachment.flags & this.VOICE_FLAG),
thumbnail: thumbnailWithObjectUrl, thumbnail: thumbnailWithObjectUrl,
}); });
}, },

2
ts/components/conversation/Message.md
View file

@ -597,7 +597,7 @@ const outgoing = new Whisper.Message({
sent_at: Date.now() - 15000, sent_at: Date.now() - 15000,
attachments: [ attachments: [
{ {
flags: textsecure.protobuf.AttachmentPointer.Flags.VOICE_MESSAGE, flags: SignalService.AttachmentPointer.Flags.VOICE_MESSAGE,
data: util.mp3, data: util.mp3,
fileName: 'agnus_dei.mp3', fileName: 'agnus_dei.mp3',
contentType: 'audio/mp3', contentType: 'audio/mp3',

2
ts/components/conversation/Quote.md
View file

@ -572,7 +572,7 @@ const outgoing = new Whisper.Message({
attachments: [ attachments: [
{ {
// proposed as of afternoon of 4/6 in Quoted Replies group // proposed as of afternoon of 4/6 in Quoted Replies group
flags: textsecure.protobuf.AttachmentPointer.Flags.VOICE_MESSAGE, flags: SignalService.AttachmentPointer.Flags.VOICE_MESSAGE,
contentType: 'audio/mp3', contentType: 'audio/mp3',
fileName: 'agnus_dei.mp4', fileName: 'agnus_dei.mp4',
}, },