Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
6358 commits 21 branches 243 tags 33 MiB
Commit graph

6292 commits

Author SHA1 Message Date
Eric House
0769cbccdc capitalize consistently 2012-07-14 07:48:19 -07:00
Eric House
479ed0dc58 update conn status on receipt or send of packets to/from relay, not 
just when relay connect status changes.  This means that a game will
show as connected when it's still waiting for another device to join
room, but also fixes exchanging moves over 10 minutes and having the
status icon say you haven't sent or received in that long.  This could
be improved.
 2012-07-12 21:15:35 -07:00
Eric House
248db3d144 update version strings and changelog 2012-07-12 20:56:28 -07:00
Eric House
b02855b00c sort tray after an undo adds tiles 2012-07-12 06:48:09 -07:00
Eric House
a3de089e15 remove unused constant 2012-07-12 06:34:54 -07:00
Eric House
abcdafe56a always invalidate board view to force layout/draw. Fixes crosshairs 
not going away, and board being unresponsive, after lookup activity is
dismissed.
 2012-07-12 06:34:01 -07:00
Eric House
d3b56f4167 don't show rem text when -1 2012-07-12 06:15:53 -07:00
Eric House
11bd4a73fe oops: fix centered text drawing. 2012-07-11 06:17:36 -07:00
Eric House
bad6c599f8 more tweaks to tray tile drawing: make small screen letters 3/4 height 
even though numbers are 1/3 and overlap is in theory possible; put 1/5
of extra space to left of letters so they don't hug the edge.
 2012-07-10 21:04:54 -07:00
Eric House
bfc68656cb move arrow to where removed tile was, and set its direction based on 
whether removed tile and the next tile are in the same column or row.
 2012-07-10 18:00:23 -07:00
Eric House
c2956f4064 save net status state on a timer (when handler is available) waiting 
five seconds.
 2012-07-10 06:21:49 -07:00
Eric House
bd70a1dd7d improve text in remaining tiles dialog, and always show the tiles for 
all trays rather than excluding those in current player's tray.
 2012-07-09 21:44:29 -07:00
Eric House
f1c5ebeb31 don't hide REM tiles square when drops to 0 2012-07-09 21:43:35 -07:00
Eric House
09a81a2639 add some consts 2012-07-09 21:36:17 -07:00
Eric House
d234646fb2 fix broken compile 2012-07-09 21:17:01 -07:00
Eric House
e6f02ee3c7 when drawing letter in tray tile, only shift origin left of edge when 
letter width exceeds that of tile.
 2012-07-09 07:03:39 -07:00
Eric House
5702c83f17 do string formatting properly, using resources and StringBuffer. 2012-07-09 06:56:08 -07:00
Eric House
6da3f10855 cleanup -- no code change 2012-07-09 06:15:02 -07:00
Eric House
e7b0727e0c leave remaining-tiles in place when pool count drops to 0. 2012-07-09 06:07:26 -07:00
Eric House
9885d3bf61 draw letters in tray tiles as far to left as possible 2012-07-07 19:55:19 -07:00
Eric House
7f087181e5 Don't store current network connType in ConnStatusHandler; instead 
pass the one for which we want icon displayed or status text
generated.
 2012-07-07 19:45:18 -07:00
Eric House
0c02103d42 fix assertion failures due to failure to get game locks. The problem 
is that getSummary() can be called at unpredictable times by
background tasks for the games list, and the current open game holds a
lock as long as it's open.  So those getSummary() calls must be
allowed to fail.  Before, letting them fail immediately meant
empty/unusable list elements; now I've added a time they'll wait
before failing.  Now the ones that are called while a game is open can
fail without being noticed, but the ones that are called as a game is
closed to update its summary will succeed by being able to wait for
its lock to be given up.
 2012-07-07 11:34:40 -07:00
Eric House
ae3ae6a3a4 turn on base64 for SMS too 2012-07-07 11:29:54 -07:00
Eric House
30c77de2d0 tweak menu name 2012-07-07 11:29:25 -07:00
Eric House
6abb56dd0c make tmp list elem closer in size to the real thing so screen jumps 
around less.
 2012-07-07 11:29:15 -07:00
Eric House
318cc52f5a we need the base64 stuff even when don't have SMS -- for serialization. 2012-07-07 11:05:45 -07:00
Eric House
052725aabc fix problems with serialization: use types that are serializable, and 
init transients correctly.
 2012-07-07 11:05:07 -07:00
Eric House
43fead368c make Random class static rather than generate one over and over 2012-07-07 09:27:27 -07:00
Eric House
3c19a7ef44 tolerate failure to get lock for five seconds before asserting (up 
from one.)
 2012-07-06 07:14:01 -07:00
Eric House
75602c47d8 on Amazon-made devices only, sleep randomly during load of game 
summary.  This seems to work around a bug where only the last item in
the list is clickable but once it's clicked events are received for
every failed click up to that point.
 2012-07-06 07:13:11 -07:00
Eric House
9a23473b2f use a dummy TextArea instead of an empty custom view as a placeholder 
for loading game summary view.
 2012-07-06 06:49:09 -07:00
Eric House
d6fdd24637 move interface methods together -- no code change 2012-07-06 06:10:04 -07:00
Eric House
1ad0a899f0 don't return from getSummary without succeeding, even if must wait on 
lock.  Fixes problem with blank entries in game list after returning
from config screen.
 2012-07-03 20:30:31 -07:00
Eric House
60a799ef1f move SMS games up again, this time in a way that networked game creation 
isn't hidden along with SMS.
 2012-07-03 07:02:29 -07:00
Eric House
bf9fe75f5c Revert "in new game dialog, move sms above network (since that's presumably" 
This reverts commit 19dbddc0b8.
 2012-07-03 06:37:24 -07:00
Eric House
eba1d91157 fix game_config view contents sticking to bottom of tall screen when lock 
checkbox hidden, e.g. on Kindle Fire.
 2012-07-03 06:29:59 -07:00
Eric House
be9ed5b963 add toolbar button style for 'large' devices so buttons are bigger on 
the Kindle Fire but not too big on phones.
 2012-07-02 07:39:06 -07:00
Eric House
8ebe180eab fix NPE 2012-07-02 06:59:35 -07:00
Eric House
c386537cb7 gitignore new files 2012-07-01 21:02:42 -07:00
Eric House
66f2007347 turn new tray-undo feature on for SMS version too 2012-07-01 21:02:11 -07:00
Eric House
19dbddc0b8 in new game dialog, move sms above network (since that's presumably 
the reason people chose that version)
 2012-07-01 17:35:50 -07:00
Eric House
2e6b64a4e4 complete implementation of java part of one-pass scoreboard draw. Now 
looks pretty much identical to what the old code draws except that
rather than having width allocated in proportion to requested size all
get the same width except the one whose score it is which gets 2x.
 2012-07-01 17:24:50 -07:00
Eric House
c41c877ae7 fix right edge of scaled text getting clipped by paying attention to 
where getTextBounds() says its left edge is.
 2012-07-01 17:05:39 -07:00
Eric House
43e8205fd8 only honor one install-set option -- fixes multiple installs. 2012-07-01 16:03:02 -07:00
Eric House
2434d85684 don't pass the same player-1 data for every player 2012-07-01 16:01:01 -07:00
Eric House
5cd8ab2b33 remove uncalled method -- no change. 2012-07-01 15:57:20 -07:00
Eric House
2ae6bd8caf override onMeasure to make BoardView only as large as it needs to be 
so that on tall narrow screens (e.g. Kindle Fire) there's no white
space between the tray and the buttons.
 2012-07-01 12:54:38 -07:00
Eric House
03f4236240 install to everything by default 2012-07-01 12:53:36 -07:00
Eric House
89ffd972bf more work on single-pass scoreboard drawing. Now the jni stuff is 
finished, but disabled via compile-time flag, and there's a
commented-out rudimentary implementation on the java side.
 2012-07-01 10:04:10 -07:00
Eric House
b9b58bd0a5 enable tray tap undo 2012-06-29 06:52:49 -07:00
Eric House
c272491db6 add compile-time option to have tap on empty tray space return one 
tile instead of all of them.
 2012-06-29 06:50:46 -07:00
Eric House
69b0a0d4a3 load conn state for sms app too 2012-06-28 07:22:10 -07:00
Eric House
9b9aec45da format status timestamps in terms of how long ago (using 
getRelativeDateTimeString); save and restore serialized timestamps.
 2012-06-28 07:20:28 -07:00
Eric House
52e70bff3d rename method; make [g|s]etPrefsString public 2012-06-28 07:17:48 -07:00
Eric House
c8e2dff962 start process of compiling with XWFEATURE_SCOREONEPASS enabled by 
adding stubbed-out methods and making old methods conditionally
compiled.  No change in code.
 2012-06-27 07:08:09 -07:00
Eric House
c8cd2d500a fix to compile and save player score rect info for non-keyboard-nav case 2012-06-27 07:04:36 -07:00
Eric House
065446def4 paint status area background manually in red or green and use a single 
transparent background icon for success and failure.
 2012-06-27 06:44:24 -07:00
Eric House
2fc2a60842 create alternate scoreboard draw flow, disabled by compile-time flag, 
that does layout and draw in a single pass and with more information
so platform has more responsibilty for dealing with space constraints
and can, I hope, do a better job.  There's no change until the flag is
turned on.  Works for GTK with flag on, but is stubbed out for ncurses.
 2012-06-26 07:20:09 -07:00
Eric House
d8e4b6481c make rectContainsRect public so can be used in assert 2012-06-26 07:15:26 -07:00
Eric House
13633186ff don't reset variable unless changed 2012-06-26 06:50:54 -07:00
Eric House
8ff27cc075 include "sms" or "text" in chooser title 2012-06-24 14:46:02 -07:00
Eric House
5eb937dede use deviceSupportsSMS() to skip asking user whether to invite vis SMS 
or email when SMS isn't an option.  Assumption: email *is* available,
which it isn't if it hasn't been configured yet.
 2012-06-24 14:43:57 -07:00
Eric House
392f4239d7 add deviceSupportsSMS() -- which checks phonetype, i.e. that there's no phone. 2012-06-24 14:42:46 -07:00
Eric House
7dfe5ba8e1 inval status icon when there's a change so it gets updated. 2012-06-21 18:28:45 -07:00
Eric House
10b47257e9 flesh out new connection status icon: track times and give meaningful 
message.  Still to do: [de]serialize state, and separate global from
per-game somehow.  Might also want to include game state (e.g. whether
in a game or still looking.)
 2012-06-20 07:50:08 -07:00
