Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-03 23:04:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4750 commits 21 branches 243 tags 33 MiB
Commit graph

4720 commits

Author SHA1 Message Date
Andy2
00e4dfd09e FOR DEBUGGING ONLY: test theory about dropped dialogs. 2011-07-20 18:25:14 -07:00
Andy2
4f29048f49 fix format specifier to not crash (use %h); remove redundant logging. 2011-07-20 18:23:30 -07:00
Andy2
84502a89bf FOR DEBUGGING ONLY: %p segfaults! 2011-07-20 18:23:05 -07:00
Andy2
348af5a935 FOR DEBUGGING ONLY: add remaining Activity lifecycle methods so 
they'll get logged, and log this ptr as well.
 2011-07-20 18:22:14 -07:00
Andy2
04a80fca07 Remove FLAG_ACTIVITY_NEW_TASK to fix duplication of root 
activity. Explanation in code.
 2011-07-20 18:20:22 -07:00
Andy2
ba40d96fea remove unused variable 2011-07-20 05:39:52 -07:00
Andy2
1f89eb0238 start on changes list 2011-07-19 18:37:23 -07:00
Andy2
30b9df399c Address crash that happened when runnable ran too late by nulling out 
m_handler in onPause() and adding new methods that check if it's null
before calling post(), postDelayed() or removeCallbacks() on it.
 2011-07-19 18:31:20 -07:00
Andy2
ea853e2e51 replace hard-coded list of preferences whose summaries are their 
values and code to enforce that with custom subclasses that do the
right thing automatically.
 2011-07-19 18:21:52 -07:00
Andy2
e4ba5fb5fd log svn rev 2011-07-19 18:14:32 -07:00
Andy2
39e752cbc9 add comment explaining change 2011-07-19 06:24:15 -07:00
Andy2
1d2c63d50f Duh. Make it f*cking compile 2011-07-19 06:21:04 -07:00
Andy2
5dd181398d test theory about dropped moves 2011-07-19 06:20:51 -07:00
Andy2
ecaca66a96 move turn-in-range assert to where it won't fail 2011-07-19 06:17:50 -07:00
eehouse@eehouse.org
6477147854 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-07-18 18:11:08 -07:00
Eric House
0548f6be66 get rid of some logging 2011-07-18 18:08:56 -07:00
Eric House
47da43a581 use new param to turn on mmap 2011-07-18 18:08:31 -07:00
Eric House
4093e1c947 add option to switch between mmap and malloc for dict runtime access. 2011-07-18 18:07:15 -07:00
Andy2
5deb68486c add a ton of asserts (no code change otherwise) 2011-07-18 06:44:17 -07:00
Andy2
c482df300b better value for RESIGN_RATIO 2011-07-15 18:24:26 -07:00
Andy2
d81458c34c use nmap -- as test case for doing same in jni 2011-07-15 18:24:08 -07:00
Eric House
febb640049 add name of remote player to notification that remote player moved. 
And remove a few dead strings.
 2011-07-15 18:13:55 -07:00
Eric House
aec3400677 trivial cleanup 2011-07-15 18:09:40 -07:00
Eric House
8ba7861a7c fix to actually do something 2011-07-15 18:09:13 -07:00
Andy2
9bed15179d version update -- getting ready for next beta! 2011-07-14 18:53:45 -07:00
Andy2
b1f14972e0 remove commented-out foo 2011-07-14 18:53:22 -07:00
Andy2
f1a23a13a8 use a market URL to go directly to the download page 2011-07-14 18:52:59 -07:00
Andy2
4a03867369 add icon; center everything 2011-07-14 18:47:45 -07:00
Andy2
86d17dc615 for now, point at downloadable local rather than market. 2011-07-14 06:42:37 -07:00
Andy2
a4420e130a fix NPEs: not all intents contain all possible elements 2011-07-14 06:18:26 -07:00
Andy2
1dbef02ef6 trim some logging 2011-07-13 21:48:06 -07:00
Andy2
806745683c removed unused param. 2011-07-13 18:42:16 -07:00
Andy2
cd15a9e6e3 fix, I think, problems with launch mode and non-main activities. 
singleTop is necessary, as with singleTask we get the whole actvity
stack nuked on every launch.  Open a game into BoardActivity then
background Crosswords; when you re-launch from the launcher or hold
the home key you're back to GamesList.  But with singleTop incoming
invite schemes would launch a second instance because though there was
one running it wasn't in the same task as the browser firing the url
to redir.php.  The solution there is to move the scheme intent from
GamesList to DispatchNotify, which is already handling notifications.
There the addition of a second launch flag means that an existing
instance will always see the launch through its onNewIntent -- under
tests I've come up with so far, anyway.
 2011-07-13 18:42:03 -07:00
Andy2
ea205ebf97 when blocking dialogs want to stack, rather than assert, just drop the 
second one.  I'm not sure this is the right thing to do, but it won't
matter except when the assert was firing.
 2011-07-13 06:13:38 -07:00
