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

6406 commits

Author SHA1 Message Date
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
Andy2
9879f96729 cleanup -- no code change 2011-12-21 18:50:55 -08:00
Andy2
2a34cd1e05 remove second param from server_do() -- it doesn't work anyway. 2011-12-21 18:45:05 -08:00
Eric House
cb04eb8840 finally got the socket leak: use keepalive ioctl to detect sockets 
whose other ends have gone down without closing properly.
 2011-12-21 18:18:30 -08:00
eehouse@eehouse.org
d5d3ad2cb0 Merge branch 'android_branch' into send_in_background 2011-12-21 06:49:03 -08:00
Andy2
f475356c87 up strings for new release 2011-12-21 06:46:42 -08:00
eehouse@eehouse.org
abd6727b10 Merge branch 'android_branch' into send_in_background 2011-12-20 17:34:26 -08:00
Andy2
0e487a4a42 When creating game in response to new-from menuitem, juggle players if 
the juggle newgame preference is set.
 2011-12-20 17:31:13 -08:00
Andy2
3e42c68091 add randomly-generated inviteID to set of params transmitted with an 
invitation and stored in a summary.  On receipe of an invitation, if
the room/inviteID exists just drop it -- don't even bring app to the
foreground.  This is meant to stop people from getting lots of
games/warnings about dupes if they happen to trigger a refresh of the
negame.php page in their browsers.
 2011-12-20 17:29:05 -08:00
Andy2
9023806b5f cleanup: move instanceof/cast from use of vector elements to addition 
of elements to save memory and time.
 2011-12-20 17:24:38 -08:00
Andy2
f40174ea30 update to add new optional param -- invite ID 2011-12-20 17:14:21 -08:00
Andy2
6cc1a2d672 Add new column and up db version number. 2011-12-20 17:12:23 -08:00
Andy2
9a26ccf1c8 prevent long names from forcing linewrap 2011-12-20 17:10:41 -08:00
Andy2
8eaeb9c2d0 reword SMS invite so URL isn't split across messages (which makes it 
not recognized by recipient as a clickable URL).
 2011-12-18 16:23:14 -08:00
Andy2
431a01ef0a remove logging I didn't mean to check in 2011-12-18 15:55:54 -08:00
Andy2
d03fc77990 list changes for next release 2011-12-18 12:27:13 -08:00
Andy2
c2c2c7e766 NEW_TASK plus CLEAR_TOP is the magic combination -- says one set of 
docs.  Looks good so far.
 2011-12-18 12:23:00 -08:00
Andy2
dd8da6d312 tweak wording 2011-12-18 12:22:06 -08:00
Andy2
a86ffa39ba up strings for next beta 2011-12-16 20:59:40 -08:00
Andy2
0d6b5914b9 revert to standard launchMode to get proper from-Launcher behavior and 
specify a pair of flags when background-launching GamesList that
strips any stack it has and doesn't launch a new instance.  Seems to
fix the problems with launching from notifications and invite emails.
But then I've thought this fixed before.
 2011-12-16 19:02:20 -08:00
eehouse@eehouse.org
14bddb0e45 Merge branch 'android_branch' into send_in_background 2011-12-15 18:46:24 -08:00
Eric House
888b4f6701 fix undeclared variable. 2011-12-15 18:45:22 -08:00
Eric House
166d8f8c03 log number of sockets tracked -- it's climbing on server and I need to 
figure out why.  This and listening for POLLRDHUP are a start (but not
sufficient).
 2011-12-15 18:41:07 -08:00
Eric House
b04604595f change assertion to log -- fails very infrequently which is probably to be expected. 2011-12-15 18:37:20 -08:00
Eric House
af7398ce20 fix undeclared variable. 2011-12-15 18:36:47 -08:00
Andy2
2ff4338797 Move more oft-used button. Thanks JB. 2011-12-15 18:33:10 -08:00
Andy2
494652518a comment out dead code (entire class) 2011-12-15 07:44:16 -08:00
Andy2
f504c3688c reverse sense of test done on receiving invitation whether game 
already exists.  Unless I'm missing something I have it wrong.
 2011-12-14 20:09:57 -08:00
Andy2
420661bf9f put back the URL in parens. Not all email clients show the link otherwise. 2011-12-14 20:08:38 -08:00
Andy2
d6ce11b084 fix to compile with DEBUG off 2011-12-14 18:17:52 -08:00
Andy2
867d9d68b0 script to install onto multiple emulators 2011-12-14 18:17:37 -08:00
Andy2
5cd8694569 ignore dicts in main wince dir 2011-12-14 07:37:59 -08:00
Eric House
de59408cb0 Merge remote branch 'origin/android_branch' into android_branch 2011-12-13 21:34:58 -08:00
Eric House
1d0b554283 add debian/ files as generated by dh_make: no changes yet, so debuild 
builds an empty .deb.
 2011-12-13 18:57:19 -08:00
Andy2
0dfc1312ff set up intents to limit choices in sending invites to SMS and email, 
and recast choices offered users from text vs. html to SMS vs. email.
Revert recent change (88986b49d5) adding
visible URL to email as it doesn't seem to be needed now.  Will want
to keep an eye on that.
 2011-12-13 17:24:21 -08:00
Andy2
e5294f2393 add to commented out code 2011-12-12 19:09:50 -08:00
Andy2
fa39db7fc6 comment out file not being used now 2011-12-12 19:01:04 -08:00
Andy2
f07e1c5ea1 use same email address for both ways you can send to me, and rfc822 
instead of text type to prevent giving handler options that aren't
email clients.
 2011-12-12 19:00:30 -08:00
