|
12 | 12 | using Microsoft.Toolkit.Uwp.Notifications;
|
13 | 13 | using Windows.UI.Notifications;
|
14 | 14 | using Microsoft.QueryStringDotNET;
|
| 15 | +using static libsignalservice.SignalServiceMessagePipe; |
15 | 16 |
|
16 | 17 | namespace Signal_Windows.ViewModels
|
17 | 18 | {
|
@@ -42,38 +43,23 @@ public void HandleIncomingMessages()
|
42 | 43 | Debug.WriteLine("HandleIncomingMessages finished");
|
43 | 44 | }
|
44 | 45 |
|
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) |
50 | 47 | {
|
51 |
| - List<SignalMessage> messages = new List<SignalMessage>(); |
52 |
| - foreach (var envelope in envelopes) |
| 48 | + if (message is SignalServiceEnvelope) |
53 | 49 | {
|
54 |
| - if (envelope == null) |
| 50 | + SignalServiceEnvelope envelope = (SignalServiceEnvelope)message; |
| 51 | + List<SignalMessage> messages = new List<SignalMessage>(); |
| 52 | + if (envelope.isReceipt()) |
55 | 53 | {
|
56 |
| - continue; |
| 54 | + SignalDBContext.IncreaseReceiptCountLocked(envelope, this); |
57 | 55 | }
|
58 |
| - try |
| 56 | + else if (envelope.isPreKeySignalMessage() || envelope.isSignalMessage()) |
59 | 57 | {
|
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); |
72 | 59 | }
|
73 |
| - catch (Exception e) |
| 60 | + else |
74 | 61 | {
|
75 |
| - Debug.WriteLine(e.Message); |
76 |
| - Debug.WriteLine(e.StackTrace); |
| 62 | + Debug.WriteLine("received message of unknown type " + envelope.getType() + " from " + envelope.getSource()); |
77 | 63 | }
|
78 | 64 | }
|
79 | 65 | }
|
|
0 commit comments