Eric House
dcf343b700 ignore new images 2012-06-20 07:32:28 -07:00
Eric House
df62888104 up version for sms build too 2012-06-20 06:35:01 -07:00
Eric House
2b9fb13dbd Merge branch 'android_smallscreen' into android_branch 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
 2012-06-20 06:14:37 -07:00
Eric House
c2c1fe4f89 attempt to improve scoreboard drawing when names are long or numerous 
enough to crowd by using same math to figure height when measuring as
when drawing, but it still needs work.
 2012-06-19 07:44:26 -07:00
Eric House
df907f6cb3 up version strings and changelog 2012-06-19 07:36:32 -07:00
Eric House
964c4cecd8 add dict-browse menuitem to small-screen board menu and on same move 
undo/redo up per user request
 2012-06-19 06:19:03 -07:00
Eric House
bb5cd677ab make turn color public so can be used from board too (though I'm not 
doing that yet.)
 2012-06-19 06:19:03 -07:00
Eric House
9d8e1ec261 cleanup: one-letter variables are bad. 2012-06-19 06:19:03 -07:00
Eric House
c34f70f9eb fix bug where current player's scoreboard would disappear if other 
players' names were too long by giving all a the same proportion of
what they request and passing in the percent given in case draw
implementation wants to use it as a cue to truncate.
 2012-06-19 06:19:03 -07:00
Eric House
4cd8f8bfd1 change toast to not imply game to start immediately. 2012-06-19 06:18:44 -07:00
Eric House
545cf9166f show green border in contracted view too when appropriate, and not 
only for net games.
 2012-06-19 06:18:16 -07:00
Eric House
d46c827b4c reduce min tray height to twice cell height, and tweak layout on 
small-screen devices to make the value readable.
 2012-06-19 06:16:36 -07:00
Eric House
2e2df3dc17 add hasSmallScreen() 2012-06-19 06:11:16 -07:00
Eric House
a65e1dfa79 add menus for small-screen devices to provide functionality others get 
from toolbar.
 2012-06-19 06:11:16 -07:00
Eric House
7a6d4c870e new .gitignore for new res directory 2012-06-19 06:11:16 -07:00
Eric House
5d9381e1bc change text of menu from hide rack to show rack depending on hidden state 2012-06-19 06:11:16 -07:00
Eric House
78dfd6267c include trayVisState in GameStateInfo on the java side 2012-06-19 06:11:16 -07:00
Eric House
fcf76aba0f include trayVisState in GameStateInfo 2012-06-19 06:11:16 -07:00
Eric House
b78ea03ea6 add board layout for small case that doesn't include toolbar or 
exchange-state buttons, and check for presence of Views that may now
be missing.  With this checkin small screen devices don't have access
to toolbar functionality -- new and expanded menu will be required for
them.
 2012-06-19 06:11:16 -07:00
Eric House
1e9928e7f3 add commented-out toString() for debugging 2012-06-19 06:11:16 -07:00
Eric House
d7f576d6b7 fix board dimensioning for small (needs-scrolling) screens. Since this 
effects larger screens needs some testing.
 2012-06-19 06:11:16 -07:00
Eric House
00102ec20a include stylesheet in generated index.html 2012-06-19 06:11:15 -07:00
Eric House
9ac5113c93 add dict-browse menuitem to small-screen board menu and on same move 
undo/redo up per user request
 2012-06-15 07:00:18 -07:00
Eric House
628c058c4c make turn color public so can be used from board too (though I'm not 
doing that yet.)
 2012-06-15 06:44:39 -07:00
Eric House
6beb572180 cleanup: one-letter variables are bad. 2012-06-15 06:43:54 -07:00
Eric House
405cb23023 fix bug where current player's scoreboard would disappear if other 
players' names were too long by giving all a the same proportion of
what they request and passing in the percent given in case draw
implementation wants to use it as a cue to truncate.
 2012-06-15 06:26:40 -07:00
Eric House
3d9478744a change toast to not imply game to start immediately. 2012-06-13 20:07:28 -07:00
Eric House
46770ac0cb show green border in contracted view too when appropriate, and not 
only for net games.
 2012-06-12 07:19:18 -07:00
Eric House
e3401724e1 new icons for network status and code to draw them, so far hard-coded 
to show success.
 2012-06-11 19:23:01 -07:00
Eric House
1993ea48f7 ignore new file 2012-06-11 07:02:39 -07:00
Eric House
266e9ba91a reduce min tray height to twice cell height, and tweak layout on 
small-screen devices to make the value readable.
 2012-06-11 07:01:36 -07:00
Eric House
ac74e2e832 add new class that will be responsible for drawing network status icon 
at right end of scoreboard.  It now shows the same icon as the games
list per connection type and gives a stubbed-out status message dialog
when tapped.  Still need to add actual status: when was the last
successful send or receive; and need to add decorations to show
connection state.
 2012-06-10 07:40:33 -07:00
Eric House
4fc33fe4e5 add hasSmallScreen() 2012-06-09 10:01:41 -07:00
Eric House
9827ea1b39 add menus for small-screen devices to provide functionality others get 
from toolbar.
 2012-06-06 06:48:55 -07:00
Eric House
dd30bb6a7c new .gitignore for new res directory 2012-06-06 06:43:00 -07:00
Eric House
b8bad58125 change text of menu from hide rack to show rack depending on hidden state 2012-06-05 22:19:44 -07:00
Eric House
6257c14436 include trayVisState in GameStateInfo on the java side 2012-06-05 22:13:58 -07:00
Eric House
60a4f123a2 include trayVisState in GameStateInfo 2012-06-05 22:13:26 -07:00
Eric House
e15c104eb4 add board layout for small case that doesn't include toolbar or 
exchange-state buttons, and check for presence of Views that may now
be missing.  With this checkin small screen devices don't have access
to toolbar functionality -- new and expanded menu will be required for
them.
 2012-06-05 07:42:39 -07:00
Eric House
c5358dc9c3 add commented-out toString() for debugging 2012-06-05 07:41:00 -07:00
Eric House
b3cf9c65aa fix board dimensioning for small (needs-scrolling) screens. Since this 
effects larger screens needs some testing.
 2012-06-05 07:38:58 -07:00
Eric House
baa8c7472d include stylesheet in generated index.html 2012-05-30 22:16:43 -07:00
Eric House
a38c275663 back to building for android-7 2012-05-30 21:23:53 -07:00
Eric House
27ddc355ed don't bother cloning message when it'll be passed to multiple games. 
Clone was too late, and there's no chance of modification of the
contents.
 2012-05-30 06:54:30 -07:00
Eric House
a03dc80205 tweak method for clarity -- no behavior change 2012-05-30 06:52:08 -07:00
Eric House
42f2612e67 turn on HASH_STREAM to match Android 2012-05-30 06:51:26 -07:00
Eric House
a0336ebb01 turn on new HASH_STREAM feature 2012-05-29 07:26:51 -07:00
Eric House
65f90b2d86 up version number and add changes 2012-05-29 07:26:24 -07:00
Eric House
821add6df5 fix to compile when HASH_STREAM not defined 2012-05-29 07:19:19 -07:00
Eric House
ac23e7e950 define HASH_STREAM to enable new algorithm 2012-05-28 15:58:00 -07:00
Eric House
240d308d07 move nperdevice and ntotal side-by-side 2012-05-28 11:08:43 -07:00
Eric House
adadc9c90c use new hash algorithm for new stream version, old for previous 
versions.  Tested upgrade scenario from b44: works.
 2012-05-28 11:07:59 -07:00
Eric House
b343034cc2 add ability to pass params only to new version of app so that test of 
upgrade from old to new needn't skip test of new features.
 2012-05-28 11:04:39 -07:00
Eric House
e36635944e fix to make two-device games much more common than four-device ones 2012-05-27 19:05:27 -07:00
Eric House
0b1a9a67fe add param to server_handleUndo to prevent it from undoing all moves in 
robot-vs-robot game, which is the wrong thing to do during a test
simulating play.
 2012-05-24 22:25:30 -07:00
Eric House
0cb217496e cleanup 2012-05-24 22:22:00 -07:00
Eric House
5309da9845 add --undo-pct option that passes through to curses client 2012-05-24 22:17:10 -07:00
Eric House
9354e0e0cd fix off-by-one error in stream_copyBits that seems to have been 
responsible for HASH_STREAM not working.
 2012-05-24 22:16:22 -07:00
Eric House
fd7a25ba3c makefile for just-released DISC2 wordlist for Catalan 2012-05-23 20:04:11 -07:00
Eric House
cd89885cd2 add new periodic (one-second) timer, and commandline option that sets 
what percent of the times that timer fires will result in a move being
undone.  Will be used to interject random out-of-order undos into
games played for testing.  (Currently the tests fail when this is
enabled; I need to fix that.)
 2012-05-23 19:58:03 -07:00
Eric House
2db02f9aa5 fix delegated dialogs to clear state before issuing dismiss callback 
so that callback can set up another dialog without tripping an assert,
then move SMS invite dialog chaining from on-click callback to
on-dismiss.
 2012-05-23 07:16:27 -07:00
Eric House
60e1d50f43 add stream_copyBits, and use it to hash the move stack -- commented 
out via conditional compile as it still doesn't work in all cases.
 2012-05-22 19:24:54 -07:00
Eric House
d1869a233c fix so non-debug build builds 2012-05-22 19:18:04 -07:00
Eric House
60aa0cb614 revert unintended commit 2012-05-21 21:49:02 -07:00
Eric House
622afa4d98 track what games we've sent died notices for and don't repeat. Fixes 
infinite message flood occurring when a packet was received after
games had been deleted on both devices.
 2012-05-21 21:47:09 -07:00
Eric House
5efaced84b Revert "Revert "track what games we've sent died notices for and don't repeat. Fixes"" 
This reverts commit 8fd1388b5f.
 2012-05-21 21:45:30 -07:00
Eric House
8fd1388b5f Revert "track what games we've sent died notices for and don't repeat. Fixes" 
This reverts commit 67715b653a.
 2012-05-21 21:44:51 -07:00
