Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-26 19:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle negative directory case and unlisted contacts.

Browse Source
This commit is contained in:
Moxie Marlinspike
2013-10-01 16:26:04 -07:00
parent 75cca3add1
commit 2d083208cc
6 changed files with 101 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/src/org/whispersystems/textsecure/push/NotFoundException.java Normal file
View File

@@ -0,0 +1,9 @@
package org.whispersystems.textsecure.push;
import java.io.IOException;
public class NotFoundException extends IOException {
public NotFoundException(String s) {
super(s);
}
}

18
library/src/org/whispersystems/textsecure/push/PushServiceSocket.java
View File

@@ -42,7 +42,8 @@ public class PushServiceSocket {
private static final String REGISTER_GCM_PATH = "/v1/accounts/gcm/";
private static final String PREKEY_PATH = "/v1/keys/%s";
private static final String DIRECTORY_PATH = "/v1/directory/";
private static final String DIRECTORY_TOKENS_PATH = "/v1/directory/tokens";
private static final String DIRECTORY_VERIFY_PATH = "/v1/directory/%s";
private static final String MESSAGE_PATH = "/v1/messages/";
private static final String ATTACHMENT_PATH = "/v1/attachments/%s";
@@ -172,7 +173,7 @@ public class PushServiceSocket {
public List<String> retrieveDirectory(Set<String> contactTokens) {
try {
ContactTokenList contactTokenList = new ContactTokenList(new LinkedList(contactTokens));
String response = makeRequest(DIRECTORY_PATH, "PUT", new Gson().toJson(contactTokenList));
String response = makeRequest(DIRECTORY_TOKENS_PATH, "PUT", new Gson().toJson(contactTokenList));
ContactTokenList activeTokens = new Gson().fromJson(response, ContactTokenList.class);
return activeTokens.getContacts();
@@ -182,6 +183,15 @@ public class PushServiceSocket {
}
}
public boolean isRegisteredUser(String contactToken) throws IOException {
try {
makeRequest(String.format(DIRECTORY_VERIFY_PATH, contactToken), "GET", null);
return true;
} catch (NotFoundException nfe) {
return false;
}
}
private void downloadExternalFile(String url, File localDestination)
throws IOException
{
@@ -284,6 +294,10 @@ public class PushServiceSocket {
throw new AuthorizationFailedException("Authorization failed!");
}
if (connection.getResponseCode() == 404) {
throw new NotFoundException("Not found");
}
if (connection.getResponseCode() != 200) {
throw new IOException("Bad response: " + connection.getResponseCode() + " " + connection.getResponseMessage());
}