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

6292 commits

Author SHA1 Message Date
Eric House
aec03fc572 When a game's consumated and guest discovers it isn't using the same 
dict, give chance to switch, and to download if required.  Because of
the way the JNI thread works, and JNI's requirement in general that
env instances match up (e.g. dicts must be destroyed in the same
thread that creates them), substituting into a live game is too hard.
So the game's saved with its new dict and then reloaded.
 2012-10-24 07:17:21 -07:00
Eric House
13c74cfbd5 protect changeDict feature with compile-time flags (since it can't be 
used on Android)
 2012-10-24 06:46:54 -07:00
Eric House
c69dbda36f add new game_changeDict() and enough gtk code to test it. 2012-10-23 19:06:00 -07:00
Eric House
521d7042be remove redundant class name (no code change) 2012-10-23 06:50:49 -07:00
Eric House
1ce7b36b59 add pref to replace querying on each download where to store dict. 
And use new background-download for update-triggered downloads.
 2012-10-22 19:35:47 -07:00
Eric House
80e2b8955e comments to remind not to remove code not called from java; no code change 2012-10-22 19:29:05 -07:00
Eric House
8f4c0169b4 fix to print contents again 2012-10-22 19:19:38 -07:00
Eric House
8e911fef05 use import to shorten type -- no code change 2012-10-22 07:30:44 -07:00
Eric House
ca561f225c make dict storage location a default set in preference rather than 
something queried each time.
 2012-10-22 07:06:12 -07:00
Eric House
6ba5d4f7c8 use new internal download code for download to get dict required for 
SMS invite as well.  Still to do: put back the query for where the
thing should be stored.  Hard-coded to go in INTERNAL for now.
 2012-10-20 18:28:14 -07:00
Eric House
13557b6e25 use Utils.showToast() everywhere 2012-10-19 18:03:00 -07:00
Eric House
04f56ccf74 download dicts without the browser. This is a partial implementation 
that will need to be generalized and used in other places, basically
whenever the full URL can be known.
 2012-10-19 17:57:17 -07:00
Eric House
37c698f41b fix link problem with upgrade from natty to oneiric (Ubuntu): -lpq 
param must follow object file list.
 2012-10-19 17:54:18 -07:00
Eric House
0f9500cea3 comment out unused param/variable 2012-10-19 17:53:15 -07:00
Eric House
6c34f43df7 show toast when update requested manually and nothing found 2012-10-18 19:51:40 -07:00
Eric House
cb1a0093c3 Merge branch 'android_branch' into android_gcm 2012-10-17 21:23:09 -07:00
Eric House
e5feded0b1 When receiving an invite for a dict we don't have, post a notification 
to DictsActivity that offers to download, and on download completion
arranges for notification of SMSService so the game can be created.
 2012-10-17 21:20:08 -07:00
Eric House
3e83af3b97 pass dict name (in addition to language) with SMS invite, and 
currently on recipient device refuse to create a game if dict not
installed.  Next step is to give a choice to download the thing or
decline.
 2012-10-17 07:11:39 -07:00
Eric House
04f51bd392 add haveDict() 2012-10-17 07:10:08 -07:00
Eric House
a8c77bca88 fix NPE 2012-10-17 07:01:01 -07:00
Eric House
6d7d8d5c64 ignore dir not on this branch 2012-10-16 08:20:53 -07:00
Eric House
50238bea3e generate sender_id const from ENV so doesn't need to be checked in. 
Now works to register as I'm using the right id.
 2012-10-16 08:16:43 -07:00
Eric House
be79ce77ee fix name of service so reply received from GCM 2012-10-16 07:56:10 -07:00
Eric House
85f81a700c missing gitignores 2012-10-16 07:42:35 -07:00
Eric House
de5dcdc5f9 starting new variant for GCM 2012-10-16 07:41:04 -07:00
Eric House
077270f1cd merge in SMS-version UI -- there will not be a separate version for 
SMS any more.
 2012-10-15 08:29:46 -07:00
Eric House
eb47e75c50 put up more user-friendly message when dicts don't match. 2012-10-15 08:07:17 -07:00
Eric House
5f247db29c use the same missing-players message for all three connection types 
(even though the way they're reported is, though shouldn't be,
different.)
 2012-10-15 07:31:02 -07:00
Eric House
96ea4f3963 ignore new files 2012-10-15 06:21:50 -07:00
Eric House
528c061156 report host-chosen dict name a bit later 2012-10-15 06:21:08 -07:00
Eric House
c811282591 UI change: networked games are no longer allowed to have per-player 
dicts.  Now you select a single dict for such games in a new spinner
just below the lang spinner, and player's dicts are no longer
displayed.  For standalone games, the single dict choice isn't there,
the individual dicts are displayed, and you must open a player config
to change the dict as before.  The idea is that this will be less
confusing, particularly when I need to tell the guest that the host is
using a different dict.
 2012-10-14 19:21:27 -07:00
Eric House
4cf595e939 on commandline, only allow assignment of per-player dicts to local 
players.  I don't know what happens when a player's position is
changed when its game is a guest and the hosts rearranges players.
Which is why on Android I'm moving to allowing per-player dicts only
on local-only games.
 2012-10-14 19:10:42 -07:00
Eric House
25a1ee451b resolve links if required to get the actual name of the dict 2012-10-12 20:50:34 -07:00
Eric House
e90c5ee94f pass index of resigning player into util_notifyGameOver. Not yet 
passed into java.
 2012-10-09 05:31:12 -07:00
