Skip to content

Commit 7d1084b

Browse files
TrolldemortedTrolldemorted
committed
Update libsignal to 2.6.6
1 parent 3d3d32a commit 7d1084b

File tree

8 files changed

+33
-27
lines changed

8 files changed

+33
-27
lines changed

‎Signal-Windows.Lib/IncomingMessages.cs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void OnMessage(SignalServiceMessagePipeMessage message)
9797
private void HandleMessage(SignalServiceEnvelope envelope)
9898
{
9999
var cipher = new SignalServiceCipher(new SignalServiceAddress(SignalLibHandle.Instance.Store.Username), new Store());
100-
var content = cipher.decrypt(envelope);
100+
var content = cipher.Decrypt(envelope);
101101
long timestamp = Util.CurrentTimeMillis();
102102

103103
if (content.Message != null)
@@ -175,15 +175,21 @@ private void HandleMessage(SignalServiceEnvelope envelope)
175175
{
176176
HandleSyncedReadMessage(readMessage);
177177
}
178-
catch(Exception e)
178+
catch (Exception e)
179179
{
180180
Logger.LogError("HandleReadMessage failed: {0}\n{1}", e.Message, e.StackTrace);
181181
}
182182
}
183183
}
184-
} //TODO callmessages
184+
}
185+
else if (content.ReadMessage != null)
186+
{
187+
SignalServiceReceiptMessage receiptMessage = content.ReadMessage;
188+
Logger.LogTrace("HandleMessage() received ReceiptMessage (type={0}, when={1})", receiptMessage.ReceiptType, receiptMessage.When);
189+
}
185190
else
186191
{
192+
//TODO callmessages
187193
Logger.LogWarning("HandleMessage() received unrecognized message");
188194
}
189195
}
@@ -213,7 +219,7 @@ private void HandleExpirationUpdateMessage(SignalServiceEnvelope envelope, Signa
213219
prefix = "You have";
214220
if (message.Group != null)
215221
{
216-
conversation = SignalDBContext.GetOrCreateGroupLocked(Base64.encodeBytes(message.Group.GroupId), 0);
222+
conversation = SignalDBContext.GetOrCreateGroupLocked(Base64.EncodeBytes(message.Group.GroupId), 0);
217223
}
218224
else
219225
{
@@ -229,7 +235,7 @@ private void HandleExpirationUpdateMessage(SignalServiceEnvelope envelope, Signa
229235
composedTimestamp = envelope.getTimestamp();
230236
if (message.Group != null)
231237
{
232-
conversation = SignalDBContext.GetOrCreateGroupLocked(Base64.encodeBytes(message.Group.GroupId), 0);
238+
conversation = SignalDBContext.GetOrCreateGroupLocked(Base64.EncodeBytes(message.Group.GroupId), 0);
233239
}
234240
else
235241
{
@@ -306,7 +312,7 @@ private void HandleGroupLeaveMessage(SignalServiceEnvelope envelope, SignalServi
306312
SignalServiceGroup sentGroup = dataMessage.Group;
307313
if (sentGroup != null)
308314
{
309-
string groupid = Base64.encodeBytes(sentGroup.GroupId);
315+
string groupid = Base64.EncodeBytes(sentGroup.GroupId);
310316
SignalGroup group = SignalDBContext.GetOrCreateGroupLocked(groupid, 0);
311317
if (isSync)
312318
{
@@ -343,7 +349,7 @@ private void HandleGroupUpdateMessage(SignalServiceEnvelope envelope, SignalServ
343349
if (dataMessage.Group != null) //TODO check signal droid: group messages have different types!
344350
{
345351
SignalServiceGroup group = dataMessage.Group;
346-
string groupid = Base64.encodeBytes(group.GroupId);
352+
string groupid = Base64.EncodeBytes(group.GroupId);
347353
SignalGroup g = new SignalGroup();
348354
string displayname = "Unknown group";
349355
string avatarfile = null;
@@ -430,7 +436,7 @@ private void HandleSignalMessage(SignalServiceEnvelope envelope, SignalServiceCo
430436
if (dataMessage.Group != null)
431437
{
432438
var rawId = dataMessage.Group.GroupId;
433-
var threadId = Base64.encodeBytes(rawId);
439+
var threadId = Base64.EncodeBytes(rawId);
434440
conversation = SignalDBContext.GetOrCreateGroupLocked(threadId, timestamp);
435441
if (!conversation.CanReceive)
436442
{

‎Signal-Windows.Lib/OutgoingMessages.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ public void SendMessage(List<SignalServiceAddress> recipients, SignalServiceData
3737
{
3838
lock (this)
3939
{
40-
MessageSender.sendMessage(recipients, message);
40+
MessageSender.SendMessage(recipients, message);
4141
}
4242
}
4343

4444
public void SendMessage(SignalServiceSyncMessage message)
4545
{
4646
lock (this)
4747
{
48-
MessageSender.sendMessage(message);
48+
MessageSender.SendMessage(message);
4949
}
5050
}
5151

@@ -69,7 +69,7 @@ public void HandleOutgoingMessages()
6969
{
7070
if (!Token.IsCancellationRequested)
7171
{
72-
MessageSender.sendMessage(new SignalServiceAddress(outgoingSignalMessage.ThreadId), message);
72+
MessageSender.SendMessage(new SignalServiceAddress(outgoingSignalMessage.ThreadId), message);
7373
outgoingSignalMessage.Status = SignalMessageStatus.Confirmed;
7474
}
7575
}
@@ -116,7 +116,7 @@ public void HandleOutgoingMessages()
116116
}
117117
foreach (UntrustedIdentityException e in identityExceptions)
118118
{
119-
Handle.HandleOutgoingKeyChangeLocked(e.getE164Number(), Base64.encodeBytes(e.getIdentityKey().serialize()));
119+
Handle.HandleOutgoingKeyChangeLocked(e.E164number, Base64.EncodeBytes(e.IdentityKey.serialize()));
120120
}
121121
}
122122
catch (RateLimitException)
@@ -128,7 +128,7 @@ public void HandleOutgoingMessages()
128128
{
129129
Logger.LogError("HandleOutgoingMessages() could not send due to untrusted identities");
130130
outgoingSignalMessage.Status = SignalMessageStatus.Failed_Identity;
131-
Handle.HandleOutgoingKeyChangeLocked(e.getE164Number(), Base64.encodeBytes(e.getIdentityKey().serialize()));
131+
Handle.HandleOutgoingKeyChangeLocked(e.E164number, Base64.EncodeBytes(e.IdentityKey.serialize()));
132132
}
133133
catch (Exception e)
134134
{

‎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.0</Version>
164+
<Version>2.6.6</Version>
165165
</PackageReference>
166166
<PackageReference Include="Microsoft.EntityFrameworkCore">
167167
<Version>1.1.4</Version>

‎Signal-Windows.Lib/Storage/DB.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,14 +376,14 @@ public static void StoreSession(SignalProtocolAddress address, SessionRecord rec
376376
.SingleOrDefault();
377377
if (session != null)
378378
{
379-
session.Session = Base64.encodeBytes(record.serialize());
379+
session.Session = Base64.EncodeBytes(record.serialize());
380380
}
381381
else
382382
{
383383
ctx.Sessions.Add(new SignalSession()
384384
{
385385
DeviceId = address.DeviceId,
386-
Session = Base64.encodeBytes(record.serialize()),
386+
Session = Base64.EncodeBytes(record.serialize()),
387387
Username = address.Name
388388
});
389389
}
@@ -470,7 +470,7 @@ public static void StorePreKey(uint preKeyId, PreKeyRecord record)
470470
ctx.PreKeys.Add(new SignalPreKey()
471471
{
472472
Id = preKeyId,
473-
Key = Base64.encodeBytes(record.serialize())
473+
Key = Base64.EncodeBytes(record.serialize())
474474
});
475475
ctx.SaveChanges();
476476
}
@@ -553,7 +553,7 @@ public static void StoreSignedPreKey(uint signedPreKeyId, SignedPreKeyRecord rec
553553
ctx.SignedPreKeys.Add(new SignalSignedPreKey()
554554
{
555555
Id = signedPreKeyId,
556-
Key = Base64.encodeBytes(record.serialize())
556+
Key = Base64.EncodeBytes(record.serialize())
557557
});
558558
ctx.SaveChanges();
559559
}

‎Signal-Windows.Lib/Storage/Store.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public uint GetLocalRegistrationId()
1919

2020
public bool SaveIdentity(SignalProtocolAddress address, IdentityKey identityKey)
2121
{
22-
LibsignalDBContext.SaveIdentityLocked(address, Base64.encodeBytes(identityKey.serialize()));
22+
LibsignalDBContext.SaveIdentityLocked(address, Base64.EncodeBytes(identityKey.serialize()));
2323
return true;
2424
}
2525

@@ -37,8 +37,8 @@ public bool IsTrustedIdentity(SignalProtocolAddress address, IdentityKey identit
3737
else
3838
{
3939
//TODO compare timestamps & firstUse, see Signal-Android impl
40-
string identity = Base64.encodeBytes(identityKey.serialize());
41-
return savedIdentity == Base64.encodeBytes(identityKey.serialize());
40+
string identity = Base64.EncodeBytes(identityKey.serialize());
41+
return savedIdentity == Base64.EncodeBytes(identityKey.serialize());
4242
}
4343
}
4444

‎Signal-Windows/ViewModels/FinishRegistrationPageViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ internal async Task OnNavigatedTo()
2525
{
2626
await Task.Run(() =>
2727
{
28-
string SignalingKey = Base64.encodeBytes(Util.getSecretBytes(52));
28+
string SignalingKey = Base64.EncodeBytes(Util.getSecretBytes(52));
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,
3232
true);
3333
SignalStore store = new SignalStore()
3434
{
3535
DeviceId = 1,
36-
IdentityKeyPair = Base64.encodeBytes(App.CurrentSignalWindowsFrontend(App.MainViewId).Locator.RegisterFinalizationPageInstance.IdentityKeyPair.serialize()),
36+
IdentityKeyPair = Base64.EncodeBytes(App.CurrentSignalWindowsFrontend(App.MainViewId).Locator.RegisterFinalizationPageInstance.IdentityKeyPair.serialize()),
3737
NextSignedPreKeyId = 1,
3838
Password = App.CurrentSignalWindowsFrontend(App.MainViewId).Locator.RegisterFinalizationPageInstance.Password,
3939
PreKeyIdOffset = 1,

‎Signal-Windows/ViewModels/LinkPageViewModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public async Task BeginLinking()
7979
LibsignalDBContext.PurgeAccountData();
8080

8181
/* prepare qrcode */
82-
string password = Base64.encodeBytes(Util.getSecretBytes(18));
82+
string password = Base64.EncodeBytes(Util.getSecretBytes(18));
8383
IdentityKeyPair tmpIdentity = KeyHelper.generateIdentityKeyPair();
8484
SignalServiceAccountManager accountManager = new SignalServiceAccountManager(App.ServiceConfiguration, CancelSource.Token, "Signal-Windows");
8585
string uuid = accountManager.GetNewDeviceUuid(CancelSource.Token);
@@ -91,14 +91,14 @@ public async Task BeginLinking()
9191
QRCodeString = tsdevice;
9292
}).AsTask().Wait();
9393

94-
string tmpSignalingKey = Base64.encodeBytes(Util.getSecretBytes(52));
94+
string tmpSignalingKey = Base64.EncodeBytes(Util.getSecretBytes(52));
9595
int registrationId = (int)KeyHelper.generateRegistrationId(false);
9696

9797
NewDeviceLinkResult result = accountManager.FinishNewDeviceRegistration(tmpIdentity, tmpSignalingKey, password, false, true, registrationId, deviceName);
9898
SignalStore store = new SignalStore()
9999
{
100100
DeviceId = (uint)result.DeviceId,
101-
IdentityKeyPair = Base64.encodeBytes(result.Identity.serialize()),
101+
IdentityKeyPair = Base64.EncodeBytes(result.Identity.serialize()),
102102
NextSignedPreKeyId = 1,
103103
Password = password,
104104
PreKeyIdOffset = 1,

‎Signal-Windows/ViewModels/RegisterFinalizationPageViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ internal async Task OnNavigatedTo()
5959
UIEnabled = false;
6060
Utils.EnableBackButton(BackButton_Click);
6161
CancelSource = new CancellationTokenSource();
62-
Password = Base64.encodeBytes(Util.getSecretBytes(18));
62+
Password = Base64.EncodeBytes(Util.getSecretBytes(18));
6363
SignalRegistrationId = KeyHelper.generateRegistrationId(false);
6464
IdentityKeyPair = KeyHelper.generateIdentityKeyPair();
6565
try

0 commit comments

Comments
 (0)