Skip to content

Commit 9d2d6a3

Browse files
committed
update libsignal
fixes #75
1 parent 56312b7 commit 9d2d6a3

File tree

3 files changed

+13
-27
lines changed

3 files changed

+13
-27
lines changed

Signal-Windows/Signal-Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
</ItemGroup>
312312
<ItemGroup>
313313
<PackageReference Include="libsignal-service-dotnet">
314-
<Version>2.5.10.3</Version>
314+
<Version>2.5.10.5</Version>
315315
</PackageReference>
316316
<PackageReference Include="Microsoft.EntityFrameworkCore">
317317
<Version>1.1.2</Version>

Signal-Windows/Signal/IncomingMessages.cs

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Microsoft.Toolkit.Uwp.Notifications;
1313
using Windows.UI.Notifications;
1414
using Microsoft.QueryStringDotNET;
15+
using static libsignalservice.SignalServiceMessagePipe;
1516

1617
namespace Signal_Windows.ViewModels
1718
{
@@ -42,38 +43,23 @@ public void HandleIncomingMessages()
4243
Debug.WriteLine("HandleIncomingMessages finished");
4344
}
4445

45-
/// <summary>
46-
/// onMessages is called from the pipe after it received messages
47-
/// </summary>
48-
/// <param name="envelopes"></param>
49-
public void onMessages(SignalServiceEnvelope[] envelopes)
46+
public void OnMessage(SignalServiceMessagePipeMessage message)
5047
{
51-
List<SignalMessage> messages = new List<SignalMessage>();
52-
foreach (var envelope in envelopes)
48+
if (message is SignalServiceEnvelope)
5349
{
54-
if (envelope == null)
50+
SignalServiceEnvelope envelope = (SignalServiceEnvelope)message;
51+
List<SignalMessage> messages = new List<SignalMessage>();
52+
if (envelope.isReceipt())
5553
{
56-
continue;
54+
SignalDBContext.IncreaseReceiptCountLocked(envelope, this);
5755
}
58-
try
56+
else if (envelope.isPreKeySignalMessage() || envelope.isSignalMessage())
5957
{
60-
if (envelope.isReceipt())
61-
{
62-
SignalDBContext.IncreaseReceiptCountLocked(envelope, this);
63-
}
64-
else if (envelope.isPreKeySignalMessage() || envelope.isSignalMessage())
65-
{
66-
HandleMessage(envelope);
67-
}
68-
else
69-
{
70-
Debug.WriteLine("received message of unknown type " + envelope.getType() + " from " + envelope.getSource());
71-
}
58+
HandleMessage(envelope);
7259
}
73-
catch (Exception e)
60+
else
7461
{
75-
Debug.WriteLine(e.Message);
76-
Debug.WriteLine(e.StackTrace);
62+
Debug.WriteLine("received message of unknown type " + envelope.getType() + " from " + envelope.getSource());
7763
}
7864
}
7965
}

Signal-Windows/ViewModels/MainPageViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
namespace Signal_Windows.ViewModels
2424
{
25-
public partial class MainPageViewModel : ViewModelBase, MessagePipeCallback
25+
public partial class MainPageViewModel : ViewModelBase, IMessagePipeCallback
2626
{
2727
private Visibility _ThreadVisibility = Visibility.Collapsed;
2828

0 commit comments

Comments
 (0)