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

Resign ourselves to a less sophisticated contact intersection method.

Browse Source
This commit is contained in:
Moxie Marlinspike
2013-09-30 13:24:42 -07:00
parent 073b1f69e3
commit 75cca3add1
7 changed files with 219 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/src/org/whispersystems/textsecure/push/ContactTokenList.java Normal file
View File

@@ -0,0 +1,18 @@
package org.whispersystems.textsecure.push;
import java.util.List;
public class ContactTokenList {
private List<String> contacts;
public ContactTokenList(List<String> contacts) {
this.contacts = contacts;
}
public ContactTokenList() {}
public List<String> getContacts() {
return contacts;
}
}

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

@@ -8,7 +8,6 @@ import com.google.thoughtcrimegson.Gson;
import org.whispersystems.textsecure.R;
import org.whispersystems.textsecure.Release;
import org.whispersystems.textsecure.crypto.IdentityKey;
import org.whispersystems.textsecure.directory.DirectoryDescriptor;
import org.whispersystems.textsecure.storage.PreKeyRecord;
import org.whispersystems.textsecure.util.Base64;
import org.whispersystems.textsecure.util.Util;
@@ -33,6 +32,7 @@ import java.security.cert.CertificateException;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
public class PushServiceSocket {
@@ -169,16 +169,13 @@ public class PushServiceSocket {
return attachment;
}
public Pair<DirectoryDescriptor, File> retrieveDirectory() {
public List<String> retrieveDirectory(Set<String> contactTokens) {
try {
DirectoryDescriptor directoryDescriptor = new Gson().fromJson(makeRequest(DIRECTORY_PATH, "GET", null),
DirectoryDescriptor.class);
ContactTokenList contactTokenList = new ContactTokenList(new LinkedList(contactTokens));
String response = makeRequest(DIRECTORY_PATH, "PUT", new Gson().toJson(contactTokenList));
ContactTokenList activeTokens = new Gson().fromJson(response, ContactTokenList.class);
File directoryData = File.createTempFile("directory", ".dat", context.getFilesDir());
downloadExternalFile(directoryDescriptor.getUrl(), directoryData);
return new Pair<DirectoryDescriptor, File>(directoryDescriptor, directoryData);
return activeTokens.getContacts();
} catch (IOException ioe) {
Log.w("PushServiceSocket", ioe);
return null;