Eric House
3221fb237a Make state disallow hints when game over 2012-10-08 07:21:36 -07:00
Eric House
ce58750b92 change "resign" menu text once game is over 2012-10-08 07:09:44 -07:00
Eric House
e64ecfb78d implement resign on top of existing endGame logic, adding "quitter" as 
new param passed to remote and changing final score formatting and
menu items to match.  Still need to show old menu on android in case
where game has already ended.
 2012-10-07 12:47:06 -07:00
Eric House
4e0c7923d9 fix bug with clean target introduced when BUILD_DIR was introduced 2012-10-07 12:14:47 -07:00
Eric House
968340f665 Fix release-build warnings that new compiler flags. 2012-10-07 11:43:50 -07:00
Eric House
fd9b9f85e2 make util_hiliteCell conditional, and remove from android where it 
wasn't used anyway.
 2012-10-05 18:51:32 -07:00
Eric House
b11da9d8eb use GamesList's Handler to set timers to redraw turn expiry indicators 
when the percent left changes.  This may be done -- except for
deciding what to do when the time actually runs out.
 2012-10-02 07:30:31 -07:00
Eric House
0a60419802 make ExpiringDelegate responsible for figuring percentage of time left 
given start time and having a constant for how long a turn lasts.  Eventually
the constant will be replaced by a second number passed in.
 2012-10-01 19:07:23 -07:00
Eric House
cd776a34dd Revert "Display turn start time in game summary. This is definitely not its" 
This reverts commit ebaa22594d.
 2012-10-01 17:53:35 -07:00
Eric House
bec596c744 remove no-longer-needed drawable 2012-10-01 17:52:56 -07:00
Eric House
0579253b8d Also override TextView to show turn left there. Works, requiring only 
that actual percentage of turn remainning be calculated.
 2012-10-01 07:24:45 -07:00
Eric House
50b10cd365 new classes overriding LinearLayout to allow framing is-turn rect to 
be drawn in two colors showing how much time left for turn.  Required
because there's no (reasonably-easy) way to create nine-parts
dynamically.
 2012-10-01 06:57:40 -07:00
Eric House
8281bd7f10 call back into java for util_getCurSeconds implementation so java and 
C world are sure to be using the same clock.
 2012-09-29 19:27:02 -07:00
Eric House
ebaa22594d Display turn start time in game summary. This is definitely not its 
final form!
 2012-09-27 07:48:30 -07:00
Eric House
2c89f13383 add turn as param to util_turnChanged, and call from server rather 
than board.
 2012-09-27 07:04:57 -07:00
Eric House
94103a4212 track time of most recent turn start, and include it in summary table. 2012-09-27 06:55:46 -07:00
Eric House
6ddd4a61c1 fix compile errors (mostly unused variables) found by gcc on latest 
Ubuntu (12.04).
 2012-09-25 07:28:02 -07:00
Eric House
53774eb807 Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-09-24 20:08:14 -07:00
Eric House
65598cdb7b replace DeleteLocalRef calls 2012-09-24 07:44:43 -07:00
Eric House
140c982d41 merge from android_branch 2012-09-24 07:39:44 -07:00
Eric House
4909dde622 call a script rather than an html file so file doesn't have to be 
updated with every release.
 2012-09-24 07:35:14 -07:00
Eric House
9a3e43428a Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-09-24 07:26:57 -07:00
Eric House
bdc114dc46 add phony targets to check, on debian-based systems, whether required 
packages are installed and to install them.
 2012-09-24 07:26:37 -07:00
Eric House
d24f9a28f6 up release number 2012-09-24 07:00:18 -07:00
Eric House
c76c5f5868 don't create obits for apps that don't have relayIDs (and presumably 
never connected.)
 2012-09-20 07:45:04 -07:00
Eric House
96e277c7ba don't offer to copy DB from sdcard when there is none. 2012-09-20 07:29:00 -07:00
Eric House
598a154693 factor common code into function 2012-09-19 08:09:27 -07:00
Eric House
81d3f7d15f up version strings for SMS version too 2012-09-19 07:20:43 -07:00
Eric House
a601d0818e save and restore search prefix even when find button not clicked, and 
display last scroll position when different from what prefix finds.
 2012-09-18 07:51:50 -07:00
Eric House
210913d4d4 track dictbrowse info for multiple copies of same dict if that's 
what's installed.
 2012-09-18 07:36:54 -07:00
Eric House
fcecd1db3c don't ask for column no longer there 2012-09-18 06:38:22 -07:00
Eric House
4fa5c61e14 add option to build in a separate directory, for e.g. case where source files 
are on ro filesystem.
 2012-09-17 06:48:53 -07:00
Eric House
168b69112e up version strings for pending new release 2012-09-17 06:36:58 -07:00
Eric House
33772ff0b9 remove redundant DB field and variable 2012-09-15 17:11:59 -07:00
Eric House
a939c9ec4b cleanup 2012-09-15 17:11:45 -07:00
Eric House
75398389b3 Merge branch 'android_branch' into android_dictdb 
Conflicts:
	xwords4/android/XWords4/jni/jniutlswrapper.c
 2012-09-15 16:36:15 -07:00
Eric House
ee1df7eeb7 replace DeleteLocalRef calls with version that checks for NULL 2012-09-15 15:57:38 -07:00
Eric House
b2d47d70be saveToken can be 0 when only gi is being saved 2012-09-15 15:49:26 -07:00
Eric House
937bde6378 combine two jniutils methods into one 2012-09-15 15:21:31 -07:00
Eric House
ad67f31573 saveToken can be 0 when only gi is being saved 2012-09-15 15:19:23 -07:00
Eric House
1e12464934 Merge branch 'android_branch' into android_dictdb 2012-09-15 10:51:58 -07:00
Eric House
571300c0f8 work with two checksums per wordlist, the old that's on the whole 
file, and the new that's on the wordlist data only.
 2012-09-15 09:34:27 -07:00
