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

add opponent address to net stat display

Browse source 
(Debug builds only)
This commit is contained in:
Eric House 2018-12-27 19:30:34 -08:00
parent 24386bd8c9
commit 320db700a9
2 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -1485,7 +1485,11 @@ public class BoardDelegate extends DelegateBase
public void onStatusClicked()
{
final String msg = ConnStatusHandler.getStatusText( m_activity, m_connTypes );
CommsAddrRec addr = new CommsAddrRec();
XwJNI.comms_getAddr( m_jniGamePtr, addr );
final String msg = ConnStatusHandler
.getStatusText( m_activity, m_connTypes, addr );
post( new Runnable() {
@Override
public void run() {

32
xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
View file

@ -35,6 +35,7 @@ import android.text.format.Time;
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
import org.eehouse.android.xw4.jni.CommsAddrRec;
import org.eehouse.android.xw4.jni.XwJNI;
import org.eehouse.android.xw4.loc.LocUtils;
@ -163,7 +164,9 @@ public class ConnStatusHandler {
return s_downOnMe && s_rect.contains( xx, yy );
}
public static String getStatusText( Context context, CommsConnTypeSet connTypes )
public static String getStatusText( Context context,
CommsConnTypeSet connTypes,
CommsAddrRec addr )
{
String msg;
if ( null == connTypes || 0 == connTypes.size() ) {
@ -176,9 +179,12 @@ public class ConnStatusHandler {
R.string.connstat_net_fmt,
connTypes.toString( context, true )));
for ( CommsConnType typ : connTypes.getTypes() ) {
String did = addDebugInfo( context, typ );
sb.append( String.format( "\n\n*** %s %s***\n",
typ.longName( context ), did ) );
sb.append( String.format( "\n\n*** %s ", typ.longName( context ) ) );
String did = addDebugInfo( context, addr, typ );
if ( null != did ) {
sb.append( did ).append( " " );
}
sb.append( "***\n" );
// For sends we list failures too.
SuccessRecord record = recordFor( context, typ, false );
@ -532,23 +538,35 @@ public class ConnStatusHandler {
return result;
}
private static String addDebugInfo( Context context, CommsConnType typ )
private static String addDebugInfo( Context context, CommsAddrRec addr,
CommsConnType typ )
{
String result = "";
String result = null;
if ( BuildConfig.DEBUG ) {
switch ( typ ) {
case COMMS_CONN_RELAY:
result = String.format( "(DevID: %d; host: %s) ",
result = String.format( "DevID: %d; host: %s",
DevID.getRelayDevIDInt(context),
XWPrefs.getDefaultRelayHost(context) );
break;
case COMMS_CONN_P2P:
result = WiDirService.formatNetStateInfo();
break;
case COMMS_CONN_BT:
result = addr.bt_hostName;
break;
case COMMS_CONN_SMS:
result = addr.sms_phone;
break;
default:
break;
}
}
if ( null != result ) {
result = "(" + result + ")";
}
return result;
}
}