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