Eric House
5d45d8d35f remove param that doesn't work when called from mod_python 2012-09-15 09:03:52 -07:00
Eric House
c815d739cd generate md5sum for old .xwd files that don't have it internally. And 
for those that do, verify that stored and generated values match.
 2012-09-13 20:54:35 -07:00
Eric House
bcc8c0c249 remove code figuring md5sum on full dict file; the sum on data is all 
we're using now.
 2012-09-13 19:33:17 -07:00
Eric House
a5bd932e0a Merge branch 'android_branch' into android_dictdb 2012-09-13 19:20:24 -07:00
Eric House
aaa12a291e use unpack to correctly pull wordcount, note and checksum 2012-09-13 19:07:37 -07:00
Eric House
20afa9fd56 rename: file's obsolete now 2012-09-13 19:06:46 -07:00
Eric House
a85ab865cb up note for new version of DISC 2012-09-13 19:05:09 -07:00
Eric House
9ea1311aa0 Merge branch 'android_branch' into android_dictdb 2012-09-13 08:00:54 -07:00
Eric House
50e90405a7 add new Catalan word lookup URL 2012-09-13 08:00:37 -07:00
Eric House
aa974be567 Before figuring md5sum (via java callback added recently), use new 
callback to see if there's already one in the DB.  Required passing
context into jniutils getter, and passing name into jni dict
constructors that previously didn't need it.
 2012-09-13 07:38:08 -07:00
Eric House
edc6b9c270 Merge branch 'android_branch' into android_dictdb 2012-09-13 05:40:08 -07:00
Eric House
3e4384c2a8 when dict doesn't have built-in md5sum, or when in DEBUG code, call 
back into java to get a sum.  It's very slow for large dicts, but will
eventually be in a DB so only done once per dict that doesn't have it.
 2012-09-13 05:39:44 -07:00
Eric House
13507e6fc2 break dict info table in two, one browse state and one for what's been 
stored in static data in DictLangCache up to now -- and remove that
static data in favor of the new table.
 2012-09-12 19:50:03 -07:00
Eric House
67b0d44f26 save search prefix too 2012-09-12 07:55:41 -07:00
Eric House
ce6356fb92 add new db table for tracking dict-releated stuff. Use it to save 
state in wordlist browser so can return to same place as left for each
dict.  Eventually the new table should replace DictLangCache.
 2012-09-12 07:44:58 -07:00
Eric House
a6bed2706d include, commented out, the parameter that makes things fall apart. I 
think the protocol needs work to survive devices failing to save
state.  Better to work on making sure they always save.
 2012-09-11 20:45:03 -07:00
Eric House
72b4b02c20 improve messages display 2012-09-11 20:44:07 -07:00
Eric House
ae2b6205bd use mem_stream_make_sized 2012-09-11 19:17:27 -07:00
Eric House
4f18f01cb8 don't malloc(0) 2012-09-11 19:17:10 -07:00
Eric House
a0b564c7e8 show related messages as well 2012-09-11 19:07:16 -07:00
Eric House
761f93dd7e use new mem_stream_make_sized 2012-09-11 19:07:00 -07:00
Eric House
5c683f173a add mem_stream_make_sized, meant to make saving games more efficient 2012-09-11 19:06:27 -07:00
Eric House
75474e1891 Add option to pretend save failed a random pct of time. Point it to 
test fix for problem on Android, but right now turning this on breaks
networking.
 2012-09-11 07:26:17 -07:00
Eric House
ad4231289f fix --max-devs and resigns begin allowed when only one game 2012-09-11 07:24:51 -07:00
Eric House
0ccc2331b5 address bug where message was getting ACK'd by a device that failed to 
save what it had ACK'd leaving the game permanently broken.  Do that
by adding a new method game_saveSucceeded() called after the client
claims to have committed bytes returned by game_writeToStream() to
disk.  In that method comms updates the value it'll use in subseqent
ACKs.
 2012-09-10 07:31:45 -07:00
Eric House
45de62818b format to 80 columns -- no code change. 2012-09-09 15:49:55 -07:00
Eric House
1608f0a8f9 handle missing error messages 2012-09-09 15:49:17 -07:00
Eric House
9340db36c1 disallow opening android DBs when not configured correctly. 2012-09-09 15:48:57 -07:00
Eric House
8fbc9ca343 fix to compile in release mode 2012-09-09 09:22:00 -07:00
Eric House
95a7b14a3a transmit dict's md5sum along with name in initial message from host to 
guest.  On guest, pass that sum into client code along with names so
the appropriate tests can be done and corrections taken.
 2012-09-08 20:23:48 -07:00
Eric House
f90e6343c7 don't crash if no dict info 2012-09-08 20:22:22 -07:00
Eric House
9a72f252ed Merge branch 'android_branch' into android_dictname 2012-09-08 13:20:59 -07:00
Eric House
1957ad3dbe add options, that sometimes work, to print desc and md5sum from .xwd 
files.  Still need to figure out how to parse binary into UTF-8.
 2012-09-08 13:20:12 -07:00