Eric House
67715b653a track what games we've sent died notices for and don't repeat. Fixes 
infinite message flood occurring when a packet was received after
games had been deleted on both devices.
 2012-05-21 21:27:22 -07:00
Eric House
e80417e806 don't draw separate icon in games list elements for needs-sync relay 
game -- since that state no longer really exists.
 2012-05-21 21:23:13 -07:00
Eric House
adac3abcc6 fix bug where all notifications wound up launching the same game 
because all their PendingIntents were the same by passing a unique
resultCode on creation.
 2012-05-21 06:46:37 -07:00
Eric House
f56b09980c include game name in notification text 2012-05-21 06:40:52 -07:00
Eric House
469f63f96f log when more than one game found with a given ID. 2012-05-20 10:33:26 -07:00
Eric House
1ca36044a0 allow for possibility that there's more than one game on device with 
one gameID.  Currently this should only happen when a device is
playing via SMS against itself -- i.e. when I'm debugging or a user is
playing around.  It hasn't been tested and may not work to the extent
that a game like that can actually work and so may want to be backed
out later.
 2012-05-20 10:24:37 -07:00
Eric House
3c4e01ef52 improve text clarity 2012-05-18 21:23:38 -07:00
Eric House
2564a660ad remove logging 2012-05-18 21:23:12 -07:00
Eric House
211318f2ef remove logging 2012-05-18 21:23:09 -07:00
Eric House
df0c5e4abf move plus button to middle, and fix so both text buttons wrap when 
required on narrow screen.
 2012-05-18 21:14:50 -07:00
Eric House
47a5ab65df use broadcast receiver for status PendingIntents from SendTextMessage, 
and pass up new MultiService messages on success or failure.  In
response to these, post SMS status icons on board.  Still need to come
up with an initial status, notice radio ups/downs, etc.  And design icons!
 2012-05-18 07:55:10 -07:00
Eric House
523d49ef04 stubs for sms status icons 2012-05-18 07:52:32 -07:00
Eric House
9ba663ab98 implement util_phoneNumbersSame in java and call telephony's number 
compare method.  Skip the java call when the numbers are
strcmp-identical.
 2012-05-18 07:41:46 -07:00
Eric House
867e9ffc2f implement stubbed-out util_phoneNumbersSame so that three-device SMS 
games work in emulator.  May need to call into java to use Android's
more sophisticated phone number comparison to work on devices.
 2012-05-18 07:17:21 -07:00
Eric House
60c3a5bf64 use green_border to frame remote players whose turn it is. 2012-05-18 06:54:05 -07:00
Eric House
091f927c8b add new file 2012-05-18 06:53:28 -07:00
Eric House
40843db7df rename 9-patch 2012-05-18 06:52:25 -07:00
Eric House
599d0630d3 built main app for same version as sms version 2012-05-18 06:22:23 -07:00
Eric House
81f830c0d4 drawable that creates a green frame around view -- to show it's remote 
player's turn.
 2012-05-18 06:22:06 -07:00
Eric House
3a54aa0ebc add util_informUndo() that gets called, and puts up a dialog, after 
remote device has performed an undo on a committed turn.
 2012-05-14 07:01:02 -07:00
Eric House
61453b8720 center gtk_ask window on parent window rather than on screen so can 
tell which instance it belongs to
 2012-05-14 06:58:54 -07:00
Eric House
edd02c24ea derive variant if called from a directory with AndroidManifest in it 2012-05-11 07:32:02 -07:00
Eric House
10ad59247a don't remove undo menuitem for networked games -- should be safe to 
use now.
 2012-05-11 07:26:49 -07:00
Eric House
a311e487a9 add another change 2012-05-09 18:22:30 -07:00
Eric House
013d9c689b fix bug introduced with dictionary lookup of words played that meant 
trades didn't get reported as remote moves -- it just became your turn
without notice.
 2012-05-09 18:22:05 -07:00
Eric House
2996af17ce fix crash when trade happens while --show-other is on 2012-05-09 18:20:51 -07:00
Eric House
261908a09f use non-strippable spaces when ': ' is meant to terminate string. 2012-05-09 18:19:53 -07:00
Eric House
f6ba94735d move BT and SMS listener installation behind if_supported tests 2012-05-09 07:09:15 -07:00
Eric House
1c08190941 list the other change 2012-05-09 06:51:48 -07:00
Eric House
d846f96ec5 post-code-review cleanup: no significant change 2012-05-09 06:51:06 -07:00
Eric House
d23f50a801 Merge remote branch 'origin/android_branch' into android_branch 2012-05-08 06:16:40 -07:00
Eric House
f7c49a6620 remove shift: --one-per doesn't take a param 2012-05-08 06:15:06 -07:00
Eric House
e797b342fe check in sms version of prefs xml file so that it can have its 
checkbox for turning off warnings about SMS costs.  I've already
wasted too much time without figuring out how to add or remove the
pref programatically....
 2012-05-07 21:09:01 -07:00
Eric House
155df55b5c break hash finishing stuff out to be called only once 2012-05-07 20:48:00 -07:00
Eric House
e82faedc63 up version number here too. 2012-05-07 07:13:48 -07:00
Eric House
08f03af2cc don't write gameID as 32 bits when it's bound for old-version client, 
and assert based only on the lower 16 bits in case came from
old-version client.  Fixes crashes testing mid-game upgrade from beta
43.
 2012-05-07 07:02:43 -07:00
Eric House
c17826ffbf up beta version 2012-05-05 17:39:30 -07:00
Eric House
3b3439371f Merge branch 'android_branch' into android_bt 2012-05-05 17:33:21 -07:00
Eric House
5104ca6bc5 always sort tiles prior to including in hash -- as a fix for the case 
where a game is opened that was created by an earlier version that
didn't save assigned tiles in sorted order.
 2012-05-05 17:33:07 -07:00
Eric House
64199c4e64 Merge branch 'android_branch' into android_bt 2012-05-05 11:08:03 -07:00
Eric House
adf43bb1e8 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2012-05-05 11:07:20 -07:00
Eric House
c2d8b17747 add --sort-tiles and fix confict between param name in code and in usage() 2012-05-05 10:55:35 -07:00
Eric House
058cbc4e1b first attempt, commented out, to hash the stream directly rather than 
its exploded contents.  Does't work once there's been some undo
activity as I don't have a way to get the length of the stack below
the undo/redo line.  Looks promising though.
 2012-05-05 10:47:28 -07:00
Eric House
eb2f5ff6eb sort assigned tiles before putting them in the move stack. Fixes hash 
comparison failure when devices are using sort-tiles option.
 2012-05-05 09:47:57 -07:00
Eric House
44a6653166 add passthrough of params present in gtk but not curses 2012-05-05 09:24:41 -07:00
Eric House
fd4ad0ae31 turn on board hashing and bigboard options (in protocol, not UI) 2012-05-04 06:16:02 -07:00
Eric House
83fec4d5eb turn on board hashing and bigboard options (in protocol, not UI) 2012-05-04 06:00:46 -07:00
Eric House
501210e3a3 turn on hash feature and mark so can see on relay 2012-05-03 21:49:15 -07:00
Eric House
d59b19514b Merge branch 'android_branch' into android_bt 2012-05-03 21:44:35 -07:00
Eric House
de3107271d changes to make hashing work -- make sure unused space in structs is 0 
-- and to detect when an incoming move doesn't make sense.  These
latter changes may not be necessary now that hash code is checked
first thing, but can't hurt, and there will be devices without hash
codes for a while.
 2012-05-03 19:02:42 -07:00
Eric House
7afa4f26db use the new --trade-pct flag 2012-05-03 19:00:56 -07:00
Eric House
47dde6cf3c init bitfield to 0 in case I want to hash stream directly 2012-05-03 19:00:43 -07:00
Eric House
652fe6dd64 fix test: unsigned can't drop below 0 2012-05-02 20:42:45 -07:00
Eric House
26913c5a37 get rid of excessive logging 2012-05-02 20:41:46 -07:00
Eric House
09f9038cff add option to have robot choose to trade tiles a configurable percent 
of the time.  Meant to increase automated test coverage of trades.
 2012-05-02 20:14:42 -07:00
Eric House
de965350c4 turn on feature that allows version of remote device to be deduced and 
included in stream -- so that new move stack hash can be included when
possible.
 2012-05-01 07:59:22 -07:00
Eric House
c52db8a8f0 toward better recovery from out-of-sync move and undo: include a hash 
of the move stack with every turn (version permitting), and drop
incoming moves created against a move stack different from ours.
 2012-05-01 07:58:11 -07:00
Eric House
0e07fab731 add stack_getHash() -- returning hash of current move stack (excluding 
any pending redos)
 2012-05-01 07:56:45 -07:00
Eric House
89ca45357a add pool_containsTiles() 2012-05-01 07:49:41 -07:00
Eric House
75247e59df fix confusing log message 2012-04-26 19:12:13 -07:00
Eric House
49f4700799 change sms-game-name dialog title 2012-04-24 19:01:21 -07:00
Eric House
b68b8aa0d0 for extra safety, move message hash into header where it can be part 
of test whether message should be deleteted from sms inbox.
 2012-04-24 07:19:52 -07:00
Eric House
9035f901b1 fix NPE for non-SMS case 2012-04-23 21:46:27 -07:00
Eric House
6930da9686 add warning about unlimited SMS plans that's triggered whenever a new 
number is added to the list of possible invitees.
 2012-04-23 20:07:44 -07:00
Eric House
010fae495b fix compile error 2012-04-23 07:37:02 -07:00
Eric House
2082b40d4a look up names from phones rather than store them separately 2012-04-23 07:32:42 -07:00
Eric House
f7c9e0cc16 use name in summary where available 2012-04-23 07:31:33 -07:00
Eric House
b2a1fefd26 synchronize access to phone-to-name hash 2012-04-23 06:55:00 -07:00
Eric House
07c1d68321 syntax error! 2012-04-23 06:54:23 -07:00
Eric House
97cb3863a6 name constant -- no code change 2012-04-23 06:34:00 -07:00
Eric House
02443d26a9 catch oob exception when older version receives enum not in values() array 2012-04-23 06:30:20 -07:00
Eric House
b34e741e30 add param to phoneToContact controlling whether phone number is 
returned when name can't be found.
 2012-04-23 06:16:06 -07:00
