Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-20 22:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert to old proto since the version that's out there now won't work

Browse source 
with the new. Can switch once this version's distributed.
This commit is contained in:
Eric House 2015-09-16 06:42:01 -07:00
parent f3d8f0b8ee
commit 5d59bcd011
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
View file

@ -74,7 +74,7 @@ public class SMSService extends XWService {
private static final int SMS_PROTO_VERSION_ORIG = 0; private static final int SMS_PROTO_VERSION_ORIG = 0;
private static final int SMS_PROTO_VERSION_WITHPORT = 1; private static final int SMS_PROTO_VERSION_WITHPORT = 1;
private static final int SMS_PROTO_VERSION = SMS_PROTO_VERSION_WITHPORT; private static final int SMS_PROTO_VERSION = SMS_PROTO_VERSION_ORIG;
private static final int MAX_LEN_TEXT = 100; private static final int MAX_LEN_TEXT = 100;
private static final int MAX_LEN_BINARY = 100; private static final int MAX_LEN_BINARY = 100;
private static final int MAX_MSG_COUNT = 16; // 1.6K enough? Should be.... private static final int MAX_MSG_COUNT = 16; // 1.6K enough? Should be....
@ -452,7 +452,9 @@ public class SMSService extends XWService {
ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 ); ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 );
DataOutputStream dos = new DataOutputStream( bas ); DataOutputStream dos = new DataOutputStream( bas );
dos.writeByte( SMS_PROTO_VERSION ); dos.writeByte( SMS_PROTO_VERSION );
dos.writeShort( getNBSPort() ); if ( SMS_PROTO_VERSION_WITHPORT <= SMS_PROTO_VERSION ) {
dos.writeShort( getNBSPort() );
}
dos.writeByte( cmd.ordinal() ); dos.writeByte( cmd.ordinal() );
dos.write( bytes, 0, bytes.length ); dos.write( bytes, 0, bytes.length );
dos.flush(); dos.flush();
@ -607,19 +609,19 @@ public class SMSService extends XWService {
try { try {
byte proto = dis.readByte(); byte proto = dis.readByte();
short myPort = getNBSPort(); short myPort = getNBSPort();
short sentPort; short gotPort;
if ( SMS_PROTO_VERSION_WITHPORT > proto ) { if ( SMS_PROTO_VERSION_WITHPORT > proto ) {
sentPort = myPort; gotPort = myPort;
} else { } else {
sentPort = dis.readShort(); gotPort = dis.readShort();
} }
if ( SMS_PROTO_VERSION < proto ) { if ( SMS_PROTO_VERSION < proto ) {
DbgUtils.logf( "SMSService.disAssemble: bad proto %d from %s;" DbgUtils.logf( "SMSService.disAssemble: bad proto %d from %s;"
+ " dropping", proto, senderPhone ); + " dropping", proto, senderPhone );
sendResult( MultiEvent.BAD_PROTO_SMS, senderPhone ); sendResult( MultiEvent.BAD_PROTO_SMS, senderPhone );
} else if ( sentPort != myPort ) { } else if ( gotPort != myPort ) {
DbgUtils.logdf( "SMSService.disAssemble(): received on port %d" DbgUtils.logdf( "SMSService.disAssemble(): received on port %d"
+ " but expected %d", sentPort, myPort ); + " but expected %d", gotPort, myPort );
} else { } else {
SMS_CMD cmd = SMS_CMD.values()[dis.readByte()]; SMS_CMD cmd = SMS_CMD.values()[dis.readByte()];
byte[] rest = new byte[dis.available()]; byte[] rest = new byte[dis.available()];