Andy2
1686f3d9a8 make --skip-confirm do what it says, and include it in test script. 2011-07-12 07:13:58 -07:00
Andy2
f4a11d2be5 ignore commit turn request when player has 0 tiles. This catches, 
awkwardly, the case in a networked game where a player runs out of
tiles in his turn but the server hasn't responded yet to kill the
game.  It remains the player's turn and he can make lots of 0-point
moves while waiting.  (Making it the next player's turn would be the
right thing to do if that player were always on a different device.)
 2011-07-12 07:13:21 -07:00
Andy2
42e7a113b9 tweak logging 2011-07-12 07:09:40 -07:00
Andy2
b28a818a1d start games via invite in onNewIntent -- required now that singleTask 
is the mode and working.
 2011-07-11 20:06:28 -07:00
Andy2
29c2e0bfd6 fold intent filters together 2011-07-11 20:05:45 -07:00
Andy2
f7a0255dc4 needs to be singleTask, not singleTop, to avoid having a new GamesList 
activity launched when launch-by-scheme happens when responding to an
invite.
 2011-07-11 19:54:41 -07:00
Andy2
7022dbf8d5 set default user name before summoning dialog to change it. For some 
reason the GamesList activity is being stopped then recreated
occasionally.  This prevents the dialog from coming up a second time
when that happens.
 2011-07-11 18:37:37 -07:00
Andy2
bd7d608c64 combine the two GamesList Activity elements. For some reason it 
didn't work before to have the custom URL launch stuff in the existing
one but it does now.
 2011-07-10 10:36:14 -07:00
eehouse@eehouse.org
a0ddf2547b Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-07-08 21:52:57 -07:00
Andy2
6bb6107b1a remove logging 2011-07-08 21:50:03 -07:00
Andy2
55376567f6 make main board bitmap static in an attempt to remove, or at least 
postpone running up against, a memory leak that appears to be in the
java side of things.  Googling suggests lots of folks are having
problems with createBitmap (though I can put the createBitmap() call
in a 50-iteration loop and not crash -- may not be the problem after
all.)  Without this change I crash the 14th time opening a game.  With
it I go 30 and run out of patience.  Now that the board is locked in
vertical mode there's little point in recreating the bitmap anyway.
 2011-07-08 21:49:51 -07:00
Andy2
8c36727578 tweak new-game dialog strings. 2011-07-08 18:45:41 -07:00
Andy2
7d1a475e61 make players remote by default when adding them to networked games. 2011-07-08 06:25:10 -07:00
Eric House
a6ba233790 Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-07-08 05:54:34 -07:00
Eric House
421e2a4ae3 fix uninitialized variable 2011-07-08 05:53:08 -07:00
eehouse@eehouse.org
dd8950a826 Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-07-07 18:51:50 -07:00
Andy2
0c4191805f Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/common_rsrc.xml
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java
	xwords4/linux/scripts/discon_ok2.sh
 2011-07-07 18:50:22 -07:00
Andy2
19ba4d8dea check for null (fixing occasional NPE) 2011-07-07 18:08:09 -07:00
Andy2
2692a8333f restart screen-on timer when activity resumed -- just in case. 2011-07-07 06:44:58 -07:00
Andy2
7376161dd5 change screen-on preference to a 10-minute interval rather than 
forever.  Should be long enough to allow a move without risking
battery death.
 2011-07-07 06:41:44 -07:00
Andy2
23831a1910 forgot a change 2011-07-07 06:27:28 -07:00
Eric House
4f0f3576ff Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-07-06 20:04:17 -07:00
Eric House
abf60e027d fix pattern to pick the right hostid. 2011-07-06 20:02:51 -07:00
eehouse@eehouse.org
ba4d898de1 Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-07-06 19:12:16 -07:00
Andy2
3ccc323465 update version and change info for next beta 2011-07-06 19:00:06 -07:00
Andy2
7fa86f8007 tweak summary 2011-07-06 18:59:47 -07:00
Andy2
ebdf4cce87 add new preference to keep the screen on when the board's visible (per 
request).  Off by default, of course.
 2011-07-06 18:50:11 -07:00
Andy2
b233136df3 copy in manually from android_invite: need the new enums to compile 2011-07-06 18:37:08 -07:00
Andy2
248b341aac move socket creation inside Thread's run() in attempt to fix too-long 
UI freeze when deleting individual games.
 2011-07-06 18:32:33 -07:00
Andy2
ae0860a047 add a newbie-info for new-from menuitem. Still need one for reset. 2011-07-06 18:24:46 -07:00
Andy2
3fdf15955e Bug: don't refuse to update preference summary just because it's empty. 2011-07-06 18:21:24 -07:00
Andy2
82552e681a add timestamps to jni logs 2011-07-06 18:15:34 -07:00
Andy2
d76ca5938b fix sync-with-relay menu items to work even if timed syncing is 
disabled.
 2011-07-06 18:15:00 -07:00
Andy2
6b773460ec call server_do before passing message to server to give it a chance to 
get any pending work done.
 2011-07-06 18:14:31 -07:00