Eric House
d5076e2167 make a couple of methods private 2012-04-23 06:14:02 -07:00
Eric House
a98f9ef12f refactor; don't rely on otherwise unused i-var. 2012-04-23 06:13:05 -07:00
Eric House
c15b56199c use marker enum to test for size. no code change 2012-04-22 17:55:53 -07:00
Eric House
a72dbdd8dd add static to cache phone->name mapping 2012-04-21 22:16:47 -07:00
Eric House
3af20f1d5a look up name for phone number in contacts and use in game config. 
Will want to use elsewhere.  May want to cache depending on speed.
 2012-04-19 00:37:37 -07:00
Eric House
e5758766f7 test for null comment 2012-04-19 00:36:51 -07:00
Eric House
fd18d8c95a add boolean param to jni version of comms_resendAll() to ack 
afterwards.  Saves some extra jni calls.  Then make comms_ackAny()
separately-useable, and use from BoardActivity after receiving
SMS messages.
 2012-04-19 00:03:22 -07:00
Eric House
033a69be8d to make it easier to tell games apart, print the number[s] of the 
remote device[s] as part of summary view and in game config screen
(read-only).  Use same field in summaries table for remote phone
numbers and bt addresses.
 2012-04-18 23:23:36 -07:00
Eric House
d6ad17ad58 don't crash if relayID null 2012-04-18 23:07:14 -07:00
Eric House
8713b9e148 don't crash when relayID is null 2012-04-18 23:05:28 -07:00
Eric House
b4416f3abe add missing private keyword 2012-04-18 23:04:55 -07:00
Eric House
d67614cd69 send ack after creating game on receipt of SMS invitation. Thought 
about starting up the game so it could connect, but that'd make it
impossible to change any settings, e.g. player name, on the accepting
end.
 2012-04-17 21:46:57 -07:00
Eric House
019a053df0 give move-made notifications ids based on the games they belong to so 
that there can be more than one, then use those ids to dismiss them if
the game's opened other than through the notifications.
 2012-04-17 20:08:37 -07:00
Eric House
3d60ee701e honor setting for toast showing messages sent and received 2012-04-17 19:23:15 -07:00
Eric House
1134f71b7b use new comms_ackAny() call to send ACKs at points where currently 
resendAll is being called.  Dramatically reduces SMS message count
when app is being relaunched and backgrounded between turns.
 2012-04-14 18:00:43 -07:00
Eric House
416a1054a7 Merge branch 'android_ack' into android_bt 
Conflicts:
	xwords4/common/comms.c
	xwords4/common/comtypes.h
 2012-04-13 20:57:35 -07:00
Eric House
f22d9530b1 track what's been ack'd, and add method to ack what hasn't been. 2012-04-13 20:21:59 -07:00
Eric House
0e4abccc41 clean up, and try to keep contacts checked while the count available 
is not in excess of the number needed.  Makes it easier to use early
on.
 2012-04-12 23:24:13 -07:00
Eric House
6ea692d430 use showConfirmThen() for non-mobile numbers 2012-04-12 23:04:08 -07:00
Eric House
8a4452ea53 add another variant of showConfirmThen() 2012-04-12 22:56:40 -07:00
Eric House
e2be770ca9 if the number of phone numbers sought matches the number available 
check them all; confirm delete (since the button's enabled now from
the beginning.)
 2012-04-12 22:38:42 -07:00
Eric House
404265565b tighten definition of connected BT or SMS game 2012-04-12 22:14:13 -07:00
Eric House
5949994557 cleanup -- remove logging and simplify code a bit. 2012-04-12 21:24:52 -07:00
Eric House
5b5b969e71 Merge branch 'android_branch' into android_bt 2012-04-12 20:59:47 -07:00
Eric House
4ffdeefe3b add dumpCursor 2012-04-12 20:59:29 -07:00
Eric House
e1c977323a on first boot, run through SMS database in case there are any messages 
there that came in before we were installed.  Pass any found in as if
newly received (but don't delete.)
 2012-04-12 20:57:52 -07:00
Eric House
459ddf6e96 Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
 2012-04-12 18:05:58 -07:00
Eric House
5efe959584 move test for whether this is first boot on new version into Utils, 
and add test for whether it's new boot ever (to be used with sms on
another branch.)
 2012-04-12 18:04:21 -07:00
Eric House
31659bc514 improvements to smsinviter dialog: add explanatory empty text, dialog 
that warns when non-mobile number being added, always check
newly-added number, etc.
 2012-04-11 18:54:38 -07:00
Eric House
0c241cf207 fix crash in sms message sink when address null -- same as bt message sink. 2012-04-10 21:47:15 -07:00
Eric House
522fd29b44 fix to show/return individual phone numbers. Still todo: warn rather 
than drop numbers not flagged as mobile.
 2012-04-10 19:25:22 -07:00
Eric House
e703685021 add new pref controlling whether networked games have hints enabled by 
default.
 2012-04-10 07:53:39 -07:00
Eric House
90bca47e1b query and send name with SMS invite -- same as for BT. 2012-04-10 07:26:56 -07:00
Eric House
027ab0538e ignore new file 2012-04-10 06:50:31 -07:00
Eric House
f841b8ccce use different SMS-headers for different variants so they can coexist 
and not poach each others' conversations.
 2012-04-10 06:49:43 -07:00
Eric House
871cf7b580 lock SMS-invite in portrait mode here too 2012-04-10 06:48:51 -07:00
Eric House
e6c8c898fc hide '+' button when no number text entered 2012-04-10 06:36:34 -07:00
Eric House
b98be90869 tweak sms-inviter button text for greater clarity 2012-04-10 06:36:17 -07:00
Eric House
66a120bd08 lock SMSInviteActivity in portrait mode -- until I think it's 
worthwile to make it scrolling.
 2012-04-10 06:30:17 -07:00
Eric House
d72cd547b7 fix bug where new game gets data from just deleted: clear cache! 2012-04-08 21:35:50 -07:00
Eric House
d6a3aafaec factor upward code from BTEvent so that SMSService can use same 
mechanism to send asynchronous results, then use to notify when a game
on other end has been deleted.  This flushed out a bug where a rowid
will get reused and a new game wind up with data from the previous
one -- but otherwise works.
 2012-04-06 23:00:47 -07:00
Eric House
d9ba0c4229 display phones sorted by contact name. 2012-04-05 18:35:29 -07:00
Eric House
523af50d1b use a single custom class rather than three parallel arrays. 2012-04-05 18:22:08 -07:00
Eric House
2a121b1635 get rid of debug formatting 2012-04-05 07:50:40 -07:00
Eric House
bffc403c0c fix problems tracking what's checked by keeping separate array of 
booleans -- since list items come and go as you scroll.  Means moving
some behavior out of InviteActivity superclass, and that untested BT
subclass may have new bugs.
 2012-04-05 07:47:59 -07:00
Eric House
784a5d5d44 handle orientation changes for BT and SMS dialogs 2012-04-05 07:37:48 -07:00
Eric House
8aa570c490 name game locally too. But still need the option, present with BT 
games, to change the name from the default before it's sent.
 2012-04-03 07:16:48 -07:00
Eric House
d37b4423a7 log when fail to delete a game. 2012-04-03 07:04:19 -07:00
Eric House
2406287a34 don't crash when msg doesn't match expected pattern. 2012-04-02 19:12:25 -07:00
Eric House
51cfbb196e to deal with case where somebody invites a friend who doesn't have 
Crosswords installed, add a URL to texts that will show up if it makes
it to an inbox and takes user to an explanation and download URL.
 2012-03-31 10:05:31 -07:00
Eric House
fff4116d24 add a .css file that makes text readably large 2012-03-31 10:03:14 -07:00
Eric House
06ff720d66 fix so SMS works and remove some BT stuff 2012-03-31 09:39:24 -07:00
Eric House
7ba69319d9 add sms variant separate from bt 2012-03-31 08:59:44 -07:00
Eric House
18a781d516 add debug-prefs checkbox to turn on Toasts when SMS sent or received; 
send on emulator too -- which works to test between two instances.
 2012-03-31 08:25:43 -07:00
Eric House
1e22a33d55 go back to android-7 SDK version to support 2.1, and to make that work 
remove use of java base64 encoding in favor of the C version I'd
already written (and that was probably compiled into the library
anyway unless the strip step catched unused code.)
 2012-03-26 20:03:29 -07:00
Eric House
0fd9e6c30f Merge branch 'android_branch' into android_bt 2012-03-26 07:14:46 -07:00
Eric House
14a1e22c5e remove dead strings (should cherry-pick) 2012-03-26 07:13:46 -07:00
Eric House
55980386fa test for mobile numbers works only on my ICS device, so comment out for now. 2012-03-26 05:34:16 -07:00
Eric House
3b10f1593c change "nbs" to "sms" everywhere. No other code change. 2012-03-24 12:52:35 -07:00
Eric House
7b9e835722 fix SMS games not having role/connection status messages. Use same 
for BT and SMS, and show different messages for host and guest.
 2012-03-24 12:30:01 -07:00
Eric House
30e2057496 put up the right new-game notification title 2012-03-24 12:13:10 -07:00
Eric House
ac06d730f8 fix so chat works on SMS (and BT, though untested) 2012-03-24 12:04:07 -07:00
Eric House
de4b72e5ff null is ok for intents to be sent by SendTextMessage 2012-03-24 11:51:12 -07:00
Eric House
d7c77d538d don't add files whose names end with ~ to .gitignored 2012-03-24 11:50:39 -07:00
Eric House
b4242fe123 use SDK-8 for now, and modify build scripts to set up properties based 
on SDK listed in AndroidManifest.xml.
 2012-03-24 11:29:19 -07:00
Eric House
0229c4ca2a go back to requiring SDK 8 APIs for Base64. Will probably need to 
expose the implementation in common via jni since there are still a
lot of SDK-7 devices out there.
 2012-03-24 11:09:13 -07:00
Eric House
606cfef6d6 prefix my messages with a header and when messages with that header 
appear stop other SMS apps from getting them.  Works!
 2012-03-24 11:01:05 -07:00
Eric House
bffa3f7a35 send via text messages rather than NBS/data messages. At this point 
all wind up in inbox, but that can be changed.
 2012-03-24 10:37:50 -07:00
Eric House
fca1e8af64 Revert "get rid of Base64 encoding stuff -- since Android apparently does it" 
This reverts commit 45715ae1e0.