Eric House
047f68aafd version with checksum and note 2012-09-08 13:18:58 -07:00
Eric House
ca88c9850e add DICTNOTE 2012-09-08 13:17:49 -07:00
Eric House
5a81484cf1 add md5Sum to DictInfo and add a getter 2012-09-08 10:11:18 -07:00
Eric House
977bee15d9 add DICTNOTEs 2012-09-08 10:10:17 -07:00
Eric House
7d51ee99d9 add dict_getMd5Sum 2012-09-08 10:09:31 -07:00
Eric House
50a4f32bfa new versions of dicts with checksums and descriptions 2012-09-08 10:08:39 -07:00
Eric House
077560bcd3 load md5sum if present 2012-09-08 09:42:23 -07:00
Eric House
14a77ff7f1 factor out common code 2012-09-08 07:45:18 -07:00
Eric House
8e58d8c1c0 print header elems, including md5sum, if present rather than just 
skipping.
 2012-09-07 20:34:55 -07:00
Eric House
5fa9b60846 add md5Sum field to dict struct, and on linux load it if present, 
otherwise calculate it.  In DEBUG builds always calculate and assert
they match.
 2012-09-07 20:34:06 -07:00
Eric House
0b81516682 add md5sum to dict header, summing not the whole file but the parts 
that make the wordlist unique: tile counts and values, and bitmaps,
and the data.  This happens to be contiguous data on non-palm .xwd
files so it's easy to duplicate if the sum isn't there.
 2012-09-07 20:32:10 -07:00
Eric House
4f180e9e14 pass rejecting dict name into java layer and display as part of turn 
lost message.
 2012-09-06 19:04:40 -07:00
Eric House
07e6239699 transmit name of failing dict 2012-09-06 08:01:11 -07:00
Eric House
509c832f2f more progress: copy dict name into badwordinfo and free it successfully 2012-09-06 07:49:05 -07:00
Eric House
2f8b6cceb5 pass additional param into callback -- unused so far. 2012-09-06 07:19:12 -07:00
Eric House
4325d4e709 Merge branch 'android_branch' into android_dictname 2012-09-05 19:30:50 -07:00
Eric House
fa90150055 Revert "As an experiment, lower case words being looked up. Apparently one of" 
This reverts commit 5bdebd445f.
 2012-09-05 19:20:05 -07:00
Eric House
4d57fb889b new and improved URL for Catalan lookup 2012-09-05 19:19:05 -07:00
Eric House
1ec03e48bb plug leak: don't alloc stream when it won't be used 2012-09-05 19:09:01 -07:00
Eric House
71c1fc527a add counter to mpool tracking so easier to find source of leaks 2012-09-05 19:08:22 -07:00
Eric House
5bdebd445f As an experiment, lower case words being looked up. Apparently one of 
the Catalan sites doesn't like upper case.  At least in theory no site
should care so the rest of the world should be ok with lower case too.
 2012-09-04 19:03:53 -07:00
Eric House
270a19f3aa Revert "first of a set of changes to communicate to clients dictionary being" 
This reverts commit b7a0f1489b, which I didn't mean to check in on this branch.
 2012-09-03 21:34:51 -07:00
Eric House
ea4d805d5f first of a set of changes to communicate to clients dictionary being 
used by server.  Clients need to care if e.g. the server's disallowing
phonies based on its dict.  Can only be sent if client is of latest
version.  In that case, common code calls into new util function.  In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it.  Once it's available, will want to install it.
 2012-09-03 21:33:46 -07:00
Eric House
b7a0f1489b first of a set of changes to communicate to clients dictionary being 
used by server.  Clients need to care if e.g. the server's disallowing
phonies based on its dict.  Can only be sent if client is of latest
version.  In that case, common code calls into new util function.  In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it.  Once it's available, will want to install it.
 2012-09-03 21:29:21 -07:00
Eric House
d12ed144ea normalize file: add comments where don't proceed a string, and replace 
tabs with spaces.
 2012-08-31 21:36:49 -07:00
Eric House
73e29211b0 remove strings no longer used 2012-08-31 21:34:25 -07:00
Eric House
a3b1fc8379 beginnings of script to annotate localized .xml files with what's missing 2012-08-31 21:33:44 -07:00
Eric House
1f330e0c49 tweak name and reflect new name on website 2012-08-30 19:21:05 -07:00
Eric House
adab1b5cea replace getString() calls that fetch format strings then apply them 
with calls to the formatting (varargs) version of getString().  Should
be no behavior change.
 2012-08-30 19:18:08 -07:00
Eric House
2eb8904a0a rename to cWords-SMS, and move name <string/> into strings.xml so it 
can be substituted too.
 2012-08-30 19:11:46 -07:00
Eric House
4ffb4efb0c silence compiler warning 2012-08-30 19:10:52 -07:00
Eric House
568bef7ac3 add DICTNOTE 2012-08-30 07:08:55 -07:00
Eric House
3b8c9bfada add two Catalan word lookup URLs 2012-08-30 07:07:42 -07:00
Eric House
73c26d8643 replace Crosswords in variants' xml files. Required passing in app 
name from build.xml and a new clean-target script that removes the
generated variant files.
 2012-08-30 07:00:26 -07:00
Eric House
4cb848582e fix edge cases in prefix matching 2012-08-28 07:35:11 -07:00
Eric House
145317426d Fix prefix matching to accept letters constituting the first part of a 
digraph tile when at the end of a prefix so that e.g. GORIL in Catalan
will list GORIL·LA (rather than nothing since GORIL, ending with the L
tile, is not a prefix.)
 2012-08-27 21:50:09 -07:00
Eric House
fddd2c4ed5 fix bug in dict_tilesToString that occurred only when a language had 
two tiles starting with the same letter: use recursive search to try
both paths in such cases.
 2012-08-27 07:10:40 -07:00
