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

wifi: fix compile; do less work on release build

Browse source 
The group info stuff I'm polling for is used only to log interesting
information, so drop it.
This commit is contained in:
Eric House 2016-11-17 22:22:08 -08:00
parent 14c34f3e70
commit 4389c63718
1 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirService.java
View file

@ -94,6 +94,7 @@ public class WiDirService extends XWService {
private static final String CMD_PING = "ping";
private static final String CMD_PONG = "pong";
private static final String CMD_MSG = "msg";
private static final String CMD_INVITE = "invite";
private static Channel sChannel;
private static ChannelListener sListener;
@ -330,39 +331,41 @@ public class WiDirService extends XWService {
}
};
sGroupListener = new GroupInfoListener() {
public void onGroupInfoAvailable( WifiP2pGroup group ) {
if ( null == group ) {
DbgUtils.logd( CLAZZ, "onGroupInfoAvailable(null)!" );
} else {
DbgUtils.logd( CLAZZ, "onGroupInfoAvailable(owner: %b)!",
group.isGroupOwner() );
Assert.assertTrue( sAmGroupOwner == group.isGroupOwner() );
if ( sAmGroupOwner ) {
Collection<WifiP2pDevice> devs = group.getClientList();
for ( WifiP2pDevice dev : devs ) {
String macAddr = dev.deviceAddress;
// DbgUtils.logd( CLAZZ, "group member: %s/%s",
// dev.deviceAddress,
// dev.deviceName );
BiDiSockWrap wrap = sSocketWrapMap.get( macAddr );
if ( null == wrap ) {
DbgUtils.logd( CLAZZ, "no socket for %s", macAddr );
} else {
DbgUtils.logd( CLAZZ, "socket for %s connected: %b",
macAddr, wrap.isConnected() );
if ( BuildConfig.DEBUG ) {
sGroupListener = new GroupInfoListener() {
public void onGroupInfoAvailable( WifiP2pGroup group ) {
if ( null == group ) {
DbgUtils.logd( CLAZZ, "onGroupInfoAvailable(null)!" );
} else {
DbgUtils.logd( CLAZZ, "onGroupInfoAvailable(owner: %b)!",
group.isGroupOwner() );
Assert.assertTrue( sAmGroupOwner == group.isGroupOwner() );
if ( sAmGroupOwner ) {
Collection<WifiP2pDevice> devs = group.getClientList();
for ( WifiP2pDevice dev : devs ) {
String macAddr = dev.deviceAddress;
// DbgUtils.logd( CLAZZ, "group member: %s/%s",
// dev.deviceAddress,
// dev.deviceName );
BiDiSockWrap wrap = sSocketWrapMap.get( macAddr );
if ( null == wrap ) {
DbgUtils.logd( CLAZZ, "no socket for %s", macAddr );
} else {
DbgUtils.logd( CLAZZ, "socket for %s connected: %b",
macAddr, wrap.isConnected() );
}
}
}
}
new Handler().postDelayed( new Runnable() {
@Override
public void run() {
getMgr().requestGroupInfo( sChannel, sGroupListener );
}
}, 60 * 1000 );
}
new Handler().postDelayed( new Runnable() {
@Override
public void run() {
getMgr().requestGroupInfo( sChannel, sGroupListener );
}
}, 10 * 1000 );
}
};
};
}
sIntentFilter = new IntentFilter();
sIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
@ -881,7 +884,9 @@ public class WiDirService extends XWService {
// you'll want to create a client thread that connects to the group
// owner.
}
getMgr().requestGroupInfo( sChannel, sGroupListener );
if ( BuildConfig.DEBUG ) {
getMgr().requestGroupInfo( sChannel, sGroupListener );
}
} else {
Assert.fail();
}