Move back to using Base64 encoding to try working with straight text messages rather than NBS.
 2012-03-24 10:05:16 -07:00
Eric House
fd30b25546 put up dialog when user picks contact that has no mobile number 2012-03-22 18:50:32 -07:00
Eric House
622bf21308 plug leak: remove message store when complete. 2012-03-22 18:49:58 -07:00
Eric House
d8e4cf0c55 cleanup excessive logging 2012-03-21 07:59:24 -07:00
Eric House
495eab9d9b fix NPE 2012-03-21 07:59:11 -07:00
Eric House
859e32e785 add field for manual number entry (and remember the number like all others) 2012-03-21 07:39:21 -07:00
Eric House
3e26bbb450 improve look of dialog, mostly by putting phone number and name on 
separate lines.
 2012-03-21 07:04:12 -07:00
Eric House
ba44f1355c save sms-invite contacts across uses of the dialog 2012-03-21 06:54:25 -07:00
Eric House
84496b3012 get phone numbers from contacts DB: factor some of BTInviteActivity 
into superclass that NBSInviteActivity can share and use to make their
UIs similar: fetch mobile numbers from DB one-at-a-time, keep a list
there, and let you check then delete or return.  Rough, and doesn't
save state the way BT does, but works.
 2012-03-21 06:17:09 -07:00
Eric House
45715ae1e0 get rid of Base64 encoding stuff -- since Android apparently does it 
internally for 'data' messages.
 2012-03-19 19:36:32 -07:00
Eric House
599d01bfc7 Replace most of NBSReceiver with new NBSService. Route outgoing (from 
comms) and incoming (from NBSReceiver) messages through it.  Since
some messages are too big, add header/protocol for breaking them up
and reassemble.  With this commit complete robot-vs-robot games are
possible between two very new Samsung phones on T-mobile.  Older
phones and other networks not tested.
 2012-03-19 07:56:55 -07:00
Eric House
8e3d8c20c1 remove temporary test sms menuitem 2012-03-19 07:39:28 -07:00
Eric House
235807df4f remove logging 2012-03-19 07:37:16 -07:00
Eric House
d63a9860cd turn on XWFEATURE_SMS 2012-03-19 07:36:40 -07:00
Eric House
fe614e9efc delegate phone number comparison to platform code which in Android 
case has a method for it.  strcmp is not enough.
 2012-03-19 07:36:18 -07:00
Eric House
9caeff4a5e recover a bit better from messages not meant for me, as is happening 
when a devices sends to self via SMS and client winds up getting a
registration message it just sent.  Not perfect yet (and may require a
change in the comms protocol -- that's not versioned :-(.
 2012-03-19 07:35:20 -07:00
Eric House
f9cd6190db don't call DeleteLocalRef on an object to be returned from the JNI. 
Crashes ICS bigtime.  This needs to be ported back to android_branch.
 2012-03-14 20:28:53 -07:00
Eric House
631666cede don't call DeleteLocalRef on an object to be returned from the JNI. 
Crashes ICS bigtime.  This needs to be ported back to android_branch.
 2012-03-14 20:26:23 -07:00
Eric House
e58747f2ec add code to build, encode, send, receive, decode and disassemble an 
new-game invitation.  Not yet tested on device.
 2012-03-14 18:13:43 -07:00
Eric House
7a6593582d use sdk-api-8 for now to get Base64 stuff. Can and should revert later. 2012-03-14 18:10:08 -07:00
Eric House
8ca6535a81 don't require Context inside CommsAddrRec 2012-03-14 07:49:37 -07:00
Eric House
60d91f1a21 add UI (some of it rough) to invite to play a new game via NBS and to 
invite if a game is opened that has not been connected to yet.
 2012-03-14 06:06:25 -07:00
Eric House
905be85e92 add temp menu that gets a phone number and sends an NBS message to it, 
and modify NBSReceiver to print sender phone number and message
contents.  Works for send-to-self!
 2012-03-13 07:51:45 -07:00
Eric House
49aefabfc5 remove inaccurate comment 2012-03-13 07:49:07 -07:00
Eric House
8cefbabd8a add different app name for BT/SMS -- as I thought I'd done before 2012-03-13 07:24:00 -07:00
Eric House
d96395c808 Merge branch 'android_branch' into android_bt 2012-03-12 21:21:03 -07:00
Eric House
326671081a Remove support for versions prior to 2.1, as nobody's using them. 
Remove code to avoid classload crash when multitouch support not
present since now it always will be.
 2012-03-12 20:34:34 -07:00
Eric House
5a3f6d6194 remove dead code 2012-03-12 20:32:21 -07:00
Eric House
3865a5f8c6 complete changelog 2012-03-12 19:52:35 -07:00
Eric House
cd8889f90e Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
	xwords4/linux/Makefile
 2012-03-12 07:04:06 -07:00
Eric House
3b5dcdc2e0 add const param decls; remove redundant method call 2012-03-12 06:59:08 -07:00
Eric House
f51c0b39e6 use const where possible for game_writeToStream and others it calls. 
No other code changes.
 2012-03-11 18:28:14 -07:00
Eric House
2a728ce4b0 turn off debug flag that's started crashing the gtk app (presumably 
due to an upgrade to a stricter version of glib)
 2012-03-11 15:06:57 -07:00
Eric House
07fba2c71b Fix problem with writing server to stream changing its internal state 
so that snapshotting made score strings disappear.  Also rename
stream_copyFromStream to stream_getFromStream to make it clearer that
the src is modified.  And swap params in stream_setPos().
 2012-03-11 14:57:28 -07:00
Eric House
a8cf03f68e optimization: allocate tmp buffer on stack rather than with malloc. 2012-03-11 14:51:51 -07:00
Eric House
5c11f1b284 add XP_LOGSTREAM 2012-03-11 14:46:03 -07:00
Eric House
739b0b6125 fix off-by-one assertion 2012-03-09 23:51:39 -08:00
Eric House
e145a04111 add missing variable assigment 2012-03-09 22:11:51 -08:00
Eric House
d732094c59 rename LookupView to LookupActivity 2012-03-08 07:58:19 -08:00
Eric House
0d69c6097a Go back to lookup dialog as dialog-themed activity. I just can't get 
contrast right on all platforms any other way.  Previous change to
using dialogs was motivated by speed, but I don't see any slowdown so
far.  Will address if I find it.
 2012-03-08 07:54:36 -08:00
Eric House
25f4e8b707 Merge remote-tracking branch 'origin/android_bt' into android_bt 2012-03-06 21:27:53 -08:00
Eric House
3aa6932f03 Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-03-06 21:27:38 -08:00
Eric House
a2493ffa97 Merge branch 'android_branch' into android_bt 2012-03-06 07:47:05 -08:00
Eric House
6a635d1631 Go back to using a built-in list item resource. Mine was 
white-on-white on several OS versions.  Need to test further to try to
reproduce the conditions that had me trying to manage contrast myself.
Or use a dialog-themed Activity for lookup dialog -- prev checkins say
that was too slow but that might be fixable....
 2012-03-06 07:41:33 -08:00
Eric House
9d153b500c don't insist that dgb .apk exist if it't not what's being installed 2012-03-06 07:36:07 -08:00
Eric House
2a8a5eb2e9 up version strings and changes list 2012-03-06 06:23:48 -08:00
Eric House
24ac205917 cleanup -- no behavior change 2012-03-06 06:23:04 -08:00
Eric House
fb45ea639f make buttons same size 2012-03-05 20:38:43 -08:00
Eric House
ae81f07997 add test for BTSUPPORTED to function so compiler can strip it 2012-03-05 20:30:02 -08:00
Eric House
57a1759b69 remove empty btconfig area from game config dialog 2012-03-05 20:24:48 -08:00
Eric House
82e1c826a6 add pre-clean target other build.xml files have 2012-03-05 20:14:54 -08:00
Eric House
fdfbd792f7 Merge branch 'android_branch' into android_bt 2012-03-05 20:08:43 -08:00
Eric House
edf13be4c8 I'm getting a crash on 2.1 in the simulator when calling 
DeleteGlobalRef then NewGlobalRef on the same ref.  So use a temp to
reverse the order.  May fix reported crash as well.
 2012-03-05 20:04:32 -08:00
Eric House
79be6654dc -p to allow multiple runs 2012-03-05 19:16:03 -08:00
Eric House
319c9da258 add -pre-clean that invokes the jni's 'make clean' 2012-03-05 19:07:49 -08:00
Eric House
a0b38ed83f Merge branch 'android_branch' into android_bt 2012-03-04 08:19:24 -08:00
Eric House
ef0c301e1a fix NPEs that would occur if play and back buttons pressed at about 
the same time by ignoring the second if we've already closed the game
being edited.
 2012-03-04 08:18:54 -08:00
Eric House
542f10a3e5 improvements to work with variants -- though jni still doesn't compile. 2012-03-02 05:49:25 -08:00
Eric House
d2952794af add variant support 2012-03-01 22:10:41 -08:00
Eric House
49b04257d3 tweak date format 2012-03-01 18:16:04 -08:00
Eric House
1fc814b104 0, not -1, is an invalid gameid 2012-03-01 18:14:51 -08:00
Eric House
1a9b3a7c63 make helper class to provide game-name dialog, use it for renaming and 
to query for name of BT game being created.
 2012-03-01 07:57:04 -08:00
Eric House
788f241238 new files to .gitignores; go back to discarding build command output 2012-03-01 06:32:49 -08:00
Eric House
3723cf08fa remove checked-in variant now that smaller one exists 2012-03-01 06:16:51 -08:00
Eric House
fc607fbd73 fix new standalone games being confused with networked ones by making 
default new addr type be NONE and checking CurGameInfo for whether
device is networked.  The default change may introduce problems: needs
testing.
 2012-02-29 18:22:20 -08:00
Eric House
10d2d222e5 Merge branch 'android_branch' into android_bt 2012-02-29 17:59:54 -08:00
Eric House
9194bbe4b1 replace large with small on the -dbg version 2012-02-29 17:49:34 -08:00
Eric House
dcbbb26e1c move app name out into separate file so the big one doesn't have to be 
checked in in multiple places.
 2012-02-29 17:48:31 -08:00