Andy2
fe98d4983c fix to compile for win32 with new APIs and to some extent to run 
(under WINE only).  Randomness is pretty screwed up -- typical initial
tray is all As.
 2011-12-12 18:53:40 -08:00
Andy2
3b13f047d7 fix to accept new dict format with 4-byte header 2011-12-12 18:51:49 -08:00
Andy2
88986b49d5 include visible URLs in parens since something about mailing seems to be 
breaking them inside <a> tags so there's something for a user to tap.
 2011-12-12 07:08:56 -08:00
eehouse@eehouse.org
9e979a9e7f Merge branch 'android_branch' into send_in_background 2011-12-08 20:59:24 -08:00
Eric House
7c9519f80f remove translations of translations of strings no longer there 2011-12-08 18:13:20 -08:00
Eric House
78672c01a3 there's room to spell out length 2011-12-08 18:12:10 -08:00
eehouse@eehouse.org
b2a3c444f3 Merge branch 'android_branch' into send_in_background 2011-12-07 19:09:36 -08:00
eehouse@eehouse.org
4581046954 Merge remote branch 'origin/android_branch' into android_branch 2011-12-07 19:07:37 -08:00
eehouse@eehouse.org
20fa54ba59 Merge branch 'android_branch' into send_in_background 2011-12-07 19:06:26 -08:00
Andy2
46efe15f4e up version and change notes for new release 2011-12-07 19:06:03 -08:00
Andy2
2992c33396 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
(conflicts were for formatting changes only)
 2011-12-07 18:46:59 -08:00
Andy2
0d4e839dba log an error and drop bad fwd packet rather than assert 2011-12-07 18:43:13 -08:00
Eric House
6cc3770cd1 script to trace history of one game in db by polling db and listing 
changes
 2011-12-07 18:37:28 -08:00
Andy2
2d7ac8e7b0 use SystemClock.elapsedRealtime() rather than 0 as initial fire time 
when setting background update timer.
 2011-12-07 18:33:26 -08:00
Andy2
c12f64cc03 save pendingMsgLevel flag as part of summary. This fixes reset games 
being displayed with the sync icon if they had it before the reset.
I'm not sure if not saving was an omission or if I've forgotten the
reason.  There *is* separate API for clearing the flags stored in that
variable but it requires a second DB write.
 2011-12-07 18:24:22 -08:00
Andy2
7b985fcbae fix formatting -- no code change 2011-12-07 06:16:11 -08:00
Andy2
17edc79aaf Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2011-12-06 19:56:10 -08:00
Andy2
ded7ffc6fe Attempting to fix occasional stalls of background proxy checker. It 
could be caused by the timer not running after an install, so always
launch it when the app is launched.  (There's no notification
available on [re]install.)  So that the check doesn't happen
immediately, which would be silly, make the initial wait same as
interval when not called in response to check-relay menu.
 2011-12-06 19:52:01 -08:00
Andy2
20446bcf32 for style points, don't return from middle of function. No behavior 
change.
 2011-12-06 19:49:41 -08:00
Andy2
5d01de4c0c found a better send email menu icon 2011-12-06 19:24:22 -08:00
Andy2
5d09c7bbed add git describe for version to email body 2011-12-06 19:19:50 -08:00
eehouse@eehouse.org
88b0535866 Merge remote branch 'origin/android_branch' into android_branch 2011-12-06 18:51:50 -08:00
Eric House
7015ae500b exit after showing usage 2011-12-06 18:50:04 -08:00
Andy2
7884246d7a add menu to main screen for sending me email. TODO: find a darker 
menu icon; add git revision to outgoing text.
 2011-12-06 18:49:48 -08:00
Andy2
3b48c3ca60 use title rather than a field in custom view for title of lookup 
dialog.
 2011-12-06 18:25:55 -08:00
Andy2
7c76af30b2 remove excessing logging 2011-12-06 18:21:48 -08:00
Andy2
ebca62b25e don't specify text file for view used in Dialog -- device will set it. 
Prevents invisible text on HTC MyTouch.
 2011-12-06 18:21:33 -08:00
Andy2
0474984b82 export new preference from jni and add a checkbox setting for it 2011-12-06 18:18:50 -08:00
Andy2
b0470d5276 add new preference that when set prevents calculation and drawing of 
crosshairs.
 2011-12-06 18:17:55 -08:00
Andy2
daa64a19a4 need to generate local.properties now that it's not checked in 2011-12-04 19:32:06 -08:00
Andy2
2918e8f059 need to generate local.properties now that it's not checked in 2011-12-02 21:35:12 -08:00
eehouse@eehouse.org
e1e8516e1b Merge branch 'android_branch' into send_in_background 2011-12-02 19:04:12 -08:00
Andy2
52d02f04dd pass tile value into drawCell(). Java code doesn't use it yet, but I 
want to play with drawing cells tray-tile-style when they're big
enough.
 2011-12-02 18:58:52 -08:00
Eric House
dc42e63974 fix read_packet() logging 2011-12-02 18:55:47 -08:00
Eric House
964d2dfb0b allow, by default, more than one-player-per-device, but require that 
roomnames be unique to eliminate risk of devices not matching up
correctly.
 2011-12-02 18:55:20 -08:00
Eric House
b706486b6e get rid of stringstream: it's either buggy or I'm using it 
incorrectly, but regardless postgres doesn't like random chars
terminating queries.
 2011-12-02 18:32:37 -08:00
