Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

accept invite even if same-gameID game open

Browse source 
more dev-only code, likely: if the game that's sending the invitation is
open when the invitation arrives, should still check if it's a dupe or
should be accepted.
This commit is contained in:
Eric House 2019-01-09 09:51:15 -08:00
parent 250583caea
commit 302a3a5025
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
View file

@ -135,17 +135,26 @@ abstract class XWServiceHelper {
// for duplicates! forceChannel's hard to dig up, but works
for ( int ii = 0; success && ii < rowids.length; ++ii ) {
long rowid = rowids[ii];
CurGameInfo gi = null;
try ( GameLock lock = GameLock.getFor( rowid ).tryLockRO() ) {
// drop invite if can't open game; likely a dupe!
success = null != lock;
if ( success ) {
CurGameInfo gi = new CurGameInfo( mService );
if ( null != lock ) {
gi = new CurGameInfo( mService );
GamePtr gamePtr = GameUtils
.loadMakeGame( mService, gi, lock );
success = gi.forceChannel != nli.forceChannel;
gamePtr.release();
}
}
if ( null == gi ) {
// locked. Maybe it's open?
JNIThread thread = JNIThread.getRetained( mService, rowid );
if ( null != thread ) {
gi = thread.getGI();
thread.release( false );
}
}
success = null != gi && gi.forceChannel != nli.forceChannel;
}
} else {
success = false;