Eric House
e8ab6ede42 remove BT-related stuff from non-BT variant 2012-02-29 07:59:48 -08:00
Eric House
36908226c1 remove ping command/menu item 2012-02-29 07:36:38 -08:00
Eric House
241e9c1fde check in files that are now different for BT variant (i.e. required 
for BT to be enabled)
 2012-02-29 06:49:30 -08:00
Eric House
cb1e1692b2 turn off BT in main part of tree and fix a couple of places not 
dealing with that correctly.
 2012-02-29 06:47:19 -08:00
Eric House
c1c20db6dd add static final boolean by which to turn BT support off and change so 
UI and background service disappear/don't run when it's off.  Goal's
to ship two apps that differ in this setting, a change in Android.mk,
and little else.
 2012-02-27 20:35:31 -08:00
Eric House
b7f82475b8 fix to compile when XWFEATURE_BLUETOOTH not set 2012-02-27 20:31:01 -08:00
Eric House
eec1cb00a1 wrap UUID in #ifdef XWFEATURE_BLUETOOTH 2012-02-27 20:30:48 -08:00
Eric House
21e69adda7 add various files required for new variant. Plan is this will be a 
separate version of the app with Bluetooth support included.
 2012-02-27 20:02:15 -08:00
Eric House
2282a976f3 add missing PKG_PATH invocation 2012-02-27 20:01:12 -08:00
Eric House
7644eb69cf Merge branch 'android_branch' into android_bt 2012-02-27 19:41:04 -08:00
Eric House
933b812d3a paths within src directory need to change to match class names. Not 
sure how I thought this was working before.
 2012-02-27 19:40:48 -08:00
Eric House
0732da0724 checking this file in -- the first to be different in a variant 2012-02-27 19:39:36 -08:00
Eric House
0578c3de24 remove duplicate string since it's ignored anyway. 2012-02-27 19:39:03 -08:00
Eric House
213f1454fb remove duplicate string since it's ignored anyway. 2012-02-27 19:38:27 -08:00
Eric House
22f866cc87 right dir name 2012-02-27 19:34:02 -08:00
Eric House
ac2fd069f1 wrong dir name 2012-02-27 19:33:44 -08:00
Eric House
1ea892e88e add variant option 2012-02-27 19:32:57 -08:00
Eric House
6496736625 take .apk file as optional param 2012-02-27 19:15:53 -08:00
Eric House
1892ccf640 Merge branch 'android_branch' into android_bt 2012-02-27 18:28:17 -08:00
Eric House
840385b3ad print dates in shorter format so columns don't wrap as frequently 2012-02-27 18:28:04 -08:00
Eric House
f1956ddcb4 prevent continuing attempts to send messages from client after it's 
deleted the game those messages are part of.  I'm keeping a list of
dead games and checking against that, and currently that list will
grow for as long as the sender thread lives.  Shouldn't be a problem
but needs fixing.  Better would be to remove all messages from queues,
but that has synchronization issues.
 2012-02-27 07:57:54 -08:00
Eric House
456dcca7b8 don't crash when device list empty 2012-02-27 07:50:11 -08:00
Eric House
34f3c38b48 Add "clear selected" button to btinviter UI that's enabled when one or 
more is checked.  On launch, get the set of known device, and on scan
do NOT start by emptying.  This allows to maintain a set of devices
and still scan without losing those not present.
 2012-02-25 10:43:08 -08:00
Eric House
99e0fea3c3 use resource rather than hard-coding name of game. 2012-02-22 14:09:03 -08:00
Eric House
1b542a1d22 using the version of BluetoothServerSocket.accept that doesn't take a 
timeout makes it slightly more likely that HTC Sensation will notice
an incoming connection, but it's still unusable most of the time.
 2012-02-22 14:08:38 -08:00
Eric House
cf77872dd4 test for null object before calling method 2012-02-22 14:06:47 -08:00
Eric House
7cef230e2c BTEventListener is implemented by superclass, so override rather then 
implement the interface.
 2012-02-22 14:06:15 -08:00
Eric House
7a21d4c151 show the giving up message as a dialog rather than a toast 2012-02-22 14:04:36 -08:00
Eric House
eecc609eae take .apk file as optional param 2012-02-22 13:01:00 -08:00
Eric House
8c7487dc91 use GameUtils.getName() to avoid NPE -- it doesn't return null 2012-02-22 13:00:16 -08:00
Eric House
642ba9bc61 fix off-by-one assertion 2012-02-22 12:58:33 -08:00
Eric House
9c217e924c use dialog theme for btinviter activity 2012-02-22 12:58:15 -08:00
Eric House
12de8bf38b change button text from Ok to Invite 2012-02-22 10:37:10 -08:00
Eric House
6f2b5a9c8d don't ask to invite when opening unconnected BT game immediately after 
sending an invitation.
 2012-02-22 10:36:37 -08:00
Eric House
b2f67cfcce don't try to send without an address. Fixes an occasional assertion 
failure.
 2012-02-22 10:35:22 -08:00
Eric House
01c86522ef bt icons now have green and red arrows to show connectedness. Still 
needs an artist's touch.
 2012-02-22 10:34:16 -08:00
Eric House
10f41e5c5b Merge branch 'android_branch' into android_bt 2012-02-22 09:52:31 -08:00
Eric House
72e114838f commented-out function to send a .xwd as an email attachment. I can't 
get it to work but it's worth keeping for a try later.
 2012-02-22 09:51:35 -08:00
Eric House
ca7a0a5913 fix to work on devices too 2012-02-22 09:49:57 -08:00
Eric House
03fcbb3ddc comment out unused button; cache list of known local devices and use 
that as starting point so initial scan can be skipped.  When unable to
deliver a message to remote device, give up after three tries and send
message to that effect.
 2012-02-22 08:02:11 -08:00
Eric House
4600ea12bf add methods to get/set cache of known BT devices (key strings required 
for prev commit)
 2012-02-22 07:51:50 -08:00
Eric House
a6f35af187 add methods to get/set cache of known BT devices 2012-02-22 07:50:33 -08:00
Eric House
a6a13bcffd add new BTEvent to tell UI that a message will be resent, and in UI 
put up a toast naming the unavailable device.  Might want a backoff on
this....
 2012-02-15 18:55:58 -08:00
Eric House
7d573970e0 move handler and post() into Activity superclasses 2012-02-15 18:38:49 -08:00
Eric House
1f4f6a06a8 Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/jni/xwjni.c
 2012-02-15 18:18:26 -08:00
Eric House
e7a5882ed9 add a state transition lack of which fired an assert -- and that's 
rare but consistent with others.
 2012-02-15 18:17:26 -08:00
Eric House
14a3a5a7aa Save which languages are displayed opened as an invisible preference 
rather than in a static so it is more persistent.
 2012-02-15 18:16:46 -08:00
Eric House
3a657eb40d Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-02-15 18:09:45 -08:00
Eric House
8590aae9b2 fix emacs compile-commands 2012-02-15 18:07:19 -08:00
Eric House
663734d0da When a message isn't sent, keep it in a per-target-device queue and 
try again in five seconds This seems to fix nearly all stalls.
Eventually will try notifying users and backing off on the resends.
 2012-02-15 06:14:40 -08:00
Eric House
3acc38076b move methods inside the threads that are their only callers. No 
behavior change.
 2012-02-15 04:53:34 -08:00
Eric House
9a2b488183 Merge branch 'android_branch' into android_bt 2012-02-14 16:56:20 -08:00
Eric House
914fa857be return COMMS_CONN_NONE as address type of null comms rather than asserting. 2012-02-14 16:54:19 -08:00
Eric House
dde97562e4 Merge branch 'android_branch' into android_bt 2012-02-13 23:36:44 -08:00
Eric House
45f2134ab5 fix variant generation -- seems to work now. JNI was broken. 2012-02-13 23:35:41 -08:00
Eric House
88ad6d81ef Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/jni/xportwrapper.c
	xwords4/android/XWords4/jni/xwjni.c
 2012-02-13 22:38:17 -08:00
Eric House
e3ffbd57ba add .gitignore files generated by script 2012-02-13 22:27:08 -08:00
Eric House
cf9ab45e6f finish first pass at build variant generation. This works well enough 
that the app so generated runs in emulator, talks to relay, and does
not crash.  Makefile has rules for .java, .xml and .h that run through
sed to xw4 in import statements, package names etc so the variant app
is in a different namespace.  Also honors any files in the variant
tree that are actually checked into git should it be necessary to make
changes beyond what sed can manage.
 2012-02-13 22:25:27 -08:00
Eric House
8590466229 stop changing directiories/assuing where it'll be run from 2012-02-13 22:15:34 -08:00
Eric House
05c220cf40 launch NDK build from inside build.xml. 2012-02-13 22:15:12 -08:00
Eric House
82b232cf74 use a macro instead of lots of repetitions of the package path to make 
it easier to modify.
 2012-02-13 22:13:23 -08:00
Eric House
a2d54794c9 Merge remote-tracking branch 'origin/android_branch' into android_bt 2012-02-12 22:30:11 -08:00
Eric House
1ed1bce7d1 call informMissing after loading game -- before that it'll never be 0. 2012-02-12 22:27:58 -08:00
Eric House
0f8ddadd69 make work from more than one directory 2012-02-12 21:23:50 -08:00
Eric House
f2b86b2a71 work-in-progress on scripts to generate a second app from the same source tree. 2012-02-12 21:22:36 -08:00
Eric House
f40f2bffcf add game name as something passed with invitation. Later will get it 
from user.  Idea is to make it easy to identify the games in GamesList
on two devices side-by-side.
 2012-02-10 18:48:46 -08:00
Eric House
43dca99a2c add preliminary text including number missing. 2012-02-10 18:44:27 -08:00
Eric House
114db0c96a cleanup: consistent param name 2012-02-10 18:08:59 -08:00
Eric House
32e2053d95 cache relay address but not BT address, which will vary on host if 
more than one guest.  This fixes three-way play over BT!!
 2012-02-10 07:00:09 -08:00
Eric House
1bb18cbde5 don't put up missing players dialog unless there's at least one. 2012-02-10 06:53:15 -08:00
Eric House
d469467fcc cleanup 2012-02-09 19:02:46 -08:00
Eric House
a0134a8500 more detail in still-rough string. 2012-02-09 18:50:32 -08:00
Eric House
73d1d1dcbd fix problem with crash after receiving names of devices chosen to 
provide missing players by postponing it until the game's fully
opened.  Now games are created on the chosen devices that are able to
connect.
 2012-02-09 18:50:01 -08:00
