TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-25 22:59:25 +00: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

38
src/org/thoughtcrime/securesms/transport/UniversalTransport.java
View File

@@ -26,6 +26,8 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.textsecure.crypto.MasterSecret;
import org.whispersystems.textsecure.directory.Directory;
import org.whispersystems.textsecure.directory.NotInDirectoryException;
import org.whispersystems.textsecure.push.PushServiceSocket;
import java.io.IOException;
import java.util.LinkedList;
@@ -57,7 +59,7 @@ public class UniversalTransport {
Recipient recipient = message.getIndividualRecipient();
String number = Util.canonicalizeNumber(context, recipient.getNumber());
if (Directory.getInstance(context).containsNumber(number)) {
if (isPushTransport(number)) {
try {
Log.w("UniversalTransport", "Delivering with GCM...");
pushTransport.deliver(message);
@@ -78,7 +80,7 @@ public class UniversalTransport {
List<String> destinations = getMediaDestinations(mediaMessage);
if (Directory.getInstance(context).containsNumbers(destinations)) {
if (isPushTransport(destinations)) {
try {
Log.w("UniversalTransport", "Delivering media message with GCM...");
pushTransport.deliver(mediaMessage, destinations);
@@ -117,4 +119,36 @@ public class UniversalTransport {
return destinations;
}
private boolean isPushTransport(String destination) {
Directory directory = Directory.getInstance(context);
try {
return directory.isActiveNumber(destination);
} catch (NotInDirectoryException e) {
try {
String localNumber = TextSecurePreferences.getLocalNumber(context);
String pushPassword = TextSecurePreferences.getPushServerPassword(context);
String contactToken = directory.getToken(destination);
PushServiceSocket socket = new PushServiceSocket(context, localNumber, pushPassword);
boolean registeredUser = socket.isRegisteredUser(contactToken);
directory.setToken(contactToken, registeredUser);
return registeredUser;
} catch (IOException e1) {
Log.w("UniversalTransport", e1);
return false;
}
}
}
private boolean isPushTransport(List<String> destinations) {
for (String destination : destinations) {
if (!isPushTransport(destination)) {
return false;
}
}
return true;
}
}