TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-30 23:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Canonicalize number when retrieving profile

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-05-31 14:51:23 -07:00
parent 73410f64b5
commit d413b80b15
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
View File

@@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.service.MessageRetrievalService; import org.thoughtcrime.securesms.service.MessageRetrievalService;
import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.GroupUtil; import org.thoughtcrime.securesms.util.GroupUtil;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.jobqueue.JobParameters; import org.whispersystems.jobqueue.JobParameters;
import org.whispersystems.libsignal.IdentityKey; import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.libsignal.InvalidKeyException;
@@ -23,6 +24,7 @@ import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.SignalServiceProfile; import org.whispersystems.signalservice.api.push.SignalServiceProfile;
import org.whispersystems.signalservice.api.util.InvalidNumberException;
import java.io.IOException; import java.io.IOException;
@@ -51,11 +53,15 @@ public class RetrieveProfileJob extends ContextJob implements InjectableType {
@Override @Override
public void onRun() throws IOException, InvalidKeyException { public void onRun() throws IOException, InvalidKeyException {
Recipients recipients = RecipientFactory.getRecipientsForIds(context, recipientIds, true); try {
Recipients recipients = RecipientFactory.getRecipientsForIds(context, recipientIds, true);
for (Recipient recipient : recipients) { for (Recipient recipient : recipients) {
if (recipient.isGroupRecipient()) handleGroupRecipient(recipient); if (recipient.isGroupRecipient()) handleGroupRecipient(recipient);
else handleIndividualRecipient(recipient); else handleIndividualRecipient(recipient);
}
} catch (InvalidNumberException e) {
Log.w(TAG, e);
} }
} }
@@ -68,9 +74,10 @@ public class RetrieveProfileJob extends ContextJob implements InjectableType {
public void onCanceled() {} public void onCanceled() {}
private void handleIndividualRecipient(Recipient recipient) private void handleIndividualRecipient(Recipient recipient)
throws IOException, InvalidKeyException throws IOException, InvalidKeyException, InvalidNumberException
{ {
SignalServiceProfile profile = retrieveProfile(recipient.getNumber()); String number = Util.canonicalizeNumber(context, recipient.getNumber());
SignalServiceProfile profile = retrieveProfile(number);
IdentityKey identityKey = new IdentityKey(Base64.decode(profile.getIdentityKey()), 0); IdentityKey identityKey = new IdentityKey(Base64.decode(profile.getIdentityKey()), 0);
if (!DatabaseFactory.getIdentityDatabase(context) if (!DatabaseFactory.getIdentityDatabase(context)
@@ -88,7 +95,7 @@ public class RetrieveProfileJob extends ContextJob implements InjectableType {
} }
private void handleGroupRecipient(Recipient group) private void handleGroupRecipient(Recipient group)
throws IOException, InvalidKeyException throws IOException, InvalidKeyException, InvalidNumberException
{ {
byte[] groupId = GroupUtil.getDecodedId(group.getNumber()); byte[] groupId = GroupUtil.getDecodedId(group.getNumber());
Recipients recipients = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupId, false); Recipients recipients = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupId, false);