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

add preference to disable wifi direct

Browse source 
Looks like there are battery drainage issues with the current half-done
implementation, so add option to turn it off. Only takes effect on
restart, and only matters on dbg variant now since it's compile-time
disabled on the main variant.

Also add discovery machine state to ConnState printout, stop running the
machine over and over (likely the battery problem), but add ability to
restart it triggered by the ConnState's "reconnect" button.

Also start persisting the most recently seen set of peers. If service
discovery and not connecting is the problem having these available to
try to connect to on startup might help.
This commit is contained in:
Eric House 2017-01-22 14:51:21 -08:00
parent b96d44393a
commit 15d0f88187
8 changed files with 101 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java
View file

@ -124,7 +124,7 @@ public class ConnViaViewLayout extends LinearLayout {
enabled = RelayService.relayEnabled( context );
break;
case COMMS_CONN_P2P:
enabled = WiDirService.supported();
enabled = WiDirService.enabled();
break;
default:
Assert.fail();

4
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -510,7 +510,7 @@ public class DlgDelegate {
if ( (XWApp.SMS_INVITE_ENABLED && Utils.deviceSupportsSMS( m_activity ))
|| XWPrefs.getNFCToSelfEnabled( m_activity )
|| NFCUtils.nfcAvail( m_activity )[0]
|| WiDirService.supported()
|| WiDirService.enabled()
|| BTService.BTAvailable() ) {
DlgState state = new DlgState( DlgID.INVITE_CHOICES_THEN )
.setAction( action )
@ -755,7 +755,7 @@ public class DlgDelegate {
items.add( getString( R.string.invite_choice_relay ) );
means.add( DlgClickNotify.InviteMeans.RELAY );
}
if ( WiDirService.supported() ) {
if ( WiDirService.enabled() ) {
items.add( getString( R.string.invite_choice_p2p ) );
means.add( DlgClickNotify.InviteMeans.WIFIDIRECT );
}

4
xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
View file

@ -350,5 +350,9 @@ public class PrefsDelegate extends DelegateBase
if ( Perms23.haveNativePerms() ) {
hideOne( R.string.key_enable_sms, R.string.key_network_behavior );
}
if ( ! BuildConfig.WIDIR_ENABLED ) {
hideOne( R.string.key_enable_p2p, R.string.key_network_behavior );
}
}
}

102
xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
View file

@ -45,6 +45,7 @@ import android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest;
import android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo;
import android.os.Handler;
import android.os.Looper;
import android.text.TextUtils;
import java.io.IOException;
import java.net.InetAddress;
@ -77,6 +78,7 @@ public class WiDirService extends XWService {
private static final String SERVICE_NAME = "srvc_" + BuildConfig.FLAVOR;
private static final String SERVICE_REG_TYPE = "_presence._tcp";
private static final int OWNER_PORT = 5432;
private static final String PEERS_LIST_KEY = TAG + ".peers_key";
private enum P2PAction { _NONE,
GOT_MSG,
@ -96,6 +98,7 @@ public class WiDirService extends XWService {
private static final String KEY_MAP = "map";
private static final String KEY_RETADDR = "raddr";
private static boolean s_enabled = false;
private static Channel sChannel;
private static ServiceDiscoverer s_discoverer;
private static IntentFilter sIntentFilter;
@ -119,6 +122,7 @@ public class WiDirService extends XWService {
private static String sDeviceName;
private static Set<DevSetListener> s_devListeners
= new HashSet<DevSetListener>();
private static Set<String> s_peersSet;
private P2pMsgSink m_sink;
@ -137,7 +141,7 @@ public class WiDirService extends XWService {
{
int result;
if ( BuildConfig.WIDIR_ENABLED && null != intent ) {
if ( enabled() && null != intent ) {
result = Service.START_STICKY;
int ordinal = intent.getIntExtra( KEY_CMD, -1 );
@ -181,6 +185,20 @@ public class WiDirService extends XWService {
public static void init( Context context )
{
DbgUtils.logd( TAG, "init()" );
s_enabled = XWPrefs.getPrefsBoolean( context, R.string.key_enable_p2p,
false );
Assert.assertNull( s_peersSet );
s_peersSet = new HashSet<String>();
String peers = DBUtils.getStringFor( context, PEERS_LIST_KEY, null );
if ( null != peers ) {
String[] macs = TextUtils.split( peers, "," );
for ( String mac : macs ) {
s_peersSet.add( mac );
}
}
DbgUtils.logd( TAG, "loaded saved peers: %s", s_peersSet.toString() );
try {
ChannelListener listener = new ChannelListener() {
@Override
@ -190,7 +208,7 @@ public class WiDirService extends XWService {
};
sChannel = getMgr().initialize( context, Looper.getMainLooper(),
listener );
s_discoverer = new ServiceDiscoverer( sChannel );
s_discoverer = new ServiceDiscoverer();
sHavePermission = true;
} catch ( NoClassDefFoundError ndf ) { // old os version
sHavePermission = false;
@ -202,22 +220,28 @@ public class WiDirService extends XWService {
public static void reset( Context context )
{
// Put experimental stuff here that might help get a connection
if ( null != s_discoverer ) {
s_discoverer.restart();
}
}
public static boolean supported()
public static boolean enabled()
{
return BuildConfig.WIDIR_ENABLED;
boolean result = BuildConfig.WIDIR_ENABLED && s_enabled;
return result;
}
public static boolean connecting() {
return supported()
public static boolean connecting()
{
return enabled()
&& 0 < sSocketWrapMap.size()
&& sSocketWrapMap.values().iterator().next().isConnected();
}
public static String getMyMacAddress( Context context )
{
if ( BuildConfig.WIDIR_ENABLED ) {
if ( enabled() ) {
if ( null == sMacAddress && null != context ) {
sMacAddress = DBUtils.getStringFor( context, MAC_ADDR_KEY, null );
}
@ -230,10 +254,16 @@ public class WiDirService extends XWService {
public static String formatNetStateInfo()
{
String connectState = "";
if ( null != s_discoverer ) {
connectState = s_discoverer.stateToString();
}
String map = mapToString( copyUserMap() );
return String.format( "role: %s; map: %s nThreads: %d",
sAmGroupOwner ? "owner" : "guest", map,
Thread.activeCount() );
connectState += String.format( "; role: %s; map: %s nThreads: %d",
sAmGroupOwner ? "owner" : "guest", map,
Thread.activeCount() );
return connectState;
}
private static String getMyMacAddress() { return getMyMacAddress(null); }
@ -306,7 +336,7 @@ public class WiDirService extends XWService {
public static void activityResumed( Activity activity )
{
if ( BuildConfig.WIDIR_ENABLED && sHavePermission ) {
if ( enabled() && sHavePermission ) {
if ( initListeners( activity ) ) {
activity.registerReceiver( sReceiver, sIntentFilter );
DbgUtils.logd( TAG, "activityResumed() done" );
@ -317,7 +347,7 @@ public class WiDirService extends XWService {
public static void activityPaused( Activity activity )
{
if ( BuildConfig.WIDIR_ENABLED && sHavePermission ) {
if ( enabled() && sHavePermission ) {
Assert.assertNotNull( sReceiver );
// No idea why I'm seeing this exception...
try {
@ -346,7 +376,7 @@ public class WiDirService extends XWService {
private static boolean initListeners( final Context context )
{
boolean succeeded = false;
if ( BuildConfig.WIDIR_ENABLED ) {
if ( enabled() ) {
if ( null == sIface ) {
try {
WifiP2pManager mgr = getMgr();
@ -447,10 +477,13 @@ public class WiDirService extends XWService {
// See: http://stackoverflow.com/questions/26300889/wifi-p2p-service-discovery-works-intermittently
private static class ServiceDiscoverer implements Runnable, ActionListener {
private State m_curState = State.START;
private State m_lastGoodState = State.START;
private State m_lastBadState = State.START;
private Channel m_channel;
private Handler m_handler;
private WifiP2pManager m_mgr;
private int[] m_failures;
private boolean m_lastSucceeded;
enum State {
START,
@ -463,13 +496,21 @@ public class WiDirService extends XWService {
DONE,
}
public ServiceDiscoverer( Channel channel )
public ServiceDiscoverer()
{
m_mgr = getMgr();
m_channel = sChannel;
m_handler = new Handler();
}
public String stateToString()
{
return String.format("last good: %s(%d); last bad: %s(%d); success last: %b",
m_lastGoodState.toString(), m_lastGoodState.ordinal(),
m_lastBadState.toString(), m_lastBadState.ordinal(),
m_lastSucceeded );
}
public void restart()
{
m_curState = State.START;
@ -487,6 +528,8 @@ public class WiDirService extends XWService {
// ActionListener interface
@Override
public void onSuccess() {
m_lastSucceeded = true;
m_lastGoodState = m_curState;
DbgUtils.logd( TAG, "onSuccess(): state %s done",
m_curState.toString() );
m_curState = State.values()[m_curState.ordinal() + 1];
@ -495,6 +538,9 @@ public class WiDirService extends XWService {
@Override
public void onFailure( int code ) {
m_lastSucceeded = false;
m_lastBadState = m_curState;
int count = ++m_failures[m_curState.ordinal()];
String codeStr = null;
switch ( code ) {
@ -568,8 +614,10 @@ public class WiDirService extends XWService {
break;
case DONE:
m_curState = State.START;
schedule( /*5 * */ 60 );
DbgUtils.logd( TAG, "machine done; should I try connecting to: %s?",
s_peersSet.toString() );
// m_curState = State.START;
// schedule( /*5 * */ 60 );
break;
default:
@ -594,7 +642,7 @@ public class WiDirService extends XWService {
private static void setDiscoveryListeners( WifiP2pManager mgr )
{
if ( BuildConfig.WIDIR_ENABLED ) {
if ( enabled() ) {
DnsSdServiceResponseListener srl = new DnsSdServiceResponseListener() {
@Override
public void onDnsSdServiceAvailable(String instanceName,
@ -1014,6 +1062,22 @@ public class WiDirService extends XWService {
return wrap;
}
private static void updatePeersList( WifiP2pDeviceList peerList )
{
Set<String> newSet = new HashSet<String>();
for ( WifiP2pDevice device : peerList.getDeviceList() ) {
String macAddress = device.deviceAddress;
newSet.add( macAddress );
}
DbgUtils.logd( TAG, "updatePeersList(): old set: %s; new set: %s",
s_peersSet.toString(), newSet.toString() );
s_peersSet = newSet;
DBUtils.setStringFor( XWApp.getContext(), PEERS_LIST_KEY,
TextUtils.join( ",", s_peersSet ) );
}
private static class WFDBroadcastReceiver extends BroadcastReceiver
implements WifiP2pManager.ConnectionInfoListener,
WifiP2pManager.PeerListListener {
@ -1028,7 +1092,7 @@ public class WiDirService extends XWService {
@Override
public void onReceive( Context context, Intent intent ) {
if ( BuildConfig.WIDIR_ENABLED ) {
if ( enabled() ) {
String action = intent.getAction();
DbgUtils.logd( TAG, "got intent: " + intent.toString() );
@ -1118,6 +1182,8 @@ public class WiDirService extends XWService {
DbgUtils.logd( TAG, "got list of %d peers",
peerList.getDeviceList().size() );
updatePeersList( peerList );
for ( WifiP2pDevice device : peerList.getDeviceList() ) {
// DbgUtils.logd( TAG, "not connecting to: %s", device.toString() );
tryConnect( device );

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
View file

@ -123,7 +123,7 @@ public class CommsAddrRec {
if ( Utils.isGSMPhone( context ) ) {
supported.add( CommsConnType.COMMS_CONN_SMS );
}
if ( WiDirService.supported() ) {
if ( WiDirService.enabled() ) {
supported.add( CommsConnType.COMMS_CONN_P2P );
}
return supported;

1
xwords4/android/app/src/main/res/values/common_rsrc.xml
View file

@ -60,6 +60,7 @@
<string name="key_disable_relay">key_disable_relay</string>
<string name="key_notify_vibrate">key_notify_vibrate</string>
<string name="key_enable_sms">key_enable_sms</string>
<string name="key_enable_p2p">key_enable_p2p</string>
<string name="key_network_behavior">key_network_behavior</string>
<string name="key_keep_screenon">key_keep_screenon</string>
<string name="key_thumbsize">key_thumbsize3</string>

3
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -2081,6 +2081,9 @@
<!-- -->
<string name="enable_sms_summary">Only if you have unlimited texting!</string>
<string name="title_enable_p2p">Enable WiFi Direct</string>
<string name="summary_enable_p2p">Experimental, uses lots of battery</string>
<!-- -->
<string name="confirm_sms_title">Confirm your SMS plan</string>
<!-- -->

5
xwords4/android/app/src/main/res/xml/xwprefs.xml
View file

@ -325,6 +325,11 @@
android:summary="@string/notify_other_summary"
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_enable_p2p"
android:title="@string/title_enable_p2p"
android:summary="@string/summary_enable_p2p"
android:defaultValue="false"
/>
<PreferenceScreen android:title="@string/network_advanced_title"
android:summary="@string/network_advanced_summary"