Eric House
3f5e62c9b7 remove logging 2011-12-02 18:31:05 -08:00
Andy2
ae2e27e651 Put the values button back (and remove the corresponding menuitem). 2011-12-02 18:14:26 -08:00
Andy2
08063d9444 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2011-12-01 21:18:37 -08:00
Andy2
4c320a52e7 allow scrolling to go a bit deeper 2011-12-01 21:10:04 -08:00
Andy2
fc00102384 don't leak/fail to install zoom-out button when chat enabled 2011-12-01 21:09:37 -08:00
Andy2
3e21b7845a comment 2011-12-01 21:04:31 -08:00
Andy2
85fdb950bb init board so deeper scrolling possible 2011-12-01 21:04:18 -08:00
Eric House
cbd455148d comment only. I tracked down the most recent network proto change 
from before which devices probably can't upgrade mid-game once the
MAX_COLS=32 change is enabled and wanted to record it.
 2011-12-01 20:23:58 -08:00
Eric House
4a32942e57 two fixes that seem to allow old- and new-proto devices to play games 
with 15x15 and 17x17 (and presumably larger) with the old games being
upgraded mid-game: when server's new and wants to use a larger board
but not all clients are capable, shrink the board; and, when new
server is opening state saved by pre-upgrade code, assume a non-0
proto version for clients that registered earlier (as old code didn't
save the client's proto version.)
 2011-12-01 20:22:16 -08:00
Eric House
6691c0713c Merge remote branch 'origin/android_branch' into android_branch 2011-12-01 20:16:15 -08:00
Eric House
0065f5078e add variable controlling odds of "upgrading" -- which still needs tweaking. 2011-12-01 20:16:09 -08:00
Eric House
1e48a8d615 Merge remote branch 'origin/android_branch' into android_branch 
Conflicts:
	xwords4/common/model.c
 2011-12-01 20:12:27 -08:00
Eric House
7da7dbc731 shoulda tried compiling before committing a large merge.... 2011-12-01 19:54:56 -08:00
Eric House
9d42e3f4d0 move logf and showf into their own DbgUtils class 2011-12-01 19:51:02 -08:00
Eric House
47884b8387 ignore new tools-generated file 2011-12-01 19:50:22 -08:00
eehouse@eehouse.org
1272ed3bf5 Merge remote branch 'origin/android_branch' into android_branch 2011-12-01 19:46:10 -08:00
Andy2
577c2c8538 move MultiHandler implementation inside BoardView. 2011-12-01 19:44:22 -08:00
Andy2
15503522f2 implement pinch-to-zoom on board -- and do it in such a way that class 
loader doesn't barf on older versions of the OS that don't provide the
necessary APIs.  Tested only on original Motorola Droid so far (and
emulator running 1.6, which is too old.)
 2011-12-01 18:56:44 -08:00
Andy2
b242d70029 up target SDK to pull in multitouch APIs 2011-12-01 05:40:50 -08:00
Eric House
32f1dfa5da configure by passing params rather than setting ENV variables 2011-11-30 21:01:11 -08:00
Eric House
c39487e0cc add ability to start out with mix of old and new versions and have old 
upgrade to new at random times.
 2011-11-29 20:51:19 -08:00
Eric House
c1e420f726 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/relay/rq.c
 2011-11-29 06:45:32 -08:00
Eric House
c8b868c243 Separate app from params. No change in behavior (though restart of 
existing games is now broken), but this sets up testing mid-game
upgrade.
 2011-11-29 06:43:16 -08:00
Eric House
ba5ff6cb5d fix too-small buffer. Seems I've done this before. 2011-11-28 20:35:34 -08:00
Eric House
c6e994abef use $RANDOM rather than $SEED -- still repeatable, but avoids relay 
problems when devices have same game seed.
 2011-11-28 18:53:40 -08:00
Eric House
adb9b3853d fix bugs around new variable-length tiles array changes, and otherwise 
improve storage of col/row data so that test runs succeed with
MAX_COLS of 16 or 32.  Still to do: test mid-game upgrade.
 2011-11-28 18:46:08 -08:00
Eric House
42d1d2f7bd define variable before it's first used. 2011-11-28 18:21:46 -08:00
Eric House
e5a943eecb tweak output 2011-11-28 18:15:09 -08:00
Eric House
f20f9d6503 complain if conf file not found (rather than leaving relay to crash 
with an assert whose cause may not be obvious)
 2011-11-28 18:14:39 -08:00
Eric House
1b864b5527 Add backtrace function. May only work on Linux but still very useful. 2011-11-28 18:12:56 -08:00
Eric House
384a41ed5b add ability to specify seed and vary board-size 2011-11-25 18:03:51 -08:00
Eric House
2bfe120014 do away with need to accept out-of-bounds values in getTileRaw(). 2011-11-23 18:25:12 -08:00
eehouse@eehouse.org
93a7d15a5e Merge remote branch 'origin/send_in_background' into send_in_background 2011-11-23 17:57:54 -08:00
Andy2
1575279cd8 replace restore menus in prefs activity with buttons at bottom of 
screen.  The trick involves getting the OS to insert the prefs xml
layout as a ListView, and seems like a hack, but it works so far.
Ought to be tested on several OS versions before next release.
 2011-11-22 19:00:03 -08:00
Andy2
cd23022cde Get rid of int m_msgID, storing all dialog messages as String m_msg. 
The code was getting confused and sometimes set one then tried to
display the other.
 2011-11-22 18:28:57 -08:00
Andy2
cdef8f42f6 add comment about NPEs received when device networking foobared. No 
code change.
 2011-11-22 18:12:21 -08:00
eehouse@eehouse.org
b2a0057d7b Merge branch 'android_branch' into send_in_background 2011-11-21 22:23:25 -08:00
Andy2
91eeee0f72 new file that build.xml comments say should be checked in. 2011-11-21 22:21:28 -08:00
Andy2
d37424ad7f Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/linuxutl.h
 2011-11-21 22:18:52 -08:00
Andy2
a8859599dd update emacs compile-command for new SDK. No code change. 2011-11-21 22:16:33 -08:00
Andy2
795b86e569 when asked to browse empty dict, put up explanatory dialog then exit 
activity.  Required new DlgDelegate method to send event after posting
alert.  Note that eventually when the dict browser shows tile info as
well as words this will change.
 2011-11-21 18:08:51 -08:00
Andy2
f32f7a8b19 Don't behave badly in presence of empty dict: word count should be 0 
and sanity test should pass.
 2011-11-21 18:07:08 -08:00
Andy2
d856b9a8ce Don't behave badly in presence of empty dict: word count should be 0 
and sanity test should pass.
 2011-11-21 18:06:46 -08:00
Andy2
e1e9a68d8f fix ptr out-of-bounds test. Was failing an empty dict. 2011-11-21 18:04:20 -08:00
Eric House
9115b344fb use a hash of lists rather than a single list to store pending 
background messages to fix assertion failure when more than two
devices are playing: messages must be sent grouped by relayID.
 2011-11-21 17:57:38 -08:00
Eric House
eec83fe5b6 don't fail when RELAY_ALLHERE comes without a connection, as that will 
happen when messages come in background.  I'm not sure what the test
I'm removing was there to catch so need to test thoroughly.
 2011-11-21 17:38:50 -08:00
Eric House
b00327aa8b fix to work for NDEVS > 2. 2011-11-21 17:35:08 -08:00
Eric House
72a3ed1891 increase buffer size: longer relay name caused stack overwrite 
failures.
 2011-11-21 17:33:44 -08:00
Eric House
a0a8a816a4 make number of devices configurable 2011-11-21 10:09:29 -08:00
Andy2
c7906c3bd4 prevent min from exceed max by not including values below min as 
possible max settings and vice-versa.  Since spinner values no longer
have a consistent base, parse them rather than relying on position --
requires assumptions such as that View is a TextView, but that is
probably not changing.
 2011-11-21 08:19:25 -08:00
Andy2
aba4e02cac use a standard list item for words rather than consing up a TextView 
and having to worry about text size.
 2011-11-21 07:20:12 -08:00
Eric House
1d13f7d1f2 update instructions for building 2011-11-19 20:05:04 -08:00
Eric House
33496914a4 More new SDK fixes: put back script to generate GitVersion.java. 2011-11-19 19:49:15 -08:00
Eric House
e335f5cf61 fix to use new sdk version to generate local.properties 2011-11-19 19:23:58 -08:00
Eric House
d806e3f906 changes made by android tool for compatibility with new SDK version 2011-11-19 19:07:16 -08:00
Andy2
c781bfc29e remove hard-coded 2-15 array for word-len limit spinners and instead 
create at runtime arrays that represent the words actually in the dict
-- e.g. showing a max of 8 when there are no words longer than that.
 2011-11-18 21:24:59 -08:00
Andy2
872ebe68f4 make array one large to hold word whose len is == max 2011-11-18 21:14:24 -08:00
Andy2
b86330c71f add dict_iter_getCounts() 2011-11-18 21:10:17 -08:00
Andy2
21330af568 make tiles array variable sizes. 32*32*2 is too many bytes to use 
when the typical board at 15*15 requires less than 1/4 of that.
 2011-11-18 18:59:59 -08:00
Andy2
cc0105e14c add param to dict_countWords in which it accumulates counts per word 
length.  Shouldn't hurt speed too much if null passed.
 2011-11-18 08:15:21 -08:00
Andy2
598be8b404 MAX_COLS -> MAX_COLS_DICT for dict-related stuff (since dicts are 
staying with fewer words for now.)
 2011-11-18 07:56:02 -08:00
Andy2
2eac8e70e0 adding missing ifdef 2011-11-18 07:43:37 -08:00
Andy2
37e81fd062 use number of bits based on stream version not current build -- 
required in case new code is talking with old in networked game.
 2011-11-18 07:43:10 -08:00
Andy2
f9c3a95603 move stream version definitions 2011-11-18 07:41:57 -08:00
Andy2
f06eaa573b fix to compile with API changes 2011-11-18 07:41:13 -08:00
Andy2
4760ceda5a Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/anddict.c
 2011-11-17 20:55:02 -08:00
Eric House
55d23c9502 various improvements, including allowing to specify seed to enhance 
reproducibility, copying xwrelay.log into directory with game logs
when they don't finish for easier analysis.
 2011-11-17 19:58:08 -08:00
Eric House
cd699ba547 close socket when done 2011-11-17 19:56:54 -08:00
Eric House
8a51d5f3e4 fix race condition that was breaking tests: when one device sends two 
messages they must be handled by the relay in order.  So modify linux
client to build a single packet of all messages sent instead of
letting rq sent each on a separate socket.  The relay would give the
sockets to different threads and sometimes the wrong one won.  Will
need to make sure the android code's doing the same thing (it appears
to be), or perhaps make the coalescing code common so I only debug it
once.
 2011-11-17 19:56:36 -08:00
