TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make relay arguments consistent.

Browse Source
This commit is contained in:
Moxie Marlinspike 2013-10-19 10:53:50 -07:00
parent fa073e0b46
commit 5b2caa0074
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,7 @@ public class PushServiceSocket {
makeRequest(String.format(PREKEY_PATH, ""), "PUT", PreKeyList.toJson(new PreKeyList(lastResortEntity, entities))); makeRequest(String.format(PREKEY_PATH, ""), "PUT", PreKeyList.toJson(new PreKeyList(lastResortEntity, entities)));
} }
public PreKeyEntity getPreKey(String number, String relay) throws IOException { public PreKeyEntity getPreKey(String relay, String number) throws IOException {
String path = String.format(PREKEY_PATH, number); String path = String.format(PREKEY_PATH, number);
if (relay != null) { if (relay != null) {

2
src/org/thoughtcrime/securesms/transport/PushTransport.java
View File

@ -191,7 +191,7 @@ public class PushTransport extends BaseTransport {
IdentityKeyPair identityKeyPair = IdentityKeyUtil.getIdentityKeyPair(context, masterSecret); IdentityKeyPair identityKeyPair = IdentityKeyUtil.getIdentityKeyPair(context, masterSecret);
IdentityKey identityKey = identityKeyPair.getPublicKey(); IdentityKey identityKey = identityKeyPair.getPublicKey();
String relay = Directory.getInstance(context).getRelay(canonicalRecipientNumber); String relay = Directory.getInstance(context).getRelay(canonicalRecipientNumber);
PreKeyEntity preKey = socket.getPreKey(canonicalRecipientNumber, relay); PreKeyEntity preKey = socket.getPreKey(relay, canonicalRecipientNumber);
KeyExchangeProcessor processor = new KeyExchangeProcessor(context, masterSecret, recipient); KeyExchangeProcessor processor = new KeyExchangeProcessor(context, masterSecret, recipient);
processor.processKeyExchangeMessage(preKey); processor.processKeyExchangeMessage(preKey);