Skip to content

Commit c92c582

Browse files
TrolldemortedTrolldemorted
committed
Update libsignal to 2.7.5
1 parent 7d1084b commit c92c582

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

‎Signal-Windows.Lib/IncomingMessages.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ private void HandleMessage(SignalServiceEnvelope envelope)
133133
}
134134
else if (content.SynchronizeMessage != null)
135135
{
136-
if (content.SynchronizeMessage.getSent().HasValue)
136+
if (content.SynchronizeMessage.Sent != null)
137137
{
138-
var syncMessage = content.SynchronizeMessage.getSent().ForceGetValue();
138+
var syncMessage = content.SynchronizeMessage.Sent;
139139
var dataMessage = syncMessage.getMessage();
140140

141141
if (dataMessage.EndSession)
@@ -166,9 +166,9 @@ private void HandleMessage(SignalServiceEnvelope envelope)
166166
HandleSignalMessage(envelope, content, dataMessage, true, timestamp);
167167
}
168168
}
169-
else if (content.SynchronizeMessage.getRead().HasValue)
169+
else if (content.SynchronizeMessage.Reads != null)
170170
{
171-
var readMessages = content.SynchronizeMessage.getRead().ForceGetValue();
171+
var readMessages = content.SynchronizeMessage.Reads;
172172
foreach (var readMessage in readMessages)
173173
{
174174
try
@@ -211,7 +211,7 @@ private void HandleExpirationUpdateMessage(SignalServiceEnvelope envelope, Signa
211211

212212
if (isSync)
213213
{
214-
var sent = content.SynchronizeMessage.getSent().ForceGetValue();
214+
var sent = content.SynchronizeMessage.Sent;
215215
type = SignalMessageDirection.Synced;
216216
status = SignalMessageStatus.Confirmed;
217217
composedTimestamp = sent.getTimestamp();
@@ -271,7 +271,7 @@ private void HandleSessionResetMessage(SignalServiceEnvelope envelope, SignalSer
271271

272272
if (isSync)
273273
{
274-
var sent = content.SynchronizeMessage.getSent().ForceGetValue();
274+
var sent = content.SynchronizeMessage.Sent;
275275
type = SignalMessageDirection.Synced;
276276
status = SignalMessageStatus.Confirmed;
277277
composedTimestamp = sent.getTimestamp();
@@ -375,7 +375,7 @@ private void HandleGroupUpdateMessage(SignalServiceEnvelope envelope, SignalServ
375375

376376
if (isSync)
377377
{
378-
var sent = content.SynchronizeMessage.getSent().ForceGetValue();
378+
var sent = content.SynchronizeMessage.Sent;
379379
type = SignalMessageDirection.Synced;
380380
status = SignalMessageStatus.Confirmed;
381381
composedTimestamp = sent.getTimestamp();
@@ -460,7 +460,7 @@ private void HandleSignalMessage(SignalServiceEnvelope envelope, SignalServiceCo
460460
{
461461
if (isSync)
462462
{
463-
var sent = content.SynchronizeMessage.getSent().ForceGetValue();
463+
var sent = content.SynchronizeMessage.Sent;
464464
conversation = SignalDBContext.GetOrCreateContactLocked(sent.getDestination().ForceGetValue(), timestamp);
465465
composedTimestamp = sent.getTimestamp();
466466
}
@@ -504,7 +504,7 @@ private void HandleSignalMessage(SignalServiceEnvelope envelope, SignalServiceCo
504504
var receivedAttachments = dataMessage.Attachments;
505505
foreach (var receivedAttachment in receivedAttachments)
506506
{
507-
var pointer = receivedAttachment.asPointer();
507+
var pointer = receivedAttachment.AsPointer();
508508
SignalAttachment sa = new SignalAttachment()
509509
{
510510
Message = message,

‎Signal-Windows.Lib/Models/SignalAttachment.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public SignalServiceAttachmentPointer ToAttachmentPointer()
3232
Relay,
3333
(uint)Util.ToIntExact(Size),
3434
null,
35+
0,
36+
0,
3537
Digest,
3638
FileName,
3739
false);

‎Signal-Windows.Lib/Signal-Windows.Lib.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
</ItemGroup>
162162
<ItemGroup>
163163
<PackageReference Include="libsignal-service-dotnet">
164-
<Version>2.6.6</Version>
164+
<Version>2.7.5</Version>
165165
</PackageReference>
166166
<PackageReference Include="Microsoft.EntityFrameworkCore">
167167
<Version>1.1.4</Version>

‎Signal-Windows.Lib/SignalLibHandle.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public async Task SetMessageRead(long index, SignalMessage message, SignalConver
343343
{
344344
Logger.LogTrace("SetMessageRead() locked");
345345
conversation = SignalDBContext.UpdateMessageRead(index, conversation);
346-
OutgoingMessages.SendMessage(SignalServiceSyncMessage.forRead(new List<ReadMessage>() {
346+
OutgoingMessages.SendMessage(SignalServiceSyncMessage.ForRead(new List<ReadMessage>() {
347347
new ReadMessage(message.Author.ThreadId, message.ComposedTimestamp)
348348
}));
349349
await DispatchMessageRead(index + 1, conversation);
@@ -627,7 +627,7 @@ private void InitNetwork()
627627
{
628628
try
629629
{
630-
MessageReceiver = new SignalServiceMessageReceiver(CancelSource.Token, LibUtils.ServiceConfiguration, new StaticCredentialsProvider(Store.Username, Store.Password, Store.SignalingKey, (int)Store.DeviceId), LibUtils.USER_AGENT);
630+
MessageReceiver = new SignalServiceMessageReceiver(CancelSource.Token, LibUtils.ServiceConfiguration, new StaticCredentialsProvider(Store.Username, Store.Password, Store.SignalingKey, (int)Store.DeviceId), LibUtils.USER_AGENT, null);
631631
Pipe = MessageReceiver.CreateMessagePipe();
632632
MessageSender = new SignalServiceMessageSender(CancelSource.Token, LibUtils.ServiceConfiguration, Store.Username, Store.Password, (int)Store.DeviceId, new Store(), Pipe, null, LibUtils.USER_AGENT);
633633
IncomingMessagesTask = Task.Factory.StartNew(() => new IncomingMessages(CancelSource.Token, Pipe, this).HandleIncomingMessages(), TaskCreationOptions.LongRunning);
@@ -736,7 +736,7 @@ private string RetrieveAttachmentUrl(SignalServiceAttachmentPointer pointer)
736736
private void DecryptAttachment(SignalServiceAttachmentPointer pointer, Stream ciphertextFileStream, Stream plaintextFileStream)
737737
{
738738
byte[] buf = new byte[32];
739-
Stream s = new AttachmentCipherInputStream(ciphertextFileStream, pointer.Key, pointer.Digest);
739+
Stream s = AttachmentCipherInputStream.CreateFor(ciphertextFileStream, pointer.Size != null ? pointer.Size.Value : 0, pointer.Key, pointer.Digest);
740740
s.CopyTo(plaintextFileStream);
741741
}
742742

‎Signal-Windows/ViewModels/AddContactPageViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public async Task RefreshContacts(CancellationToken? cancellationToken = null)
193193
var signalContactDetails = accountManager.GetContacts(intermediateContacts.Select(c => c.PhoneNumber).ToList());
194194
foreach (var contact in intermediateContacts)
195195
{
196-
var foundContact = signalContactDetails.FirstOrDefault(c => c.getNumber() == contact.PhoneNumber);
196+
var foundContact = signalContactDetails.FirstOrDefault(c => c.Number == contact.PhoneNumber);
197197
if (foundContact != null)
198198
{
199199
contact.OnSignal = true;

‎Signal-Windows/ViewModels/FinishRegistrationPageViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ await Task.Run(() =>
2929
App.CurrentSignalWindowsFrontend(App.MainViewId).Locator.RegisterFinalizationPageInstance.AccountManager.VerifyAccountWithCode(
3030
App.CurrentSignalWindowsFrontend(App.MainViewId).Locator.RegisterFinalizationPageInstance.VerificationCode.Replace("-", ""),
3131
SignalingKey, App.CurrentSignalWindowsFrontend(App.MainViewId).Locator.RegisterFinalizationPageInstance.SignalRegistrationId,
32-
true);
32+
true, null);
3333
SignalStore store = new SignalStore()
3434
{
3535
DeviceId = 1,

0 commit comments

Comments
 (0)