TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Moxie Marlinspike 2014-02-14 16:40:54 -08:00
parent 556b0dec1d
commit 7d3a2acb29
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ import android.os.Parcelable;
import org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal; import org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal;
public class IncomingPushMessage implements PushMessage, Parcelable { public class IncomingPushMessage implements Parcelable {
public static final Parcelable.Creator<IncomingPushMessage> CREATOR = new Parcelable.Creator<IncomingPushMessage>() { public static final Parcelable.Creator<IncomingPushMessage> CREATOR = new Parcelable.Creator<IncomingPushMessage>() {
@Override @Override

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

@ -18,7 +18,7 @@ package org.whispersystems.textsecure.push;
import org.whispersystems.textsecure.util.Base64; import org.whispersystems.textsecure.util.Base64;
public class OutgoingPushMessage implements PushMessage { public class OutgoingPushMessage {
private int type; private int type;
private int destinationDeviceId; private int destinationDeviceId;

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

@ -61,6 +61,8 @@ import ws.com.google.android.mms.ContentType;
import ws.com.google.android.mms.pdu.PduBody; import ws.com.google.android.mms.pdu.PduBody;
import ws.com.google.android.mms.pdu.SendReq; import ws.com.google.android.mms.pdu.SendReq;
import static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal;
public class PushTransport extends BaseTransport { public class PushTransport extends BaseTransport {
private final Context context; private final Context context;
@ -315,9 +317,9 @@ public class PushTransport extends BaseTransport {
CiphertextMessage message = cipher.encrypt(plaintext); CiphertextMessage message = cipher.encrypt(plaintext);
if (message.getType() == CiphertextMessage.PREKEY_WHISPER_TYPE) { if (message.getType() == CiphertextMessage.PREKEY_WHISPER_TYPE) {
return new PushBody(OutgoingPushMessage.TYPE_MESSAGE_PREKEY_BUNDLE, message.serialize()); return new PushBody(IncomingPushMessageSignal.Type.PREKEY_BUNDLE_VALUE, message.serialize());
} else if (message.getType() == CiphertextMessage.CURRENT_WHISPER_TYPE) { } else if (message.getType() == CiphertextMessage.CURRENT_WHISPER_TYPE) {
return new PushBody(OutgoingPushMessage.TYPE_MESSAGE_CIPHERTEXT, message.serialize()); return new PushBody(IncomingPushMessageSignal.Type.CIPHERTEXT_VALUE, message.serialize());
} else { } else {
throw new AssertionError("Unknown ciphertext type: " + message.getType()); throw new AssertionError("Unknown ciphertext type: " + message.getType());
} }