Skip to content

Commit 6c23447

Browse files
golf1052Sanders Lauture
authored andcommitted
Specify locale where using %d.
Reflects signalapp/libsignal-service-java@28700ba
1 parent daa2d3d commit 6c23447

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

libsignal-service-dotnet/push/PushServiceSocket.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Globalization;
34
using System.IO;
45
using System.Linq;
56
using System.Net;
@@ -253,12 +254,12 @@ public async Task<List<SignalServiceEnvelopeEntity>> GetMessages(CancellationTok
253254

254255
public async Task AcknowledgeMessage(CancellationToken token, string sender, ulong timestamp)// throws IOException
255256
{
256-
await MakeServiceRequestAsync(token, string.Format(SENDER_ACK_MESSAGE_PATH, sender, timestamp), "DELETE", null, NO_HEADERS);
257+
await MakeServiceRequestAsync(token, string.Format(new CultureInfo("en-US"), SENDER_ACK_MESSAGE_PATH, sender, timestamp), "DELETE", null, NO_HEADERS);
257258
}
258259

259260
public async Task AcknowledgeMessage(CancellationToken token, string uuid)
260261
{
261-
await MakeServiceRequestAsync(token, string.Format(UUID_ACK_MESSAGE_PATH, uuid), "DELETE", null, NO_HEADERS);
262+
await MakeServiceRequestAsync(token, string.Format(new CultureInfo("en-US"), UUID_ACK_MESSAGE_PATH, uuid), "DELETE", null, NO_HEADERS);
262263
}
263264

264265
public async Task<bool> RegisterPreKeys(CancellationToken token, IdentityKey identityKey, SignedPreKeyRecord signedPreKey, IList<PreKeyRecord> records)
@@ -439,11 +440,11 @@ public async Task RetrieveAttachmentAsync(int cdnNumber, SignalServiceAttachment
439440
string path;
440441
if (cdnPath.V2.HasValue)
441442
{
442-
path = string.Format(ATTACHMENT_ID_DOWNLOAD_PATH, cdnPath.V2.Value);
443+
path = string.Format(new CultureInfo("en-US"), ATTACHMENT_ID_DOWNLOAD_PATH, cdnPath.V2.Value);
443444
}
444445
else
445446
{
446-
path = string.Format(ATTACHMENT_KEY_DOWNLOAD_PATH, cdnPath.V3);
447+
path = string.Format(new CultureInfo("en-US"), ATTACHMENT_KEY_DOWNLOAD_PATH, cdnPath.V3);
447448
}
448449

449450
await DownloadFromCdnAsync(destination, cdnNumber, path, maxSizeBytes, listener, token);
@@ -467,7 +468,7 @@ public async Task RetrieveStickerAsync(FileStream destination, byte[] packId, in
467468
}
468469

469470
string hexPackId = Hex.ToStringCondensed(packId);
470-
await DownloadFromCdnAsync(destination, 0, string.Format(STICKER_PATH, hexPackId, stickerId), 1024 * 1024, null, token);
471+
await DownloadFromCdnAsync(destination, 0, string.Format(new CultureInfo("en-US"), STICKER_PATH, hexPackId, stickerId), 1024 * 1024, null, token);
471472
}
472473

473474
/// <summary>
@@ -489,7 +490,7 @@ public async Task<byte[]> RetrieveStickerAsync(byte[] packId, int stickerId, Can
489490
string hexPackId = Hex.ToStringCondensed(packId);
490491
MemoryStream output = new MemoryStream();
491492

492-
await DownloadFromCdnAsync(output, 0, 0, string.Format(STICKER_PATH, hexPackId, stickerId), 1024 * 1024, null, token);
493+
await DownloadFromCdnAsync(output, 0, 0, string.Format(new CultureInfo("en-US"), STICKER_PATH, hexPackId, stickerId), 1024 * 1024, null, token);
493494

494495
return output.ToArray();
495496
}

0 commit comments

Comments
 (0)