diff --git a/xwords4/android/XWords4/jni/xportwrapper.c b/xwords4/android/XWords4/jni/xportwrapper.c index 4a089f407..d18f04492 100644 --- a/xwords4/android/XWords4/jni/xportwrapper.c +++ b/xwords4/android/XWords4/jni/xportwrapper.c @@ -112,12 +112,12 @@ and_xport_relayConnd( void* closure, XP_UCHAR* const room, XP_Bool reconnect, AndTransportProcs* aprocs = (AndTransportProcs*)closure; if ( NULL != aprocs->jxport ) { JNIEnv* env = *aprocs->envp; - const char* sig = "(Ljava/lang/String;ZIZI)V"; + const char* sig = "(Ljava/lang/String;IZI)V"; jmethodID mid = getMethodID( env, aprocs->jxport, "relayConnd", sig ); jstring str = (*env)->NewStringUTF( env, room ); (*env)->CallVoidMethod( env, aprocs->jxport, mid, - str, reconnect, devOrder, allHere, nMissing ); + str, devOrder, allHere, nMissing ); deleteLocalRef( env, str ); } } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java index e0e8775bb..eadcc7733 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java @@ -1030,17 +1030,14 @@ public class BoardActivity extends XWActivity // TransportProcs.TPMsgHandler interface ////////////////////////////////////////////////// - public void tpmRelayConnd( final String room, boolean isReconnect, - final int devOrder, final boolean allHere, - final int nMissing ) + public void tpmRelayConnd( final String room, final int devOrder, + final boolean allHere, final int nMissing ) { - if ( !isReconnect ) { - post( new Runnable() { - public void run() { - handleConndMessage( room, devOrder, allHere, nMissing ); - } - } ); - } + post( new Runnable() { + public void run() { + handleConndMessage( room, devOrder, allHere, nMissing ); + } + } ); } public void tpmRelayErrorProc( TransportProcs.XWRELAY_ERROR relayErr ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java index c50a836f1..ba89de474 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/CommsTransport.java @@ -435,11 +435,10 @@ public class CommsTransport implements TransportProcs, } } - public void relayConnd( String room, boolean isReconnect, int devOrder, - boolean allHere, int nMissing ) + public void relayConnd( String room, int devOrder, boolean allHere, + int nMissing ) { - m_tpHandler.tpmRelayConnd( room, isReconnect, devOrder, allHere, - nMissing ); + m_tpHandler.tpmRelayConnd( room, devOrder, allHere, nMissing ); } public void relayErrorProc( XWRELAY_ERROR relayErr ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiMsgSink.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiMsgSink.java index a4dff8698..9041220bc 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiMsgSink.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiMsgSink.java @@ -48,8 +48,8 @@ public class MultiMsgSink implements TransportProcs { { } - public void relayConnd( String room, boolean isReconnect, int devOrder, - boolean allHere, int nMissing ) + public void relayConnd( String room, int devOrder, boolean allHere, + int nMissing ) { } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/TransportProcs.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/TransportProcs.java index b17c29fc3..013750586 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/TransportProcs.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/TransportProcs.java @@ -37,8 +37,7 @@ public interface TransportProcs { }; void relayStatus( CommsRelayState newState ); - void relayConnd( String room, boolean isReconnect, int devOrder, - boolean allHere, int nMissing ); + void relayConnd( String room, int devOrder, boolean allHere, int nMissing ); public static enum XWRELAY_ERROR { NONE ,OLDFLAGS @@ -62,8 +61,7 @@ public interface TransportProcs { boolean relayNoConnProc( byte[] buf, String relayID ); public interface TPMsgHandler { - public void tpmRelayConnd( String room, boolean isReconnect, - int devOrder, boolean allHere, + public void tpmRelayConnd( String room, int devOrder, boolean allHere, int nMissing ); public void tpmRelayErrorProc( XWRELAY_ERROR relayErr ); }