Andy2
1889fbd78b relaunch activity, with pararms in intent, every time min or max 
changed.  Can't figure any other way to change the list of section
heads, as setListAdapter() is ignored when called a second time.
Note: I got an assertion failure in the jni indexing code so there
may be a bug here.
 2011-11-17 19:52:10 -08:00
Andy2
aab9fd9df2 test the variable that may have been changed, not the one that holds 
the pre-change value.
 2011-11-17 06:54:26 -08:00
Andy2
63c0c5cf09 fix compile warning by passing ptr to embedded super 2011-11-17 06:11:42 -08:00
Andy2
210c59ef9b move bonus square values into model: add API to set an array, and API 
to query model for values.  Now everybody else queries new model API
rather than client via util_getSquareBonus(), model uses its internal
values if present otherwise falls back to util_getSquareBonus(), and
internalizes the array as part of the game.  Now it should be easier
to have different bonus patterns and to have them exchanged as part of
network game init.
 2011-11-16 19:01:11 -08:00
Andy2
fab39a5f87 Trying to deal with old- and new-proto devices interacting. Fix 
clients to append their stream version to their inital connect
message.  (The format can't change, so detecting additional length was
the only option.  comm.c on existing clients won't allow more than one
connect message per channel, so adding a new to be used in addition
didn't work.)  New servers detect this; old will ignore.  Track the
version (implicit or not) of all clients, and use the lowest any
supports, so that new server and all new clients will use newer proto.
 2011-11-16 06:47:55 -08:00
Andy2
bdb8e6f03c fix several crashers that prevented network games from working when 
MAX_COLS was larger than 16.  In order that old-style messages on
relay be readable by new-style code on device, modified server.c's
protocol to include stream version.  But: unless I come up with a
better way of doing this all devices will have to be upgraded at the
same time: old won't be able to read the new format as it's done here.
 2011-11-15 06:13:25 -08:00
Andy2
379e5f1d96 use actual rather than max possible board dimensions to apportion 
space, fixing crashes when max upped to 32.  Will still fail as actual
size approaches that number.
 2011-11-14 20:18:09 -08:00
Andy2
86d5778ec3 remove 16x16 limitation on board size, replacing with 32x32. Change 
is enabled by a compile-time flag so Android needn't follow yet.
 2011-11-14 18:21:41 -08:00
Andy2
2492e7cfc5 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/cursesmain.c
 2011-11-13 17:10:46 -08:00
Eric House
d6fecaa3d3 don't crash when dict is empty file 2011-11-13 17:06:57 -08:00
Andy2
4edca4ee4c Check for null return from getInfo(), the result when it tries to open 
a corrupt dict.  Such dicts should never get this far, but it doesn't
hurt to be safe.
 2011-11-11 18:30:53 -08:00
Andy2
44c5500ab0 don't crash when empty or corrupt dict file passed in. 2011-11-11 18:29:26 -08:00
Andy2
b334e688bb use getInfo to run sanity check on .xwd files in download directory. 
This prevents deliberately corrupted files from making it into dict
lists.  To the extent that checkSanity() works, it should make use of
that dir safe.
 2011-11-11 07:45:25 -08:00
Andy2
9ff4596667 fix compile warning by passing ptr to embedded super 2011-11-11 07:42:00 -08:00
Andy2
92eb6b857d allow null info ptr so getInfo can be used solely to run sanity check 
on dict.
 2011-11-11 07:41:31 -08:00
Andy2
dddec50f1d Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/linux/Makefile
	xwords4/linux/linuxmain.c
 2011-11-10 19:22:57 -08:00
eehouse@eehouse.org
e48ed847df Merge remote branch 'origin/android_branch' into android_branch 2011-11-10 19:02:57 -08:00
Andy2
284bd2d0c4 turn on sanity checking of dicts in download directory, but from 
DictLangCache rather than when the directory's walked initially.  Need
to test still with bogus dict and make sure it's never shown.
 2011-11-10 19:02:18 -08:00
Eric House
5be5e9fdeb cleanup script output 2011-11-10 18:39:35 -08:00
Eric House
619c25ee49 add a bit of logging to help deciphering test app problems. 2011-11-10 18:28:11 -08:00
Eric House
cee738942e back out earlier change using redo: it was broken. Add assert to 
catch problem with passing ptr to tiles as src of tiles.
 2011-11-10 18:26:32 -08:00
Eric House
6d98631640 sanity check: make sure tiles are within range. 2011-11-10 18:24:45 -08:00
eehouse@eehouse.org
9f22b11f81 Merge remote branch 'origin/android_branch' into android_branch 2011-11-10 06:54:42 -08:00
Andy2
43a79a0b47 use undo/redo rather than copying stack to figure past move score. 
This may have been contributing to crashes, but the new code's more
effecient anyway.
 2011-11-10 06:52:33 -08:00
Andy2
00f743409a script for reproducing problem with relay games that show up randomly. 2011-11-10 06:51:30 -08:00
Andy2
d479b2b979 use timeout rather than idle. Sometimes (due to bug?) curses app is 
too busy ever to fire idle proc.
 2011-11-10 06:51:05 -08:00
Andy2
645695e358 improve logging, and fix mistyped variable found by inspection rather 
because of a problem.
 2011-11-10 06:41:07 -08:00
Andy2
b9a7574925 fix emacs header comments; no code change 2011-11-10 06:39:36 -08:00
Andy2
af5c8a096f don't pass a pointer to a tray inside the model to model code that 
will modify that tray!  Fixes nasty random crash/assertion failure.
 2011-11-10 06:35:05 -08:00
Eric House
36c267ad88 Merge remote branch 'origin/android_branch' into android_branch 2011-11-09 06:52:32 -08:00
Eric House
268f018140 add dict sanity check that will, I hope, catch corrupt dicts. 2011-11-09 06:51:12 -08:00
eehouse@eehouse.org
ffd6a42c1e Merge remote branch 'origin/android_branch' into android_branch 2011-11-08 21:12:47 -08:00
Eric House
c591182d6c Modify linux bonus square code to work with board data that's half the 
size.  Toward a board small enough to be transmitted as part of
network game initialization.
 2011-11-08 21:11:06 -08:00
Andy2
956fe350ba remove changed param -- mmap's the default now. 2011-11-07 18:19:12 -08:00
Andy2
e4aa2ff180 finish changelog 2011-11-07 06:51:27 -08:00
Andy2
995c410b7c revert unintended checkin: logging should not always be on. 2011-11-07 06:49:55 -08:00
Andy2
4b5a06fe20 test code tweaks 2011-11-05 06:14:46 -07:00
Andy2
3707e7aaca tweak to get performance to same level as before length-filtering was 
added, mostly by using local variables instead of ptr-accessed in
struct and macro magic to support that.  Passes every test I can think
of on Linux but fast-scrolling broken on Android.
 2011-11-05 06:14:35 -07:00
eehouse@eehouse.org
214f8990bf Merge branch 'android_branch' into android_browsedict 2011-11-04 17:23:27 -07:00
Andy2
ac875894a6 replace assert that occasionally fails with logging. Not sure why it 
fails, but I just drop the (timer) event in the non-debug case so it's
probably harmless.
 2011-11-04 17:19:50 -07:00
Andy2
5123bebe50 don't set dict name to "download more". Just not a good idea. 2011-11-04 17:15:12 -07:00
Andy2
0561ca5ab9 make buttons a bit wider since the bar scrolls now, and rearrange. 2011-11-04 17:14:37 -07:00
Andy2
223d2d6e92 set configchanges on chat activity -- it handles orientations changes fine. 2011-11-04 07:11:34 -07:00
eehouse@eehouse.org
71b09b80ab Merge remote branch 'origin/android_branch' into android_branch 2011-11-04 07:05:56 -07:00
eehouse@eehouse.org
6c1b0e9b58 Merge branch 'android_branch' into android_browsedict 2011-11-04 07:05:16 -07:00
Andy2
61681745c2 sort languages (groups) in dicts activity alphabetically 2011-11-04 07:03:40 -07:00
Andy2
57a1069efe wire min/max through jni: now selecting numbers changes the number and 
length of words selected.  But it's really slow, and indexing seems
broken in some cases.  Not ready for release yet.
 2011-11-04 06:56:59 -07:00
Andy2
fa14f02b69 add ui support for min,max filtering of wordlist. Not yet wired into 
jni.  But: even disabled it seems to lead to much slower scrolling, so
I need to investigate that before taking this any further.
 2011-11-04 06:18:11 -07:00
Andy2
1bba95a985 add minmax compile-time flag, commented-out 2011-11-04 06:17:09 -07:00
Andy2
da02e994b7 protext min,max with compile-time flag 2011-11-04 06:16:44 -07:00
Andy2
4e66747bbc fix for changed API 2011-11-03 21:35:17 -07:00
Eric House
adb9473a87 Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/common/dictiter.c
	xwords4/linux/linuxmain.c
 2011-11-03 21:32:04 -07:00
Eric House
30387bc528 up version codes 2011-11-03 21:27:43 -07:00
Eric House
a2319a8073 experimental additions, mostly compile-time disable-able, so prune 
dict by wordlen.
 2011-11-03 21:25:51 -07:00
Andy2
948def8223 replace burried launch-dict-browser menuitem with toolbar button and 
newbie hint.
 2011-11-03 18:14:01 -07:00
Andy2
8db6b0bddd wrap toolbar in a HorizontalScrollView. Comes into action when all 
buttons are enabled.
 2011-11-03 17:24:56 -07:00
Andy2
1de9f806e9 test dict_countWords() 2011-11-03 06:19:07 -07:00
Andy2
627410250f reuse existing code in dict_countWords() 2011-11-03 06:18:53 -07:00
Andy2
4f29f51253 turn dict iter feature on for linux for good 2011-11-03 06:18:15 -07:00
Andy2
d19858d6bb add (buried) menuitem to launch dict browser from game. Required 
adding method to get current player from BoardView.
 2011-11-03 05:51:38 -07:00
Andy2
6e58963231 sign up to handle keyboard/orientation changes for dict browser 2011-11-03 05:32:36 -07:00
Andy2
eace89000b save text size rather than figure each time 2011-11-03 05:20:38 -07:00
Andy2
a5498ee33a fix find to return position rather than boolean 2011-11-03 05:20:11 -07:00
Andy2
56fc73e78a don't go straight from tap on dict word to browser: add bool so that 
even if there's only one lookup URL it'll be listed and user can
quickly cancel.
 2011-11-02 18:48:13 -07:00
Andy2
c222f08252 catch up with API changes. 2011-11-02 18:46:06 -07:00
eehouse@eehouse.org
ae118e78a3 Merge branch 'android_branch' into android_browsedict 2011-11-02 18:32:26 -07:00
Andy2
5c995af38c stop changing formats between internal and external structs 
(iterators); use internal format all the time for speed.  Update linux
test code for new API.
 2011-11-02 18:32:00 -07:00
Andy2
7231bd4be3 make dict entries text size bigger 2011-11-02 05:18:10 -07:00
Andy2
8704acfbf1 launch dict browser from tap on dict rather than contextual menu on it. 2011-11-02 05:06:53 -07:00
Andy2
050a68ce42 use XP_REALLOC now that it's fixes 2011-11-02 05:04:31 -07:00
eehouse@eehouse.org
04b8c09128 Merge branch 'android_branch' into android_browsedict 2011-11-02 04:39:51 -07:00
Andy2
ab4ccb1a22 use realloc for testing 2011-11-02 04:39:12 -07:00
Andy2
38867b2875 fix bug in debug free following debug realloc to smaller size 2011-11-02 04:38:39 -07:00
Andy2
eb2b139e48 add some consts and better test for null index data 2011-11-01 18:47:20 -07:00
Andy2
b822f573d6 use getStartsWith() to implement search; add dict name and word count to 
title; change text of menu item that launches dict browser from
Details to Browse
 2011-11-01 18:45:41 -07:00
Andy2
9f2158f094 add dict_getStartsWith to jni 2011-11-01 18:43:36 -07:00
Andy2
482aca5cfb fix crash due to bad allocation of indexing data space. First cut 
used XP_REALLOC, but that turns out to be broken, at least on android.
Haven't really used it before...
 2011-11-01 18:33:29 -07:00
Andy2
5827127ceb add some consts and better test for null index data 2011-11-01 18:18:06 -07:00
Andy2
fc4a5c31f4 silence picky compiler 2011-10-31 21:11:52 -07:00
Andy2
11b7ed1e8e fix to compile with new dictiter files 2011-10-31 21:11:22 -07:00
Andy2
3b04cb542c silence picky compiler 2011-10-31 21:11:10 -07:00
eehouse@eehouse.org
45de6c734b Merge branch 'android_branch' into android_browsedict 2011-10-31 21:06:04 -07:00
Andy2
0d4404d43b add dict_getStartsWith(), and code to test it. Lots of cleanup and 
bugfixing of dictiter code as well.
 2011-10-31 21:05:34 -07:00
Andy2
88f556356c dict_tileForString -> dict_tilesForString 2011-10-31 20:56:48 -07:00
Andy2
69b1b4da27 break dict iteration stuff out into new files. No code change 
otherwise.
 2011-10-31 18:30:55 -07:00
Andy2
3c53da46ce fix to compile with changed API. Crashes, but want to fix up API in 
other branch before debugging here....
 2011-10-31 18:22:33 -07:00
eehouse@eehouse.org
24d95675c7 Merge branch 'android_branch' into android_browsedict 2011-10-31 07:03:34 -07:00
eehouse@eehouse.org
916d817ef2 Merge remote branch 'origin/android_branch' into android_branch 2011-10-31 07:02:30 -07:00
eehouse@eehouse.org
ff3a8d4179 Merge branch 'android_branch' into android_browsedict 2011-10-31 06:38:16 -07:00
Andy2
1d34c26ebc remove unneeded parama 2011-10-31 06:37:53 -07:00
Andy2
dc58d123d5 combine params into single struct 2011-10-31 06:34:21 -07:00
Eric House
491c9d06d6 reverse sense of option to mmap dicts by default 2011-10-29 20:31:47 -07:00
Andy2
7d1e9c7638 Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2011-10-28 22:27:22 -07:00
Andy2
8f3c4f6426 add config option to enable face-up tile picking 2011-10-28 22:24:47 -07:00
Andy2
8d228ae190 turn on face-up tile picking for Android (though there's no prefs UI 
to enable it for a game yet).  In common code, break pick tile utils
method in two, one for blank and the other for tray tiles.  In java,
implement dialog for picking the tiles.  Works, though is a bit clumsy
to have the dialog come and go after every pick.  Better would be a
dialog that stays up and accumulates picks -- but it'd have to know to
reduce the set of tile choices as letters are chosen.  This'll do for
now.
 2011-10-28 22:15:56 -07:00
Andy2
390e7558b0 Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/common/dictnry.c
 2011-10-28 21:00:01 -07:00
Eric House
f6ff3e85c6 Merge remote branch 'origin/android_branch' into android_branch 
Conflicts:
	xwords4/common/dictnry.c
	xwords4/common/dictnry.h
	xwords4/linux/linuxmain.c
 2011-10-28 20:54:55 -07:00
Eric House
71450b02b3 use indexing (and add binary search) to double speed of getNthWord 2011-10-28 20:27:16 -07:00
Eric House
ff89ffb168 add missing backup button to fully test tile picking 2011-10-28 20:23:59 -07:00
Andy2
4df13f5617 fix missing dict language 2011-10-28 06:39:47 -07:00
Andy2
b490618c8e silence warning with cast 2011-10-28 06:34:59 -07:00
Eric House
84044fa9ee move lookup dialog into superclass so can be used from dict browser. 2011-10-27 21:10:35 -07:00
Eric House
308720186d get all word-click events and print contents -- setting up for lookup 2011-10-27 18:43:28 -07:00
Eric House
1741021c3c add search field and button. Not yet wired to do anything. 2011-10-27 18:26:48 -07:00
Eric House
ed055b83c6 export index from jni and use for fastscrolling. Works, but is a bit slow still. 2011-10-27 07:01:57 -07:00
Eric House
5282246dd6 use <cr> and previx separator, not terminator, so java-side split() doesn't end list with empty str. 2011-10-27 07:00:57 -07:00
Eric House
4818a2919d Merge branch 'android_branch' into android_browsedict 2011-10-26 22:25:54 -07:00
Eric House
42d1a48a1d don't include indices for prefixes that don't exist. 2011-10-26 22:25:21 -07:00
Eric House
412a58f6b9 make dict_makeIndex work for depth > 1. 2011-10-26 22:20:21 -07:00
Eric House
f2c4e39cd4 add dict_makeIndex(). Works, but only for depth==1 so far (A, not AA or AAA). 2011-10-26 07:10:50 -07:00
Andy2
92f692510f outline for fastscroll with thumb. Will need jin support mapping 
indices <-> first letters, e.g. BB to whatever the index is of the
first word starting with BB.
 2011-10-25 19:33:55 -07:00
Andy2
a7ce5a43de fix so count comes from dict; combine two jni methods into one; fix 
crash in destructor.  Now an entire dict can be scrolled through if
you have the patience.
 2011-10-25 18:36:12 -07:00
eehouse@eehouse.org
57487aaf3e Merge branch 'android_branch' into android_browsedict 2011-10-25 06:49:32 -07:00
Andy2
b62fe13c97 move dict iterator test into separate function and add test for 
dict_getNthWord().  Still ifdef'd out.
 2011-10-25 06:48:59 -07:00
Andy2
fc973079dc add first cut at dict_getNthWord. Works. Is slow. 2011-10-25 06:48:16 -07:00
Andy2
74cf751729 use existing dict iteration APIs to implement jni that adequately 
displays a dict.  But I don't have a getNth in C to implement the one
I've added in java; need to add that, and caching, to speed it up.
 2011-10-24 20:15:52 -07:00
eehouse@eehouse.org
a75aa88c58 Merge branch 'android_branch' into android_browsedict 2011-10-24 18:27:33 -07:00
Andy2
ac214236c4 add code to walk dict backwards as well, and test code that 
succesfully walks huge dicts in both directions turning out the same
list of words either way.  Still compile-time disabled.
 2011-10-24 18:27:16 -07:00
Andy2
b08f9770cf add dictionary browser. For now it just adds items to the list that 
give the position so I can get a feel for how it works.  Will use this
to figure out the right API for a dictionary iterator.
 2011-10-23 19:35:15 -07:00
Andy2
c237717de5 dict_getInfo returns false if the dict doesn't parse so can be used to 
test validity of downloaded dict.  Internally (in jni), add lots of
checks that format is correct and we don't run off end of ptr walking
truncated dict.
 2011-10-23 14:21:57 -07:00
Andy2
7c7cd82e0a add code to iterate over words in a dict. Works on Linux (iterating 
forward only) but disabled at compile time.  Idea's to have a dict
browser.  There was some simple refactoring in common code Android
uses, and that tests fine.
 2011-10-21 18:51:33 -07:00
Andy2
201c32e4db add support for download directory as a place where we look for dicts 
and to/from which dicts can be moved.  Right now it's just
/sdcard/download.  Dunno if that's universal.  There seems not to be
API except in newer SDK versions for finding it.
 2011-10-20 20:22:36 -07:00
Andy2
4eee7f8aa7 Pass selected tiles into new util function, and from there into java 
world, so confirming query can include them.
 2011-10-19 18:34:26 -07:00
Andy2
f41d3c27e6 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/common/server.c
 2011-10-19 06:23:16 -07:00
Andy2
d63f6961d4 fix log comment to correctly identify site. 2011-10-18 21:29:59 -07:00
Andy2
c2a7a5c347 fix crash: don't destroy stream if for some reason it's null. Not 
sure how that happens, but it does.
 2011-10-18 21:29:40 -07:00
Andy2
90b0a4e46f if words stream is null, don't pass into java code (where current impl 
will get a NPE)
 2011-10-18 21:28:50 -07:00