Andy2
52510b0b10 force XW_STATE to be 1 byte. 2011-07-06 18:13:59 -07:00
Andy2
859283a8d0 save stateAfterShow as part of serialized game state. Fixes problem 
where games with more than two devices would hang because server.c
code was dropping messages that comms.c code thought were good and so
ACK'd preventing them from being sent again.  They were being dropped
because the game was in the wrong state after displaying a move-made
dialog because the state it was to move to after doing that display
had not been saved.
 2011-07-06 18:11:56 -07:00
Andy2
63799a5f4a add new error message to DEBUG-only printing code. 
Conflicts:

	xwords4/common/comms.c
 2011-07-06 18:10:42 -07:00
Andy2
a975a405aa handle new "no-connect-dead-game" error code the same as an in-play 
"deleted" message: put up existing dialog offering to delete the game.
 2011-07-06 06:50:56 -07:00
Andy2
9ec72d6015 handle new "no-connect-dead-game" error code the same as an in-play 
"deleted" message: put up existing dialog offering to delete the game.
 2011-07-06 06:49:19 -07:00
Andy2
f3ab40519d add new error message to DEBUG-only printing code. 2011-07-06 06:47:56 -07:00
Andy2
86e3cc7286 When device reconnects to a dead game, just deny the connection with a 
new error message rather than allow it as if it were a normal game
only to send a game-dead message after.  This solves the problem of
how device knows not to put up welcoming message or suggestion to
invite to a game that's suddenly missing players.  BUT: this change is
incompatible with existing versions and so needs to get pushed out
before the in-use relay can be upgraded to include this code.
 2011-07-06 06:47:25 -07:00
Andy2
928404be50 remove unused enum 2011-07-06 06:15:25 -07:00
Eric House
a3dbde9b88 more dealing with edge cases. 2011-07-05 21:42:03 -07:00
Eric House
98a65d82ed fix crash in rare edge case 2011-07-05 21:40:13 -07:00
Eric House
d3108aac79 split method in two to provide new API (I'm not using yet) 2011-07-05 21:39:38 -07:00
Andy2
4789bac85e add new mode that only launches games after the relay says there's a 
message for them.  This is to mimic a common way games are played on
Android and to ensure that there are no points where that style of
play hangs because no device in the game will be "up".
 2011-07-04 19:46:12 -07:00
Andy2
999d4c11e7 simple script for watching what messages the relay has pending for a 
game.
 2011-07-04 12:51:27 -07:00
Andy2
4b75174170 save stateAfterShow as part of serialized game state. Fixes problem 
where games with more than two devices would hang because server.c
code was dropping messages that comms.c code thought were good and so
ACK'd preventing them from being sent again.  They were being dropped
because the game was in the wrong state after displaying a move-made
dialog because the state it was to move to after doing that display
had not been saved.
 2011-07-04 12:51:00 -07:00
Andy2
0eec455119 change one return type; improve logging 2011-07-04 12:46:48 -07:00
Andy2
8904f37e1a force XW_STATE to be 1 byte. 2011-07-04 12:45:51 -07:00
Andy2
ab8e4e437b call server_do before passing message to server to give it a chance to 
get any pending work done.
 2011-07-04 12:37:23 -07:00
Andy2
66d42faead fix sync-with-relay menu items to work even if timed syncing is 
disabled.
 2011-07-04 12:28:17 -07:00
Andy2
7024718c87 add timestamps to jni logs 2011-07-04 09:38:22 -07:00
eehouse@eehouse.org
8f782070ac Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-07-03 09:28:36 -07:00
Eric House
e207e0e142 add option to run only one game at a time in a given room. The idea 
was to mimic conditions that are creating a bug on-device but it
didn't work.  Still, a useful test case....
 2011-07-02 23:12:16 -07:00
Andy2
175aace629 fix a couple of rare failures due to race conditions testing or 
valgrind flushed out.
 2011-07-02 13:28:24 -07:00
Eric House
35bfdb1dd6 Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-06-30 19:44:46 -07:00
Eric House
09b81c6ad7 fix rare crash: don't call PQgetvalue when there are no results. 2011-06-30 19:39:00 -07:00
Eric House
5c5708fa66 try to fix race condition that sometimes means script detects game is 
over but doesn't communicate to relay: don't consider file done until
have info to sent to relay.
 2011-06-30 19:37:37 -07:00
eehouse@eehouse.org
3db7fccb53 Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-06-30 18:57:53 -07:00
Andy2
ada84cccb3 make invites work with games having more than two players. But: the 
games themselves don't work!  Fix this or disable 3- and 4-device
networked games.
 2011-06-30 18:56:51 -07:00
Andy2
36287870d4 add np (num players) param 2011-06-30 18:22:42 -07:00
Andy2
546791d215 custom message when more than one player missing reminding to invite 
more than one person.
 2011-06-30 06:30:05 -07:00
Andy2
0c42da905a plug memory leak flushed out by auto-juggle code: null dict doesn't 
mean the end of the list.
 2011-06-29 21:43:50 -07:00
Eric House
48ea9e2b28 add preference to juggle players when creating a new game 
Conflicts:

	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java
 2011-06-29 21:43:44 -07:00
Eric House
ef9d359ab9 tweak default param values 2011-06-29 21:38:54 -07:00