Eric House
75cb8cae9c factor code and log bt name of local device on startup -- no 
significant change.
 2012-02-09 18:48:26 -08:00
Eric House
74aeeca8e0 move BT device listing into its own Activity. Call it from 
NewGameActivity and from BoardActivity when the new notifyMissing
method gets called.  Works as before called from NewGameActivity but
BoardActivity crashes on iterating over list of devices returned.
 2012-02-09 05:21:23 -08:00
Eric House
0755a9e781 add new util function that gets called when a game is opened to inform 
it if any players are missing.  Idea's to allow for non-relay devices
the invitation opportunity that comes when a game connects to the
relay and learns that no other games have joined its room.
 2012-02-09 05:19:03 -08:00
Eric House
79a897b428 fix assert (but still leaking) 2012-02-09 05:16:32 -08:00
Eric House
764180fc48 remove unused member 2012-02-09 05:15:09 -08:00
Eric House
8fb962eaab strings for new layout 2012-02-09 04:46:58 -08:00
Eric House
ea0893bad6 layout for replacement for BT-device chooser dialog -- so can be 
called from other places.
 2012-02-09 04:46:01 -08:00
Eric House
be8d3e8b5a when receiving a message for a game that no longer exists, reply to 
that effect, and on receipt of that reply offer to delete the local
copy.
 2012-02-08 06:41:39 -08:00
Eric House
bf5b6ada77 include public-room column 2012-02-07 18:59:17 -08:00
Eric House
15f8cd5b33 post notifications when moves arrive and game isn't open. And handle 
BAD_PROTO event (untested).
 2012-02-07 18:41:56 -08:00
Eric House
ba40028a91 raise an error when unexpected protocol received. Later I can add a 
user-visible message.
 2012-02-07 18:11:56 -08:00
Eric House
898d9c339a add protocol-identifier byte. For now just assert it matches. 2012-02-07 18:05:06 -08:00
Eric House
ac2ac47aed code cleanup: make treads own their queue datastructures, use methods 
to stop them, etc.  Heading toward making it easier to detect when the
BT stack is hosed and user needs to be warned or told to get a better
phone.
 2012-02-07 17:42:01 -08:00
Eric House
3bda56420c turn on XWFEATURE_BLUETOOTH 2012-02-07 17:38:50 -08:00
Eric House
7214b7e12a turn off the palmos-era bt wrapper stuff I was trying to use to know 
when to reset the stack.  It breaks Android when I turn on
XWFEATURE_BLUETOOTH and adds no value I can see.
 2012-02-07 17:38:24 -08:00
Eric House
aca4e1fed8 init db before using it 2012-02-07 07:06:25 -08:00
Eric House
bde5910c2a Merge branch 'android_branch' into android_bt 2012-02-07 06:21:13 -08:00
Eric House
49a3f1cad6 git-copied (using checkout) from android_bt 2012-02-07 06:20:51 -08:00
Eric House
e0ee197888 make relay check happen on demand, not many minutes later. 2012-02-06 21:35:11 -08:00
Eric House
c8d4090510 another change for b42 2012-02-06 19:26:56 -08:00
Eric House
47c3bd3090 track a BT game's set (singleton for two-device game) of remote 
devices in summary DB so, e.g., we can quickly determine what games
care when a devices becomes available via BT.  First use of this is
notifying when a remote game's deleted -- least that's the plan.  This
commit just adds to the DB and scans the DB to build a map of
device->gameIDs array.
 2012-02-06 19:02:19 -08:00
Eric House
52ffefb173 add new column to store mac addresses of remote devices in this game via BT. 2012-02-06 18:57:30 -08:00
Eric House
796baffa6d Merge branch 'android_branch' into android_bt 2012-02-06 18:13:57 -08:00
Eric House
d3bb7d490a simplify cursor code 2012-02-06 18:12:28 -08:00
Eric House
bfe04a08b5 removed unneeded null-byte addition 2012-02-06 18:11:30 -08:00
Eric House
39e30184b1 move responsibility for letting other device know a participant game 
has loaded into CommsTransport.
 2012-02-06 06:53:28 -08:00
Eric House
d8ee493f1b On "configure first" BT newgame button, create the game then launch 
the GameConfig activity.  If the user exits other than with "play
game", delete it so user never sees it.  Otherwise launch it.  Next
step is to detect a BT host that's missing clients and offer to invite
them.
 2012-02-06 06:29:37 -08:00
