empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix crash when fetching messages.

Browse source
This commit is contained in:
Greyson Parrelli 2022-10-05 19:49:29 -04:00
parent f9a4b7cf12
commit 9946da2cec
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
View file

@ -220,7 +220,7 @@ public class PushServiceSocket {
private static final String DEVICE_PATH = "/v1/devices/%s"; private static final String DEVICE_PATH = "/v1/devices/%s";
private static final String DIRECTORY_AUTH_PATH = "/v1/directory/auth"; private static final String DIRECTORY_AUTH_PATH = "/v1/directory/auth";
private static final String MESSAGE_PATH = "/v1/messages/%s?story=%s"; private static final String MESSAGE_PATH = "/v1/messages/%s";
private static final String GROUP_MESSAGE_PATH = "/v1/messages/multi_recipient?ts=%s&online=%s&urgent=%s&story=%s"; private static final String GROUP_MESSAGE_PATH = "/v1/messages/multi_recipient?ts=%s&online=%s&urgent=%s&story=%s";
private static final String SENDER_ACK_MESSAGE_PATH = "/v1/messages/%s/%d"; private static final String SENDER_ACK_MESSAGE_PATH = "/v1/messages/%s/%d";
private static final String UUID_ACK_MESSAGE_PATH = "/v1/messages/uuid/%s"; private static final String UUID_ACK_MESSAGE_PATH = "/v1/messages/uuid/%s";
@ -548,7 +548,7 @@ public class PushServiceSocket {
throws IOException throws IOException
{ {
try { try {
String responseText = makeServiceRequest(String.format(MESSAGE_PATH, bundle.getDestination(), story ? "true" : "false"), "PUT", JsonUtil.toJson(bundle), NO_HEADERS, unidentifiedAccess); String responseText = makeServiceRequest(String.format("/v1/messages/%s?story=%s", bundle.getDestination(), story ? "true" : "false"), "PUT", JsonUtil.toJson(bundle), NO_HEADERS, unidentifiedAccess);
SendMessageResponse response = JsonUtil.fromJson(responseText, SendMessageResponse.class); SendMessageResponse response = JsonUtil.fromJson(responseText, SendMessageResponse.class);
response.setSentUnidentfied(unidentifiedAccess.isPresent()); response.setSentUnidentfied(unidentifiedAccess.isPresent());