Eric House
694857dd4e
add, but disable with compile flags, ability to mark sent messages
...
with a timestamp rather than delete them. Plan is to experiement with
this as a way of keeping devices from sending too many identical
messages when GCM's in use -- since constraints on the msgs table will
not allow identical messages to be added.
2012-11-15 06:25:22 -08:00
Eric House
c847ec127e
add and use function that does formatted printing to a std::string so
...
query buffers can no longer overflow.
2012-11-15 06:15:44 -08:00
Eric House
5463535265
don't increase backoff if there wasn't actually anything to send.
2012-11-14 05:42:47 -08:00
Eric House
9598ea3585
fix to compile post API change.
2012-11-13 21:32:42 -08:00
Eric House
c4df31892e
Fix occasional infinite loop of devices sending and receiving the same
...
message over and over when getting updated by GCM. The problem
occurred when one device had an un-ACKable initial message still in
its queue. I call resendAll a lot, which caused that message to get
resent to the other game which then replied without being able to ACK
it so it remained to be sent again. This would continue until users
moved forward in the game. The fix is to add a backoff timer to
resendAll() so that it can't loop. The timer is reset when an ackable
and new message is received, meaning there's been a change in what's
available to resend. And since users calling resendAll manually
expect it to do something, add a force param that ignores the backoff.
seems to fix the problem (but needs a lot of testing.)
2012-11-13 21:25:03 -08:00
Eric House
cf8d30ce5d
tweak logging; fix uninitialized debug-only variable
2012-11-13 21:18:52 -08:00
Eric House
ba11fcf8df
don't bother checking for stream size of 0 in jni since comms does
...
that now.
2012-11-13 21:01:25 -08:00
Eric House
cd2550a90d
Merge remote-tracking branch 'origin/android_branch' into android_branch
2012-11-13 07:24:54 -08:00
Eric House
093fc4d1fa
cleanup
2012-11-13 07:23:07 -08:00
Eric House
57ea768aaf
refuse to send 0-length messages. That may happen only when the stupid
...
curses client calls server_initClientConnection over and over, but
reduces unnecessary messaging in that case at least.
2012-11-13 07:22:48 -08:00
Eric House
c4f5b4522e
minor printing tweaks
2012-11-13 07:17:56 -08:00
Eric House
2908802017
try to make linux client mimic Android a bit better in saving after
...
any network activity so messages get acked more quickly.
2012-11-13 06:15:36 -08:00
Eric House
43b1e219f3
add a bit more logging to comms
2012-11-13 06:14:36 -08:00
Eric House
082e6a61f7
comment out unused command
2012-11-12 20:57:39 -08:00
Eric House
60814264e7
compile with XWFEATURE_COMMSACK turned off
2012-11-12 20:56:50 -08:00
Eric House
76c938cc67
fix to compile with API change; to drop relayid when it's rejected and
...
to use register with the GCM id on next [re]connect; and to not leave
variable unintialized when unable to call into java world due to being
called without context.
2012-11-12 08:03:25 -08:00
Eric House
4f3c81417d
go back to logging devids for now
2012-11-12 08:01:24 -08:00
Eric House
6ca966f22a
make test script and linux client mimic case where relay regid is
...
rejected by relay. Client re-registers and a new relay regid is
issued.
2012-11-12 07:27:20 -08:00
Eric House
6a85661095
lots of improvements: make useful for testing with non-android clients; shelve backoff data, etc.
2012-11-10 19:31:22 -08:00
Eric House
1316ae4b67
Fix relay devid protocol to deal with case where client submits a
...
ID_TYPE_RELAY id that's not in the devices table (as has happened when
a device switches relay URLs during testing, but might also happen if
I have to delete an entry from the devices table.) In that case,
return ID_TYPE_NONE to the client, which will be its clue to delete
its ID_TYPE_RELAY id and submit the platform-specific id again.
Note: android won't compile this revision thanks to util.h change
2012-11-10 15:05:44 -08:00
Eric House
b53412d98d
Fix to actually work. Grrr.
2012-11-10 14:52:10 -08:00
Eric House
ba733634cb
NPE: don't crash on first install
2012-11-09 06:57:37 -08:00
Eric House
b0f85e02df
use grep of app's help message to determine whether a param is
...
supported so can test with older clients and not crash.
2012-11-09 06:55:38 -08:00
Eric House
f1ee77882b
Send devid with RECONN as well as CONN so games present when device
...
upgrades can also use GCM. Tested on relay but not device.
2012-11-09 06:54:12 -08:00
Eric House
ff16db5c10
remove logging
2012-11-08 20:09:16 -08:00
Eric House
0f21f849d9
fix crash attempting to download dict when there's no network, e.g. in
...
airplane mode.
2012-11-08 20:08:20 -08:00
Eric House
0ef7c8bf46
return TYPE_NONE on devices like Kindle that don't do GCM instead of
...
an empty string claiming to be a GCM ID.
2012-11-08 19:58:03 -08:00
Eric House
07123ac823
cleanup: remove logging and only check for messages when the json data
...
holds that command.
2012-11-08 19:54:09 -08:00
Eric House
5cbafb9f56
up version strings and code
2012-11-08 19:49:45 -08:00
Eric House
283045c649
revert previous trivial change
2012-11-08 19:23:52 -08:00
Eric House
3b1f6a695f
don't show "can't do GCM" Toast on Kindle Fire
2012-11-08 06:38:35 -08:00
Eric House
2df4199a77
test script for messaging devices
2012-11-08 06:13:01 -08:00
Eric House
4eff38a85d
Merge remote-tracking branch 'origin/android_branch' into android_branch
2012-11-07 22:06:41 -08:00
Eric House
af89047969
treat an empty devID string as TYPE_NONE regardless of what the client claims.
2012-11-07 22:03:58 -08:00
Eric House
e6cd2265df
fix crash: make formatParams work with empty strings
2012-11-07 21:57:18 -08:00
Eric House
aafcd5144a
Better Kindle fix: don't even post message if SMS not supported.
2012-11-07 19:46:33 -08:00
Eric House
949b804f35
fix NPE on Kindle Fire, which has no SMS DB. Duh.
2012-11-07 19:43:08 -08:00
Eric House
83754d626e
add backoff for resending for messages still not removed from msgs table
2012-11-07 08:05:45 -08:00
Eric House
45d0b2dbc8
various improvements, including printing a period on every loop when
...
there's no work to do. All that remains is backoff.
2012-11-07 07:31:52 -08:00
Eric House
8516dca1cb
what I really meant to check in
2012-11-07 06:23:20 -08:00
Eric House
9b48523ff3
fix to work with new DB scheme and to send json client now expects
2012-11-07 06:17:33 -08:00
Eric House
1e13d6ac6c
look for values in msg sent from server, including one that puts up a
...
message via a notification.
2012-11-06 19:09:15 -08:00
Eric House
2c339ed7a5
fix to work with new devid/table scheme
2012-11-06 07:25:38 -08:00
Eric House
39dbed2004
add missing util method (fixing crash) and with it wire up new devID
...
scheme: now relay-assigned shorter id will be saved and used for
future games.
2012-11-06 07:08:06 -08:00
Eric House
9ad28908bb
assert enum within range
2012-11-06 07:07:14 -08:00
Eric House
9981360c67
put back minsdk stuff accidentally removed in merge.
2012-11-05 06:55:54 -08:00
Eric House
41cfacfee4
don't crash on emulator (which doesn't have library required by GCM)
2012-11-05 06:20:55 -08:00
Eric House
03108f311a
Merge branch 'android_branch' into android_gcm
2012-11-05 06:14:21 -08:00
Eric House
0376e25c26
Merge branch 'fix_beta_53' into android_branch
2012-11-05 05:43:33 -08:00
Eric House
bb2e3ffdb1
fix (by dropping second message) assert that there is no first
...
message. This is a TEMPORARY fix.
2012-11-04 21:36:20 -08:00
Eric House
e8720ec419
add link to changelog
2012-11-04 17:53:42 -08:00
Eric House
3942a49cac
Add a debug preference allowing to provide, or override, the download
...
dir. This will let users work around bugs on devices like my Blaze 4G
where the OS gives the wrong path, and also allows testing. Inval
DictUtil's dict cache eash time this is changed, so in effect adding a
wrong path pref hides all dicts in the Downloads dir.
2012-11-04 17:47:30 -08:00
Eric House
69108fd8a1
cleanup: import class to make declarations shorter.
2012-11-04 17:33:07 -08:00
Eric House
30675cfd3e
remove logging
2012-11-04 17:21:37 -08:00
Eric House
90480aca4c
don't put up toast when checking SMS DB
2012-11-04 07:40:24 -08:00
Eric House
68d6e10ab7
up version strings for quick bugfix release.
2012-11-03 17:27:46 -07:00
Eric House
4dd094b2b3
if the download dir doesn't exist (and on my "Blaze 4G" the function
...
getDownloadCacheDirectory() returns a path that doesn't) then don't
offer to move things there.
2012-11-03 17:26:43 -07:00
Eric House
59937b8514
modify how devids are handled on the relay and the protocol through
...
which they're communicated to the device. Device is expected to have
a platform-specific notion of ID which the relay stores in a new
devices table and indexes with a 32-bit number which is returned to
the device -- which is encouraged but not required to use it in lieu
of the longer ID in future communications. Modify linux client and
test script to use the relay-supplied id. Some of this is commented
out for now.
2012-11-03 10:58:01 -07:00
Eric House
773f04e95b
remove .gitignores from directory that's going away
2012-11-02 05:36:48 -07:00
Eric House
563422de02
turn on DEVID feature for linux
2012-11-02 05:35:56 -07:00
Eric House
47f9eb03b9
merge in changes from the -gcm directory: GCM will be a feature of the
...
non-variant build now.
2012-11-02 05:35:31 -07:00
Eric House
e66ddc3765
make stream_catString work with null ptr
2012-11-01 21:08:58 -07:00
Eric House
ecd6d81228
Merge branch 'android_branch' into android_gcm
2012-11-01 19:50:07 -07:00
Eric House
a73a5e8077
there seems to be no way to fix the warning so add comment
2012-11-01 19:46:38 -07:00
Eric House
257a15917b
script to run with lint checks enabled -- since I always have to look up how.
2012-11-01 19:46:08 -07:00
Eric House
a4787d5614
remove unused strings
2012-11-01 19:45:13 -07:00
Eric House
364acb6dcd
cleanup: remove some logging and unused string resources
2012-11-01 19:32:29 -07:00
Eric House
935e3b9673
fix to work from main build directory
2012-11-01 19:32:08 -07:00
Eric House
1c33c8cc31
scripts that help find unneeded string resources
2012-11-01 19:17:46 -07:00
Eric House
27935752a8
check cursor still open in attempt to fix crash seen on Galaxy Nexus
2012-11-01 18:39:26 -07:00
Eric House
057a41e4a9
check cursor still open in attempt to fix crash seen on Galaxy Nexus
2012-11-01 07:59:42 -07:00
Eric House
7135e30fe9
add missing ifdef
2012-11-01 07:58:36 -07:00
Eric House
3e289adc18
move related methods together
2012-11-01 07:58:27 -07:00
Eric House
fe819982da
Merge remote-tracking branch 'origin/android_branch' into android_gcm
2012-10-31 07:44:16 -07:00
Eric House
3d6a170921
python script to check relay and invoke GCM to notify recipients
2012-10-31 07:20:40 -07:00
Eric House
a61bb31aa5
update for newest wordlist
2012-10-31 07:12:10 -07:00
Eric House
b552a1fad0
check for moves on receiving message from GCM. Round-trip now works!
2012-10-31 07:09:23 -07:00
Eric House
d97c057b8c
Merge branch 'android_branch' into android_gcm
2012-10-31 06:33:54 -07:00
Eric House
1cae4e9a4c
increase buffer size, and test rather than assert for overflow. Fixes
...
crash with new large GCM devids.
2012-10-31 06:12:24 -07:00
Eric House
1b7a618454
send the right dev id
2012-10-31 06:03:31 -07:00
Eric House
fe47266b1f
don't ignore output when compiling jni: hides errors!
2012-10-30 08:05:25 -07:00
Eric House
6014e3d76f
turn on devid code and implement support in java. Untested, but should work.
2012-10-30 07:57:17 -07:00
Eric House
6cf5d7e04e
Android.mk needs to be checked in
2012-10-30 07:48:16 -07:00
Eric House
c93dfd6605
Merge branch 'android_branch' into android_gcm
...
Conflicts:
xwords4/android/XWords4/res/values/common_rsrc.xml
2012-10-30 07:10:42 -07:00
Eric House
3469975d2a
add, still disabled by compile-time flags, code to transmit device ID
...
(e.g. ID Android devices get via GCM) to relay and to associate it
there with messages that need to be delivered.
2012-10-30 07:01:47 -07:00
Eric House
80a79b6991
Make it less likely that a message received while I'm not intercepting
...
them will be opened more than once: track whether I've searched the
SMS db, and only clear that setting when SMS play is *disabled*.
2012-10-29 21:20:32 -07:00
Eric House
ba0f91c438
cleanup: use constant
2012-10-29 20:43:02 -07:00
Eric House
e90621ec1d
use existing string rather than invent a new one
2012-10-29 07:30:09 -07:00
Eric House
e39b776d80
Add button to alert warning that SMS isn't on that takes you to
...
Preferences.
2012-10-29 07:20:11 -07:00
Eric House
2375a6730a
tweak text
2012-10-27 15:31:49 -07:00
Eric House
b83e587d91
changelog and version strings for beta 53
2012-10-27 15:21:33 -07:00
Eric House
5aef1afec3
point URL at android part of sf.net site, not home.
2012-10-27 13:18:08 -07:00
Eric House
f0a46eacfa
script reached by URL in SMS messages sent to devices without
...
Crosswords installed.
2012-10-27 13:15:34 -07:00
Eric House
86378e4f0b
Merge remote branch 'origin/android_branch' into android_branch
2012-10-27 08:55:19 -07:00
Eric House
e7d5be06e9
fix crash when old client connects to new host by making host use the
...
right version test in deciding what to send.
2012-10-27 08:52:54 -07:00
Eric House
4ea8569abc
honor --min-devs flag
2012-10-27 08:15:07 -07:00
Eric House
e1fa0f9dd3
Merge remote-tracking branch 'origin/android_branch' into android_branch
2012-10-26 07:06:59 -07:00
Eric House
fb747304eb
put sms at bottom of new-game dialog
2012-10-26 07:00:23 -07:00
Eric House
b097e0825e
fix linux crash do to casting problem
2012-10-26 06:49:15 -07:00
Eric House
d7d666e4f9
Merge branch 'android_branch' into android_gcm
2012-10-25 08:12:02 -07:00
Eric House
6e39466b09
somehow new dict-download code is storing some in info DB with
...
langcode of 0. Work around that by rebuilding cache entry when that's
seen.
2012-10-25 08:03:56 -07:00
Eric House
6180834ada
log case where game has no dicts
2012-10-25 08:02:30 -07:00
Eric House
4ed1446e06
Fix new bug: don't null out default dict just because we don't have one.
2012-10-25 07:58:39 -07:00
Eric House
b40e9b7928
assert non-0 lang code
2012-10-25 07:10:54 -07:00
Eric House
f2684e5652
log device ID even when it's not newly assigned
2012-10-25 06:24:19 -07:00
Eric House
fcc4a0a5f9
add new file
2012-10-25 06:23:49 -07:00
Eric House
4c1c0ddaaa
Merge branch 'android_branch' into android_gcm
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
2012-10-24 08:05:50 -07:00
Eric House
9bb8c9cddf
don't allow change of dict in in-play networked game
2012-10-24 08:01:52 -07:00
Eric House
3d14ed96e7
cleanup and rename method
2012-10-24 07:40:14 -07:00
Eric House
643a301214
cleanup: add additional param to downloadFinished() iface method
2012-10-24 07:22:26 -07:00
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