take
@@ -25,12 +25,10 @@
New with this release
- - Offer to "Archive" finished games
- - Make tap on thumbnail toggle whether game's selected rather
- than open it. (Tap to the right still opens)
- - Bug fix: don't allow duplicate group names
- - Fix battery-hogging behavior on non-Google-play
- installs
+ - F-Droid has stiffened their prohibition against including
+ proprietary Google components. This release complies by removing
+ "Google Cloud Messaging" – which never worked on
+ f-droid installs anyway.
(The full changelog
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index b90febc40..7a498c8b1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -206,23 +206,16 @@ public class BoardDelegate extends DelegateBase
ab.setNegativeButton( R.string.button_rematch, lstnr );
// If we're not already in the "archive" group, offer to move
- final String archiveName = LocUtils
- .getString( m_activity, R.string.group_name_archive );
- final long archiveGroup = DBUtils.getGroup( m_activity, archiveName );
- long curGroup = DBUtils.getGroupForGame( m_activity, m_rowid );
- if ( curGroup != archiveGroup ) {
+ if ( !inArchiveGroup() ) {
lstnr = new OnClickListener() {
public void onClick( DialogInterface dlg,
int whichButton ) {
- makeNotAgainBuilder( R.string.not_again_archive,
- R.string.key_na_archive,
- Action.ARCHIVE_ACTION )
- .setParams( archiveName, archiveGroup )
- .show();
+ showArchiveNA();
}
};
ab.setNeutralButton( R.string.button_archive, lstnr );
}
+
} else if ( DlgID.DLG_CONNSTAT == dlgID
&& BuildConfig.DEBUG && null != m_connTypes
&& (m_connTypes.contains( CommsConnType.COMMS_CONN_RELAY )
@@ -847,6 +840,9 @@ public class BoardDelegate extends DelegateBase
enable = m_gameOver && rematchSupported( false );
Utils.setItemVisible( menu, R.id.board_menu_rematch, enable );
+ enable = m_gameOver && !inArchiveGroup();
+ Utils.setItemVisible( menu, R.id.board_menu_archive, enable );
+
boolean netGame = null != m_gi
&& DeviceRole.SERVER_STANDALONE != m_gi.serverRole;
Utils.setItemVisible( menu, R.id.gamel_menu_checkmoves, netGame );
@@ -890,6 +886,10 @@ public class BoardDelegate extends DelegateBase
doRematchIf();
break;
+ case R.id.board_menu_archive:
+ showArchiveNA();
+ break;
+
case R.id.board_menu_trade_commit:
cmd = JNICmd.CMD_COMMIT;
break;
@@ -1112,9 +1112,7 @@ public class BoardDelegate extends DelegateBase
break;
case ARCHIVE_ACTION:
- String archiveName = (String)params[0];
- long archiveGroup = (Long)params[1];
- archiveAndClose( archiveName, archiveGroup );
+ archiveAndClose();
break;
case ENABLE_SMS_DO:
@@ -2600,12 +2598,33 @@ public class BoardDelegate extends DelegateBase
return wordsArray;
}
- private void archiveAndClose( String archiveName, long groupID )
+ private boolean inArchiveGroup()
{
- if ( DBUtils.GROUPID_UNSPEC == groupID ) {
- groupID = DBUtils.addGroup( m_activity, archiveName );
+ String archiveName = LocUtils
+ .getString( m_activity, R.string.group_name_archive );
+ long archiveGroup = DBUtils.getGroup( m_activity, archiveName );
+ long curGroup = DBUtils.getGroupForGame( m_activity, m_rowid );
+ return curGroup == archiveGroup;
+ }
+
+ private void showArchiveNA()
+ {
+ makeNotAgainBuilder( R.string.not_again_archive,
+ R.string.key_na_archive,
+ Action.ARCHIVE_ACTION )
+ .show();
+ }
+
+ private void archiveAndClose()
+ {
+ String archiveName = LocUtils
+ .getString( m_activity, R.string.group_name_archive );
+ long archiveGroupID = DBUtils.getGroup( m_activity, archiveName );
+
+ if ( DBUtils.GROUPID_UNSPEC == archiveGroupID ) {
+ archiveGroupID = DBUtils.addGroup( m_activity, archiveName );
}
- DBUtils.moveGame( m_activity, m_rowid, groupID );
+ DBUtils.moveGame( m_activity, m_rowid, archiveGroupID );
waitCloseGame( false );
finish();
}
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DevID.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DevID.java
index 2ba88cb9d..8a39bac03 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DevID.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DevID.java
@@ -31,8 +31,6 @@ package org.eehouse.android.xw4;
import android.content.Context;
-import com.google.android.gcm.GCMRegistrar;
-
public class DevID {
private static final String TAG = DevID.class.getSimpleName();
@@ -137,7 +135,7 @@ public class DevID {
if ( 0 != storedVers && storedVers < curVers ) {
result = ""; // Don't trust what registrar has
} else {
- result = GCMRegistrar.getRegistrationId( context );
+ result = GCMStub.getRegistrationId( context );
}
return result;
}
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
index 726fe693a..7f1832fe5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
@@ -1238,7 +1238,7 @@ public class DictsDelegate extends ListDelegateBase
// parse less data
String name = null;
String proc = String.format( "listDicts?lc=%s", m_lc );
- HttpURLConnection conn = NetUtils.makeHttpConn( m_context, proc );
+ HttpURLConnection conn = NetUtils.makeHttpUpdateConn( m_context, proc );
if ( null != conn ) {
JSONObject theOne = null;
String langName = null;
@@ -1320,7 +1320,7 @@ public class DictsDelegate extends ListDelegateBase
public Boolean doInBackground( Void... unused )
{
boolean success = false;
- HttpURLConnection conn = NetUtils.makeHttpConn( m_context, "listDicts" );
+ HttpURLConnection conn = NetUtils.makeHttpUpdateConn( m_context, "listDicts" );
if ( null != conn ) {
String json = NetUtils.runConn( conn, new JSONObject() );
if ( !isCancelled() ) {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
index 78c43b68e..acf6ac4be 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
@@ -25,6 +25,8 @@ import android.text.TextUtils;
import junit.framework.Assert;
+import org.json.JSONArray;
+import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedInputStream;
@@ -88,49 +90,29 @@ public class NetUtils {
m_obits = obits;
}
- public void run() {
- Socket socket = makeProxySocket( m_context, 10000 );
- if ( null != socket ) {
- int strLens = 0;
- int nObits = 0;
+ @Override
+ public void run()
+ {
+ try {
+ JSONArray params = new JSONArray();
for ( int ii = 0; ii < m_obits.length; ++ii ) {
- String relayID = m_obits[ii].m_relayID;
- if ( null != relayID ) {
- ++nObits;
- strLens += relayID.length() + 1; // 1 for /n
- }
+ JSONObject one = new JSONObject();
+ one.put( "relayID", m_obits[ii].m_relayID );
+ one.put( "seed", m_obits[ii].m_seed );
+ params.put( one );
}
+ HttpURLConnection conn = makeHttpRelayConn( m_context, "kill" );
+ String resStr = runConn( conn, params );
+ Log.d( TAG, "runViaWeb(): kill(%s) => %s", params, resStr );
- try {
- DataOutputStream outStream =
- new DataOutputStream( socket.getOutputStream() );
- outStream.writeShort( 2 + 2 + (2*nObits) + strLens );
- outStream.writeByte( NetUtils.PROTOCOL_VERSION );
- outStream.writeByte( NetUtils.PRX_DEVICE_GONE );
- outStream.writeShort( m_obits.length );
-
- for ( int ii = 0; ii < m_obits.length; ++ii ) {
- String relayID = m_obits[ii].m_relayID;
- if ( null != relayID ) {
- outStream.writeShort( m_obits[ii].m_seed );
- outStream.writeBytes( relayID );
- outStream.write( '\n' );
- }
- }
-
- outStream.flush();
-
- DataInputStream dis =
- new DataInputStream( socket.getInputStream() );
- short resLen = dis.readShort();
- socket.close();
-
- if ( resLen == 0 ) {
+ if ( null != resStr ) {
+ JSONObject result = new JSONObject( resStr );
+ if ( 0 == result.optInt( "err", -1 ) ) {
DBUtils.clearObits( m_context, m_obits );
}
- } catch ( java.io.IOException ioe ) {
- Log.ex( TAG, ioe );
}
+ } catch ( JSONException ex ) {
+ Assert.assertFalse( BuildConfig.DEBUG );
}
}
}
@@ -139,8 +121,7 @@ public class NetUtils {
{
DBUtils.Obit[] obits = DBUtils.listObits( context );
if ( null != obits && 0 < obits.length ) {
- InformThread thread = new InformThread( context, obits );
- thread.start();
+ new InformThread( context, obits ).start();
}
}
@@ -214,14 +195,26 @@ public class NetUtils {
return host;
}
- protected static HttpURLConnection makeHttpConn( Context context,
- String proc )
+ protected static HttpURLConnection makeHttpRelayConn( Context context,
+ String proc )
+ {
+ String url = XWPrefs.getDefaultRelayUrl( context );
+ return makeHttpConn( context, url, proc );
+ }
+
+ protected static HttpURLConnection makeHttpUpdateConn( Context context,
+ String proc )
+ {
+ String url = XWPrefs.getDefaultUpdateUrl( context );
+ return makeHttpConn( context, url, proc );
+ }
+
+ private static HttpURLConnection makeHttpConn( Context context,
+ String path, String proc )
{
HttpURLConnection result = null;
try {
- String url = String.format( "%s/%s",
- XWPrefs.getDefaultUpdateUrl( context ),
- proc );
+ String url = String.format( "%s/%s", path, proc );
result = (HttpURLConnection)new URL(url).openConnection();
} catch ( java.net.MalformedURLException mue ) {
Assert.assertNull( result );
@@ -233,11 +226,21 @@ public class NetUtils {
return result;
}
+ protected static String runConn( HttpURLConnection conn, JSONArray param )
+ {
+ return runConn( conn, param.toString() );
+ }
+
protected static String runConn( HttpURLConnection conn, JSONObject param )
+ {
+ return runConn( conn, param.toString() );
+ }
+
+ private static String runConn( HttpURLConnection conn, String param )
{
String result = null;
Map params = new HashMap();
- params.put( k_PARAMS, param.toString() );
+ params.put( k_PARAMS, param );
String paramsString = getPostDataString( params );
if ( null != paramsString ) {
@@ -273,7 +276,8 @@ public class NetUtils {
}
result = new String( bas.toByteArray() );
} else {
- Log.w( TAG, "runConn: responseCode: %d", responseCode );
+ Log.w( TAG, "runConn: responseCode: %d for url: %s",
+ responseCode, conn.getURL() );
}
} catch ( java.net.ProtocolException pe ) {
Log.ex( TAG, pe );
@@ -285,17 +289,18 @@ public class NetUtils {
return result;
}
+ // This handles multiple params but only every gets passed one!
private static String getPostDataString( Map params )
{
String result = null;
try {
ArrayList pairs = new ArrayList();
// StringBuilder sb = new StringBuilder();
- String[] pair = { null, null };
+ // String[] pair = { null, null };
for ( Map.Entry entry : params.entrySet() ){
- pair[0] = URLEncoder.encode( entry.getKey(), "UTF-8" );
- pair[1] = URLEncoder.encode( entry.getValue(), "UTF-8" );
- pairs.add( TextUtils.join( "=", pair ) );
+ pairs.add( URLEncoder.encode( entry.getKey(), "UTF-8" )
+ + "="
+ + URLEncoder.encode( entry.getValue(), "UTF-8" ) );
}
result = TextUtils.join( "&", pairs );
} catch ( java.io.UnsupportedEncodingException uee ) {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 89c24ebb4..984e57840 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -26,6 +26,7 @@ import android.content.Intent;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Handler;
+import android.text.TextUtils;
import junit.framework.Assert;
@@ -38,6 +39,10 @@ import org.eehouse.android.xw4.jni.UtilCtxt.DevIDType;
import org.eehouse.android.xw4.jni.XwJNI;
import org.eehouse.android.xw4.loc.LocUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
@@ -46,13 +51,16 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
+import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.Socket;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
public class RelayService extends XWService
implements NetStateCache.StateChangedIf {
@@ -60,6 +68,7 @@ public class RelayService extends XWService
private static final int MAX_SEND = 1024;
private static final int MAX_BUF = MAX_SEND - 2;
private static final int REG_WAIT_INTERVAL = 10;
+ private static final int INITIAL_BACKOFF = 5;
// One day, in seconds. Probably should be configurable.
private static final long MAX_KEEPALIVE_SECS = 24 * 60 * 60;
@@ -90,8 +99,9 @@ public class RelayService extends XWService
private static final String ROWID = "ROWID";
private static final String BINBUFFER = "BINBUFFER";
- private static HashSet s_packetsSent = new HashSet();
- private static int s_nextPacketID = 1;
+ private static Map s_packetsSentUDP = new HashMap<>();
+ private static Map s_packetsSentWeb = new HashMap<>();
+ private static AtomicInteger s_nextPacketID = new AtomicInteger();
private static boolean s_gcmWorking = false;
private static boolean s_registered = false;
private static CommsAddrRec s_addr =
@@ -110,6 +120,8 @@ public class RelayService extends XWService
private Runnable m_onInactivity;
private int m_maxIntervalSeconds = 0;
private long m_lastGamePacketReceived;
+ // m_nativeNotWorking: set to true if too many acks missed?
+ private boolean m_nativeNotWorking = false;
private static DevIDType s_curType = DevIDType.ID_TYPE_NONE;
private static long s_regStartTime = 0;
@@ -160,7 +172,7 @@ public class RelayService extends XWService
{
boolean enabled = ! XWPrefs
.getPrefsBoolean( context, R.string.key_disable_relay, false );
- Log.d( TAG, "relayEnabled() => %b", enabled );
+ // Log.d( TAG, "relayEnabled() => %b", enabled );
return enabled;
}
@@ -403,7 +415,7 @@ public class RelayService extends XWService
byte[][][] msgss = expandMsgsArray( intent );
for ( byte[][] msgs : msgss ) {
for ( byte[] msg : msgs ) {
- gotPacket( msg, true );
+ gotPacket( msg, true, false );
}
}
break;
@@ -449,7 +461,7 @@ public class RelayService extends XWService
case TIMER_FIRED:
if ( !NetStateCache.netAvail( this ) ) {
Log.w( TAG, "not connecting: no network" );
- } else if ( startFetchThreadIf() ) {
+ } else if ( startFetchThreadIfNotUDP() ) {
// do nothing
} else if ( registerWithRelayIfNot() ) {
requestMessages();
@@ -510,9 +522,9 @@ public class RelayService extends XWService
}
}
- private boolean startFetchThreadIf()
+ private boolean startFetchThreadIfNotUDP()
{
- // DbgUtils.logf( "startFetchThreadIf()" );
+ // DbgUtils.logf( "startFetchThreadIfNotUDP()" );
boolean handled = relayEnabled( this ) && !XWApp.UDP_ENABLED;
if ( handled && null == m_fetchThread ) {
m_fetchThread = new Thread( null, new Runnable() {
@@ -601,6 +613,15 @@ public class RelayService extends XWService
}
}
+ private boolean skipNativeSend()
+ {
+ boolean skip = m_nativeNotWorking;
+ if ( ! skip ) {
+ skip = XWPrefs.getSkipToWebAPI( RelayService.this );
+ }
+ return skip;
+ }
+
private void startWriteThread()
{
if ( null == m_UDPWriteThread ) {
@@ -608,46 +629,38 @@ public class RelayService extends XWService
public void run() {
Log.i( TAG, "write thread starting" );
for ( ; ; ) {
- PacketData outData;
+ boolean exitNow = false;
+ boolean useWeb = skipNativeSend();
+ List dataListUDP = new ArrayList<>();
+ List dataListWeb = new ArrayList<>();
try {
- outData = m_queue.take();
+ for ( PacketData outData = m_queue.take(); // blocks
+ null != outData;
+ outData = m_queue.poll() ) { // doesn't block
+ if ( outData.isEOQ() ) {
+ exitNow = true;
+ break;
+ }
+ if ( useWeb || outData.getForWeb() ) {
+ dataListWeb.add(outData);
+ } else {
+ dataListUDP.add(outData);
+ }
+ }
} catch ( InterruptedException ie ) {
Log.w( TAG, "write thread killed" );
break;
}
- if ( null == outData
- || 0 == outData.getLength() ) {
+ if ( exitNow ) {
Log.i( TAG, "stopping write thread" );
break;
}
- try {
- DatagramPacket outPacket = outData.assemble();
- m_UDPSocket.send( outPacket );
- int pid = outData.m_packetID;
- Log.d( TAG, "Sent udp packet, cmd=%s, id=%d,"
- + " of length %d",
- outData.m_cmd.toString(),
- pid, outPacket.getLength());
- synchronized( s_packetsSent ) {
- s_packetsSent.add( pid );
- }
- resetExitTimer();
- ConnStatusHandler.showSuccessOut();
- } catch ( java.net.SocketException se ) {
- Log.ex( TAG, se );
- Log.i( TAG, "Restarting threads to force"
- + " new socket" );
- m_handler.post( new Runnable() {
- public void run() {
- stopUDPThreadsIf();
- }
- } );
- } catch ( java.io.IOException ioe ) {
- Log.ex( TAG, ioe );
- } catch ( NullPointerException npe ) {
- Log.w( TAG, "network problem; dropping packet" );
- }
+ sendViaWeb( dataListWeb );
+ sendViaUDP( dataListUDP );
+
+ resetExitTimer();
+ ConnStatusHandler.showSuccessOut();
}
Log.i( TAG, "write thread exiting" );
}
@@ -659,8 +672,138 @@ public class RelayService extends XWService
}
}
+ private int sendViaWeb( List packets )
+ {
+ Log.d( TAG, "sendViaWeb(): sending %d at once", packets.size() );
+ int sentLen = 0;
+ if ( packets.size() > 0 ) {
+ HttpURLConnection conn = NetUtils.makeHttpRelayConn( this, "post" );
+ if ( null == conn ) {
+ Log.e( TAG, "sendViaWeb(): null conn for POST" );
+ } else {
+ try {
+ JSONArray dataArray = new JSONArray();
+ for ( PacketData packet : packets ) {
+ Assert.assertFalse( packet.isEOQ() );
+ byte[] datum = packet.assemble();
+ dataArray.put( Utils.base64Encode(datum) );
+ sentLen += datum.length;
+ }
+ JSONObject params = new JSONObject();
+ params.put( "data", dataArray );
+
+ String result = NetUtils.runConn(conn, params);
+ if ( null != result ) {
+ Log.d( TAG, "sendViaWeb(): POST(%s) => %s", params, result );
+ JSONObject resultObj = new JSONObject( result );
+ JSONArray resData = resultObj.getJSONArray( "data" );
+ int nReplies = resData.length();
+ Log.d( TAG, "sendViaWeb(): got %d replies", nReplies );
+
+ noteSent( packets, s_packetsSentWeb ); // before we process the acks below :-)
+
+ for ( int ii = 0; ii < nReplies; ++ii ) {
+ byte[] datum = Utils.base64Decode( resData.getString( ii ) );
+ // PENDING: skip ack or not
+ gotPacket( datum, false, false );
+ }
+ } else {
+ Log.e( TAG, "sendViaWeb(): failed result for POST" );
+ }
+ } catch ( JSONException ex ) {
+ Assert.assertFalse( BuildConfig.DEBUG );
+ }
+ }
+ }
+ return sentLen;
+ }
+
+ private int sendViaUDP( List packets )
+ {
+ int sentLen = 0;
+ for ( PacketData packet : packets ) {
+ boolean getOut = true;
+ byte[] data = packet.assemble();
+ try {
+ DatagramPacket udpPacket = new DatagramPacket( data, data.length );
+ m_UDPSocket.send( udpPacket );
+
+ sentLen += udpPacket.getLength();
+ noteSent( packet, s_packetsSentUDP );
+ getOut = false;
+ } catch ( java.net.SocketException se ) {
+ Log.ex( TAG, se );
+ Log.i( TAG, "Restarting threads to force"
+ + " new socket" );
+ m_handler.post( new Runnable() {
+ public void run() {
+ stopUDPThreadsIf();
+ }
+ } );
+ } catch ( java.io.IOException ioe ) {
+ Log.ex( TAG, ioe );
+ } catch ( NullPointerException npe ) {
+ Log.w( TAG, "network problem; dropping packet" );
+ }
+ if ( getOut ) {
+ break;
+ }
+ }
+
+ if ( sentLen > 0 ) {
+ startAckTimer( packets );
+ }
+
+ return sentLen;
+ }
+
+ private void startAckTimer( final List packets )
+ {
+ Runnable ackTimer = new Runnable() {
+ @Override
+ public void run() {
+ List forResend = new ArrayList<>();
+ Log.d( TAG, "ackTimer.run() called" );
+ synchronized ( s_packetsSentUDP ) {
+ for ( PacketData packet : packets ) {
+ PacketData stillThere = s_packetsSentUDP.remove(packet.m_packetID);
+ if ( stillThere != null ) {
+ Log.d( TAG, "packed %d not yet acked; resending",
+ stillThere.m_packetID );
+ stillThere.setForWeb();
+ forResend.add( stillThere );
+ }
+ }
+ }
+ m_queue.addAll( forResend );
+ }
+ };
+ m_handler.postDelayed( ackTimer, 10 * 1000 );
+ }
+
+ private void noteSent( PacketData packet, Map map )
+ {
+ int pid = packet.m_packetID;
+ Log.d( TAG, "Sent [udp?] packet: cmd=%s, id=%d",
+ packet.m_cmd.toString(), pid );
+ if ( packet.m_cmd != XWRelayReg.XWPDEV_ACK ) {
+ synchronized( map ) {
+ map.put( pid, packet );
+ }
+ }
+ }
+
+ private void noteSent( List packets, Map map )
+ {
+ for ( PacketData packet : packets ) {
+ noteSent( packet, map );
+ }
+ }
+
private void stopUDPThreadsIf()
{
+ DbgUtils.assertOnUIThread();
+
if ( null != m_UDPWriteThread ) {
// can't add null
m_queue.add( new PacketData() );
@@ -687,7 +830,7 @@ public class RelayService extends XWService
}
// MIGHT BE Running on reader thread
- private void gotPacket( byte[] data, boolean skipAck )
+ private void gotPacket( byte[] data, boolean skipAck, boolean fromUDP )
{
boolean resetBackoff = false;
ByteArrayInputStream bis = new ByteArrayInputStream( data );
@@ -766,7 +909,7 @@ public class RelayService extends XWService
startService( intent );
break;
case XWPDEV_ACK:
- noteAck( vli2un( dis ) );
+ noteAck( vli2un( dis ), fromUDP );
break;
// case XWPDEV_MSGFWDOTHERS:
// Assert.assertTrue( 0 == dis.readByte() ); // protocol; means "invite", I guess.
@@ -795,7 +938,7 @@ public class RelayService extends XWService
byte[] data = new byte[packetLen];
System.arraycopy( packet.getData(), 0, data, 0, packetLen );
// DbgUtils.logf( "RelayService::gotPacket: %d bytes of data", packetLen );
- gotPacket( data, false );
+ gotPacket( data, false, true );
} // gotPacket
private boolean shouldRegister()
@@ -873,11 +1016,15 @@ public class RelayService extends XWService
{
ByteArrayOutputStream bas = new ByteArrayOutputStream();
try {
- String devid = getDevID( null );
+ DevIDType[] typp = new DevIDType[1];
+ String devid = getDevID( typp );
if ( null != devid ) {
DataOutputStream out = new DataOutputStream( bas );
writeVLIString( out, devid );
+ Log.d(TAG, "requestMessagesImpl(): devid: %s; type: " + typp[0], devid );
postPacket( bas, reg );
+ } else {
+ Log.d(TAG, "requestMessagesImpl(): devid is null" );
}
} catch ( java.io.IOException ioe ) {
Log.ex( TAG, ioe );
@@ -1080,6 +1227,7 @@ public class RelayService extends XWService
@Override
protected Void doInBackground( Void... ignored )
{
+ Assert.assertFalse( XWPrefs.getSkipToWebAPI( m_context ) );
// format: total msg lenth: 2
// number-of-relayIDs: 2
// for-each-relayid: relayid + '\n': varies
@@ -1127,6 +1275,8 @@ public class RelayService extends XWService
}
// Now open a real socket, write size and proto, and
// copy in the formatted buffer
+
+ Assert.assertFalse( XWPrefs.getSkipToWebAPI( m_context ) );
Socket socket = NetUtils.makeProxySocket( m_context, 8000 );
if ( null != socket ) {
DataOutputStream outStream =
@@ -1203,23 +1353,31 @@ public class RelayService extends XWService
{
int nextPacketID = 0;
if ( XWRelayReg.XWPDEV_ACK != cmd ) {
- synchronized( s_packetsSent ) {
- nextPacketID = ++s_nextPacketID;
- }
+ nextPacketID = s_nextPacketID.incrementAndGet();
}
return nextPacketID;
}
- private static void noteAck( int packetID )
+ private static void noteAck( int packetID, boolean fromUDP )
{
- synchronized( s_packetsSent ) {
- if ( s_packetsSent.contains( packetID ) ) {
- s_packetsSent.remove( packetID );
+ PacketData packet;
+ Map map = fromUDP ? s_packetsSentUDP : s_packetsSentWeb;
+ synchronized( map ) {
+ packet = map.remove( packetID );
+ if ( packet != null ) {
+ Log.d( TAG, "noteAck(fromUDP=%b): removed for id %d: %s",
+ fromUDP, packetID, packet );
} else {
Log.w( TAG, "Weird: got ack %d but never sent", packetID );
}
- Log.d( TAG, "noteAck(): Got ack for %d; there are %d unacked packets",
- packetID, s_packetsSent.size() );
+ if ( BuildConfig.DEBUG ) {
+ ArrayList pstrs = new ArrayList<>();
+ for ( Integer pkid : map.keySet() ) {
+ pstrs.add( map.get(pkid).toString() );
+ }
+ Log.d( TAG, "noteAck(fromUDP=%b): Got ack for %d; there are %d unacked packets: %s",
+ fromUDP, packetID, map.size(), TextUtils.join( ",", pstrs ) );
+ }
}
}
@@ -1245,7 +1403,7 @@ public class RelayService extends XWService
registerWithRelay();
} else {
stopUDPThreadsIf();
- startFetchThreadIf();
+ startFetchThreadIfNotUDP();
}
}
@@ -1394,18 +1552,19 @@ public class RelayService extends XWService
long now = Utils.getCurSeconds();
if ( s_curNextTimer <= now ) {
if ( 0 == s_curBackoff ) {
- s_curBackoff = 15;
+ s_curBackoff = INITIAL_BACKOFF;
+ } else {
+ s_curBackoff = Math.min( 2 * s_curBackoff, result );
}
- s_curBackoff = Math.min( 2 * s_curBackoff, result );
s_curNextTimer += s_curBackoff;
}
diff = s_curNextTimer - now;
}
Assert.assertTrue( diff < Integer.MAX_VALUE );
- Log.d( TAG, "figureBackoffSeconds() => %d", diff );
- result = (int)diff;
+ result = (int)diff;
}
+ Log.d( TAG, "figureBackoffSeconds() => %d", result );
return result;
}
@@ -1419,14 +1578,37 @@ public class RelayService extends XWService
}
private class PacketData {
- public PacketData() { m_bas = null; }
+ public ByteArrayOutputStream m_bas;
+ public XWRelayReg m_cmd;
+ public byte[] m_header;
+ public int m_packetID;
+ private long m_created;
+ private boolean m_useWeb;
+
+ public PacketData() {
+ m_bas = null;
+ m_created = System.currentTimeMillis();
+ }
public PacketData( ByteArrayOutputStream bas, XWRelayReg cmd )
{
+ this();
m_bas = bas;
m_cmd = cmd;
}
+ @Override
+ public String toString()
+ {
+ return String.format( "{cmd: %s; age: %d ms}", m_cmd,
+ System.currentTimeMillis() - m_created );
+ }
+
+ void setForWeb() { m_useWeb = true; }
+ boolean getForWeb() { return m_useWeb; }
+
+ public boolean isEOQ() { return 0 == getLength(); }
+
public int getLength()
{
int result = 0;
@@ -1439,13 +1621,13 @@ public class RelayService extends XWService
return result;
}
- public DatagramPacket assemble()
+ public byte[] assemble()
{
- byte[] dest = new byte[getLength()];
- System.arraycopy( m_header, 0, dest, 0, m_header.length );
+ byte[] data = new byte[getLength()];
+ System.arraycopy( m_header, 0, data, 0, m_header.length );
byte[] basData = m_bas.toByteArray();
- System.arraycopy( basData, 0, dest, m_header.length, basData.length );
- return new DatagramPacket( dest, dest.length );
+ System.arraycopy( basData, 0, data, m_header.length, basData.length );
+ return data;
}
private void makeHeader()
@@ -1464,10 +1646,5 @@ public class RelayService extends XWService
Log.ex( TAG, ioe );
}
}
-
- public ByteArrayOutputStream m_bas;
- public XWRelayReg m_cmd;
- public byte[] m_header;
- public int m_packetID;
}
}
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
index 1dbd678bc..75efe5abe 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
@@ -258,7 +258,8 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
@Override protected String doInBackground( Void... unused )
{
- HttpURLConnection conn = NetUtils.makeHttpConn( m_context, "getUpdates" );
+ HttpURLConnection conn
+ = NetUtils.makeHttpUpdateConn( m_context, "getUpdates" );
String json = null;
if ( null != conn ) {
json = NetUtils.runConn( conn, m_params );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
index 80d16b1d2..6747f05a2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
@@ -115,6 +115,16 @@ public class XWPrefs {
return getPrefsString( context, R.string.key_update_url );
}
+ public static String getDefaultRelayUrl( Context context )
+ {
+ return getPrefsString( context, R.string.key_relay_url );
+ }
+
+ public static boolean getSkipToWebAPI( Context context )
+ {
+ return getPrefsBoolean( context, R.string.key_relay_via_http_first, false );
+ }
+
public static int getDefaultProxyPort( Context context )
{
String val = getPrefsString( context, R.string.key_proxy_port );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
index c1f305fb1..fc2e666ae 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
@@ -82,7 +82,7 @@ class XWService extends Service {
s_seen.add( inviteID );
}
}
- Log.d( TAG, "checkNotDupe(%s) => %b", inviteID, !isDupe );
+ Log.d( TAG, "checkNotDupe('%s') => %b", inviteID, !isDupe );
return !isDupe;
}
diff --git a/xwords4/android/app/src/main/res/menu-small/board_menu.xml b/xwords4/android/app/src/main/res/menu-small/board_menu.xml
index 49835d6a7..b553c5711 100644
--- a/xwords4/android/app/src/main/res/menu-small/board_menu.xml
+++ b/xwords4/android/app/src/main/res/menu-small/board_menu.xml
@@ -6,6 +6,13 @@
android:title="@string/board_menu_invite"
/>
+ -
-