Andy2
652b7e703a Remove difference between debug- and non-debug stream format. 2011-10-18 21:27:28 -07:00
Andy2
b31e829414 Remove file-format differences between debug and non-debug versions. 
Fix curses to compile non-debug.
 2011-10-18 18:52:37 -07:00
eehouse@eehouse.org
b8adbd94c1 Merge branch 'android_branch' into send_in_background 2011-10-18 06:47:38 -07:00
Andy2
028c416587 don't disable player listing when game is in play and locked; allow 
users to see info about players and change dict.
 2011-10-18 06:46:46 -07:00
Andy2
71fabdac95 add changelist change 2011-10-18 06:35:26 -07:00
Andy2
214debca47 up strings for beta 37 2011-10-18 06:16:15 -07:00
Andy2
ff82c20b2c fix brokenness (black-on-black text in lookup dialog) on 2.2 and 
beyond by copying in layout for built-in list items and hard-coding
white text color.  This is risky/fragile but I can't find another fix.
 2011-10-17 21:33:11 -07:00
Andy2
dc84cfcb97 cleanup/reformat. No code change. 2011-10-17 20:27:51 -07:00
Andy2
235259ef45 a bit more tuning of model_listWordsThrough()... 2011-10-17 18:26:04 -07:00
Andy2
3b7532aba8 improve stack_redo() to return the redone move, and use that to avoid 
making a copy of the move stack in model_listWordsThrough()
 2011-10-17 18:16:19 -07:00
Andy2
9109396ae9 in model_listWordsThrough, only undo as much as needed to find the 
move tile that places a tile on the cell we're interested in.
 2011-10-17 06:48:59 -07:00
Andy2
8062a027e7 cleanup: NULL's a legal value now. 2011-10-17 06:48:13 -07:00
Andy2
b02e0eb9cf actually list words: makes a better test. 2011-10-17 06:47:49 -07:00
Andy2
29eec38821 remove unused strings 2011-10-16 17:59:00 -07:00
eehouse@eehouse.org
5afb0ae145 Merge branch 'android_branch' into send_in_background 2011-10-14 22:34:29 -07:00
Andy2
6793742f0f remove option to list all words played in a single lookup dialog, and 
supporting code in the jni/common C.
 2011-10-14 22:32:30 -07:00
Eric House
46392da205 Fix crash when password dialog comes up second time: don't be cute and 
reuse custom views as they remember their parent and that needs to be
cleared.  Just recreate each time and let gc() do its job.
 2011-10-14 19:07:19 -07:00