Eric House
79be03ac66 splite lines to get under 80 columns; no code change 2012-08-27 07:06:40 -07:00
Eric House
da4ec16ba4 remove one-release logging confirming getInstallerPackageName result. 2012-08-27 06:15:11 -07:00
Eric House
a0e8b6c076 add description 2012-08-26 21:36:00 -07:00
Eric House
c5f21a3517 new field to be populated if dict desc header is found. 2012-08-26 21:00:21 -07:00
Eric House
08aa9b66e8 also load new desc field in android client, and add jni call to retrieve it 2012-08-26 20:59:17 -07:00
Eric House
9d174601b9 add field, and getter, for new dict header description string, and 
load it in linux client.
 2012-08-26 20:58:28 -07:00
Eric House
f3b289f4be fix to take defaults from current dir 2012-08-26 20:18:37 -07:00
Eric House
6cf138b962 Merge remote branch 'origin/android_branch' into android_branch 2012-08-25 10:22:12 -07:00
Eric House
b29df8512a add null-terminated note to dawg header and modify linux client to 
accept it if present.  Android client will successfully ignore it and
will need to be modified to capture and display it if present.  Idea's
to display information about copyright, source, etc. of wordlists.
 2012-08-25 10:20:52 -07:00
Eric House
efb7a9b5c5 call loge rather than logf from within catch statements 2012-08-23 07:08:17 -07:00
Eric House
9606c2ec56 Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-08-23 06:53:23 -07:00
Eric House
c6ce5da5a5 Merge remote branch 'origin/android_branch' into android_branch 2012-08-23 06:52:47 -07:00
Eric House
786e05b1f9 update to install beta 51 2012-08-23 06:51:32 -07:00
Eric House
47822e94e3 remove comment 2012-08-23 06:38:57 -07:00
Eric House
67ddbf140b remove comment unintentionally committed 2012-08-23 06:38:45 -07:00
Eric House
c13971e3d8 convert a few more variable names from single- to double-letter 2012-08-23 06:38:29 -07:00
Eric House
8f6486b381 add psuedo-unique device id to update messages; log installer once 
(which will only matter once it's on the market)
 2012-08-22 19:10:38 -07:00
Eric House
32e1530d3f i => ii; no other change 2012-08-22 07:44:21 -07:00
Eric House
a86ab69aec don't store argv element in game data structure where it gets freed. 2012-08-22 07:35:18 -07:00
Eric House
6758ebcdf5 version strings 2012-08-21 18:57:26 -07:00
Eric House
1423968098 check every day, not every seven, for users who've said they want the 
intermediate builds.
 2012-08-21 18:55:44 -07:00
Eric House
02fa53cbc7 bring in recent tweak 2012-08-21 08:02:36 -07:00
Eric House
31ef5026be use constants for json params so easier to paste into python code 2012-08-21 07:43:49 -07:00
Eric House
46a5486071 Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-08-21 07:18:05 -07:00
Eric House
ba43e54d8b make default false 2012-08-21 07:14:58 -07:00
Eric House
6b23bebd0a use constants 2012-08-20 21:36:14 -07:00
Eric House
cc4549e7d3 add debug pref controlling whether non-release updates are installed. 
(passed to info.py, but is ignored there so far)
 2012-08-20 07:23:13 -07:00
Eric House
4d51cc8d3a check for presence of apache mode (which is unavable when running from 
cmdline)
 2012-08-20 07:07:57 -07:00
Eric House
fca1621ad0 use json to do app and all dict queries in one transaction 2012-08-18 07:42:42 -07:00
Eric House
07c6d57233 pass git version and installer name (usually empty) as part of update 
for more granularity
 2012-08-16 21:49:52 -07:00
Eric House
16de50ce3d catch sms version up with beta-50 and auto-update changes 2012-08-16 08:15:52 -07:00
Eric House
fbe842d089 cleanup 2012-08-16 08:14:50 -07:00
Eric House
7b86eb7a59 new file 2012-08-16 08:10:05 -07:00
Eric House
75d8820b98 make check-for-updates a debug-only menuitem 2012-08-16 07:48:34 -07:00
Eric House
5584a66043 run update checks off a timer that adds a random element to its 
interval; move update check URL into a debug pref.
 2012-08-16 07:43:57 -07:00
Eric House
6bdec885b1 add nextRandomInt() to Utils and use it 2012-08-16 07:26:51 -07:00
Eric House
6226efe8d6 move remaining non-jni prefs stuff from CommonPrefs to XWPrefs. No 
other changes.
 2012-08-16 06:31:23 -07:00
Eric House
81d7903aa3 move new version checking stuff into new file 2012-08-15 19:24:57 -07:00
Eric House
e749aedd34 return url inside a json rather than just a url for more flexibility 
and so python's error messages don't trigger Notifications that then
fail.
 2012-08-15 18:55:54 -07:00
Eric House
4b318070ca remove unused imports 2012-08-15 18:52:56 -07:00
Eric House
910bb2a5a0 add new function loge that takes an Exception and logs a stack trace 
for it
 2012-08-15 18:52:31 -07:00
Eric House
3666d5b541 Merge branch 'from_android_beta_49' into android_branch 2012-08-15 18:31:07 -07:00
Eric House
ca4b2e5354 update version code/strings 2012-08-15 18:18:59 -07:00
Eric House
de87b32bb8 fix bug the right way this time: it's ok for a word not to be in the 
current player's wordlist when the most recent move's being reported,
but not to ignore word legality altogether.
 2012-08-15 18:11:16 -07:00
Eric House
de9a408b15 Revert "Fix bug where if word being scored for long-touch-on-scoreboard wasn't" 
This reverts commit 07912bdcdb.
Problem is it breaks WARN-PHONIES
 2012-08-15 18:01:36 -07:00
Eric House
6947c50238 pass lang instead of lang code; include app name in notification text 2012-08-15 07:22:10 -07:00
Eric House
cd340aba0c post notification on receipt of url for new app that'll result it it's 
being downloaded.
 2012-08-15 06:53:13 -07:00
Eric House
dfdaa500a7 return url for app to download when version's old 2012-08-15 06:51:48 -07:00
Eric House
7cb68f1c85 post notification when new dict is available and download it in 
when notification selected.
 2012-08-15 06:10:39 -07:00
Eric House
e0a8af72c9 work on temporary help site 2012-08-15 06:08:53 -07:00
Eric House
2155631021 improve, including commmandline testability and use of shelve to store 
md5sums after they're generated.
 2012-08-14 18:29:48 -07:00
Eric House
8b6af3fdb9 add md5sum calculator for dicts and use to send POST that checks if 
they're current.
 2012-08-14 07:13:03 -07:00
Eric House
3ef81f248b start on checking for updates/latest version: a menu item that 
triggers new code that sends an HTTP POST to a python script on the
server that returns whether the current version is correct.
 2012-08-13 21:10:22 -07:00
Eric House
9128c2d60c factor code into new method copyFileStream 2012-08-13 07:45:14 -07:00
Eric House
829fd01685 remove change note about SMS version release 2012-08-13 07:09:59 -07:00
Eric House
13d359cb39 turn on endgame BONUSALL feature for linux client too 2012-08-13 06:44:46 -07:00
Eric House
c98bbe2b9a use setsockopt to limit read() block time and so to prevent linux 
version from being unkillable when relay crashes at the wrong time.
 2012-08-13 06:44:16 -07:00
Eric House
25e65d3e6f cleanup: don't return from middle of function 2012-08-12 19:45:54 -07:00
Eric House
c49408d7e9 fix warnings compiling in release mode 2012-08-12 19:37:47 -07:00
Eric House
07912bdcdb Fix bug where if word being scored for long-touch-on-scoreboard wasn't 
in current player's dictionary it'd show up empty: word, once played,
needn't be legal to be displayed.
 2012-08-12 19:25:16 -07:00
Eric House
eb8401bb7a fix bug when turn lost for phonies in networked game: what's sent must 
match what's expected.
 2012-08-12 11:52:20 -07:00
Eric House
ec0702d584 initialize buffer that common code will pass to strcat. 2012-08-10 21:31:01 -07:00
Eric House
d66208a1f2 add script to sync; rename to put all in directory 2012-08-10 08:05:12 -07:00
Eric House
1e5757dc45 to start work on website... 2012-08-02 22:26:48 -07:00
Eric House
c046606e53 string changes a new changes file toward new release and initial 
release of SMS version
 2012-08-02 07:18:58 -07:00
Eric House
27cbd0e0c9 go with end-game change that takes remaining tiles into account for 
robots but not for hints.
 2012-08-01 20:31:21 -07:00
Eric House
464696566d get rid of NODE_CAN_4. Not change to post-compiled code 2012-08-01 20:29:15 -07:00
Eric House
b8ba3c5906 move sms enable checkbox to top of screen 2012-07-31 23:25:51 -07:00
Eric House
ade5a84e2d tweak sms plan confirmation text 2012-07-31 07:46:16 -07:00
Eric House
3641799c4e wrap sms confirm view in scroller as it's wordy enough to need it in 
landscape mode.
 2012-07-31 07:45:58 -07:00
Eric House
8562503cd9 show status icon as red when SMS game and airplane mode on. (Better 
would be to track radio state in NetStateCache.)
 2012-07-31 06:47:52 -07:00
Eric House
0aadec9380 Uninstall variant based on where called from if unspecified 2012-07-31 06:46:11 -07:00
Eric House
4414943f90 implement loading saved DB from /sdcard 2012-07-30 18:36:41 -07:00
Eric House
b8a96f70bf turn on (experimentally) new feature making robot more likely to use 
all remaining tiles (in doing same with hints, which probably won't
ship)
 2012-07-30 07:34:41 -07:00
Eric House
af2c361225 add debug menu option to enable debug features, and first such 
feature, to copy xwdb file to /sdcard.  Option to do opposite is
stubbed out.
 2012-07-30 07:23:52 -07:00
Eric House
1fe14be9bf less ominous text for new SMS game creation, ominousness having moved. 2012-07-30 07:14:52 -07:00
Eric House
d25916ae5f protect sqlite code with compile-time flag so easier to disable. 2012-07-29 08:37:08 -07:00
Eric House
8f04bfadaf modify engine score ranking to include estimate of bonus to be earned 
if all tiles are used (ending the game and triggering penalties for
other players.)  Changes are protected by compile-time flags currently
not turned on.
 2012-07-29 08:35:08 -07:00
Eric House
730cd0d599 tweak dialog text 2012-07-26 21:16:00 -07:00
Eric House
9185ec71ca use newest Catalan wordlist 2012-07-26 21:14:40 -07:00
Eric House
08e5fbdcc2 add ability to open game in sqlite3 DB from an Android phone. It's 
read-only now: changes are not saved.  But it works!
 2012-07-26 20:44:33 -07:00
Eric House
0c030360bf fix compile warning 2012-07-26 20:42:25 -07:00
Eric House
e70fbda502 don't send packets if SMS play disabled 2012-07-26 07:21:16 -07:00
Eric House
1abba7e560 fix crash on first install: context !always= PrefsActivity 2012-07-26 07:20:39 -07:00
Eric House
9c670804f2 draw status icon background red when SMS turned off. 2012-07-25 23:26:24 -07:00
Eric House
bc91956e20 put up an alert when SMS game opened but SMS is disabled. (Does not 
have a button taking you to settings.)
 2012-07-25 07:15:57 -07:00
Eric House
6405294f2f remove unused pref 2012-07-25 07:12:54 -07:00
Eric House
cd1eb2e4da add pref enabling SMS games, and a scary confirmation dialog meant to 
force user to realize the potential costs (by requiring interaction).
Until that's enabled, show in New Game activity an explanation and
button that goes to Preferences.
 2012-07-24 07:15:27 -07:00
Eric House
4f437f0d55 don't start SMS receivers on device without a phone 2012-07-24 07:09:37 -07:00
Eric House
8e961fcb4c remove logging 2012-07-24 06:56:55 -07:00
Eric House
b7247d259c add superclass for CommonPrefs that can hold stuff not related to 
jni/common code.
 2012-07-23 22:42:38 -07:00
Eric House
381f30b6d2 claim to handle keyboard/orientation changes for prefs activity 2012-07-23 22:36:50 -07:00
Eric House
a785d89d31 ignore new files 2012-07-23 22:33:43 -07:00
Eric House
9df8086476 no SMS game option if device has no phone 2012-07-21 19:02:23 -07:00
Eric House
549c826c9a show SMS message send/receives from BoardActivity where a hander's 
available.
 2012-07-20 21:36:59 -07:00
Eric House
54b4478582 show orange arrows briefly when net traffic goes in or out 2012-07-20 18:11:02 -07:00
Eric House
00317dea1e center board and buttons so that any leftover white space is half 
above and half below.
 2012-07-20 17:01:58 -07:00
Eric House
2a25bae706 don't use cached bitmap if board's been resized 2012-07-19 06:54:56 -07:00
Eric House
95b68ffae2 up changelog and version strings for new release 2012-07-18 07:24:59 -07:00
Eric House
a5c3c7e548 fix layout on wider screens (e.g. 768x1024): rather than draw the 
board so wide that scrolling's required, reduce width enough that it's
not.
 2012-07-18 07:07:53 -07:00
Eric House
516a1800a0 Add board-size to game config. It makes no sense for it to exist in 
per-game defaults but not be settable in config.  But it may make more
sense to remove both options/locations entirely, or hide them by
default.
 2012-07-16 07:15:33 -07:00
Eric House
50a749eccc ignore new file 2012-07-16 06:17:01 -07:00
Eric House
9b0436d1ee Make rem string measure function return boolean to indicate rect will 
be invisible rather than setting width and height to 0.  No real
change beyond simplifying/speeding platform code.
 2012-07-15 09:30:27 -07:00
Eric House
d602a0c22b fix reported NPE by saving variable in bundle passed to onCreate 2012-07-14 14:53:57 -07:00
Eric House
0769cbccdc capitalize consistently 2012-07-14 07:48:19 -07:00
Eric House
479ed0dc58 update conn status on receipt or send of packets to/from relay, not 
just when relay connect status changes.  This means that a game will
show as connected when it's still waiting for another device to join
room, but also fixes exchanging moves over 10 minutes and having the
status icon say you haven't sent or received in that long.  This could
be improved.
 2012-07-12 21:15:35 -07:00
Eric House
248db3d144 update version strings and changelog 2012-07-12 20:56:28 -07:00
Eric House
b02855b00c sort tray after an undo adds tiles 2012-07-12 06:48:09 -07:00
Eric House
a3de089e15 remove unused constant 2012-07-12 06:34:54 -07:00
Eric House
abcdafe56a always invalidate board view to force layout/draw. Fixes crosshairs 
not going away, and board being unresponsive, after lookup activity is
dismissed.
 2012-07-12 06:34:01 -07:00
Eric House
d3b56f4167 don't show rem text when -1 2012-07-12 06:15:53 -07:00
Eric House
11bd4a73fe oops: fix centered text drawing. 2012-07-11 06:17:36 -07:00
Eric House
bad6c599f8 more tweaks to tray tile drawing: make small screen letters 3/4 height 
even though numbers are 1/3 and overlap is in theory possible; put 1/5
of extra space to left of letters so they don't hug the edge.
 2012-07-10 21:04:54 -07:00
Eric House
bfc68656cb move arrow to where removed tile was, and set its direction based on 
whether removed tile and the next tile are in the same column or row.
 2012-07-10 18:00:23 -07:00
Eric House
c2956f4064 save net status state on a timer (when handler is available) waiting 
five seconds.
 2012-07-10 06:21:49 -07:00
Eric House
bd70a1dd7d improve text in remaining tiles dialog, and always show the tiles for 
all trays rather than excluding those in current player's tray.
 2012-07-09 21:44:29 -07:00
Eric House
f1c5ebeb31 don't hide REM tiles square when drops to 0 2012-07-09 21:43:35 -07:00
Eric House
09a81a2639 add some consts 2012-07-09 21:36:17 -07:00
Eric House
d234646fb2 fix broken compile 2012-07-09 21:17:01 -07:00
Eric House
e6f02ee3c7 when drawing letter in tray tile, only shift origin left of edge when 
letter width exceeds that of tile.
 2012-07-09 07:03:39 -07:00
Eric House
5702c83f17 do string formatting properly, using resources and StringBuffer. 2012-07-09 06:56:08 -07:00
Eric House
6da3f10855 cleanup -- no code change 2012-07-09 06:15:02 -07:00
Eric House
e7b0727e0c leave remaining-tiles in place when pool count drops to 0. 2012-07-09 06:07:26 -07:00
Eric House
9885d3bf61 draw letters in tray tiles as far to left as possible 2012-07-07 19:55:19 -07:00
Eric House
7f087181e5 Don't store current network connType in ConnStatusHandler; instead 
pass the one for which we want icon displayed or status text
generated.
 2012-07-07 19:45:18 -07:00
Eric House
0c02103d42 fix assertion failures due to failure to get game locks. The problem 
is that getSummary() can be called at unpredictable times by
background tasks for the games list, and the current open game holds a
lock as long as it's open.  So those getSummary() calls must be
allowed to fail.  Before, letting them fail immediately meant
empty/unusable list elements; now I've added a time they'll wait
before failing.  Now the ones that are called while a game is open can
fail without being noticed, but the ones that are called as a game is
closed to update its summary will succeed by being able to wait for
its lock to be given up.
 2012-07-07 11:34:40 -07:00
Eric House
ae3ae6a3a4 turn on base64 for SMS too 2012-07-07 11:29:54 -07:00
Eric House
30c77de2d0 tweak menu name 2012-07-07 11:29:25 -07:00
Eric House
6abb56dd0c make tmp list elem closer in size to the real thing so screen jumps 
around less.
 2012-07-07 11:29:15 -07:00
Eric House
318cc52f5a we need the base64 stuff even when don't have SMS -- for serialization. 2012-07-07 11:05:45 -07:00
Eric House
052725aabc fix problems with serialization: use types that are serializable, and 
init transients correctly.
 2012-07-07 11:05:07 -07:00
Eric House
43fead368c make Random class static rather than generate one over and over 2012-07-07 09:27:27 -07:00
Eric House
3c19a7ef44 tolerate failure to get lock for five seconds before asserting (up 
from one.)
 2012-07-06 07:14:01 -07:00
Eric House
75602c47d8 on Amazon-made devices only, sleep randomly during load of game 
summary.  This seems to work around a bug where only the last item in
the list is clickable but once it's clicked events are received for
every failed click up to that point.
 2012-07-06 07:13:11 -07:00
Eric House
9a23473b2f use a dummy TextArea instead of an empty custom view as a placeholder 
for loading game summary view.
 2012-07-06 06:49:09 -07:00
Eric House
d6fdd24637 move interface methods together -- no code change 2012-07-06 06:10:04 -07:00
Eric House
1ad0a899f0 don't return from getSummary without succeeding, even if must wait on 
lock.  Fixes problem with blank entries in game list after returning
from config screen.
 2012-07-03 20:30:31 -07:00
Eric House
60a799ef1f move SMS games up again, this time in a way that networked game creation 
isn't hidden along with SMS.
 2012-07-03 07:02:29 -07:00
Eric House
bf9fe75f5c Revert "in new game dialog, move sms above network (since that's presumably" 
This reverts commit 19dbddc0b8.
 2012-07-03 06:37:24 -07:00
Eric House
eba1d91157 fix game_config view contents sticking to bottom of tall screen when lock 
checkbox hidden, e.g. on Kindle Fire.
 2012-07-03 06:29:59 -07:00
Eric House
be9ed5b963 add toolbar button style for 'large' devices so buttons are bigger on 
the Kindle Fire but not too big on phones.
 2012-07-02 07:39:06 -07:00
Eric House
8ebe180eab fix NPE 2012-07-02 06:59:35 -07:00
Eric House
c386537cb7 gitignore new files 2012-07-01 21:02:42 -07:00
Eric House
66f2007347 turn new tray-undo feature on for SMS version too 2012-07-01 21:02:11 -07:00
Eric House
19dbddc0b8 in new game dialog, move sms above network (since that's presumably 
the reason people chose that version)
 2012-07-01 17:35:50 -07:00
Eric House
2e6b64a4e4 complete implementation of java part of one-pass scoreboard draw. Now 
looks pretty much identical to what the old code draws except that
rather than having width allocated in proportion to requested size all
get the same width except the one whose score it is which gets 2x.
 2012-07-01 17:24:50 -07:00
Eric House
c41c877ae7 fix right edge of scaled text getting clipped by paying attention to 
where getTextBounds() says its left edge is.
 2012-07-01 17:05:39 -07:00
Eric House
43e8205fd8 only honor one install-set option -- fixes multiple installs. 2012-07-01 16:03:02 -07:00
Eric House
2434d85684 don't pass the same player-1 data for every player 2012-07-01 16:01:01 -07:00
Eric House
5cd8ab2b33 remove uncalled method -- no change. 2012-07-01 15:57:20 -07:00
Eric House
2ae6bd8caf override onMeasure to make BoardView only as large as it needs to be 
so that on tall narrow screens (e.g. Kindle Fire) there's no white
space between the tray and the buttons.
 2012-07-01 12:54:38 -07:00
Eric House
03f4236240 install to everything by default 2012-07-01 12:53:36 -07:00
Eric House
89ffd972bf more work on single-pass scoreboard drawing. Now the jni stuff is 
finished, but disabled via compile-time flag, and there's a
commented-out rudimentary implementation on the java side.
 2012-07-01 10:04:10 -07:00
Eric House
b9b58bd0a5 enable tray tap undo 2012-06-29 06:52:49 -07:00