Eric House
606e733b19 add _ to typedef to reduce number of etags hits on name. No code change. 2012-02-06 06:27:53 -08:00
Eric House
4deb1d3a77 add threadKiller to close sockets when remote isn't responding -- 
which can sometimes be for minutes with the Moment at least.  Make
name->hwaddr Map static since it might as well outlive a Service
instance (though right now I'm clearing it all the time.)
 2012-02-05 21:47:26 -08:00
Eric House
99e001b8a2 launch game after creating it 2012-02-05 21:45:21 -08:00
Eric House
0cc7ad3e49 start from gameID in onCreate as well as onNewIntent. 2012-02-05 21:44:52 -08:00
Eric House
a2b5274b6c on ICS CreateGlobalRef doesn't return the same value as is passed in. 
So stop assuming it does!  Fixes multiple crashes on ICS and need to
be ported to android_branch.
 2012-02-05 19:12:09 -08:00
Eric House
8947ddca0b on ICS CreateGlobalRef doesn't return the same value as is passed in. 
So stop assuming it does!  Fixes multiple crashes on ICS and need to
be ported to android_branch.
 2012-02-05 19:11:38 -08:00
Eric House
bc8299fe30 run accept() with timeout so it'll show up in logs when the thread 
died.  I hope.
 2012-02-03 17:30:47 -08:00
Eric House
cc9f2b793e enhance receiver to get BT on/off and connect attempts and to start 
bt service in response.
 2012-02-03 17:29:40 -08:00
Eric House
6982545f59 Recipient of BT new-game invitation puts up Notification after 
creating it that will launch it.
 2012-02-03 17:21:17 -08:00
Eric House
3026a7e4f8 fix compile warning 2012-02-03 17:14:04 -08:00
Eric House
121e4a5d1d remove unused import statements: no code change 2012-02-03 17:12:14 -08:00
Eric House
cebb002fd0 add state summaries for BT games too 2012-02-03 17:09:59 -08:00
Eric House
8793d8f4fd include seed and missingPlayers in any non-standalone game summary 2012-02-03 17:03:47 -08:00
Eric House
a392826ebf move notification posting into new method that can be called from 
elsewhere.
 2012-02-03 06:25:17 -08:00
Eric House
e53621a5bc fix compile warnings 2012-02-03 05:43:17 -08:00
Eric House
82586668f9 move bteventhandler implementation up into XWActivity so subclasses 
can easily listen for one or two events.  Have Board listen to events
for un/successful message sends and up up icon to indicate if BT is
working.
 2012-02-01 18:51:41 -08:00
Eric House
00a0ecb1b8 icons stolen from ubuntu as placeholders for BT-working and -not. 2012-02-01 18:49:42 -08:00
Eric House
b3fdcecaf4 send result (failure) for SEND even if there's an exception 2012-02-01 18:42:30 -08:00
Eric House
6b600f4d9b Merge remote branch 'origin/android_branch' into android_branch 2012-02-01 07:13:15 -08:00
Eric House
ab32480cd5 Even host needs an address to mark game as BT 2012-02-01 07:00:25 -08:00
Eric House
5e330595fc pass bt address as well as name, and use when available -- since OS 
doesn't provide ready name->addr translation.
 2012-02-01 06:50:19 -08:00
Eric House
afac1cc5bd add BTReceiver -- will need to know when BT goes up and down. 2012-02-01 06:13:55 -08:00
Eric House
26109f926b implement BT's "configure first" to create a BT game without any other 
device being involved.  Useful for testing of config.  Might be the
basis for getting games going with non-default settings but I'm not
sure how to get them all set up with the same gameID so they'll
connect.
 2012-01-31 18:52:18 -08:00
Eric House
b4b7609894 include hwAddr as well as device name in bt section of address 2012-01-31 18:48:59 -08:00
Eric House
af2fcc76e0 consider it an error if no dicts found for language. With this change 
I can install a game for which there's no dict and when user opens it
he'll get an opportunity to download one.  Might be better to refuse
to install it....
 2012-01-31 18:47:38 -08:00
Eric House
5c8488af1b string and layout needed for edb39ac77d 2012-01-31 18:45:00 -08:00
Eric House
6326e45892 make btAddr a string rather than array of bytes. 2012-01-31 18:43:26 -08:00
Eric House
edb39ac77d remove assumptions that non-standalone==relay. BT games now 
configurable (though no BT-specific settings are exposed).
 2012-01-31 18:28:49 -08:00
Eric House
e91c0daf65 check for null obj before calling through its vtable 2012-01-31 06:44:54 -08:00
Eric House
579e8b7dfd send language and player counts with invitations. Works as long as 
the recipient has a dict in the lang; otherwise crashes on that device.
 2012-01-30 20:41:50 -08:00
Eric House
6978ba06f1 kick off scan immediately if have no devices to present 2012-01-30 19:39:45 -08:00
Eric House
82529c738e add start/stopProgress methods and push to DlgDelegate so can be used 
from other Activities.  Use while sending game info as well as scanning.
 2012-01-30 19:33:56 -08:00
Eric House
cd8ace6c9f queue isn't meant to be static 2012-01-30 19:32:56 -08:00
Eric House
144db5628f Merge branch 'android_branch' into android_bt 2012-01-30 18:47:10 -08:00
Eric House
0b197bf12e include DbgUtils to make debug changes easier. No code change. 2012-01-30 18:46:51 -08:00
Eric House
ad5b42121b revert recently-added typo 2012-01-30 18:39:11 -08:00
Eric House
b4f9553579 install into devices too 2012-01-30 18:38:43 -08:00
Eric House
06d8df4fb5 remove dead file 2012-01-30 06:39:54 -08:00
Eric House
094d08e903 Get play via BT working!!! Replace BTConnection with BTService to make 
keeping the listener/sender threads going much easier.  Create new
message sink to dispatch incoming messages, and start passing return
addresses into comms (not required before when relay was only
transport as it has no return addresses.)
 2012-01-30 06:39:18 -08:00
Eric House
3f03232008 include jni log messages too 2012-01-30 06:34:15 -08:00
Eric House
786cb4dc55 replaces BTConnection (and uses a lot of its code) 2012-01-30 06:26:48 -08:00
Eric House
edaef7f0a4 add new column 2012-01-26 23:02:56 -08:00
Eric House
698dac890f combine bt receivers, and start listening when ACL connected. Less 
reliable but means I don't have to powercycle BT every time I install.
 2012-01-26 07:14:43 -08:00
Eric House
bc351d1675 add ok button to dialog listing paired devices, make them selectable, 
and don't dismiss/invite until the ok button's tapped.
 2012-01-26 06:54:55 -08:00
Eric House
6bfd6e74e6 Merge branch 'android_branch' into android_bt 2012-01-26 06:24:18 -08:00
Eric House
9f2ec43617 move ProgressDialog into NewGameActivity where it belongs. 2012-01-26 06:23:46 -08:00
Eric House
adf49dffd7 init/take down thread local storage in constructor/destructor rather 
than as static initializer (and then leaking on shutdown.)
 2012-01-26 05:48:10 -08:00
Eric House
866aeb2387 change relay connect message format to include client version (meaning 
of which is TBD).  When a new-version client connects, store the value
it's passed. At first this will let me track how quickly people
upgrade.  Later I can use it to let different clients have different
formats to their messages e.g. to proxy.
 2012-01-26 05:43:54 -08:00
Eric House
af26ebfff9 fix usage hint 2012-01-26 05:40:22 -08:00
Eric House
da9f206f86 fix scan. 2012-01-25 18:56:40 -08:00
Eric House
5ca35254cc pass messages to BT and send them -- they're received on the other 
side but not yet acted on.  Combine several send threads into one so
that all bt socket operations will be in the same thread and can't
coincide.  (Rescan is broken.)
 2012-01-25 18:32:07 -08:00
Eric House
8959dc09a2 add -g option that filters for xw4 2012-01-25 18:28:25 -08:00
Eric House
0934f83106 add gameID to params passed to comms' sendproc, including passing 
through to java layer.
 2012-01-25 18:27:37 -08:00
Eric House
813e31ada8 fix crash by checking for null socket (meaning unable to open 
connection to relay)
 2012-01-25 18:09:26 -08:00
Eric House
74efac3dd9 include bt name of host in client games, but not of client[s] in host 
games.  This allows clients to pass host name for use in addressing
when their initial message is sent.
 2012-01-24 06:53:50 -08:00
Eric House
ac6ecfa845 copy bt_hostName as part of address 2012-01-24 06:51:40 -08:00
Eric House
a543bfa639 send new gameID so it actually arrives. Games are being created on 
both ends with the same gameID.
 2012-01-24 06:28:55 -08:00
Eric House
b954ef0643 revert recently-added typo 2012-01-24 06:21:43 -08:00
Eric House
4e1e5ab303 script to make it easier to run two or more logcat sessions 2012-01-24 06:21:12 -08:00
Eric House
c425686589 lots of changes. Respond to new-bt-game button by posting a list of 
known paired-with-Crosswords devices and sending invite to the one
selected.  Includes rescan button with infinite progress indicator
(that sometimes works).  Recipient saves new game with the gameID
passed.  Then sender does too (but gameID doesn't seem to stick.)
Both games crash when you open them, but they're created.
 2012-01-23 20:52:04 -08:00
Eric House
f048980701 cleanup 2012-01-23 20:49:34 -08:00
Eric House
2c24441ff3 create BT game and display with BT icon using hard-coded defaults for 
now and no addressing.  Fails in assert when trying to send as BT
addressing isn't handled yet.
 2012-01-23 07:54:22 -08:00
Eric House
beef55e3ac formatting 2012-01-23 07:52:46 -08:00
Eric House
f42f9adad1 use listener to ensure that BT-related UI is enabled/disabled when 
power state changes.
 2012-01-23 06:37:54 -08:00
Eric House
eb214d4f69 Turn on BT in response to user tapping "turn on" button. Still to do: 
listen for BT turnoff/on that's independent of the button and
re-layout -- in case user does it himself while the NewGame Activity
is frontmost.
 2012-01-21 10:19:36 -08:00
Eric House
18b620732b fix missing buttons 2012-01-21 10:17:07 -08:00
Eric House
81e29482fe add buttons, text etc. still to be determined, to start BT games. Add 
text and unimplemented button to turn BT on if it's not there.
 2012-01-21 09:46:52 -08:00
Eric House
6d93fcfdd3 install into devices too 2012-01-21 08:50:12 -08:00
Eric House
adb5ce541d add room name to subject of invite 2012-01-20 17:35:50 -08:00
Eric House
548fb86734 Play around with getting notified when another device connects. I 
need an alternative to keeping a listening socket open in a thread
forever, as the OS will eventually shut me down if there's memory
pressure.
 2012-01-19 22:32:34 -08:00
Eric House
847f1199be add gameID to summary. The slot's already in the DB, though unused, 
so no version change required.
 2012-01-19 18:53:55 -08:00
Eric House
923d6a24bd use libuuid to prep BT UUID, now a string instead of an array of bytes 
for ease of use from java.  Since libbluetooth stupidly and
unrepentantly redefines uuid_t, add a new file/function to call
libuuid without having to pull its definitions into the bt code.  This
code compiles but is completely untested: I don't quite remember how
to play games via BT on Linux and at any rate will need an always-on
listener like the one I'm adding to the Android client.
 2012-01-19 18:52:33 -08:00
Eric House
a34921155f make gameID consistently 32 bits in C code. It's been stored as 16, 
so stream version must change.  Plan's to use it to address incoming
BT packets so a game needn't be open to receive.
 2012-01-19 18:47:53 -08:00
Eric House
5f77ef6e13 get uuid from C code so can ensure linux version has same. 2012-01-19 18:28:27 -08:00
Eric House
1f8be87acb put up Toast when ping succeeds with name of device[s] pinged. 2012-01-19 18:08:54 -08:00
Eric House
00d2bb2a56 add temporary ping menuitem, and implement by sending message to first 
device that's running our service.  Logs show messages being received.
 2012-01-19 06:42:08 -08:00
Eric House
0337b97b57 begin bluetooth work. Add new class that logs when BT comes on and 
goes off.  Sketch out always-on listening socket, but it's not called
yet.
 2012-01-18 18:30:53 -08:00
Eric House
8a66cd4c1f Address reports of crashes tapping wordlist button when device is 
having trouble making initial relay connection for a game (which I
can't reproduce) by disabling that button when there isn't a current
player.
 2012-01-17 18:58:45 -08:00
Eric House
00575c6d4e Don't assert when don't have expected connType (likely as result of 
race condition.  Just don't show the type in summary.  Likely fixes
once-seen assertion failure.
 2012-01-17 18:48:33 -08:00
Eric House
7a90f71d41 up version strings 2012-01-17 18:23:26 -08:00
Eric House
07e93971d3 makefile for latest CSW 2012-01-17 18:19:57 -08:00
Eric House
4a52ad4d0c cleanup: remove logging 2012-01-17 06:54:07 -08:00
Eric House
2a51f8d621 cleanup 2012-01-17 06:53:47 -08:00
Eric House
960dfc7825 draw alternating game lines in alternating colors 2012-01-16 12:13:35 -08:00
Eric House
edd1dd95dd Merge remote branch 'origin/android_branch' into android_branch 2012-01-13 07:54:40 -08:00
Eric House
546ec8a3f4 get non-printing column out of cols array to be treated separately. 2012-01-13 07:54:11 -08:00
Eric House
2902b38405 Merge remote-tracking branch 'origin/android_branch' into android_branch 
Conflicts:
	xwords4/relay/scripts/showgames.php
 2012-01-13 07:50:53 -08:00
Eric House
ca49078730 improve to print each game as multiple rows, one per device. 2012-01-12 19:17:38 -08:00
Eric House
8c52836f9d php file to display state of relay's DB. This is the first and rough cut. 2012-01-12 06:30:30 -08:00
Eric House
bd35f8363f cast enum to int inside switch to avoid new compiler error 2012-01-11 18:43:51 -08:00
Eric House
7de8a90df3 silence compiler warning. 2012-01-11 18:29:14 -08:00
Eric House
37b333001b outline of php script to print contents of games DB 2012-01-05 20:25:34 -08:00
Eric House
db78b986c9 I've seen index OOB exceptions from lookup code, so assert at likely 
entry point that null array isn't being passed.  This should probably
not ship.
 2012-01-05 17:19:58 -08:00
Eric House
1fc286ee95 show in collapsed summary if game is over 2012-01-05 17:18:07 -08:00
Eric House
1ae2879fb7 tweak logging 2012-01-04 18:35:21 -08:00
Eric House
5b9b531cb9 log one line before honoring logging-on preference. 2012-01-04 18:34:15 -08:00
Eric House
b8528145b3 explicitly store bool as int 2012-01-04 18:21:52 -08:00
Eric House
4a8a52a921 Merge remote branch 'origin/android_branch' into android_branch 2012-01-04 18:16:32 -08:00
Eric House
caa40fa023 store most recent IP address each device has come in on. Requires new 
column in db.  Not really used yet but interesting to watch....
 2012-01-04 18:14:12 -08:00
Eric House
72dd8f6b6a ignore debian build files 2012-01-04 18:11:29 -08:00
Eric House
32988413dd cleanup: remove unneeded private constructor and make statics private 2012-01-04 06:26:17 -08:00
Eric House
814e4dd088 cut some logging 2012-01-03 18:53:58 -08:00
Eric House
8e62cf10c7 script to uninstall 2012-01-03 18:53:42 -08:00
Eric House
03e6db5107 remove logging 2012-01-03 18:27:25 -08:00
Eric House
0e7fcf7b51 ignore new obj dir 2012-01-03 18:27:15 -08:00
Eric House
de269f1e3d up copyright for the new year 2012-01-03 06:20:23 -08:00
Eric House
a2c4114d0b fix uninitialized variable error 2012-01-02 18:25:01 -08:00
Eric House
1b395b637b use the full name 2012-01-02 18:17:29 -08:00
Eric House
6344db199a go with target==7 for consistency. 2012-01-02 18:15:43 -08:00
Eric House
d0999d1944 update build scripts to use newer NDK. 2012-01-02 18:11:36 -08:00