Andy2
0eec455119
change one return type; improve logging
2011-07-04 12:46:48 -07:00
Andy2
8904f37e1a
force XW_STATE to be 1 byte.
2011-07-04 12:45:51 -07:00
Andy2
ab8e4e437b
call server_do before passing message to server to give it a chance to
...
get any pending work done.
2011-07-04 12:37:23 -07:00
Andy2
66d42faead
fix sync-with-relay menu items to work even if timed syncing is
...
disabled.
2011-07-04 12:28:17 -07:00
Andy2
7024718c87
add timestamps to jni logs
2011-07-04 09:38:22 -07:00
eehouse@eehouse.org
8f782070ac
Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite
2011-07-03 09:28:36 -07:00
Eric House
e207e0e142
add option to run only one game at a time in a given room. The idea
...
was to mimic conditions that are creating a bug on-device but it
didn't work. Still, a useful test case....
2011-07-02 23:12:16 -07:00
Andy2
175aace629
fix a couple of rare failures due to race conditions testing or
...
valgrind flushed out.
2011-07-02 13:28:24 -07:00
Eric House
35bfdb1dd6
Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite
2011-06-30 19:44:46 -07:00
Eric House
09b81c6ad7
fix rare crash: don't call PQgetvalue when there are no results.
2011-06-30 19:39:00 -07:00
Eric House
5c5708fa66
try to fix race condition that sometimes means script detects game is
...
over but doesn't communicate to relay: don't consider file done until
have info to sent to relay.
2011-06-30 19:37:37 -07:00
eehouse@eehouse.org
3db7fccb53
Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite
2011-06-30 18:57:53 -07:00
Andy2
ada84cccb3
make invites work with games having more than two players. But: the
...
games themselves don't work! Fix this or disable 3- and 4-device
networked games.
2011-06-30 18:56:51 -07:00
Andy2
36287870d4
add np (num players) param
2011-06-30 18:22:42 -07:00
Andy2
546791d215
custom message when more than one player missing reminding to invite
...
more than one person.
2011-06-30 06:30:05 -07:00
Andy2
0c42da905a
plug memory leak flushed out by auto-juggle code: null dict doesn't
...
mean the end of the list.
2011-06-29 21:43:50 -07:00
Eric House
48ea9e2b28
add preference to juggle players when creating a new game
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java
2011-06-29 21:43:44 -07:00
Eric House
ef9d359ab9
tweak default param values
2011-06-29 21:38:54 -07:00
Eric House
b4a513ce87
reduce logging; log errno on syscall failure
2011-06-29 21:38:31 -07:00
Eric House
8e31fd88c3
reduce logging; and fix valgrind-found problem using wrong
...
synchronization primative.
2011-06-29 21:37:33 -07:00
Eric House
04740486fb
wrap more logging in ifdefs
2011-06-29 21:35:21 -07:00
Eric House
2b4f439a2f
rough script to parse logs looking for threads that have hung (stopped logging)
2011-06-29 21:32:18 -07:00
Andy2
57cfefb6a9
fix leaks -- that don't really matter as process is exiting, but
...
quiets valgrind.
2011-06-29 18:45:02 -07:00
Andy2
f3a4ff9dfc
use cid for variables of type CookieID everywhere instead of almost
...
everywhere
2011-06-29 18:42:41 -07:00
Andy2
4cb45d3b82
juggle before setting language (makes sense though not demonstrable
...
difference)
2011-06-29 18:30:08 -07:00
Andy2
cd844a5bad
plug memory leak flushed out by auto-juggle code: null dict doesn't
...
mean the end of the list.
2011-06-29 18:28:55 -07:00
Andy2
632980dc98
add preference to juggle players when creating a new game
2011-06-29 06:16:58 -07:00
Andy2
413b2f5b2e
include default language in text in new game dialog.
2011-06-28 19:01:03 -07:00
Andy2
5dd524ef2f
param name for clarity
2011-06-28 19:00:21 -07:00
Andy2
a9d1dc7bdc
add default room name in configure-first case too.
2011-06-28 18:32:32 -07:00
Andy2
363acc228a
use printf so rooms sort numerically
2011-06-28 17:38:59 -07:00
Andy2
b2a7acbdf1
remove echo
2011-06-27 18:59:36 -07:00
Andy2
3db0543994
work in absence of drop-nth-packet param
2011-06-27 18:57:27 -07:00
Andy2
ceeee39c2d
fold it what can from android_invite branch to make relay upgrade test
...
easier
2011-06-27 18:43:42 -07:00
Andy2
8673c6a001
toward being able to verify that upgrading the relay won't hurt
...
in-play games: add ability to pick up games mid-play; don't sleep
before killing a device unless it's only been running less that the
minimum.
2011-06-27 18:32:30 -07:00
Andy2
a96dfb57f6
drop-packet test got an assert because we assumed the effects of a
...
dropped packet. Instead, now treat the connection as broken and
restart.
2011-06-27 18:30:52 -07:00
Andy2
e122953fd5
clean up logging
2011-06-27 18:27:07 -07:00
Andy2
c84722fc22
add ack
2011-06-27 06:45:14 -07:00
Andy2
fffcbb677e
under testing I'm running up against the 1024-files-open limit and
...
dying with an assert. Log something -- but still die as there's
nothing to be done in code except hope some connections don't
reconnect right away. Fixes: 'ulimit -n' or edit 'nofile' param in
/etc/security/limits.conf on the relay host.
2011-06-27 06:20:51 -07:00
Andy2
c2cd3a709a
specify name of database in config file rather than hard-coding it.
2011-06-25 21:32:18 -07:00
Andy2
ffeb94e4bd
start getting rid of super-verbose logging
2011-06-25 21:30:32 -07:00
Andy2
cdc16ee974
variable/method name change only: cookieid->cid
2011-06-25 15:43:52 -07:00
Andy2
38ad3aa81c
cleanup; and: collapse HostRec and socket set into map of socket to
...
HostRec, protecting all accesses with ReadWrite locks.
2011-06-25 15:40:12 -07:00
Andy2
6c121dac57
final set of changes -- all test cases now seem to be passing. Stop
...
duplicating set of sockets owned by a cref, moving it from cinfo into
cref and caching a copy outside when cref is unclaimed (after which no
change is possible until it's claimed again.)
2011-06-24 18:34:34 -07:00
Andy2
df60ec648b
Don't return new error XWRELAY_ERROR_NORECONN as devices don't have it
...
yet.
2011-06-24 18:32:53 -07:00
Andy2
e44ed96691
fix logging: calling read(), not recv()
2011-06-24 18:28:18 -07:00
Andy2
9ff149fe2d
fix race: if we get a cid from the DB while another thread has claimed
...
that cid, then by the time we can claim it there's no longer space for
us. Call new method after the claim succeeds to make sure there's
still room, and if not relinquish and loop back to the DB for another
try.
2011-06-23 19:00:32 -07:00
Andy2
c51e5e41f4
fix ClaimSocket: it was neither marking claims nor checking for marks.
2011-06-23 18:58:50 -07:00
Andy2
63a4e6c953
get rid of per-cref mutex: it's redundant now that access is
...
synchronized. Add method to check if new players are still welcome to
allow fix for race.
2011-06-23 18:57:48 -07:00
Andy2
a5bab1232f
deal with changing connnames: use the last
2011-06-23 18:12:38 -07:00
Andy2
e886a1aefe
lots more changes -- another snapshot, this, rather than stuff
...
carefully polished and reviewed. Shows progress, though, in getting
through tests.
2011-06-23 07:12:50 -07:00
Andy2
b4381e8403
drop-packets off, not on, by default
2011-06-22 18:17:47 -07:00
Andy2
3ebcc01e86
beginning -- this is a snapshot -- of rewrite of how relay keeps
...
multiple thread out of a single game. Add new class that locks
per-cid and start using it. Very incomplete.
2011-06-22 06:51:26 -07:00
Andy2
c87df3ce16
add option to drop incoming packets randomly (rather than 1st, then
...
2nd, then 3rd etc.)
2011-06-20 18:55:57 -07:00
Andy2
aecdd8922f
don't show times -- not interesting for debugging right now
2011-06-20 18:55:17 -07:00
Eric House
85d484a881
major mod to deal with devices that fail to receive ACK and then
...
reconnect. I was putting both (i.e. the same device twice) in the
same game. Now I detect this based on the seed being duplicated and
treat the device as having failed to ACK then proceed with the CONNECT
as if it were new. Tested pretty heavily but only with two-device
games.
2011-06-20 18:13:15 -07:00
Eric House
44af266db6
add logging
2011-06-20 18:10:42 -07:00
Eric House
238fac3696
add new ack column to track whether devices have ACKd yet.
2011-06-20 18:10:07 -07:00
Andy2
9b4034f409
fix undefined variable by updating script before possibly deleting it
2011-06-16 18:35:08 -07:00
Andy2
7eb099d3a6
show seeds
2011-06-15 06:49:32 -07:00
Andy2
3f7cd851f2
use new drop-nth-packet option, incrementing by 1 each time.
...
Currently this breaks the relay -- which must be fixed.
2011-06-15 06:49:15 -07:00
Andy2
2d7a1f13b8
add drop-nth-packet option
2011-06-15 06:47:08 -07:00
Andy2
cb5fa56a90
Tweak a couple of messages. Bye Luke!
2011-06-14 06:40:10 -07:00
Andy2
ecc5211791
Bug: don't refuse to update preference summary just because it's empty.
2011-06-14 06:16:11 -07:00
Eric House
5fc430c6da
Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite
2011-06-14 05:47:16 -07:00
Eric House
cb3e33ef72
update for months-old param name changes
2011-06-14 05:46:27 -07:00
Andy2
7a5549cc43
set selectAllOnFocus on player name edit. Can't figure out how to
...
force focus to that field though....
2011-06-14 05:38:37 -07:00
Andy2
d470a1c1e0
add a newbie-info for new-from menuitem. Still need one for reset.
2011-06-13 18:47:42 -07:00
Andy2
a318021308
title that won't surprise on upgrade
2011-06-13 18:26:12 -07:00
Andy2
d18ac741b7
add new debug pref for redirecting host so it and relay can live on
...
different machines.
2011-06-13 18:17:37 -07:00
Andy2
c9c470b724
remove logging
2011-06-13 06:27:55 -07:00
Andy2
5232186b1d
path starts with //, not /
2011-06-13 05:28:06 -07:00
Andy2
dfc8519c9c
wrap password query field in layout too so it can have some margins.
2011-06-11 06:06:42 -07:00
Andy2
e9e8211050
capitalize names in player config too
2011-06-11 06:06:03 -07:00
Andy2
6620b42abd
clean up new game dialog (thanks K.T.!): remove title bar, add some
...
spacing and make it scrollable for when in landscape mode.
2011-06-10 22:51:54 -07:00
Andy2
8c65ed5548
have default name text selected for easier replacement
2011-06-10 22:28:49 -07:00
Andy2
bb82831fb4
put EditText into a layout so can have some margins.
2011-06-10 20:55:18 -07:00
Andy2
1a89ed1f14
use new Utils.inflate where appropriate
2011-06-10 20:09:38 -07:00
Andy2
d058e3fd4b
use a layout instead of a raw text widgit.
2011-06-10 20:02:14 -07:00
Andy2
1cc2717d50
tweak text for consistency
2011-06-10 20:01:22 -07:00
Andy2
a7851f3c55
on initial startup check if the default name's been set for Player 1.
...
If not, give a chance to set it and a welcome message. Whatever
happens, wind up with some sort of default name so the query isn't
repeated unless user clears all defaults.
2011-06-10 18:58:49 -07:00
Andy2
1d5cfd49fa
remove second URL that was meant to allow user to install Crosswords
...
if it's not installed (because SMS apps confuses with the way it
presents multiple URLs.) Will try to do the same thing with the
redirect .php script whose output will stick around if the redirect
fails. Also, use URI.Builder instead of a format string to build the
redirect URL. It's cleaner. Still need to have a space in the format
string to keep sentence-finishing period from becoming part of the
room name. Not sure how to fix that without moving to html messages
which I assume don't work in SMS.
2011-06-10 06:49:32 -07:00
Andy2
d089c29ada
factor uri parsing and creating code into its own class -- in case
...
there are matching operations required. I thought one would be for
URLEncoder.encode() but seems not to be: spaces are un-escaped just
fine.
2011-06-09 20:56:29 -07:00
Eric House
dd97a81191
make constant string a static final rather than a resource.
2011-06-09 20:48:06 -07:00
Eric House
265ebc5e3e
add download url in csse redir fails
2011-06-09 18:30:59 -07:00
Andy2
6c4f35b425
wrap parsing of new-game URI in a try so don't crash when they're
...
badly formatted.
2011-06-09 06:49:55 -07:00
Andy2
e097b15071
room names are user-created and need to be URLEncoded to e.g. escape
...
spaces.
2011-06-09 06:38:43 -07:00
Andy2
d43d789820
move socket creation inside Thread's run() in attempt to fix too-long
...
UI freeze when deleting individual games.
2011-06-07 20:51:26 -07:00
Andy2
cb8e162080
Progress toward getting invites going. Seems to work but is very
...
clunky: email and sms both send messages with URLs that work on the
receiving end.
2011-06-07 18:38:10 -07:00
eehouse@eehouse.org
484bb295d0
Merge branch 'android_branch' into android_invite
2011-06-06 22:08:49 -07:00
Andy2
07be547151
fix array OOB exception by avoiding the dereference. Better would be
...
to remember the dict name from before "download" was chosen and always
fall back to it.
2011-06-06 22:07:57 -07:00
Andy2
54777c8dbd
catch exception (and put up a explanatory Toast) that occurs, says
...
google's crash report site, when I try to launch something to handle
http and nothing can. Maybe people are installing Crosswords on
devices that don't have browsers.
2011-06-06 20:40:12 -07:00
Andy2
7fc267bb24
google reports a crash in warnIllegalWord that only makes sense if I'm
...
passing a 0-length array of bad words. Which should never happen, and
would be caught by asserts in a debug build, but: when there are no
bad words don't call back into the java world.
2011-06-06 20:35:34 -07:00
Andy2
1bc70f2c8f
google reports a crash in warnIllegalWord that only makes sense if I'm
...
passing a 0-length array of bad words. That in turn suggests a
screwup where a move's rejected for some reason other that a word not
being in the dictionary. This is all supposition, and all stuff
that'd be caught by asserts in a debug build, but: when there are no
bad words don't report them -- even if the move's rejected.
2011-06-06 20:33:10 -07:00
Andy2
f58eded796
fix (assuming diagnosis is correct) NPE crash reported on google site.
2011-06-06 20:06:59 -07:00
Andy2
53b2a3a6b5
Merge branch 'android_branch' into android_invite
...
Conflicts:
xwords4/android/XWords4/res/values/common_rsrc.xml
2011-06-06 18:55:21 -07:00
Andy2
845b277c01
rename m_path->m_name for consistency
2011-06-06 18:44:29 -07:00
Andy2
c21a494e0b
remove unnecessary setAction call. (Haven't tested if others can go.)
2011-06-06 18:32:17 -07:00
Andy2
2ce4c1417c
do a better job of figuring out whether to use black or white to
...
outline blank tiles.
2011-06-06 18:28:20 -07:00
Andy2
1f664fa9e8
fix crash launching chat activity -- due to incorrect removal of URI
...
code recently.
2011-06-06 18:15:02 -07:00
eehouse@eehouse.org
b2d62f0f3d
Revert "extend code for choosing whether to make arrow white or black based on"
...
This reverts commit 1ef67e74eb
2011-06-06 18:10:05 -07:00
Andy2
37a2fa0aa1
update release notes
2011-06-06 07:02:16 -07:00
Andy2
1ef67e74eb
extend code for choosing whether to make arrow white or black based on
...
background to apply to blank-mark ring. Fixes disappearing mark when
tile background gets dark.
2011-06-06 06:52:10 -07:00
Andy2
056261fe9e
up version number/strings
2011-06-06 06:49:47 -07:00
Andy2
a6a668881f
Merge branch 'android_branch' into android_invite
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
2011-06-05 10:49:17 -07:00
Andy2
84572c1ed6
get rid of the other places where Uri's being used but a simple name
...
is needed.
2011-06-05 10:44:26 -07:00
Andy2
c46015c514
fix crash on K's G2X due to URI.fromFile() returning a really strange
...
path. I don't need a URI anyway as the path is now just a key for DB
lookup. So just pass the name as an extra -- and rename variable to
reflect.
2011-06-05 10:29:33 -07:00
Andy2
d0f0fa04ce
set background color of board root view from prefs on creation and
...
whenever pref color might have changed.
2011-06-05 10:20:23 -07:00
Andy2
65efbe38c9
set background color of board root view from prefs on creation and
...
whenever pref color might have changed.
2011-06-03 23:35:06 -07:00
Andy2
f29dff4ff5
add icon for new add-game menuitem
2011-05-26 18:46:29 -07:00
Andy2
3b78bab89d
sort by creation time rather than name
2011-05-20 22:55:07 -07:00
Andy2
c9be5b464c
actually set the creation timestamp
2011-05-20 22:51:30 -07:00
Andy2
13e8667634
use Player %d when no default player name set
2011-05-20 06:51:13 -07:00
Andy2
3df47f8fe2
separate string for missing player
2011-05-20 06:50:38 -07:00
Andy2
815490fb87
update gi before creating summary. In case of networked game,
...
incoming messages may have changed the version inside the jni
(reordered or renamed players) and we want those changes in the
summary.
2011-05-20 06:44:06 -07:00
Andy2
d554f71e8a
cleanup: move invariant out of loop
2011-05-20 06:39:39 -07:00
Andy2
a29f08616e
what I meant to check in.
2011-05-19 22:53:58 -07:00
Andy2
232e4ec1e9
track missing players -- players for whom space is reserved locally
...
and whose names have not yet been received from host/server -- as part
of summary. They can be drawn differently to give a clear visual
indication which games are not in play and for which the user might
want to issue an invitation.
2011-05-19 22:53:04 -07:00
Andy2
0b2ca44fa9
we need *name and *namef forms
2011-05-19 22:50:39 -07:00
Andy2
89911ecaa4
add server_getMissingPlayers to return a bitvector indicating players
...
not yet received on device. Meant to be included in summary. I'm not
happy with how much code it took to figure this. I don't know
server.c all that well any more.
2011-05-19 22:48:21 -07:00
Andy2
0f45c26aea
remove, for now, test that prevents multiple games from a single email
...
so on-device testing possible. Later need to improve the test.
2011-05-19 06:54:46 -07:00
Andy2
362eb10d9d
remove, for now, test that prevents multiple games from a single email
...
so on-device testing possible. Later need to improve the test.
2011-05-19 06:54:27 -07:00
Andy2
7349a61f5a
add market url to install and break ugly/non-localized url out of
...
localized strings.xml.
2011-05-19 06:52:42 -07:00
Andy2
4c5c435fb5
add new parameter so client always gets notified on connection
...
including how many players are still missing.
2011-05-19 05:51:00 -07:00
Andy2
0c3a6d362c
when a networked game connects and is missing player, offer to invite
...
someone. Factor out code from create-and-invite path to support this.
Move invite-related strings into resources. Still untested with
networked device (to send email.)
2011-05-18 19:00:32 -07:00
Andy2
71afbf617c
add empty view so screen is never completely blank
2011-05-18 06:28:44 -07:00
Andy2
55278ab2a2
what I meant to check in.
2011-05-17 18:44:57 -07:00
Andy2
bf4b3c3058
fix hint text to mention only one button, hide that button along with
...
the text -- and make the add-game menu item actually work.
2011-05-17 18:44:34 -07:00
Andy2
7389b3b4c8
disable the three unused name prefs
2011-05-17 18:26:53 -07:00
Andy2
0763e7d5b3
put the two dictionary settings into their own subscreen -- like
...
player names.
2011-05-17 18:20:21 -07:00
Andy2
bc3e5b5ca4
add defaults for first through fourth player names. Apply them only
...
to local, non-robot players, which at the moment means only the first
will get used. Not sure what the right strategy is now so maybe all
but the first goes away.
2011-05-17 18:12:23 -07:00
eehouse@eehouse.org
574194cb4f
Merge branch 'android_branch' into android_invite
2011-05-16 19:38:25 -07:00
Andy2
9cc2dfca34
include language in set-default-dict message to reinforce connection
...
between dict and language. I really want to lock the two defaults --
force to change both if one is a different language -- but am not sure
it that's easy enough to do quickly (for next beta.)
2011-05-16 17:58:31 -07:00
Andy2
903b412046
add note that storage location decision isn't permanent
2011-05-16 17:37:52 -07:00
eehouse@eehouse.org
2fae0842c4
Merge branch 'android_branch' into android_invite
2011-05-16 06:44:04 -07:00
Andy2
740c5dd46c
up constants and change message for new release
2011-05-16 06:43:42 -07:00
Andy2
6b4320e727
start to fill in text for new-game dialog.
2011-05-16 06:35:49 -07:00
Andy2
3762fc07d1
express size in K (rounding up)
2011-05-15 08:02:06 -07:00
Andy2
94f582cdc0
switch size and wordcount columns
2011-05-15 08:01:36 -07:00
Andy2
332767105c
express size in K (rounding up)
2011-05-15 07:37:29 -07:00
Andy2
7ccacdc26d
switch size and wordcount columns
2011-05-15 07:28:10 -07:00
Andy2
a89d81587d
Merge branch 'android_branch' into android_invite
...
Conflicts:
xwords4/android/XWords4/res/values/strings.xml
2011-05-14 11:54:31 -07:00
Andy2
53f1bc8858
fix to use positional params in format strings
2011-05-14 11:44:13 -07:00
Andy2
ba6968c937
remove strings no longer used
2011-05-14 11:29:05 -07:00
Andy2
c996e98624
replace two menuitems, default-robot and default-human, with a single
...
that invokes a dialog giving an explanation and three choices: robot,
human and both.
2011-05-14 11:04:19 -07:00
Andy2
54a793f6c2
fix to use positional params in format strings
2011-05-14 10:25:58 -07:00
Andy2
6ee8c171be
implement moveDict and redraw row with new location if successful.
2011-05-14 10:12:30 -07:00
Andy2
aedc3c6cdc
fix title -- not showing wordcount any more
2011-05-14 10:10:24 -07:00
Andy2
f914a15b97
comment field GONE by default; revealed when used
2011-05-14 10:07:34 -07:00
Eric House
c99093fb35
Merge branch 'android_branch' into android_invite
2011-05-11 22:04:06 -07:00
Andy2
fe1bec74f5
add context menuitem to move dicts, dialog to confirm, and call
...
stubbed-out method to do the actual move. Still need a title and to
inval so gets redrawn (and to implement the actual move.)
2011-05-11 19:01:13 -07:00
Andy2
644100a005
Add generic Object cache to work around being unable to subclass an
...
object that's defined in a layout file (class cast to the subclass
fails, as you'd expect.) Will use this to cache a dict's location.
Eventually there needs to be a DB for dict details.
2011-05-11 18:59:41 -07:00
Andy2
e51b6f3322
add dict's locations to display
2011-05-11 18:07:07 -07:00
Andy2
19ed409dda
add notion of dict location, method to get it, and rewrite a couple of
...
others to use that.
2011-05-11 18:06:43 -07:00
Andy2
7d38a629b5
add comment field to XWListItem and its layout. Get elements by id
...
rather than position.
2011-05-11 18:05:41 -07:00
Andy2
8b130521fa
Merge branch 'android_branch' into android_invite
...
Conflicts:
xwords4/android/XWords4/res/values/strings.xml
2011-05-10 18:55:13 -07:00
Andy2
b4b54c5fb9
quick hack to open up all groups. Need eventually to remember how
...
user sets 'em.
2011-05-10 18:52:47 -07:00
Andy2
ec1e8674ec
replace placeholder language names with empty strings so, maybe, can
...
elect not to display
2011-05-10 18:36:48 -07:00
Andy2
782a9f1f70
get rid of strings that don't seem to be used anymore. Still need to
...
pull from localized files.
2011-05-10 18:36:04 -07:00
Andy2
af96e184d7
don't refresh public room names when game is locked.
2011-05-10 18:34:39 -07:00
eehouse@eehouse.org
bad8a5e19b
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-05-10 18:30:00 -07:00
Eric House
dd27a0ebcd
first cut at script to do stuff with xml string resources, e.g. find strings that aren't used
2011-05-10 18:26:54 -07:00
Andy2
8a8e1c9db0
remove no-op method and call of same
2011-05-10 18:25:27 -07:00
Andy2
472ffd02bf
fix getting wrong networked window title even when configuring a
...
non-networked game. And remove no-op method call.
2011-05-10 18:24:57 -07:00
Andy2
75e41caf90
go back to using XWListItem (with its delete-me X) and get rid of
...
delete context menu item.
2011-05-10 06:31:09 -07:00
Andy2
2dbf1ac489
add formatted=false to postpone fix suggested by new version of SDK
2011-05-10 06:27:58 -07:00
Andy2
085748e201
hook up context menus, and add a delete item to replace the
...
checkboxes. Still need to disable it when dict is built-in. And
maybe add a different menu for languages.
2011-05-09 18:59:51 -07:00
Andy2
c990900913
cache list of langs. Performance is otherwise abysmal. May need to
...
add mechanism to notify when the list is invalidated. (Or move
caching into DictsLangCache class.)
2011-05-09 06:49:45 -07:00
Andy2
a559fdaae9
use a built-in layout for top-level rows to get the expander drawn right.
2011-05-09 06:32:30 -07:00
Andy2
9dfcb2dda2
first step toward using an expandable list for dicts browser, with
...
languages as first-level items each containing all of the dictionaries
in that language. This is a snapshot: it's broken visually and
functionally.
2011-05-08 22:50:42 -07:00
Andy2
129a9e97ef
fix compile error
2011-05-06 19:01:15 -07:00
Andy2
d407880dc1
complete the work of handling an incoming intent sent via a
...
new-game-invite URI. Seems to work, but requires two devices to test.
2011-05-06 18:56:30 -07:00
Andy2
249402758a
add new activity for starting a new game. Has four buttons and
...
(eventually) explanatory text. Currently more-or-less works,
including sending an email with a link that when clicked launches
Crosswords. (Still need to respond to that link on receipt, but I'm
at least pulling out the necessary fields.)
2011-05-06 06:52:10 -07:00
Andy2
77bf5e2d36
php file to be run on server to enable via redirection clickable links
...
in SMS app that will launch Crosswords.
2011-05-06 06:49:43 -07:00
Andy2
f05e02144c
move setting gameID (if not already set) to creation of C version of
...
the struct so it always happens, and also set it back into the java
version at the same time. Makes creation of new games easier.
2011-05-06 06:47:44 -07:00
Andy2
2294159c7c
change sufficient to get a custom scheme in browser to launch me. Had
...
to duplicate an activity element which is bad and maybe won't work
everywhere so try to fix this. But this *does* work in 2.2 emulator.
2011-05-04 19:04:02 -07:00
Andy2
4d31c9cbe5
update release notes
2011-05-03 18:55:51 -07:00
Andy2
a87f90b6e9
up version for b26
2011-05-03 18:47:16 -07:00
Andy2
b4bfea0d93
handle missing-dict downloads through DictsActivity too. Now
...
everything routes through that class via static methods that kick the
activity off if needed.
2011-05-03 18:25:46 -07:00
Andy2
6e973ba48d
tweak wording
2011-05-02 18:40:35 -07:00
Andy2
0b7891ad8f
look in sd dir too when asking if file exists
2011-05-02 18:33:19 -07:00
Andy2
d11ef3c390
From game config's download-more spinner items, launch DictsActivity
...
rather than a separate download. This uses DictsActivity's query for
where the downloaded item should be stored.
2011-05-02 08:04:04 -07:00
Andy2
7cf412dd50
implement test for presence of external storage; don't crash if not present.
2011-05-02 07:39:07 -07:00
Andy2
5886f0ed85
cleanup; use dialog id from the right range.
2011-04-30 15:23:36 -07:00
Andy2
0171d0ccb2
inval new file from main thread after async task finished. Seems to
...
prevent attempts to read file while it's still being written (but only
on external storage.)
2011-04-30 15:23:14 -07:00
Andy2
e1e181949e
offer user a choice between using internal and external storage when
...
downloading dicts. Still to do: check if external is available before
offering; and either remove ability to download from within config
dialog or offer that choice there. Or just use a preference to
determine where storage happens. Also, on emulator game hangs during
download when using external storage.
2011-04-30 14:28:35 -07:00
Andy2
8caefef406
test for null lock. Market reports a NPE that this fixes, though it
...
can only happen if an onClick handler gets called after onPause().
Assuming that's true, this fixes it.
2011-04-29 18:58:02 -07:00
Andy2
f53f2dd224
remove GameConverter -- it's been months
2011-04-29 06:40:00 -07:00
Andy2
e89c6f94b6
update with changes since b24
2011-04-29 06:39:34 -07:00
Andy2
d49a20867a
new default robot dictionary
2011-04-29 06:25:16 -07:00
Andy2
deeb2f3cba
fix compile-command
2011-04-29 06:24:41 -07:00
Andy2
61c33ca783
new smallish English dictionary. See the Makefile for origins.
2011-04-29 06:24:25 -07:00
Andy2
02f23ac1ec
In list item loading async task, don't wait on lock. Give up if it's
...
not available and wait to be called again. Fixes occasional assertion
failure when lock held for even five seconds. Screen jerks around a
bit but otherwise seems to work well.
2011-04-28 21:08:24 -07:00
Andy2
ba026f761d
get rid of unused parameter
2011-04-28 18:47:16 -07:00
Andy2
2572af039d
fix NPE by refusing to calc font info when don't have char set, and by
...
resusing to draw when don't have font info. Until other bugs got
fixed this must meant lots of all-white boards, and it's not strictly
necessary, but is an improvement.
2011-04-28 18:43:18 -07:00
Andy2
09100dcb2c
track lang code of last dict sent and don't send repeats.
2011-04-28 18:41:39 -07:00
Andy2
3b3a822dcc
a gmae may have several dictionaries in several places, but all should
...
share the same language. So pick one to send to draw_dictChanged
rather than sending all (some of which may be null.)
2011-04-28 18:40:44 -07:00
Andy2
2886458814
assign dicts in constructor. Makes new games have the right dicts
...
even if not configured after, assuming defaults are set.
2011-04-27 06:51:30 -07:00
Andy2
9013897a5a
assign dicts as soon as language is changed.
2011-04-27 06:39:52 -07:00
Andy2
399fc081d7
add menuitem to set default robot dict.
2011-04-27 06:38:45 -07:00
Andy2
17fd65fb2d
list cur value for robot dict too
2011-04-27 06:38:07 -07:00
Andy2
0c9d33da3f
Add infrastructure to sort dicts by wordcount so robot can have
...
smallest and human largest. Sorting works. Still need to fix when
new dicts get assigned after lang change -- too often all players wind
up inheriting the default.
2011-04-26 18:59:11 -07:00
Andy2
a5fd4cef30
move setRemoveOnDismiss into delegate, and call it from a dialog
...
that's been crashing when called from performRestoreInstanceState.
The hope is that this will prevent the crash by forcing the dialog to
always be recreated. But it may be that I just need to test for
m_missingDictNames being null....
2011-04-26 18:26:21 -07:00
Andy2
83f2882589
what I mean to check in (without commented out stuff)
2011-04-26 06:43:06 -07:00
Andy2
4113d92be7
need to replace the main dict too
2011-04-26 06:41:31 -07:00
Andy2
33c81ec7ec
check for null to fix NPE.
2011-04-25 21:08:51 -07:00
Andy2
7a5920e9f2
use game dict if no player dict (to avoid NPE)
2011-04-25 21:01:15 -07:00
Andy2
ecc5357ef8
up version info, and collapse two locations into one resource entry.
2011-04-25 20:46:23 -07:00
Andy2
024f7e0541
per-gi dictName matters again: preserve it, include it in lists passed
...
to jni, and don't bother to assign a per-player dict when it'd be the
same as the game dict. Allows many games to have just the one, and
also fixes problems opening games saved with older versions. Duh.
2011-04-25 20:24:56 -07:00
Andy2
af08b2e5b0
add a couple of asserts
2011-04-25 20:17:54 -07:00
Andy2
bf67a88c5a
expect the array of dicts passed to include the game dict (as part of
...
changes to always have a game dict and to have player dicts only when
they're different.)
2011-04-25 20:16:38 -07:00
Andy2
6aa0d38c45
don't call through to java draw_dictChanged unless it's for the main
...
game dict.
2011-04-25 20:15:34 -07:00
Andy2
9d973cca15
load summaries for game list items via async tasks whenever a cached
...
View isn't present. Fixes failure to redraw after changing language,
and also should speed inital load. Needs testing.
2011-04-23 22:58:11 -07:00
Andy2
e9fadd4d96
Rework list item code to deal with when the summary isn't available:
...
have update icon hidden by default, and print the game name (which we
know.)
2011-04-23 18:19:35 -07:00
Andy2
20ec6dd011
Avoid relocking game after downloading: don't set lock checkbox
...
in onResume() unless it's the first time through.
2011-04-23 07:51:31 -07:00
Andy2
3c30cbd23a
move ownership of language and dict lists used in spinners into
...
DictLangCache where they can be updated when a dict is added via the
"download more..." item (inclusion of which is a hack.) Now as soon
as you return to the spinner after downloading you'll have the new
dict or lang to choose.
2011-04-23 07:39:56 -07:00
eehouse@eehouse.org
325ac65c05
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-04-21 18:44:46 -07:00
Andy2
60922baf72
bunch of changes moving UI from using one dict per game to one per
...
player: remove dictName from CurGameInfo and GameSummary classes and
from DB; deal with missing dicts (the warning, fetching and replacing)
when opening games and deleting dicts. Etc. Trivial testing passes.
2011-04-21 18:37:11 -07:00
Andy2
3970a3ef8a
no need to make new string to copy since they're immutable
2011-04-21 18:35:10 -07:00
Andy2
c814226a08
get rid of gi.dictName: don't pass it across the jni boundary
2011-04-21 18:29:37 -07:00
Andy2
4e7570020f
remove mistaken (I think) assert
2011-04-20 22:13:44 -07:00
Eric House
1ab5aa02b9
Makefile for new dict containing 4288 words: good for the robot.
2011-04-14 22:09:44 -07:00
eehouse@eehouse.org
5a21aea2e5
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-04-13 06:58:58 -07:00
Eric House
3cc105da0b
add ability to dump board (model) as text, protected by ifdef that
...
will likely only get set on Linux. Uses lower-case to designate
blanks. For that and maybe string size assumptions is very broken for
non-ascii languages, including Spanish.
2011-04-13 06:45:22 -07:00
Eric House
0474fda127
reverse (back) sense of show-other option
2011-04-13 06:41:49 -07:00
Eric House
baedbdff2c
remove logging
2011-04-12 22:17:56 -07:00
Eric House
92ac25ed3f
don't require MAX_NUM_PLAYERS==4
2011-04-12 22:17:45 -07:00
Andy2
002bb40a09
report counts/values using language rather than dictionary name. To
...
support that, pass lang name from java into jni.
2011-04-11 18:55:42 -07:00
Andy2
40116d792f
format "game_name (lang)" using string in resource.
2011-04-11 18:52:10 -07:00
Andy2
3c0cf176ef
show language as part of game name, not dict as separate line
2011-04-11 06:54:31 -07:00
Andy2
3fb368692c
dammit -- proofread those checkins!
2011-04-11 06:52:07 -07:00
eehouse@eehouse.org
819adbe236
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-04-11 06:43:00 -07:00
Andy2
c6cd60deef
Save and restore per-player dicts; load games that have 'em correctly.
...
Robots default to BasEnglish dict and humans to CollegeEng. Add new
per-game default for robot dict. Still need to deal with language
changes and non-English case in general.
2011-04-11 06:42:17 -07:00
Andy2
96254ad8b5
when opening saved game, notify draw of per-player dicts as well as of
...
a single game-wide one.
2011-04-11 06:39:31 -07:00
Andy2
092dfdd590
not supposed to be checked in with debugging on
2011-04-11 06:33:31 -07:00
Andy2
2b3398e6a2
pass Context in constructor rather than to methods that need it
2011-04-11 06:31:48 -07:00
Andy2
dc70db5ba4
catch up with API change
2011-04-11 06:16:25 -07:00
Eric House
d6165deb47
anything beyond the 15th char in a bonus-square line is a comment (ignored)
2011-04-10 13:13:45 -07:00
Eric House
26eadb3b99
add commandline option to set bonus square pattern via an external
...
file. (Effects only Linux versions.)
2011-04-10 13:04:05 -07:00
Eric House
3310645a12
test files for new bonus-squares-settable feature
2011-04-10 13:02:45 -07:00
Andy2
4272686034
Makefile for new smaller Dutch wordlist
2011-04-08 22:13:31 -07:00
Andy2
97d54c86eb
snapshot: track dictName per player in addition to per game. Not yet
...
used yet; need to pass into jni next.
2011-04-08 06:50:08 -07:00
Andy2
fc4e454d92
bugfix: add background to set of colors restored.
2011-04-08 06:17:35 -07:00
Eric House
c77d3039cc
add XP_FREEP. Should be no change in behavior.
2011-04-07 18:07:45 -07:00
Eric House
0ce963336a
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-04-04 16:16:09 -07:00
Andy2
55221c70b0
fix for new API
2011-04-03 21:51:51 -07:00
Andy2
3b7b4802a9
add ability to specify, track and use separate dictionaries for each
...
player. Works for gtk client. Compiles for Android but there's no UI
yet to specify more than one dict. Management of dupicate dicts
without duplicating memory -- refcounting -- will be up to the
platforms.
2011-04-01 19:57:10 -07:00
Eric House
b5746eece9
color tray divider
2011-04-01 18:16:04 -07:00
Andy2
d430e158ba
add commandline flag for phonies
2011-04-01 17:36:04 -07:00
Andy2
f64257752f
fix failure to draw timer in different player color when it has same
...
value as previous timer, e.g. when you're tapping on players who
haven't had a turn yet. Note that without the test to prevent drawing
the same timer hints are broken -- device is too busy to make progress.
2011-04-01 07:49:31 -07:00
Andy2
f6be6222a1
draw timer in player color
2011-04-01 07:22:40 -07:00
Andy2
6584c69df1
add and honor preference for board background color (e.g. scoreboard
...
and tray when no tile present). This may allow a light-on-dark theme.
2011-04-01 07:17:11 -07:00
Andy2
a64bad0b73
just make network icon the height of scoreboard (not tested on tablet,
...
the place where this was last changed)
2011-04-01 07:14:04 -07:00
eehouse@eehouse.org
32143d8116
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-03-31 18:19:31 -07:00
Andy2
9f76bdede9
hold mutex for slightly shorter time
2011-03-31 18:16:56 -07:00
Eric House
27346cf58b
change AIP to remove several stored messages at a time. Will use
...
later to delete messages after proxy fetches and ACKs them so traffic
isn't repeated.
2011-03-31 18:15:03 -07:00
Eric House
7aeb0a4df0
make default socket timeout 5 seconds, not 20.
2011-03-31 18:13:16 -07:00
Eric House
c30dd905a2
move getting user strings into impl so available in background. Fixes
...
bug where trades were not reported when received from relay via proxy.
2011-03-31 18:11:36 -07:00
Eric House
13b5acf8b5
changes log updated
2011-03-31 18:07:02 -07:00
Andy2
cd4ddd5dbb
fix help
2011-03-31 06:41:39 -07:00
Andy2
379538fd7e
show robot/remote scores by default
2011-03-31 06:41:34 -07:00
Andy2
80e0edbf03
cleanup
2011-03-31 06:41:11 -07:00
Andy2
21ab1d6d55
constants: toward beta 24
2011-03-30 18:58:06 -07:00
Eric House
67a3349919
Don't move arrow on pen-up if pen-down was in a different cell.
2011-03-29 18:13:38 -07:00
Eric House
f4ea54c30b
cleanup; no behavior change
2011-03-29 18:12:55 -07:00
Eric House
1caddcf39b
no need to request orientation when it never changes
2011-03-15 06:17:00 -07:00
Eric House
553bee4956
replace fwrite etc with write so fsync can be added before close.
2011-03-14 18:56:17 -07:00
Eric House
bcf767d66e
fix NPE in race; no longer any need to set preferred orientation; do a
...
bit of asserting trying to catch another race.
2011-03-14 18:34:00 -07:00
Eric House
58cb40b08e
claim to handle keyboardHidden change so it'll be ignored.
2011-03-14 18:32:36 -07:00
Eric House
c0dd42d0ba
let's see if not claiming to handle orientation changes stops Samsung from ignoring my portrait-only setting.
2011-03-14 06:57:17 -07:00
Andy2
8bb2857e63
The relay is hanging inside recv(). Use setsockopt to set a 20-second
...
receive (and send) timeout on all sockets accept() returns. Sockets
that timeout should then get closed and dropped.
2011-03-12 05:13:54 -08:00
Andy2
58ff3189a0
remove layout and code allowing toolbar to be positioned in landscape
...
mode.
2011-03-12 04:15:57 -08:00
Andy2
257d7cf094
set requested screen orientation. Seems to prevent going into
...
landscape mode when keyboard opened.
2011-03-11 21:52:37 -08:00
Andy2
84d0823341
prevent board from displaying in portrait mode.
2011-03-11 19:07:05 -08:00
Andy2
01fe8f6087
don't ping relay every time app is launched -- timer is enough.
2011-03-11 19:06:42 -08:00
Eric House
9b99183d2c
update for b23
2011-03-11 18:06:43 -08:00
Andy2
e7ab1c34b7
add more carriage returns for history formatting
2011-03-11 06:52:43 -08:00
Andy2
a280fe7e3e
remove localized format strings identical to that causing crash in English
2011-03-11 06:47:29 -08:00
Andy2
552a5ff6da
up constants for beta 23
2011-03-11 06:45:49 -08:00
Andy2
28f3ad316b
hide/show hint at top of games list via a preference rather than the
...
number of games in the list, and modify hint text to point to the
prefs setting.
2011-03-11 06:44:25 -08:00
Andy2
c909f91a61
fix over-long initial trays in history by adding <cr>. Not sure if
...
line brakes belong in common code or strings however...
2011-03-10 19:00:15 -08:00
Andy2
d6dd2b942f
fix crash tapping player name after a trade -- since the format string
...
was wrong.
2011-03-10 18:56:13 -08:00
Andy2
492e086311
break the hint into two so goes-away part can be smaller.
2011-03-10 18:34:02 -08:00
Andy2
d56ce42585
hide games-list hint when more than 2 games present, and add text to
...
that effect so people aren't surprised.
2011-03-10 18:24:27 -08:00
Andy2
d9bb5197d4
Add two new menus to be available only when in trade mode. Hide and
...
show them and another group depending on whether trading at the time.
To make that work, replace the individual calls made to dis/enable
toolbar buttons with a single jin call that takes a struct full of
booleans and make that struct available in BoardActivity where menus
are hidden/shown. Remove the individual calls from the jin interface.
2011-03-10 18:13:56 -08:00
Andy2
26a274ab0f
make the empty-list message a header instead since its instructions
...
matter after there are games in the list. But hide it whenever there
are four or more games.
2011-03-09 18:42:06 -08:00
Andy2
bfc5bb62dc
don't call nobody dumb, even a robot.
2011-03-08 21:58:12 -08:00
Andy2
8ef3aa51b2
Reverse sense of is-local bit so that on upgrade people don't see all
...
their local players marked as remote.
2011-03-08 18:43:29 -08:00
Andy2
678cbe1dea
fix plural and make name consistent
2011-03-08 18:42:45 -08:00
Andy2
fc4fddb055
check if can hint (to refresh buttons) after enter/leaving trade mode
2011-03-08 07:41:16 -08:00
Andy2
aa88503cfb
have board_canHint() return false when trade in progress.
2011-03-08 07:40:38 -08:00
Andy2
15ef9c4fd2
add prompt to dict-pick spinner
2011-03-08 07:31:11 -08:00
Andy2
7de951f149
update with changes from b21
2011-03-08 07:13:14 -08:00
Andy2
9acea8ec5a
fire a toast in response to "check relay" menu so people get sense of
...
something being done. Firing from RelayService might be more honest
but is much harder.
2011-03-08 06:33:22 -08:00
Andy2
9dd69015cc
say "relay", not "server"
2011-03-07 21:37:56 -08:00
Andy2
133079e200
tweak newbie message for new local game creation
2011-03-07 21:14:47 -08:00
Andy2
0225bf215b
change text of add-game buttons to be (says Deb) clearer
2011-03-07 20:47:49 -08:00
Andy2
b2db1a0936
don't call remote player robot
2011-03-07 20:44:31 -08:00
Andy2
b441fdb56e
make hint text bigger and proportional to cell size.
2011-03-07 20:29:44 -08:00
Andy2
a6edcaadd9
zoom by five instead of four
2011-03-07 20:26:08 -08:00
Andy2
2f3a1b03f5
cleanup
2011-03-07 20:23:47 -08:00
Andy2
5c2d0a064c
Better exchange miniwindow text. But more needed after fixing
...
BoardView code to better format.
2011-03-07 06:41:17 -08:00
Andy2
8c40628916
Support new error message about exchange being disallowed when no selection.
2011-03-07 06:40:11 -08:00
Andy2
54f2ae3edf
error string for: fire user error rather than committing turn when
...
trade attempted without any tiles selected.
2011-03-07 06:29:40 -08:00
Andy2
828bd9aa4c
fire user error rather than committing turn when trade attempted
...
without any tiles selected.
2011-03-07 06:28:43 -08:00
Andy2
0e86467ea1
use high-contrast for mini-window (same as arrow)
2011-03-05 23:21:38 -08:00
Andy2
58d29fbb26
a bit of cleanup: inval rather than replace
2011-03-05 15:38:03 -08:00
Andy2
81e3578dd5
Fix another recycled dialog message by making superclass dismiss
...
listener adder available and using it.
2011-03-05 10:16:29 -08:00
Andy2
92a726aff3
call removeDialog() when dismissing blocking dialogs. Fixes reporting
...
the same robot move every time.
2011-03-05 10:05:31 -08:00
Andy2
166bee6c82
always show game name (for now)
2011-03-04 21:33:26 -08:00
Andy2
b0b747f642
remove logging around GameLock
2011-03-04 18:53:47 -08:00
Andy2
997365bc20
new printStack() required for prev commit
2011-03-04 18:36:53 -08:00
Andy2
4cdafbd510
reduce the length of the sleep when waiting for lock; add code to
...
capture stack trace at lock time that'll be printed out along with the
current thread's trace when I can't get a lock in one second. I'll
comment that out shortly but want it for debugging -- though it's
untested: can't repro any failure to lock now.
2011-03-04 18:36:33 -08:00
Andy2
2b28a4d27c
unlock GameLock before launching BoardActivity -- to fix a deadlock.
...
Also do lock/unlock in onPause/onResume rather than onStart/Stop to
hold the lock for a shorter time.
2011-03-04 18:22:17 -08:00
Andy2
1b6d8ebed2
don't show game name if it's hidden in BoardActivity -- that is, use
...
the same preference to govern both. Still to do: need to inval all
game list items when that preference changes.
2011-03-04 07:40:56 -08:00
Andy2
2fdda2bae1
move game_name to its own row at top so it serves as title.
2011-03-04 07:39:54 -08:00
Andy2
754d7b06ef
add boolean 'wait' to getSummary() allowing it to return null if it
...
can't get a read lock. Fix GameListAdapter to handle that null.
2011-03-04 07:22:08 -08:00
Andy2
abdabd9c3c
don't pass timeout value to join() when stopping jni thread. If the
...
timeout fires there's nothing I can do anyway. So it it take as long
as required to exit run(), and if that's too long fix it.
2011-03-04 07:19:06 -08:00
Andy2
b085540ee3
make the jni thread a daemon per recommendation from google dev suppt.
2011-03-04 07:14:17 -08:00
Andy2
f21ddedc59
go back to singleTop for GamesList to see if it fixes the occasional
...
Activity duplication I'm seeing on-device.
2011-03-04 07:13:00 -08:00
Andy2
a5ba0ac5fe
remove pending messages after sending them.
2011-03-04 06:38:25 -08:00
Andy2
a1d1251c0e
remove logging
2011-03-04 05:46:20 -08:00
Andy2
6acf7fda68
fix crash: rather than pass chat message to jnithread that will be
...
null when the board activity has lost focus, save it to be sent once
the thread's been recreated.
2011-03-04 05:45:29 -08:00
Andy2
eb3b83ec48
fix rare crash by tracking whether showDialog has been called and
...
testing that before dismissing it.
2011-03-03 19:00:50 -08:00
Andy2
ecfe1d110e
Make getSummary able to fail since it can be called when somebody has
...
a write lock that will be held for a long time. One place it'll fail
is when game list item's been invalidated and wants to update. Deal
with null summary coming back there.
2011-03-03 06:52:20 -08:00
Andy2
c6fc912d89
reimplement GameLock without ReadWriteLock which isn't quite what I
...
wanted (which is more like a checkout mechanism). Lots of logging
remains to be removed.
2011-03-03 06:50:48 -08:00
Andy2
1ca8ce9192
make saveDict return false if aborts the download. (Not used yet.)
2011-03-03 05:38:45 -08:00
Andy2
ce61427bba
generate md5 sum file optionally. Later I'll want to download these
...
to check that the file arrived safely.
2011-03-02 19:00:25 -08:00
Andy2
0348867326
add printStack()
2011-03-02 18:59:35 -08:00
Andy2
a0bf3405b8
get rid of columns I don't plan to use yet -- can always add later.
2011-03-02 18:58:20 -08:00
Andy2
693310bdc7
don't call super() twice!!
2011-03-02 18:57:56 -08:00
Andy2
b32f65574d
now that game name's in the display, sort by that.
2011-03-02 07:10:43 -08:00
Andy2
9e56e4f40c
call dbchange listeners after deleting game. And with the dbchange
...
listeners working a lot of inval/onContentChanged stuff can be
removed.
2011-03-02 07:02:24 -08:00
Andy2
61a9f708a2
add game name to list item. I really want to swap the columns now but
...
can't make player name/score line up correctly on right.
2011-03-02 06:49:04 -08:00
Andy2
467e999509
set and clear dbchange listener in onCreate and onDestroy rather than
...
onStart and onPause so it'll get called when not in front too. Not
sure why this worked before the GameLock change....
2011-03-02 06:48:14 -08:00
Andy2
c144503630
move GameLock class from DBUtils to GameUtils
2011-03-01 21:59:15 -08:00
Andy2
ce6eca3fe5
add class that maintains read and write locks per-game record to
...
prevent writes to a game while it's open. Seems to work, but needs
more testing.
2011-03-01 21:44:59 -08:00
Andy2
4eb77809fb
remove redundant logging
2011-03-01 06:51:20 -08:00
Andy2
a344f26d1b
add static boolean that controls whether logging is on (for java).
...
Add an Application subclass that fetches the value from a preference,
a checkbox setting in advanced prefs, and modify the static when
that's changed at runtime.
2011-02-28 20:07:07 -08:00
Andy2
54ef8f73c9
get rid of some logging
2011-02-28 18:43:47 -08:00
Andy2
69638d8aa9
fix string so we get called on boot
2011-02-28 18:36:47 -08:00
Andy2
bfc82242d7
add new column to be used to track whether a game is in use -- not
...
used yet but anticipated and I'm added a lot this release anyway....
2011-02-28 06:45:52 -08:00
Andy2
20ad465b96
from GamesList.onNewIntent, launch the first changed game rather than
...
just invalidating all changed list items.
2011-02-28 06:37:29 -08:00
Andy2
ed8707fb4b
replace array[1] with HashSet to support more than one db change
...
listener (part 2)
2011-02-28 05:42:09 -08:00
Andy2
b57b6b1b31
replace array[1] with HashSet to support more than one db change listener
2011-02-28 05:41:02 -08:00
Andy2
c31e964ce4
remove class and interface no longer used
2011-02-27 22:45:51 -08:00
Andy2
fe9932b57d
remove hint menu. Add sync-with-server item to board and factor code
...
implementing same in GamesList up into DlgDelegate where it can be
called from both. Also, make syncing fire off the service just as the
timer does so that results generate Notifications. Makes it better
for testing if nothing else.
2011-02-27 22:43:09 -08:00
Andy2
d2e663fa99
remove logging
2011-02-27 22:40:26 -08:00
Eric House
4d5aad61b4
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
2011-02-26 20:02:29 -08:00
Andy2
6df2abecb6
don't use special launchModes for GamesList *but* do invoke it from
...
DispatchNotify so that an existing instance will be reused rather than
a new on created on top of the stack.
2011-02-26 19:47:33 -08:00
Andy2
9cc7cd0dc8
add logging of activity lifecycle methods -- and override a couple just
...
to do the logging before calling super(). These should go once I've
got the lifecycle stuff working.
2011-02-26 19:46:29 -08:00
Andy2
ef074f2944
don't bother passing flags to DispatchNotify class.
2011-02-26 19:45:05 -08:00
Andy2
a0f5ef4e18
remove logging
2011-02-26 19:44:02 -08:00
Eric House
a68170de51
remove PendingIntent.FLAG_UPDATE_CURRENT; it's breaking things.
2011-02-26 12:10:24 -08:00
Andy2
5ba6579180
Add Discard button to dialog explaining that remote game's been
...
deleted. To do that: added interface to TransportProcs that a caller
can implement and to which it delegates the UI (error code reports).
BoardActivity implements that interface. To avoid a race condition
where the JNIThread would save the game after I'd deleted it I kill
the thread and wait for it to die before deleting the game and calling
finish().
2011-02-25 19:57:43 -08:00
Andy2
86274785dd
add newbie-info on turn-changed
2011-02-25 07:13:54 -08:00
Andy2
5e0f12e49d
add a confirmation dialog to "undo last", and remove it altogether
...
from networked games since as currently implemented it can quickly get
them permanently out-of-sync (and cause the jni code to assert.) Need
to debug this....
2011-02-25 06:54:38 -08:00
Andy2
0be59d1ba7
add showConfirmThen (which XWListActivity already has)
2011-02-25 06:53:36 -08:00
Andy2
d41487150b
add draw_boardBegin (fix broken compile)
2011-02-24 22:28:15 -08:00
Andy2
ce64f79cdd
add draw_boardBegin
2011-02-24 22:24:24 -08:00
Andy2
5afb7aadff
add dict_getTileValue
2011-02-24 22:23:57 -08:00
Andy2
40dcda2262
add flag that's supposed to help notification launch an open activity
2011-02-24 22:21:04 -08:00
Andy2
5291307c11
get rid of onRestart -- onStart is always called right after.
2011-02-24 22:20:10 -08:00
Andy2
8b5f4a84f2
tweak strings so relevant part visible.
2011-02-24 17:45:02 -08:00
Andy2
9809864afb
move connect-never option to the top where won't be scrolled off
...
screen initially
2011-02-24 17:44:43 -08:00
Andy2
66bc435f28
always save after receiving messages that may have changed state.
...
Previously did so only when in background, but that leaves a problem:
if device A sends messages to B and B ACKs them so that they're
deleted but exits without saving (for any reason) the game is
permanently horked. It's safer to save immediately.
2011-02-24 17:35:22 -08:00
Andy2
f382f17d20
make game_receiveMessage return even if server doesn't do anything
...
with it -- since caller will use the return value to decide whether to
save state.
2011-02-24 17:33:10 -08:00
Andy2
f0d90f0576
get rid of cute auto-array-creation. No behavior change; maybe no
...
change in generated code.
2011-02-24 07:39:35 -08:00
Andy2
9818a29f86
Use bitvector (an int) instead of an enum for flags noting what
...
arrived in the background. When notification that game's over arrives,
add it to the flags, then on game open show the game over dialog (in
addition to raising chat activity and possibly showing recent move.)
2011-02-24 07:09:41 -08:00
Andy2
7910aed896
XW[List]Activity now call removeDialog() every time a dialog is
...
dismissed so that they now all go through onCreateDialog() every time.
This allows to shrink or eliminate onPrepareDialog(). The hope is
that it will fix the occasional crash where restoreManagedDialogs
invokes onPrepareDialog() and some ivar I need isn't set because the
class was just reloaded.
2011-02-24 06:25:18 -08:00
Andy2
1529319a60
add vibrate permission; get RelayReceiver notified on boot so can set
...
initial timer.
2011-02-23 07:39:14 -08:00
Eric House
83cb8550dc
set the right field for sounds and notifications (helps to RTFM, but still not tested on device)
2011-02-23 06:00:27 -08:00
Eric House
29b05b83ec
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-02-22 19:56:40 -08:00
Eric House
ab71ac8847
add game name to chat activity title
2011-02-22 19:55:57 -08:00
Andy2
aaffb749cd
move network prefs into its own category; add prefs checkboxes there
...
and getters controlling whether vibrate and sound are used as part of
notifications.
2011-02-22 18:59:56 -08:00
Andy2
151df44c96
get rid of m_invalPath. It seems to be the onContentChanged() on
...
focus grabs that was needed.
2011-02-22 18:30:37 -08:00
Andy2
dbb69bfff5
add in flags to get vibration and sound with notifications. (Untested
...
on device.) Will want to add prefs to disable these.
2011-02-22 18:29:53 -08:00
Andy2
bf567a131a
fix crash (according to stack crawl from device)
2011-02-22 18:09:20 -08:00
Andy2
697fc7d5ca
get rid of some logging
2011-02-22 06:54:03 -08:00
Andy2
030d2e76a7
add interface with method that's called whenever a DB record is saved.
...
GamesList implements that interface and invalidates the list item
corresponding so it'll get redrawn with updated info. Should allow to
replace m_invalPath but doesn't...
2011-02-22 06:48:20 -08:00
Andy2
f75318e9d0
rename method and add variant then remove duplicated code. No behavior change.
2011-02-21 19:47:00 -08:00
Andy2
a4e995742f
bring back RelayService, which RelayReceiver now delegates to for the
...
work of pinging relay on timer. That work, which can cause receiver
to exceed its timeout if there are e.g. problems resolving hostnames,
must be done in a thread and Receivers aren't supposed to have
threads. Seems to work as well as it did before and also fixes
force-restart bugs when the network is slow/unavailable.
2011-02-21 18:12:15 -08:00
Andy2
318b820ea7
tweak newbie info for chat
2011-02-21 18:09:12 -08:00
Andy2
07fd2f6bb8
add title to chat activity
2011-02-21 06:51:47 -08:00
Andy2
21d46957be
comment out some logging and the annoying toast-on-relay-check
2011-02-21 06:50:54 -08:00
Andy2
353832a7ca
Look at opening game immediately when relaunched via onNewIntent() as
...
well as via onCreate().
2011-02-19 21:20:56 -08:00
Andy2
5ede3b19f0
up constants for beta 22
2011-02-19 08:41:14 -08:00
Andy2
2150d8b4a4
be a bit less pessimistic
2011-02-18 22:53:13 -08:00
Eric House
5d25faa780
update changes log
2011-02-18 22:51:09 -08:00
Eric House
1e3f094289
up constants for b21
2011-02-18 22:50:37 -08:00
Andy2
3fb7c48172
turn off tile selection for linux (perhaps temporarily)
2011-02-18 22:31:28 -08:00
Andy2
15f40f01af
fix to compile with new gdk that's on ubuntu 10.10. Need to fix the
...
APIs eventually.....
2011-02-18 22:28:32 -08:00
Andy2
5460941ba8
cleanup
2011-02-18 22:23:06 -08:00
Andy2
9fbce6f942
remove old comment that wasn't supposed to get checked in.
2011-02-18 22:18:28 -08:00
Eric House
8fe195e91c
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-02-18 22:15:03 -08:00
Eric House
020c2b6982
fix warnings by removing unused strings
2011-02-18 22:13:24 -08:00
Andy2
27bc89b684
when launched after chat messages have been received, launch the chat
...
activity. This requires an enum be stored in the DB instead of a
boolean.
2011-02-18 18:45:26 -08:00
Andy2
31348d978e
mark game as synced -- having messages -- if the only messages to
...
arrive had to do with chat. Clear that flag when opening game, not
when saving it.
2011-02-18 18:06:27 -08:00
Andy2
94a7361e99
Add spaces to sql commands adding columns -- they'll fail otherwise.
2011-02-18 18:02:52 -08:00
Andy2
0726cefb10
fix NPE: if there's no history string don't try to split it.
2011-02-18 17:44:23 -08:00
Andy2
d2fda267e5
fix assertion failure that happened when I changed whether remote
...
scores were shown mid-game. If the value's not as expected just don't
show the score.
2011-02-18 17:43:01 -08:00
Andy2
da6d7da350
always say the net's available when on simulator. The net-up
...
notification stuff just doesn't work there.
2011-02-18 17:41:15 -08:00
Andy2
cd01c32ad1
When launched with a list of relayIDs (presumably because data has
...
arrived for them), open the first corresponding game for which the
dictionary is still there.
2011-02-17 17:41:53 -08:00
Andy2
2e9d87fddc
override gameDictHere to allow null params
2011-02-17 17:40:35 -08:00
Andy2
c271cb2fdd
add a clear-history menu to chat
2011-02-17 07:14:58 -08:00
Andy2
b3ffb4895b
use background rather than text color to separate local and non- chat.
2011-02-17 06:56:48 -08:00
Andy2
c844e9165d
limit knowledge of how history is stored to DBUtils.
2011-02-17 06:27:48 -08:00
Andy2
fec402cf50
display chat history as a scrolling list of TextView objects rather
...
than in a single TextView so different styles can be applied based on
whether text is from local or remote device. For now text is just
grey if local.
2011-02-16 18:53:47 -08:00
Andy2
736860685b
add a Send button to the chat activity and send on it rather than <cr>.
2011-02-16 18:13:54 -08:00
Andy2
0c9b053844
save into DB rather than drop chat messages received in background.
...
Still need to add UI to let user know a new message is there.
2011-02-16 07:37:14 -08:00
Andy2
a954977e56
white-space difference only: fix indentation.
2011-02-16 07:13:41 -08:00
Andy2
1400de489d
implement chat with an activity rather than a little dialog. Include
...
history, and store it in the game record in the DB (new column). This
will allow to not drop chat messages that arrive in the background,
though that's not implemented yet.
2011-02-16 06:55:46 -08:00
Andy2
9eba54344b
get rid of theme stuff. It's broken and looks like crap. When
...
there's enough color control to make a different theme look good put
this change back and fix it.
2011-02-14 20:14:48 -08:00
Andy2
526b3c1bef
register receiver with app context rather than a single activity's so
...
that it doesn't leak when that activity goes away.
2011-02-14 18:12:46 -08:00
Andy2
0354c3f1d9
sort by creation time rather than lastsaved time. This is a temporary
...
workaround to fix a bug where the UI isn't updating often enough and
sometimes delete or other position-based long-tap menu actions on the
list act on the wrong game. This gives an order that won't change.
Revisit later if a more dynamic order is desired.
2011-02-14 18:11:55 -08:00
Andy2
700c58d6dc
drop any relayIDs for which messages didn't have any effect on the
...
game they were passed to. This prevents duplicate messages from
generating notifications over and over -- and dupes are common when
messages stay on relay until the receiving game ACKs them.
2011-02-14 07:08:35 -08:00
Andy2
688fadb965
override onNewIntent to inval games whose ids have changed
2011-02-14 07:07:05 -08:00
Andy2
fffeceb665
include list of changed relayIDs in intent used to relaunch GamesList.
2011-02-14 07:06:16 -08:00
Andy2
be4bb3a73e
set launchMode of GamesList activity to singleTask. This seems to be
...
the only way to have it wind up on top *and without it being a second
instance of the activity* when relaunched in response to a move-made
notification. Even passing the SINGLE_TASK flag to the relaunching
Intent doesn't accomplish this.
2011-02-14 07:04:34 -08:00
Andy2
c2aa7438c7
get rid of excess logging
2011-02-14 06:13:20 -08:00
Andy2
95b60cc767
modify games list items to include a second column with everything but
...
the players and connection method in it. Put the game's last-saved
time in that column. Now sort order has most recently opened games at
top.
2011-02-11 18:29:11 -08:00
eehouse@eehouse.org
2beea5b04f
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-02-10 06:45:12 -08:00
Andy2
061eb9c405
return list of games ordered by mod time so they display in that
...
order, with newest (most recently modified) at top. This won't really
make sense until modtime is added to the display.
2011-02-10 06:13:07 -08:00
Andy2
0f764664d4
add comment about failed attempt to deliniate list items by having
...
their backgrounds alternate slightly.
2011-02-10 06:11:54 -08:00
Eric House
984227955b
make two versions the same since there's been no release since first was added.
2011-02-09 22:17:18 -08:00
eehouse@eehouse.org
0184369e5d
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-02-09 06:50:21 -08:00
Andy2
b4d0774aa7
getRelayIDs -> getRelayIDNoMsgs to allow option of querying all, even
...
those already flagged as having new data. The idea is that there
might be still newer data available, e.g. chat messages, that should
be fetched.
2011-02-09 06:45:45 -08:00
Andy2
cf65d9baec
override onRestart to, like onStart, register subclasses with
...
DispatchNotify class as ready to handle notifications.
2011-02-09 06:44:16 -08:00
Andy2
d02295ac85
use new function to try to avoid creating a notification when the UI
...
to display a change -- the GamesList activity -- is already available.
2011-02-09 06:43:11 -08:00
Andy2
e59148dbe5
use changed API
2011-02-09 06:42:14 -08:00
Andy2
af0048c93a
use changed API
2011-02-09 06:41:53 -08:00
Andy2
4c1c298168
move logic for deciding whether a change needs to be turned into a
...
notification or can just be reflected via a currently-visible UI into
a separate function callable from outside.
2011-02-09 06:40:27 -08:00
Andy2
c18625d69a
change what's reported via notifications to reflect that changes have
...
already been fetched.
2011-02-09 06:32:58 -08:00
Andy2
c60e48b156
RelayReceiver should not be launched in new process since that
...
prevents its communicating with/updating a game that's already
running. User presumably wants the current app state updated when
possible.
2011-02-09 06:32:07 -08:00
Andy2
c56f0b5cea
Save cached prev move explanation as part of stream so can be shown to
...
user when game is opened later. Fixes problem displaying empty
explanation on first open of game that was updated in the background.
2011-02-09 06:30:51 -08:00
Andy2
f956df853d
return "" rather than null when there's no java class backing util --
...
common code is less likely to crash.
2011-02-09 06:17:38 -08:00
Eric House
dada74aad7
delete dict if there's an IO error while writing it. A German
...
correspondent's having occasional crashes with a single dictionary.
It appears that if it were truncated during the download that it would
appear ok until a word search spread into a missing area. This fix is
untested, and should probably be replaced by a checksum that computed
and checked after the download, but I think it's an improvement.
2011-02-08 21:18:51 -08:00
Eric House
a2ad3d7c0b
cleanup
2011-02-08 21:07:31 -08:00
Eric House
ad7f8252b9
separate out UtilCtxt implementation from BoardActivity so there's no
...
dependency on an open game having a visual representation. This
should allow e.g. receiving and caching chat messages that come in
while game is not in foreground.
2011-02-08 21:06:18 -08:00
Eric House
d1ffc3af7b
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-02-08 20:59:11 -08:00
Eric House
beaa7ba5a5
assume dict is utf8-encoded but check and fail if it isn't
2011-02-08 20:57:41 -08:00
Eric House
861aec127b
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-02-04 08:09:50 -08:00
eehouse@eehouse.org
a22f50f2f6
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-02-04 07:09:59 -08:00
Andy2
c587a11ee2
Add turn and isrobot/islocal flags to summaries DB, and use to
...
background in green the player whose turn it is provided that player's
local.
2011-02-04 06:20:40 -08:00
Eric House
e196cfb352
add state table entry lack of which caused a bunch of crashes in a
...
short time on the live relay. I'm not sure why it's needed, why they
happened only this time (likely due to a single device) or
alternatively why I don't see those crashes in testing, but the
addition doesn't break anything.
2011-02-04 05:41:44 -08:00
Andy2
79bd17e59b
put each player in a game list item in its own line with score at
...
right end and name at the left. This will allow e.g. marking in green
a local player whose turn it is.
2011-02-03 06:47:20 -08:00
Andy2
935fe0c7a0
remove option to not show bonus values.
2011-02-01 21:13:46 -08:00
Andy2
33bccaaf42
use slightly different, recommended code to test if network's available.
2011-02-01 20:57:05 -08:00
Andy2
223909f560
change what checking with the server means, from calling HAS_MSGS to
...
GET_MSGS. When the messages come in, open up saved games and play
them into them, saving them after if there were any changes. Tested
by playing a two-device game all the way through fetching messages
after every move.
2011-02-01 20:51:46 -08:00
Andy2
f41356c98b
fix the show-other param
2011-02-01 18:57:01 -08:00
Andy2
bf0582f0aa
make hint buttons en/disabled based on board_canHint() results.
2011-02-01 18:56:37 -08:00
Andy2
8a7029435c
fix some comments
2011-02-01 18:55:48 -08:00
Andy2
ee620a3e37
move bonus squares into jni since they're constant rather than e.g. in
...
an editable resource.
2011-02-01 18:55:00 -08:00
Andy2
c2be642302
add game_getGi to fetch into java world any changes to the gi in the
...
jni world.
2011-02-01 18:53:29 -08:00
Andy2
383206f5dc
move bonus squares into jni since they're constant rather than e.g. in
...
an editable resource.
2011-02-01 18:52:29 -08:00
Eric House
c6e7b21f8a
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-02-01 09:39:55 -08:00
eehouse@eehouse.org
71c92bbaef
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-01-31 21:47:20 -08:00
Andy2
977feada82
use a reference to a byte array in the java heap (locking down the
...
object) rather than allocating a new array in the C heap -- for the
DAWG data of a dictionary. This can use up to 5% of the java heap for
huge dictionaries, but I'm hoping it fixes a problem reported by a
user of the large German dictionary that seems to involve allocation.
If I'm reading correctly, as long as I stay within 16M (24M or more on
newer devices) I'm sure to get my memory in the java world while it's
less a sure thing in the JNI world (where in addition linux's
aggressive overallocation is used, meaning I'll fail when I try to
swap in memory on write rather than get back NULL from malloc.)
2011-01-31 18:56:20 -08:00
Eric House
95443ec9d9
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-01-28 14:43:20 -08:00
Eric House
bb24694e37
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-01-27 21:09:30 -08:00
Eric House
dc82e57f14
add ability to fetch messages for more than one game at a time
2011-01-27 21:08:17 -08:00
Andy2
566a456489
use getChannel().size() rather than available() to decide how many
...
bytes to read from downloaded dictionary file -- because available()
will not always return the full size. I suspect this is why a German
user is crashing when using the very large 2_15 German dict.
2011-01-27 21:03:37 -08:00
Eric House
70f52b162b
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-01-27 14:58:10 -08:00
Andy2
57ec020330
change format of reply to MSG_GET: include number of messages per
...
device to support fetching for more than one at once. This is
meaningless for rq as written now but a device will want to do this.
2011-01-27 06:37:36 -08:00
Eric House
481a533e58
ignore uncompressed dicts too
2011-01-24 22:21:44 -08:00
Eric House
4bf613a006
move pipe handling code to where can be shared by curses and gtk -- but use from curses is untested.
2011-01-24 22:20:47 -08:00
Eric House
63d16a99a2
turn off http view
2011-01-24 22:20:01 -08:00
Eric House
4ae8c76959
break printed runtime into hours:minutes:seconds
2011-01-24 22:19:02 -08:00
Andy2
825cda9125
new feature for testing proxy: --with-pipe option causes linux client
...
to, instead of putting up UI, blocking on pipe and once it's readable
opening saved game and passing messages into it from pipe then saving
it when done. Works, but requires gtk so far.
2011-01-23 21:52:26 -08:00
Andy2
4b8e462b8b
check for null ptrs to allow creating loading games that won't draw or
...
communicate with users.
2011-01-23 21:45:41 -08:00
Andy2
42d1a713c9
add new -f flag to invoke new fetch-message proxy command. Write the
...
results to stdout in stream format (len + message). Goal is to be
able to pipe output to the linux clients to test.
2011-01-22 12:54:47 -08:00
Andy2
f96f4a040b
add new proxy command that fetches actual messages stored for a device.
2011-01-22 12:52:26 -08:00
Andy2
d98a3fe232
when peeking is disabled (the default on android), don't allow
...
swapping to view of the current player's board if the current player
is remote -- because then won't be able to swap back to own view until
it's your turn. Fixes annoyance in multi-device game on Android.
2011-01-21 21:32:52 -08:00
Andy2
09b5c44fb4
add option to prevent switching players by tapping scoreboard (to
...
mimic android)
2011-01-21 21:29:28 -08:00
Andy2
96fead3164
add msglen column to msgs table to be used to avoid calculating size
...
later. Stores size of string as it was passed to db, not as stored.
2011-01-21 06:46:49 -08:00
Andy2
b863931db5
turn proxy service back on
2011-01-21 06:10:06 -08:00
Eric House
725888cb6c
run proxy sockets through same thread pool as game sockets. This
...
prevents race conditions that are turning up when I'm running multiple
threads -- by allowing me to really not be running multiple threads.
Tested with the usual script.
2011-01-20 18:14:56 -08:00
Eric House
c4bf153d36
log reason game ended to game's logfile
2011-01-20 18:10:33 -08:00
Andy2
b506673946
use only one thread until race condition's fixed
2011-01-19 18:36:50 -08:00
Andy2
3ae62e4704
use an index rather than a ptr to track fd array (so a parallel array
...
can be added)
2011-01-19 18:36:24 -08:00
Eric House
4202ea5fac
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-01-19 09:10:51 -08:00
Andy2
a8f4d772f8
set one timestamp when saving game, and another on game creation.
2011-01-19 06:54:23 -08:00
Andy2
7d6e136ca3
fix comment
2011-01-19 06:21:31 -08:00
eehouse@eehouse.org
a9c65aa950
Revert "add ctime and mtime timestamps to DB when creating, and upgrade to new"
...
This reverts commit 465370bac6
2011-01-19 06:19:33 -08:00
Andy2
7f866da8da
draw dragged tiles translucent
2011-01-18 22:03:17 -08:00
Andy2
46f085f479
drop rather than asserting failure when unable to create a dialog.
2011-01-18 21:19:02 -08:00
Andy2
f6b95f93a1
use HashSet rather than String[] for faster lookup.
2011-01-18 18:47:24 -08:00
Andy2
bce4a11595
more work on color prefs. Add a list pref at the same level as colors
...
for setting "scheme". Implement that as changing potentially several
colors but only empty cell color for now. Remove prefs for whether
cell letters follow user colors (they always will) and the new one for
frame color -- it'll always be dark grey.
2011-01-18 18:42:25 -08:00
Andy2
8d52149c28
cache the background color on which arrow is based so don't have to
...
compute its blackness each time.
2011-01-17 20:39:35 -08:00
Andy2
e9e54ba379
toward supporting a light-on-dark theme: add pref for cell border
...
color; add pref for whether highlight is black-on-white or the
reverse; and remake the board arrow in white if the background is a
dark color. It's now possible to configure various colors so that
black empty cells looks good. Next need a single control to do it.
2011-01-17 18:55:36 -08:00
Andy2
33d5246b7a
add a new-user hint, displayed the first time the arrow's drawn on the
...
board, explaining what the arrow's for and how to move and disable it.
Implementation required passing XWActivity into BoardView so the
newbie hint method could be called on it.
2011-01-15 21:46:28 -08:00
Andy2
465370bac6
add ctime and mtime timestamps to DB when creating, and upgrade to new
...
version by adding them. Can't have them default to 'now' because
that's not supported for ADDs. Can't remove columns either, so at
some point I'll need to migrate to get rid of accumulated cruft.
Timestamps are not set nor read yet.
2011-01-14 19:03:08 -08:00
Andy2
c9fec737e5
changes, protected by a disabled compile-time flag, to use cairo-based
...
API for drawing instead of now-deprecated gdk ones. Unfortunately
nothing actually draws and I'm putting the debugging off until I have
some time.
2011-01-14 18:15:33 -08:00
Eric House
04d8260f01
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-01-14 12:02:15 -08:00
Andy2
13ef8dd098
add hints-allowed to set of defaults for new games
2011-01-13 18:45:38 -08:00
Eric House
e7172fb4af
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-01-13 14:57:24 -08:00
Andy2
9ebbbb0fec
replace robot smart checkbox with a spinner having three settings.
...
Keep the kludge whereby the settings in all the players are kept the
same.
2011-01-13 06:48:50 -08:00
Andy2
d2ddc5cee7
turn off tile selection for android
2011-01-12 19:01:04 -08:00
Andy2
cd5dedfa67
add compile-time flag to disable selection of tiles in tray (other
...
than as part of an exchange) and to remove feature where tapping empty
cell moves selected tile there. This is to address user confusion on
Android, and I'll ask for testing before putting this in the main
branch. This leaves only place-arrow-then-tap as an alternative to
drag-and-drop, and may annoy people. Worth trying: disable only the
automatic selection of another tile after the selected one is dropped.
2011-01-12 19:00:48 -08:00
Andy2
e7dbac41a6
fix to compile with new gdk that's on ubuntu 10.10. Need to fix the
...
APIs eventually.....
2011-01-12 19:00:20 -08:00
Andy2
6ccf0c167c
fix next-hint which I just broke: need to track whether working on
...
behalf of robot after all, though it's not needed in the API, to
distinguish case where moves must be cached (for next-hint feature).
2011-01-11 18:10:48 -08:00
Andy2
ceab787cdd
update to work with robot-smartness changes. At this point the UI's
...
unchanged and I'm trying to mimic the old per-game setting using the
new per-robot setting internally. Still need to change the UI to
allow move than just a boolean choice.
2011-01-10 20:46:05 -08:00
eehouse@eehouse.org
a656bb8f0c
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-01-10 18:20:42 -08:00
Eric House
2b502a39c6
fix mod-by-zero error when iq == 2
2011-01-10 18:19:10 -08:00
Eric House
b3de3fc91e
add --robot-iq param for testing
2011-01-10 18:18:35 -08:00
Andy2
6495bd321f
fix to compile with robotiq changes
2011-01-10 06:57:10 -08:00
Andy2
efb54c7b05
fix compile errors the stricter android compiler found.
2011-01-10 06:56:11 -08:00
eehouse@eehouse.org
09da57f165
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-01-10 06:48:25 -08:00
Andy2
f48c1cc8b2
add robot-iq param to test new common code and adapt to its API
...
changes; change param from robot-name to robot.
2011-01-10 06:46:09 -08:00
Andy2
639279f865
up the number of moves saved to 32 to match Android.
2011-01-10 06:44:47 -08:00
Andy2
f111b78714
switch from tracking robot intelligence as a per-game boolean
...
implemented (when not smart) as trying to match the human's score to a
per-robot value between 1 and 100 that gives the percentage of best
moves to store before picking randomly from among them. So a 1 means
save only the best move and always pick it; 100 means save all the
best moves (how many are saved is compile-time configurable) and pick
one of them. Because it's settable per-robot a smarter robot can be
played against a dumber one (though I may choose not to make it
settable per-robot on shipping versions.)
2011-01-10 06:44:28 -08:00
Andy2
fc23080120
param name has changed
2011-01-10 06:40:42 -08:00
Eric House
c7b6d799f0
switch to utf8
2011-01-07 18:05:57 -08:00
Andy2
5459631c76
No need for empty .dict when creating empty .dict.gz
2011-01-06 18:20:56 -08:00
Andy2
6f2cde1304
create an index at the top of page; indent dict lines; drop ".xwd"
2011-01-06 18:09:10 -08:00
Andy2
d3717c579e
add ACCESS_NETWORK_STATE permission
2011-01-06 08:08:36 -08:00
Andy2
99c26cc0e9
move network state listener into own class so it can live longer than
...
a single game (keeping network state across games launches) and be
used by other network clients later.
2011-01-06 08:08:16 -08:00
Andy2
d832ba6795
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
...
Conflicts:
xwords4/linux/linuxmain.c
xwords4/linux/scripts/discon_ok2.sh
2011-01-06 07:44:33 -08:00
Eric House
720f78d18a
get rid of ivars used only for http UI
2011-01-04 21:43:10 -08:00
Eric House
46e9ae3c01
up copyright date
2011-01-03 16:33:03 -08:00
Eric House
11d7de5f0d
display the number of devices (pids) running
2010-12-21 20:52:01 -08:00
Eric House
64004e9df8
fix to use long-opts
2010-12-21 20:51:36 -08:00
Eric House
9ea5c7462d
fix long-opts glitches
2010-12-21 20:51:21 -08:00
Andy2
7fe5e43963
modify to use new long-only flags
2010-12-21 08:02:51 -08:00
Andy2
63e7084cc8
fix a couple of the new options
2010-12-21 08:01:44 -08:00
Andy2
a7aabdc41b
use getopt_long_only and a table to make adding params easier, fix
...
running out of letters, and force better usage.
2010-12-21 00:58:02 -08:00
Andy2
2cc46d8a69
get rid of unused but oft-included file
2010-12-17 19:02:01 -08:00
Andy2
ff6fb7070e
Android market reports a few crashes going out-of-bounds on array of
...
bad words. Add an assertion on the only path that seems likely to be
causing that.
2010-12-17 18:57:43 -08:00
Andy2
0ee156c9f0
add empty: case for WINCE type too
2010-12-17 18:55:44 -08:00
Andy2
c0bec75fd8
fix crash when input wordlist is empty by not counting zero-length
...
word as a word.
2010-12-17 18:55:25 -08:00
Andy2
53de4eab9b
correctly detect empty dict and set top ptr to null. Fixes crash
...
using empty dicts.
2010-12-17 18:54:27 -08:00
Andy2
c5e0955460
simplify build rule
2010-12-17 17:39:33 -08:00
Andy2
7e46163988
add counts and values -- from wikipedia article, as are Arabic and
...
Turkish files just checked in.
2010-12-17 17:38:47 -08:00
Andy2
18f8b0d4e4
switch to utf-8, adding an iconv call to translate the wordlists.
2010-12-17 17:37:57 -08:00
Andy2
32fccca995
Turkish. As with Arabic, untested.
2010-12-17 17:36:38 -08:00
Andy2
71559e27c6
add Arabic. I have no wordlist but this should still allow play
...
between humans, even over the net. Untested, though, as my phone
doesn't have any Arabic glyphs.
2010-12-17 17:36:03 -08:00
Andy2
1535f56cd6
adding Turkish and Arabic and language names
2010-12-17 17:34:54 -08:00
Andy2
7e0f025d9e
remove logging
2010-12-17 06:51:56 -08:00
Andy2
3336b39d6d
add (wordcount) to subst title to make meaning more clear
2010-12-16 20:29:48 -08:00
Andy2
ea85512c4f
put word count into list of dicts for substitution. Done by adding
...
actual count then stripping it back off to form the dict name again.
2010-12-16 20:24:04 -08:00
Andy2
0059f92626
use medium sized text for empty view
2010-12-16 18:50:15 -08:00
Andy2
693909ec67
add an empty view along side list view; all setEmptyView to install it
...
to be shown when list is empty.
2010-12-16 18:47:25 -08:00
Andy2
740060f531
remove logging
2010-12-16 18:45:46 -08:00
eehouse@eehouse.org
f0c31956d2
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-12-16 06:41:30 -08:00
Andy2
95a6982851
use new overridden method
2010-12-16 06:38:47 -08:00
Andy2
993e66da99
add newbie info on launch of dicts activity (and override method so
...
don't have to pass null)
2010-12-16 06:37:05 -08:00
Andy2
6cd22f6461
add newbie info on launch of dicts activity
2010-12-16 06:36:25 -08:00
Andy2
16933d14c1
fix list item layout to have variable height so it doesn't clip dict
...
listings that wrap to a second line -- e.g. the Spanish_FAA ones.
2010-12-16 06:24:47 -08:00
Andy2
647443c03e
reintroduce BroadcastReceiver listening for connectivity going up and
...
down. When network's down, return -1 from send proc so that comms
timing can retry. This works on both cellphone on carrier network
(with airplane mode as the test for loss/gain of network) and on
emulator (with death/restart of relay as the test since I don't know
how to kill the iface itself). A quick test on phone using wifi this
morning suggested it didn't work, that into/out of airplane mode did
not result in notifications getting set. Need to test that, and back
this out if can't be fixed since I can't break wifi.
2010-12-15 18:39:25 -08:00
Eric House
a663b2deae
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-12-13 22:08:11 -08:00
Eric House
442b3983cf
highlight during draw where possible because doing it after isn't
...
possible with wide chars -- meaning I haven't figured out how yet.
ncurses documentation is well hidden....
2010-12-13 22:07:25 -08:00
Andy2
d1605c4493
fix: convert to utf8 and replace grep that didn't work (presuambly
...
because ranges have different meanings in utf-8) with one that does.
2010-12-13 20:39:04 -08:00
Andy2
d78584fddf
remove obsolete, pre-utf8 files
2010-12-13 20:09:26 -08:00
Andy2
bb0a79914b
add conversion from ISO88591 since the default dict's in that format.
2010-12-13 20:09:09 -08:00
Andy2
dc807c948a
use sed instead of tr since as with Slovak a letter was getting
...
dropped. Same one in fact.
2010-12-13 19:58:37 -08:00
Andy2
cd3ff71efb
notify comms layer when unable to establish connection. This allows
...
comms logic to retry and fixes failure on device to detect when
network comes up after being down when game was opened.
2010-12-13 18:30:22 -08:00
Andy2
299c84bb2b
use sed rather than tr to uppercase letters. tr was dropping the Á
...
letter for some reason. The sed feature I'm using is a gnu extension
but has the advantage of working. Should probably do this for all
languages and in the info files.
2010-12-13 18:16:22 -08:00
Andy2
23a4a7ef64
get rid of unused/stubbed out method
2010-12-13 06:37:26 -08:00
Eric House
2807ee2ce0
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-12-12 20:50:35 -08:00
Eric House
894afdc0cb
take words up to 15 letters long. This makes no difference with any
...
dict I've tried as there just aren't any words over 7 letters long
made up of only a-f.
2010-12-12 20:02:28 -08:00
Eric House
e8e0b25fad
go back to old dict -- correcting a change I didn't mean to check in.
2010-12-12 20:01:33 -08:00
eehouse@eehouse.org
9140c8b39a
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-12-10 05:43:31 -08:00
Eric House
9c5b2c9f4f
add for current French list
2010-12-09 21:22:37 -08:00
Eric House
98456dd652
fix to build dicts, wince/android format by default
2010-12-09 21:22:14 -08:00
Eric House
6b58c9031f
script to build html page for downloading dicts
2010-12-09 21:21:41 -08:00
Andy2
183d920eb0
update changelog for beta 20
2010-12-09 07:41:43 -08:00
Andy2
1fbdd62372
up version num/strings
2010-12-09 07:21:56 -08:00
Andy2
c4fa9cb707
exit loop rather than trying to use key again after cancelling it.
...
Fixes CancelledKeyException raised when launching networked game in
airplane mode.
2010-12-09 06:58:55 -08:00
Andy2
d5d81fea5b
don't return dialog when msgID is 0. This should fix occasional crash
...
where OS wants to restore a dialog but the message ID has gotten
cleared -- via a mechanism I'm not quite clear on.
2010-12-08 18:52:08 -08:00
Andy2
a1c96b5601
change default dict download url so new set can coexist with old and
...
get picked up only by new release that can handle it.
2010-12-08 18:47:21 -08:00
Andy2
65ea075102
when downloading new dict inval the info cache to it'll get reloaded
...
-- in case we're overwriting one with the same name.
2010-12-08 18:46:25 -08:00
Andy2
1b40d1d47b
make method public to be used outside
2010-12-08 18:45:31 -08:00
Andy2
5534939407
add inval() to prevent stale data when new dict downloaded over top of
...
old.
2010-12-08 18:44:59 -08:00
Andy2
c83e4cc7a3
all places where dict lang is displayed can also display word count
2010-12-08 05:51:26 -08:00
eehouse@eehouse.org
64bcb8bb2b
Revert "replace call to rand() with android_only function that reads two bytes"
...
This reverts commit 1653b9f6e9
2010-12-08 05:38:41 -08:00
Eric House
efe6d6d95d
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-12-07 20:47:19 -08:00
Eric House
b65338b643
script for use on relay host
2010-12-07 20:46:02 -08:00
Andy2
3987749079
log calls to set-not-again. I'm getting crashes and that may help
...
track it down. Remove this later.
2010-12-07 18:57:38 -08:00
Andy2
4a12f7a96f
Revert "in attempt to work around non-random rand() in jni world, call back"
...
This reverts commit 99c92e779d
2010-12-07 18:43:53 -08:00
eehouse@eehouse.org
57bfe4c943
Revert "switch from nio to regular old io, with separate reader and writer"
...
This reverts commit b23de9a958
2010-12-07 18:12:35 -08:00
eehouse@eehouse.org
b389478350
Revert "register for notification of network going up and down; start using"
...
This reverts commit 77fe3952da
2010-12-07 18:12:02 -08:00
Eric House
eb22322e8d
change title until we have column headers
2010-12-06 21:08:38 -08:00
Eric House
2a0151baf7
add BasEnglish dictionary.
2010-12-06 21:08:15 -08:00
Eric House
4ac4b37619
Merge remote branch 'maidu/android_branch' into dawg_fixup
2010-12-06 21:05:41 -08:00
Andy2
77fe3952da
register for notification of network going up and down; start using
...
that information to connect and not. There seems to be no way to get
notified when a socket's underlying transport goes down (might not
even want to) so this will be the best way to have the arrows go red
when the device goes into airplane mode.
2010-12-06 20:19:17 -08:00
eehouse@eehouse.org
fcd179f6b7
Merge remote branch 'origin/android_branch' into dawg_fixup
2010-12-06 18:50:13 -08:00
Andy2
39b40a9a3d
build with a header giving word count
2010-12-06 18:31:12 -08:00
Andy2
74fc103e9d
opt for the long form of annotated name (includes word count)
2010-12-06 18:28:00 -08:00
Andy2
ad829b74f7
cache DictInfo rather than just lang code; add method that formats
...
name with lang and count. Ideally the dict display would be a table,
but it's not trivial to switch from a list to scrolling table.
2010-12-06 18:27:00 -08:00
Andy2
f50e6b3f1b
turn dict_getLangCode into dict_getInfo, adding a struct that contains
...
lang code and new word count.
2010-12-06 18:25:23 -08:00
Andy2
e4999acc98
add dict_getWordCount()
2010-12-06 18:24:31 -08:00
Andy2
ff9e03ef4b
read rather than just skipping word count
2010-12-06 07:30:28 -08:00
Andy2
91c04d3267
switch to new format (with header giving word count)
2010-12-06 07:26:47 -08:00
Andy2
12508b7cd5
cleanup stderr output
2010-12-06 07:23:22 -08:00
Andy2
0072112b5a
fix syntax for including newheader so only one gets included. Fixes
...
bug building multiple dicts where headers would accumulate.
2010-12-06 07:23:05 -08:00
Andy2
e2bb50ef62
skip new header if present
2010-12-06 07:22:07 -08:00
Eric House
c4cdc24b78
initial changes to add a header to xwd format so that stuff like
...
number of words can be included. Changed to build dicts and linux to
open them. Android still needs to learn. Also, some of the tools in
dawg/ need to be fixed to read old-format (pre-utf8) .xwd files.
2010-12-05 19:33:10 -08:00
Eric House
eff2324950
fix compile command
2010-12-05 19:30:00 -08:00
Eric House
bef1e125bf
ignore .pdb files
2010-12-05 19:29:15 -08:00
Andy2
b23de9a958
switch from nio to regular old io, with separate reader and writer
...
threads. Greatly simplifies things, but only tested for the simplest
case, and I know it won't correctly reconnect when relay goes down.
But folks recommend against nio, and I'd like to see if I'll get
notifications in the form of blocking socket calls returning or
raising exceptions when the network goes down, something that isn't
happenening with nio.
2010-12-03 18:48:14 -08:00
Andy2
fda21e8d15
save room and player names if leaving simple config dialog via the
...
advanced config button (but still drop if back button hit.)
2010-12-03 06:44:34 -08:00
Andy2
426f990156
fix infinite loop creating networked game: util_rand() can't call into
...
java in some cases so needs to fall back to returning rand().
2010-12-03 06:43:40 -08:00
eehouse@eehouse.org
ddaa368af3
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-12-02 22:38:16 -08:00
Andy2
984a5d6154
Fix yet again what shouldn't have been checked in.
2010-12-02 22:37:21 -08:00
Eric House
9fd4229384
pass host to rq too
2010-12-02 22:34:59 -08:00
Eric House
328fe7d6dc
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-12-02 22:31:34 -08:00
Eric House
d1244da284
script encapsulating sql query that's useful to run (with 'watch') along with discon_ok2.sh
2010-12-02 22:29:36 -08:00
Andy2
99c92e779d
in attempt to work around non-random rand() in jni world, call back
...
into the java world by making it a util_ctxt function. Do same on
linux to test. We'll see how it is -- and can back this commit out if
there's no improvement.
2010-12-02 19:02:36 -08:00
eehouse@eehouse.org
c4a4a39438
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-12-02 05:56:26 -08:00
Eric House
ae9dbd1e5c
create mtimes array rather than mtimes timestamp
2010-12-01 21:09:25 -08:00
Eric House
4bd5553596
track mtime per host rather than per game -- make it an array in the db.
2010-12-01 21:08:22 -08:00
Andy2
2e956e2f6e
debug is not supposed to be checked in turned on
2010-12-01 18:13:55 -08:00
Andy2
e89feb62d8
second part of manual merge of unicode_branch's dawg/ directory into
...
this one. This adds the directories and their files created inside
dawg.
2010-11-30 18:38:05 -08:00
Andy2
79990bc7b1
first set of changes formed by applyinig diff of android_branch's
...
dawg/ directory against unicode_branch's. The two branches seem to
have to common ancestor -- probably didn't survive translation from
svn -- so this is the best I can do.
This checkin is all the files that were modified by the patch plus a
couple of simple additions. Next I'll be adding directories that the
patch created. It also reintroduced a bunch of .cvsignore files; I
won't check those in.
2010-11-30 18:35:11 -08:00
Andy2
78be732c64
use min of score ht and cell width for network status icon. Fixes
...
problem on 600x800 devices where the icon overlaps the board.
2010-11-30 18:21:28 -08:00
Andy2
a5c36f37a4
new strings for dict substitution
2010-11-30 06:37:23 -08:00
Andy2
d086dad34e
Since you can't add/remove buttons in onCreateDialog(), add a new one
...
to use when there are other dicts available in the same langauge as
the missing one that offers to substitute, and another dialog
presenting a list of same-language dicts. Then substitute the one
tapped.
2010-11-30 06:37:01 -08:00
Andy2
3a9eb72db3
add static methods to count and list dicts in a given langauge.
2010-11-30 06:34:57 -08:00
Andy2
1653b9f6e9
replace call to rand() with android_only function that reads two bytes
...
from /dev/urandom. rand() has been returning pretty crappy numbers
resulting in lots of clustering of tiles in trays. Let's see if this
is any better.
2010-11-29 17:12:12 -08:00
Andy2
b4fb57de9c
move thread inside so it can be started and stopped. And exit the
...
thread on failure to connect, allowing comms' timer to control when we
retry. This fixes problem where would try multiple times/second to
connect when relay was down. Now we try every 15 seconds (per comms,
which can as well back-off), and shortly after the relay comes back up
connect successfully.
2010-11-24 18:14:34 -08:00
Andy2
8623c569e7
move game data from separate files into a BLOB column in the existing
...
summaries db table, using the existing SNAPSHOT column rather than
adding a new one and upping the version. Includes utility fired at
game-start to convert existing games that seems to work. Also
improved a few queries and updates to -- I think -- use the API
better.
2010-11-24 17:22:46 -08:00
Andy2
be35d875b2
move game data from separate files into a BLOB column in the existing
...
summaries db table, using the existing SNAPSHOT column rather than
adding a new one and upping the version. Includes utility fired at
game-start to convert existing games that seems to work. Also
improved a few queries and updates to -- I think -- use the API
better.
2010-11-24 17:22:04 -08:00
Andy2
7c96048ba2
add, but comment out because it requires user permission, code to
...
notice when cellular data becomes available and notify relay of dead
games then. Must be a way to notice a network interface cellular or
not without permission since I already have permission to use it.
2010-11-23 19:01:32 -08:00
Andy2
c3f43dd26c
when deleting all games don't inform relay until after the last one so
...
a single connection does it.
2010-11-23 18:28:05 -08:00
Andy2
5bf87b3bea
add function to invoke rq once for all the relayIDs in the set of
...
devices making up a game. Actually using it make the script fail for
some reason and so it's commented out, but it helped to debug the
relay.
2010-11-23 18:12:11 -08:00
Andy2
0bbf7272aa
don't create thread if there are no obits in the db -- makes it
...
cheaper to call when there may be nothing to do.
2010-11-23 18:10:51 -08:00
Andy2
7c8622392d
send the list of saved deleted relayID/seed pairs off to the relay and
...
remove them from db when relay reports success. TODO: relay always
reports success even if some are malformed and it's aborted parsing.
2010-11-23 17:56:17 -08:00
Andy2
1720fbbd50
fix parsing of relay ids by replacing separating \n with \0.
2010-11-23 17:46:16 -08:00
Andy2
111c59dd30
toward having game deletion get reported even if network isn't live at
...
the moment: create new "obits" table and put dead game info in it.
Change constant for current table name to be less generic.
2010-11-23 06:44:59 -08:00
Andy2
2127394260
don't allow resignations below a certain point -- which happens to fix
...
divide-by-zero error.
2010-11-22 20:44:28 -08:00
Andy2
daecc807c1
don't init nPerDevice, and deal with it not being inited.
2010-11-22 20:43:37 -08:00
Andy2
eebf5f1252
remove the big dictionary. Ideally I'll figure out how to gracefully
...
allow to switch without downloading before the next beta.
2010-11-22 18:24:37 -08:00
Andy2
983906810c
set dropdown view resource on public rooms spinner -- fixes problem
...
where it was drawing super-small.
2010-11-22 07:39:18 -08:00
Andy2
3ee3af8881
init crosshairs correctly so 0th column and row aren't drawn short.
2010-11-22 07:04:51 -08:00
Andy2
edab239060
add one more change
2010-11-21 20:12:45 -08:00
Andy2
ead21206e0
up version to 5 not 6 since prev beta was at 4.
2010-11-21 20:12:34 -08:00
Andy2
7d164f2389
complete list of changes
2010-11-20 21:19:56 -08:00
Andy2
d23dc4aee5
No need to use CurGameInfo for any game summary fields since it's all
...
in the summary db now. Saves opening the game itself just to show it
in a list.
2010-11-20 20:37:01 -08:00
Andy2
985c3d586c
move gameslist summarizing methods from CurGameInfo to GameSummary.
2010-11-20 20:34:41 -08:00
Andy2
b3b9742cdf
add serverrole and players summary to summary db
2010-11-20 20:34:00 -08:00
Andy2
a9a1076d02
actually delete dict when no games use it.
2010-11-19 21:47:38 -08:00
Andy2
b2e418436d
tweak string
2010-11-19 21:09:36 -08:00
Andy2
e38ac33e00
move dict-missing dialog from DlgDelegate into GamesList because
...
that's the only place that is or should be calling it. And since we
can usually figure out the exact url for the dictionary go ahead and
try to download that.
2010-11-19 21:08:09 -08:00
Andy2
0578a0e4f6
When deleting dictionaries, just do it unless the dictionary's in use
...
in which case tell user how many games are using it when asking for
confirmation. To do that, add dict into summary DB, and to do that
add CurGameInfo into GameSummary's constructor. Also, when there's no
summary for a game, make one on the spot and add it to the db. This
will crash if the game's dict has been deleted. Need to deal with
that, probably by deleting unsummarazible games, becuase now if
somebody installs this on top of a device where a game's dict is
missing and it has no summary I'll never boot.
2010-11-19 18:37:00 -08:00
Andy2
586b211b04
add dict name and language to summary database. Probably eventually
...
want to move everything for the display here -- and maybe the file
contents too as a BLOB.
2010-11-19 18:24:56 -08:00
Andy2
71059e6dff
remove nPlayers from game_summarize
2010-11-19 18:23:34 -08:00
Andy2
92940e6638
add model_getNPlayers()
2010-11-19 18:22:39 -08:00
eehouse@eehouse.org
d261aa8184
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-11-18 22:42:43 -08:00
Eric House
a1caaeb183
simulate games being deleted before they're finished
2010-11-18 22:27:46 -08:00
Eric House
7a2d279308
add logging so script can better track what state relay game is in
2010-11-18 22:27:06 -08:00
Andy2
43be0183a5
just assert that dict can be opened as part of opening game. GamesList
...
is now responsible for not launching a game if its dict is gone.
2010-11-18 19:05:22 -08:00
Andy2
3eb8b723de
don't assume no-dict dialog should call finish on its calling
...
Activity() on exit -- we're not letting the Activity launch any more.
2010-11-18 19:04:43 -08:00
Andy2
198534dce3
check if dict missing and warn rather than do anything that will crash
...
if it's not there. Ideally I could open the config dialog so user
could change the dict but that isn't working. Maybe just offer to
open it after swapping in the default dict?
2010-11-18 19:00:49 -08:00
Andy2
7921ddca10
don't crash when asked to reset a game whose dict has been deleted.
2010-11-18 18:52:04 -08:00
Andy2
163c124072
update for b19
2010-11-17 06:13:31 -08:00
Andy2
fc88742978
up constants for b19
2010-11-16 21:06:43 -08:00
Eric House
b91187d6a5
test result when parsing; drop if didn't parse
2010-11-16 20:30:43 -08:00
Eric House
f33466b6db
exit with non-0 on failure so calling script/loop can exit too
2010-11-16 20:29:55 -08:00
Eric House
4c6c3c1ded
when marking a device in a dead game, negate its nperdevice entry rather than always using -1.
2010-11-16 20:28:53 -08:00
Andy2
635ae053b6
cut down on printing; don't assert-fail when relay's crashed.
2010-11-15 20:40:59 -08:00
Andy2
2c5c7a0dd1
init m_nRoomsFilled -- not sure when this http view feature broke
2010-11-15 20:08:59 -08:00
Andy2
a1be555910
improve string for deleted remote game -- but really needs a "delete
...
now" button.
2010-11-15 19:02:12 -08:00
Andy2
3b30aff613
use external relayID.sh script
2010-11-15 19:01:38 -08:00
Andy2
ea292c7e2f
exclude dead games when looking for open public rooms
2010-11-15 19:01:11 -08:00
Andy2
58cd93ef6f
given a log file, generates an ID that can be passed with the -d
...
option to relay/rq.
2010-11-15 18:34:56 -08:00
Andy2
c6bd2125a4
java uses '/' to delimit device id, so we'll make that standard.
2010-11-15 18:27:36 -08:00
Andy2
c36679fe13
init isDead to false. Fixes prolem where if DB entry's missing the
...
value is uninitialized and so device gets warned that other device
resigned even if none did.
2010-11-15 18:21:40 -08:00
Andy2
a69e2ad8be
add test for device-gone notification by calling rq after gleaning
...
required params from logs. So far testing only after game is over;
need to test mid-game deletion too.
2010-11-15 06:52:35 -08:00
Andy2
d4e810c9cb
delimiter changed
2010-11-15 06:51:05 -08:00
Andy2
ce5738a4e1
write the count
2010-11-15 06:50:09 -08:00
Andy2
edf0c40904
track isDead when creating SafeCref for devgone
2010-11-15 06:49:41 -08:00
Andy2
2c9f2572a8
use GameFull()
2010-11-15 06:48:57 -08:00
Andy2
feca7345dc
add GameFull -- database, not in-memory state, knows if game is full.
2010-11-15 06:48:36 -08:00
eehouse@eehouse.org
14579c6e30
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-11-14 19:40:35 -08:00
Eric House
528ae0c986
allow more than one device death per message
2010-11-14 15:19:38 -08:00
Eric House
a8ac30b180
add -d option to test dev-gone on relay
2010-11-14 15:18:49 -08:00
Andy2
9026d5c149
remove obsolete script I keep accidentally invoking
2010-11-12 18:26:01 -08:00
Andy2
43896ff187
remove unused method and variable
2010-11-12 18:25:15 -08:00
Andy2
fc8cac3b6a
handle new device-gone message by posting timed-out dialog.
2010-11-11 06:43:36 -08:00
Andy2
b0a4790ce0
respond to new game-gone message by passing to utils.
2010-11-11 06:41:24 -08:00
Andy2
0787a06eb5
accept new message from device announcing the death of a game
...
(including seed so it's harder to spoof); respond to that by setting a
DEAD column in the db and flagging the device as gone. Notify any
connected device of the fact. Refuse to accept new connections to
that game. As already-connected devices reconnect, allow them to do
so but send a new status message that their game is dead. Not heavily
tested yet.
2010-11-11 06:40:50 -08:00
Andy2
3d59bc7e39
add new DEAD column to track when a game's been deleted
2010-11-11 06:29:21 -08:00
Andy2
04e1b0c22b
new constants, include new status event type, for relay to accept
...
notification of deleted game and communicate that to others in the
game as they connect.
2010-11-11 06:26:59 -08:00
Andy2
d809db7b21
plug into delete and reset code to notify relay that game's forever gone.
2010-11-11 06:25:08 -08:00
Andy2
cf84cce41a
define and handle new other-was-deleted error relay is about to start
...
returning.
2010-11-11 06:23:48 -08:00
Andy2
e3f373039a
add informOfDeath to communicate to relay when game is deleted
2010-11-11 06:22:38 -08:00
eehouse@eehouse.org
048eff92b8
Merge branch 'relay_proxy' of /home/andy2/dev/git/LOCAL_ORIGIN into relay_proxy
2010-11-10 07:17:39 -08:00
eehouse@eehouse.org
7929167129
Merge branch 'android_branch' into relay_proxy
2010-11-10 07:06:10 -08:00
Andy2
f373b52d45
fix bug drawing tile letters when drawScaled() got triggered (e.g. for
...
W on non-std-sized screen): pass null as scr rect to drawBitmap so the
whole bitmap gets used.
2010-11-10 07:05:40 -08:00
Andy2
d3e644db83
stop requiring 1.6 sdk when runs fine on 1.5
2010-11-10 06:57:45 -08:00
Andy2
c8d7ca40a5
use \1 instead of \n as delimiter -- in case somebody passes as string
...
containing a \n.
2010-11-09 18:02:22 -08:00
Andy2
0f111ab363
use PQexecParams instead of PQexec for queries involving strings from
...
users (i.e. room names) to avoid crashes when the contain apostrophes
-- and in general to be safer.
2010-11-09 17:27:33 -08:00
Eric House
966616cbc4
throw in the public flags; disallow unset variables
2010-11-09 05:54:23 -08:00
Eric House
2a2f4d4395
been a while since cvs...
2010-11-09 05:53:49 -08:00
Andy2
42481a31cc
add seed to db; get and set it.
2010-11-08 17:23:54 -08:00
Andy2
82876bda06
add seed and fetch it in jni
2010-11-08 17:23:16 -08:00
Andy2
22f7a42c1d
make comms_getChannelSeed non-static so jni can call it
2010-11-08 17:22:38 -08:00
Andy2
b49015c9a1
map out-of-range lang codes to 0. Otherwise we get outOfBounds
...
exceptions once Hex dict is installed.
2010-11-07 15:42:09 -08:00
Andy2
d893632e1b
map out-of-range lang codes to 0. Otherwise we get outOfBounds
...
exceptions once Hex dict is installed.
2010-11-07 15:34:40 -08:00
Andy2
83ae8d316c
switch to RelativeLayout, putting lock checkbox at top and play game
...
button in the middle with everything else scrolling in between. This
particular application of RelativeLayout works on 1.5 (in emulator).
2010-11-07 15:13:39 -08:00
Andy2
aff3c9a931
stop requiring 1.6 sdk when runs fine on 1.5
2010-11-07 15:12:37 -08:00
Andy2
1e5ac393c1
update for b18 (but leave b17 description below since that represents
...
two months of work and b18 two hours.)
2010-11-07 14:13:04 -08:00
Andy2
6da013af9d
up constants for beta-18
2010-11-07 14:04:37 -08:00
Andy2
c2472c0cb5
don't call java code if rect width is 0. Fixes crash (but not design
...
problem) where first to connect in room specifies a timer and second
does not. Second eventually gets message saying there's a timer but
has not layed out space in the board and java freaks out when later
asked to make a 0-width image. This fix leaves the device not drawing
the timer until the game is reopened. The better fix would trigger a
re-layout as soon as the change is made.
2010-11-07 14:03:24 -08:00
Andy2
cfd4345287
remove too-frequent logging
2010-11-07 13:31:43 -08:00
Andy2
99a557a604
fix blanks-first option to assign one blank per tray rather than all
...
to first. Makes for more realistic test.
2010-11-07 12:20:39 -08:00
Andy2
83f6ebca79
work around bug -- or design flaw -- where when timer is set hint or
...
robot with blank in tray keeps flashing the in-progress indicator by
flagging CMD_TIMER_FIRED as a non-ui event so busy() won't return when
it's what's on the queue. Problem with that is that the timer stops
advancing during a hint which is clearly not what's happened.
2010-11-07 12:13:07 -08:00
Andy2
2c95179050
don't complain about empty room name for standalone game
2010-11-07 11:50:01 -08:00
Andy2
57838c0436
improve script. Allow pass either branch or tag on commandline,
...
defaulting to branch of tree from which called. Add usage(). set -u
-e and deal with [ -n "$1" ] being an error in that case.
2010-11-07 08:16:36 -08:00
Andy2
46a01ace56
work around occasional crash in on-device testing by checking for 0
...
before passing to getString. Not sure of the circumstances but the
crash is coming from restoreManagedDialogs() -- might be related to
screen orientation changes.
2010-11-06 21:34:16 -07:00
Andy2
dd3bd1f661
don't show hint buttons until there are tiles assigned
2010-11-06 21:31:53 -07:00
Andy2
a6a7f1899d
remove logging
2010-11-06 21:01:50 -07:00
Andy2
2fc48cbd97
nuke unused constant
2010-11-06 21:01:29 -07:00
Andy2
92ec742f90
script to build from a clean tree. I'm getting emacs and git tmpfile
...
picked up by the android build system and incorporated into .apks;
this will avoid that.
2010-11-06 20:19:07 -07:00
Andy2
d2782af487
do case-insensitive comparison of room names
2010-11-06 18:52:10 -07:00
Andy2
73d7c7a27b
use new field to determine if simple relay config dialog can handle
...
the game or if user's already changed it enough that the full-on
dialog is required.
2010-11-06 18:26:09 -07:00
Andy2
f36b253ae7
add number of players to GameSummary. Changes DB but it's already
...
changed since last beta so I'm not upping the version.
2010-11-06 18:24:44 -07:00
Andy2
9fccbcc6b4
Problem with new minimal-config relay dialog: user can accidentally
...
tap "play game" and wind up connecting and creating an empty-room-name
game; or can dismiss the dialog and be confused because there's no way
back to it. Solution: define empty-room-name as an illegal case.
Check for it when "play game" is tapped in either config dialog and
raise an alert. And when user wants to open a game from the GamesList
activity go to the minimal config dialog if it's a relay game without
a room name.
2010-11-06 16:41:12 -07:00
Andy2
8213c9a5c1
add showOKOnlyDialog
2010-11-06 16:38:33 -07:00
Andy2
248c758b1c
add a bit of space around bullet items
2010-11-06 16:37:59 -07:00
Andy2
b7fc678e3d
tweak changes, removing steps to create networked game since that's
...
part of the UI now.
2010-11-06 15:29:05 -07:00
eehouse@eehouse.org
58317afb28
Merge branch 'android_branch' into relay_proxy
2010-11-06 15:06:08 -07:00
Andy2
ceec9eda28
set m_invalPath so new network game will be drawn correctly first time
...
back in GamesList
2010-11-06 15:01:06 -07:00
Andy2
a72e029f40
add name field to and use a style for bulleted items in simplified
...
relay-connect dialog; remove not-again text and dialog attached to
new-relay-game button; tweak text.
2010-11-06 14:55:57 -07:00
eehouse@eehouse.org
8dad8750ba
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-11-06 14:43:57 -07:00
Andy2
d6adc84ee3
tweak two prefs strings
2010-11-06 14:40:28 -07:00
Eric House
98716b755a
get rid of menuitem that was there only for development testing
2010-11-06 08:30:45 -07:00
Andy2
c125edd2cb
make text bulleted -- easier to read/follow
2010-11-05 05:53:28 -07:00
eehouse@eehouse.org
fc739e2c67
Merge branch 'android_branch' into relay_proxy
2010-11-05 05:19:16 -07:00
eehouse@eehouse.org
6d205011f5
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-11-05 05:12:59 -07:00
Andy2
145ab6f356
remove wordy explanation
2010-11-05 05:11:40 -07:00
eehouse@eehouse.org
64cc199e1a
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-11-05 05:10:24 -07:00
Eric House
0d863d2d3f
fix casting error caught by compiler
2010-11-05 05:06:24 -07:00
Eric House
7b3691662a
version of build.xml modified to pass -xline to javac. For future use...
2010-11-05 05:06:04 -07:00
Andy2
2f38ce3d92
add button leading to the main config dialog plus an explanation of
...
what it's for.
2010-11-04 20:37:59 -07:00
Andy2
23924ff74e
add new activity that's popped up on creation of a networked game to
...
ask only for the room name to make it as easy as possible to
get started.
2010-11-04 19:48:46 -07:00
Andy2
c9239fc921
make method public
2010-11-04 19:46:05 -07:00
Andy2
9c48c91156
init room name to current text -- duh! -- preventing close process
...
from thinking a change has been made (room name nulled) when none had
been.
2010-11-04 06:36:28 -07:00
eehouse@eehouse.org
d04a5870af
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-11-03 21:00:43 -07:00
Andy2
c630697c59
Fix crash on 2.2 emulator by turning of ipv6 on emulator. per
...
workarounds found online. Suggested fix is to use io instead of nio.
2010-11-03 20:54:35 -07:00
Andy2
d1fcdb69da
double max room name len since the old value was too small -- only
...
filled half a text field on android
2010-11-03 18:38:43 -07:00
Andy2
e2ee0755cb
set max len for roomname field (with comment that it should be kept in
...
sync with the C constant)
2010-11-03 18:38:13 -07:00
Andy2
c7febf0d10
nuke unused constant
2010-11-03 18:30:05 -07:00
Andy2
9e05e6c2b3
add lastMsgRcd to status printout
2010-11-03 18:28:54 -07:00
Andy2
c039b92339
don't send 0-length message
2010-11-03 18:26:20 -07:00
Andy2
0148a93f3e
add a constraint to the stored messages table to avoid dupes. Then
...
remove the artificial limit on number of stored messages. This seems
to fix problems where lots of chats in a row clog up the relay so that
messages never get flowing again. Works more cleanly than
artificially ACKing.
2010-11-03 18:14:19 -07:00
Andy2
633d4c95a7
fix buffer overflow sql error with large messages; combine logged messages.
2010-11-03 18:12:26 -07:00
Eric House
31df12747b
fix prev hint to work not just compile
2010-11-01 22:20:35 -07:00
Eric House
892f30692b
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-11-01 21:54:28 -07:00
Eric House
e54bf588ab
fix to compile on wince/win32
2010-11-01 21:54:04 -07:00
Andy2
8bf8383d60
reread preferences in case of an upgrade. Fixes bug where default
...
port was 0 because the new key, meant to change the value, was not
being initialized. It's a hack to use a side-effect to determine
whether this is an upgrade, but since I'm already calculating it
didn't see any point to doing it again.
2010-11-01 18:56:23 -07:00
Andy2
1e5a856287
log host/port connecting to. Too useful to omit.
2010-11-01 18:53:36 -07:00
Andy2
8f55469930
remove strings no longer in English
2010-11-01 18:12:14 -07:00
Andy2
3d70da5a8d
cleanup
2010-11-01 06:57:54 -07:00
Andy2
804070efc7
base comms_canChat() on whether connID's been assigned. It's possible
...
to send a message from a client immediately after its initial message
but init-message dupe-detection in comms will drop that because only
one channel-0 message is expected -- the initial connection message.
So don't encourage platform code to enable the feature before common
code can deliver the message.
2010-11-01 06:57:41 -07:00
Andy2
2d9851902c
replace chat menuitem with chat button enabled using comms_canChat()
2010-11-01 06:55:37 -07:00
Andy2
40e42b79c5
up version numbers and strings -- getting ready for release
2010-10-30 09:11:47 -07:00
Andy2
b2fd178d60
tray->rack; clarify not-again text for 'turn done' button so it isn't
...
stupid when displayed for ending a trade.
2010-10-29 20:24:50 -07:00
Andy2
64a8b1e61a
change confusing const name
2010-10-29 20:20:25 -07:00
Andy2
8c7043d42c
fix crash using undo/redo after a turn has overwritten pending tiles:
...
when redoing need to check that cell is still empty.
2010-10-29 20:07:09 -07:00
Andy2
5b33df4e25
modify model_getTile to take NULL for out parms where the result is
...
often ignored, then pass NULL instead of the address of variables
called 'ignore'. Should be no behavior change.
2010-10-29 19:52:15 -07:00
Andy2
3d52698939
don't show all-here not-again dialog to host host -- already got the
...
first-in version.
2010-10-29 19:14:56 -07:00
Andy2
148fe848c2
get rid of implication that some deletions are undoable.
2010-10-29 19:02:57 -07:00
Andy2
fd1ca2c9c5
confirm single game delete.
2010-10-29 19:02:21 -07:00
Andy2
5b6a5aafe8
add three not-again messages displayed after connection is first made
...
with the relay, for first-in-room, last-in-room, and the less common
middle case. Add confirmation dialog for game reset.
2010-10-29 18:44:07 -07:00
Andy2
6de7fb28e3
add lock-setting checkbox to game config dialog and toggle
...
setEnabled() on most widgets as it's checked. Add not-again dialog
explaining possibility of reset of started game. Don't even show the
checkbox for non-started game.
2010-10-29 07:42:16 -07:00
Andy2
814dd89458
remove unused ivar; override setEnabled to dis/enable delete button
2010-10-29 07:40:41 -07:00
Andy2
30b6a6b54e
remove unused and confusing id
2010-10-29 06:48:45 -07:00
Andy2
a7c1319527
call super only in the default case
2010-10-29 06:48:18 -07:00
Andy2
d98525de95
make chat display dialog blocking. This fixes problem where multiple
...
chats received at once see all but the first dropped, and probably
fixes reported problem where only one message every got displayed.
2010-10-29 06:46:27 -07:00
Andy2
b115ce14ed
add devOrder (= hostID) to params passed on connect. Fix to pass new
...
param from jni; use object to pass params into UI thread since there
are now too many for handler.
2010-10-29 06:34:39 -07:00
Andy2
ab708e4db1
add devOrder (= hostID) to params passed on connect. Make linux apps compile after API change.
2010-10-29 06:32:18 -07:00
Andy2
0d7f2c4f23
add devOrder (= hostID) to params passed on connect. Should make for
...
better explanatory message.
2010-10-29 06:31:33 -07:00
Andy2
4cd15a9c6a
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
...
Conflicts:
xwords4/common/comms.c
2010-10-29 05:27:07 -07:00
Eric House
e069a268cd
implement dialog to edit chat text
2010-10-28 21:31:40 -07:00
Andy2
c087b4b031
add room name to callback used when device connects: pass the new
...
parameter through and format into messages posted via Toast.
2010-10-28 18:48:07 -07:00
Andy2
645a042481
add room name to callback used when device connects: fix jni to compile
2010-10-28 18:46:28 -07:00
Andy2
7e0bcee6d2
add room name to callback used when device connects: fix linux to compile
2010-10-28 18:46:07 -07:00
Andy2
41fc05106b
add room name to callback used when device connects
2010-10-28 18:45:55 -07:00
Andy2
5400fad50d
log timeout-dlg messages so there's a record
2010-10-28 18:44:37 -07:00
Andy2
ddeb744ff7
init room name to empty string
2010-10-28 18:43:06 -07:00
Eric House
4ae58342da
test, don't assert: comms can be null
2010-10-28 05:45:56 -07:00
Eric House
670f7982ea
add comms_isConnected
2010-10-27 21:58:36 -07:00
Eric House
1b83b13101
make player name and password single-line
2010-10-27 21:58:02 -07:00
Eric House
eba5b77494
add comms_isConnected; public room variables default to false
2010-10-27 20:50:11 -07:00
Andy2
7ad4a43468
use new confirm-delete-all dialog to confirm deletion of dictionary
2010-10-27 06:33:13 -07:00
Andy2
4c17ea8802
generalize confirm-delete-all dialog into confirm-then-do
2010-10-27 06:25:29 -07:00
eehouse@eehouse.org
3ffc93a637
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-10-27 05:51:54 -07:00
Eric House
b878599f7b
remove comment
2010-10-26 20:57:27 -07:00
Eric House
fd85bd35da
set dictLang to 0 (unknown) when reading old-version stream
2010-10-26 20:56:41 -07:00
Andy2
559f933ef5
tweak not-again hint wording
2010-10-26 19:33:38 -07:00
Andy2
11c68797bf
unique title for not-again dialogs
2010-10-26 19:28:22 -07:00
Andy2
eb41e24c4e
show language of dict that can't be found
2010-10-26 18:48:28 -07:00
Andy2
84e6d94919
add languages to dict names in set-default spinner
2010-10-26 18:35:54 -07:00
Andy2
c8a6f453c9
dismiss underlying activity when no-dict dialog is cancelled too.
2010-10-26 18:28:54 -07:00
Andy2
1ceea2cde2
check that default dict exists and if it doesn't use same as if hadn't
...
been specified. Catches case where dict is downloaded, made new-game
default, and then deleted.
2010-10-26 18:20:49 -07:00
Andy2
26210e1cf2
new function for reporting missing dict called from two places
2010-10-26 18:08:53 -07:00
Andy2
89c7e02928
add CollegeEng dict and make it default for new games
2010-10-26 06:54:54 -07:00
Andy2
f9b2eb4a3e
attach not-again dialog to turn done menuitem
2010-10-25 21:32:07 -07:00
Andy2
d7b6cb0691
use resetGame() to populate a newly created game. With this change a
...
new network game will connect without first having been opened in the
GameConfig dialog.
2010-10-25 18:56:51 -07:00
Andy2
e1b7a0f44d
when resetting game, if it's multi-device but doesn't have a default
...
address (as will be the case if it was just created), get and give it
one.
2010-10-25 18:55:53 -07:00
Andy2
3cbda7471c
init public room vars to false
2010-10-25 18:55:15 -07:00
Andy2
54d312e523
saveSummary(0 needs to be passed context in case must init dbhelper.
2010-10-25 18:51:07 -07:00
Andy2
2e122fe9f3
default for new networked game is no robots, second player remote.
2010-10-25 18:08:09 -07:00
Andy2
b237277544
put back enum just removed; it's screwing up existing code having all
...
the followers change.
2010-10-25 18:06:48 -07:00
Andy2
39e502fe71
add not-again hints to all the buttons
2010-10-24 17:47:11 -07:00
Andy2
e909e4b343
remove redundant message; advance state to ALLCONNECTED on receipt of
...
RECONN or CONN that lists the game as full. This means we get the
all-green icon (or the A in the gtk case) when in a consummated game
rather than only when all devices are actually connected.
2010-10-23 20:29:24 -07:00
eehouse@eehouse.org
24fae0f53b
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-10-23 19:50:11 -07:00
Eric House
8a038dc748
Merge branch 'relay_proxy' of ssh://xwords.git.sf.net/gitroot/xwords/xwords into relay_proxy
2010-10-23 19:45:03 -07:00
Andy2
2fa76a9e24
add second button to games list to add networked game, and remove
...
ability from config dialog to make a game networked or not. This
should confuse people less. Better would be if the two buttons had
icons and those icons were associated with games in the list according
to which type of game they represent.
2010-10-23 18:41:37 -07:00
Andy2
cff95ce3de
go back to play being the onclick action (removing preference to make
...
it that way); add more newbie hints; fix DIALOG id definitions to not
overlap superclass's.
2010-10-23 14:08:57 -07:00
Andy2
038f6bd94c
rename some private methods; add onPrepareDialog to fix problem where
...
msg stuck from previous invocation
2010-10-23 14:06:03 -07:00
Andy2
dd82fa02ad
remove chat menuitem -- it's only a button now.
2010-10-23 14:00:24 -07:00
Andy2
314872d533
shrink needs-sync flag icon
2010-10-23 13:52:56 -07:00
Andy2
9383ef064d
use sync icon instead of "M" to mark games with data.
2010-10-23 13:45:31 -07:00
Andy2
43ad43b604
change meetup server back to relay
2010-10-23 11:24:19 -07:00
Andy2
b6dfa0be8b
disable background-checking code for now: make default be disabled and
...
remove Preference that allows to change it.
2010-10-23 11:19:55 -07:00
Andy2
5a5c73916e
Don't allow copy of relay-connected game.
2010-10-23 11:08:33 -07:00
Andy2
7cf4535b4c
new dbmgr API returns number of players in game; use that rather than
...
currently connected devices to populate [RE]CONNECT message
2010-10-22 22:34:43 -07:00
Andy2
593dac9d99
rotate 90 degrees
2010-10-22 22:04:09 -07:00
Eric House
85d29cf560
if can't send allcond to a device because it's not connected queue the
...
message to be sent next time it does. And since the cookieID will
change and should be there already anyway, remove it. (Should remove
the hostID too for the same reason.)
2010-10-22 19:02:52 -07:00
Eric House
6e843dec6c
make 10997 default relay port
2010-10-22 18:30:19 -07:00
Andy2
7765bd0a1a
move decision how to display connection info from CommsTransport to
...
BoardActivity (where it'll be easier to include optional not-again dialog)
2010-10-21 20:13:41 -07:00
Andy2
8fac0945b9
chat not-again message without obscenities
2010-10-21 19:22:17 -07:00
Andy2
99dbbb443c
add comms_canChat, which knows better than java code what state a
...
connected game is in, and call it to determine whether to show the
chat icon.
2010-10-21 19:14:10 -07:00
Andy2
198f39b606
don't use yes button for simple ok dialog
2010-10-21 19:12:04 -07:00
Andy2
ae97d7d0f4
shouldn't have commented that out...
2010-10-21 06:51:26 -07:00
Andy2
aa0be5e2f2
remove unused imports
2010-10-21 06:50:29 -07:00
Andy2
ea617f39fa
to deal with not being implement a common superclass for Activity and
...
ListActivity create a delegate they use for dialog-related stuff.
Move code from them into it -- and delegate.
2010-10-21 06:33:04 -07:00
Andy2
5599f91232
new prefs key and string for not-again help dlg for chat
2010-10-21 06:31:28 -07:00
Andy2
848c1493fd
chat button enabled only for multi-device games. Needs to be disabled
...
for unconnected games as well....
2010-10-21 06:30:48 -07:00
Andy2
8a891816b4
add chat button
2010-10-21 06:28:01 -07:00
Andy2
5c9cf0ebc8
add first helptext dialog, with do-not-show-again button, attached to
...
the sync menuitem. The plan's that a bunch of these will make the
game easier for newbies to use.
2010-10-20 20:48:18 -07:00
Andy2
0d4f77fb0a
add sync icon to games list menu
2010-10-20 20:00:40 -07:00
Andy2
8788f9d4d5
move OK dialog to new scheme. Using a static global Bundle instead of
...
the newer form of showDialog because that requires version 8 of the
SDK.
2010-10-20 19:52:13 -07:00
Andy2
c1dc34e25d
move common dialog code from Utils to XWActivity and XWListActivity
...
(which delegates to XWActivity.)
2010-10-20 18:34:41 -07:00
Andy2
8db6c7ad7f
add setPrefsBoolean
2010-10-20 18:09:24 -07:00
Andy2
95f5c2e023
cleanup: add missing string; remove unused strings and array.
2010-10-19 18:43:26 -07:00
Andy2
01e926e8b3
up sdk version to silence warning
2010-10-19 18:42:32 -07:00
Andy2
17f1790d52
remove unused layout files (since they take up space in the .apk even
...
if never referenced)
2010-10-19 18:42:07 -07:00
Andy2
85e32907f0
remove '\r's
2010-10-19 18:39:27 -07:00
Andy2
1fecf9dbb4
implement new check-relay menu, and use new task to check for messages
...
if there are any connected games.
2010-10-19 07:54:52 -07:00
Andy2
4a5c0832d4
use new generalized code to check for messages.
2010-10-19 07:54:10 -07:00
Andy2
94b8aedda7
generalize relay-msg-check code so can be used from two places.
2010-10-19 07:53:26 -07:00
Andy2
d1b1e6db14
refactor into common subroutine -- no behavior change
2010-10-19 07:50:23 -07:00
Andy2
994a73e28b
return null, not empty list, when nothing found
2010-10-19 07:49:54 -07:00
Andy2
f31e28dbd7
menu and strings for check-server menu added to GamesList
2010-10-19 07:49:23 -07:00
Andy2
ab8c3f985e
add generic info dialog that, with luck, can be reused.
2010-10-19 07:48:34 -07:00
Andy2
b718804a4b
new AsyncTask for pinging server on demand
2010-10-19 07:47:05 -07:00
Andy2
b9e3ca212b
turn off glib-dependant checksuming for non-linux builds
2010-10-18 22:08:04 -07:00
eehouse@eehouse.org
6e56fb3544
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-10-18 20:56:31 -07:00
Eric House
7b5d88cbba
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-10-18 20:20:14 -07:00
Eric House
9ba2d2f177
default msgs entry timestamps to 'now'
2010-10-18 20:19:09 -07:00
Eric House
211e9ded7f
TIMEOUT needs to be bigger for small NGAMES values
2010-10-18 20:18:24 -07:00
Eric House
3648c22bd4
fix long-standing bug where initial messages were not getting deleted
...
and multiplying; log md5 sums of messages in debug build.
2010-10-18 20:17:44 -07:00
Andy2
9cfb302a2f
don't populate room name; better that people see the hint
2010-10-18 06:48:26 -07:00
Andy2
db3c4da01f
set a default value that actually exists
2010-10-18 06:47:31 -07:00
Andy2
b4c1710c66
remove strings dropped with prev change
2010-10-18 06:31:19 -07:00
Andy2
62d054cd46
default show-robot-scores to true; move background-check-frequency
...
within existing PreferenceScreen
2010-10-18 06:30:56 -07:00
Andy2
a2f0ec232a
put back RestartTimer call inadvertently removed
2010-10-18 06:23:24 -07:00
Andy2
dda6e056a0
set summary from the array of use-visible values
2010-10-18 06:18:37 -07:00
Andy2
2d66913323
populate public rooms list as soon as checkbox set -- and mention
...
language and number of players in failure message
2010-10-17 21:13:14 -07:00
Andy2
56e83bfc1c
trim leading and trailing whitespace from roomnames. If somebody has
...
two spaces between words those will still matter.
2010-10-17 20:45:48 -07:00
Andy2
6b7a92534a
make default relay port 10997 (and change key so it'll apply for everybody)
2010-10-17 20:37:51 -07:00
Andy2
332ff27d8a
use same string for both
2010-10-17 20:30:43 -07:00
Andy2
a58e74b70a
add play game button at bottom of game config dialog.
2010-10-17 20:27:21 -07:00
Andy2
5c958eaadb
deal with null socket (e.g. if in airplane mode); deal with new public
...
rooms format.
2010-10-17 20:18:24 -07:00
Andy2
1621e5932a
give label different text from dialog title
2010-10-17 20:00:41 -07:00
Andy2
8972df7b88
add explanatory title to phonies spinner
2010-10-17 18:55:09 -07:00
Andy2
885bfe4779
remove values button. Seven buttons is too much. Add back when have
...
means of assigning priority so it only shows up when there's space.
2010-10-17 18:42:44 -07:00
Andy2
2cd0bf8c24
add singleline and selectonfocus for roomname edit
2010-10-17 12:45:34 -07:00
Andy2
2bfb26cded
sleep (in thread) before closing proxy socket. This works around
...
problem where, on PRX_HAS_MSGS path only, device reading socket gets
EOF early though logging here confirms additional bytes have been
written. Gross but effective.
2010-10-17 06:38:28 -07:00
Andy2
b63d730b53
compare languages rather than actual dict names so can switch dicts
...
mid-game.
2010-10-16 15:05:46 -07:00
Andy2
60e4c624e4
implement reply button; clear message edit field each time
2010-10-16 15:05:16 -07:00
Andy2
21afd79751
make send message first rather than last menuitem
2010-10-16 15:04:12 -07:00
Andy2
26b777acf8
don't post notification when results list returns empty
2010-10-16 11:01:12 -07:00
eehouse@eehouse.org
5d9989eb1b
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-10-16 10:50:23 -07:00
Andy2
a82051739b
move interface; add some logging.
2010-10-16 10:49:25 -07:00
Andy2
91e95eb48b
fix string (which should not be hard-coded!) and use new class.
2010-10-16 10:48:59 -07:00
Andy2
02ea8b13e0
move this functionality into RelayReceiver
2010-10-16 08:08:12 -07:00
Andy2
737b146093
Receiver replaces Activity as target of alarms. This seems to prevent
...
flasing to the front when alarms fire which was causing all kinds of
grief. But: not yet tested on device.
2010-10-16 08:07:48 -07:00
Andy2
cd1ce339ed
fix off-by-one error in reading from cursor
2010-10-16 07:57:47 -07:00
Eric House
38ae2faacc
don't nuke bad files along with good
2010-10-14 22:17:34 -07:00
Eric House
34df149046
include age of room with info returned for open public rooms
2010-10-14 22:16:21 -07:00
Eric House
e5c7f476ba
get rid of microseconds in timestamps
2010-10-14 22:15:41 -07:00
Eric House
c92d59fa53
games can be started with multiple dicts; saving of successful games/logs optional
2010-10-14 05:59:45 -07:00
Eric House
f246178b8f
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-10-12 19:18:21 -07:00
Eric House
40a7a1b5a3
cleanup; track checked rooms rather than checking each time seen
2010-10-12 19:17:42 -07:00
Eric House
0cf94dda8b
fix frequent assertion failure that dates from when no messages passed
...
outside of ALLCOND state. With this fix the test script is running
all games to completion if given enough time.
2010-10-12 19:16:46 -07:00
Andy2
a52c18522c
use HashSet rather than relying on nesting (which I can't) to track
...
whether I'm running
2010-10-12 18:53:19 -07:00
Andy2
34428b3460
new Activity class
2010-10-12 18:28:05 -07:00
Andy2
82d5f21d54
extend subclass of Activity or ListActivity
2010-10-12 18:27:50 -07:00
Andy2
c37ad2d650
register self with RelayService to be called directly if running when
...
there's something to update. Use handler to do this from non-UI thread.
2010-10-12 18:27:13 -07:00
Andy2
8e8c4f4d31
if GamesList is frontmost when we have relayIDs to update then just
...
call the interface it's registered. Otherwise post notification.
2010-10-12 18:25:29 -07:00
Andy2
ad9a249042
new files. Subclass Activity and ListActivity to track whether we're
...
running (yeah, WTF, but that's what Android dev support says you have
to do!). Special-purpose Activity to be the target of notifications
so I have more control on how to handle them.
2010-10-12 18:21:18 -07:00
Andy2
673c9858cb
fire every 30 for testing
2010-10-12 05:24:23 -07:00
eehouse@eehouse.org
ddb8f508f9
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-10-12 05:23:04 -07:00
Eric House
0d1542ca9d
tweaks to logging
2010-10-12 05:18:44 -07:00
Eric House
8011eeec2c
cleanup; fix off-by-one bug with NAMES that was breaking runs with
...
four-device games; check before run that there aren't already waiting
games in db.
2010-10-12 05:17:32 -07:00
Andy2
b124a3f438
add every-five-minutes option; change 10-seconds debug option to 60
2010-10-11 06:54:02 -07:00
Andy2
392aeff7ad
replace FLAG_ONE_SHOT with FLAG_UPDATE_CURRENT; seems to fix failure
...
of notification to fire.
2010-10-11 06:52:26 -07:00
Andy2
86b57526df
show game name in title if not hidden
2010-10-11 06:47:33 -07:00
Andy2
e637a64d96
Change param signage to fix compiler warning
2010-10-11 06:20:30 -07:00
Andy2
56cd161d8b
Pass list of relayIDs through activity to onNewActivity() added to
...
GamesList, and inval those list elements that now have messages
pending so they redraw. And add static method to be called from there
to cancel the status-bar notification now that it's been acted on.
2010-10-09 21:44:42 -07:00
Andy2
6ad074182f
make GamesList singleTop so notifications go to existing activity
2010-10-08 17:33:44 -07:00
Andy2
7d9c143d15
string doesn't need localizing
2010-10-08 17:32:51 -07:00
Andy2
76258f609a
make sure game is still over before calculating final scores. Fixes
...
assertion failure in server.c.
2010-10-08 17:30:26 -07:00
Andy2
97d96add5e
add stubbed-out strings
2010-10-08 06:53:41 -07:00
Andy2
e855b51491
use new DB api to build list of relayIDs to send; set summary DB field
...
and post notification on response.
2010-10-08 06:52:43 -07:00
Andy2
3bbbd65077
use same 1.5-safe layout on all devices; add elem (a text field for
...
now) to be shown when messages are pending; show it.
2010-10-08 06:47:46 -07:00
Andy2
6ce5f36133
add msgsPending field set from new DB column; add methods to set
...
column and to fetch relayIDs for games where it's not set, and to get
path for game based on relayID.
2010-10-08 06:46:10 -07:00
Andy2
d5eff5af21
new column to track whether game has pending msgs
2010-10-08 06:42:51 -07:00
relay
680b2f31b3
use pid to avoid permission problems for logfile in /tmp
2010-10-07 19:48:38 -07:00
Eric House
f2ad6d92b4
use full paths so pidof doesn't pick up instances of xwrelay launched elsewhere
2010-10-07 19:41:02 -07:00
Eric House
86d73392d5
track bytes sent in db; use defaults to init ctime
2010-10-06 21:45:05 -07:00
eehouse@eehouse.org
46ff3c3b68
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-10-06 05:22:10 -07:00
Andy2
cb4092bb39
make relayID a String rather than a byte[]; log result of pending
...
messages query to confirm working.
2010-10-06 05:21:19 -07:00
Eric House
6c5b279946
respect TIMEOUT, and kill all remaining processes before exiting
2010-10-05 20:58:29 -07:00
Eric House
a444786a28
reduce logging
2010-10-05 20:57:19 -07:00
Eric House
f0b05da131
reduce logging
2010-10-05 20:57:07 -07:00
Andy2
a78c4b304e
custom class for pref
2010-10-05 18:39:00 -07:00
Andy2
df939249e4
fix caps and add too-long string
2010-10-05 18:38:46 -07:00
Andy2
861de8d592
call new method to start polling timer
2010-10-05 18:38:06 -07:00
Andy2
81fb934e4a
new custom class for resetting polling timer on prefs change
2010-10-05 18:36:56 -07:00
Andy2
cd0d14b1bb
new class will own setting summary for relay-polling frequency so don't do it here
2010-10-05 18:36:15 -07:00
Andy2
ae6edf4ace
add static methods for starting timer.
2010-10-05 18:35:35 -07:00
Andy2
ed95d2e794
add proxy port to list whose values are displayed
2010-10-05 06:17:35 -07:00
Andy2
31f3cbc6c8
complete rewrite: use bash's new associative arrays to track games and
...
pids etc. so that a single process can manage starting and stopping
all games. Fixes race conditions where a game would be killed after
finishing but before it'd sent out the message that would allow other
games to finish.
2010-10-04 22:16:58 -07:00
Andy2
a13bb34419
plug memory leak
2010-10-04 22:14:44 -07:00
Eric House
2e844d798f
replace single db connection protected by a mutex with one connection per thread kept in thread-local storage.
2010-10-04 20:04:14 -07:00
Eric House
d9ca6f5e11
block TERM and INT from all but the main thread. (Pretty much untested; doesn't fix hang-on-SIGINT.)
2010-10-04 20:03:19 -07:00
Eric House
1ff4d67bc0
block TERM and INT from all but the main thread. (Pretty much untested; doesn't fix hang-on-SIGINT.)
2010-10-04 20:03:00 -07:00
Eric House
43bf3cd50f
improve log statement
2010-10-04 20:01:00 -07:00
Andy2
fae8faa0be
add stubbed-out Reply button to msg received dialog.
2010-10-04 18:59:44 -07:00
Andy2
1ed8e7a66c
fix crash: can't call dialog from non-UI thread
2010-10-04 18:53:33 -07:00
Andy2
89f967a016
pass remaining reconnect params in case connName's missing from db.
...
Should only matter if the relay's db's been deleted.
2010-10-04 18:39:26 -07:00
Eric House
b3c7cb3711
start on sending chat messages. Doesn't even compile -- committing to get onto another machine.
2010-10-04 05:38:05 -07:00
Eric House
1e13e92deb
support for receiving and displaying chat messages. Compiles but not tested.
2010-10-03 18:32:39 -07:00
Eric House
d35bc7d748
refuse to store more than four messages at a time for a single
...
connName/hid pair. This works around a problem where a device,
continuing to connect and send all pending messages for another device
that is not connecting, winds up with hundreds of identical messages
stored.
2010-10-03 18:18:15 -07:00
Eric House
14fd1f9023
add test code for chat feature: display incoming chat and send via
...
menu. Sent message is hard-coded for now; should fix that.
2010-10-03 18:13:48 -07:00
Eric House
61b228f189
implement simple chat on top of current server-level protocol --
...
meaning it'll work on any tranport but relay doesn't know about it.
(If relay knew about it I could send a "shutting down for a minute"
message to every connected device, which would be cool. But this is
easier.) Written, BTW, enroute from Seattle with help from beer from
Chris in first class. :-)
2010-10-03 18:11:51 -07:00
Eric House
4a5de0a24c
cleanup
2010-10-03 18:09:15 -07:00
Eric House
1f87379cd0
change default port
2010-09-29 07:37:26 -07:00
Eric House
1b93654f7e
use stored procedure sum_array instead of C macro
2010-09-29 06:21:08 -07:00
eehouse@eehouse.org
d0797af6e5
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-09-28 21:11:17 -07:00
Andy2
f78b1747dd
put up an alert when unable to find any public rooms
2010-09-28 18:58:05 -07:00
Andy2
0bfad7cd05
up timeout to 15 seconds.
2010-09-28 18:42:23 -07:00
Andy2
2610ef34ac
move dict above connection settings since it provides a parameter
2010-09-28 18:38:47 -07:00
Andy2
978fa010f1
commented-out sleep positioned to give download progress time to come up.
2010-09-28 18:35:33 -07:00
Andy2
814f6887da
put up a progress dialog while fetching public names that mentions
...
params passed.
2010-09-28 18:34:29 -07:00
Andy2
0b143efced
add getLangName
2010-09-28 18:33:29 -07:00
Andy2
6b1dabd8e2
don't crash when public rooms list is empty
2010-09-28 18:32:43 -07:00
Eric House
bc65377cfd
track device seeds in db.
2010-09-28 18:06:50 -07:00
Eric House
a6f5ea5f4a
sync after saving. Seems to improve recovery from TERMs sent by test scripts.
2010-09-28 18:06:05 -07:00
Eric House
a89520a377
use __func__
2010-09-28 18:04:31 -07:00
Andy2
953e4601b9
fetch public rooms using new class rather than hardcoding. With this
...
checkin game is possible based on public-room lookup.
2010-09-28 06:48:51 -07:00
Andy2
132321c9fd
new AsyncTask subclass to fetch public rooms list from relay
2010-09-28 06:47:58 -07:00
Andy2
89d20578b8
new class to create socket for talking to proxy
2010-09-28 06:47:21 -07:00
Andy2
39827ec894
add new pref for relay's proxy/device port
2010-09-28 06:43:04 -07:00
Andy2
1de029f3f0
skip public rooms if full. (Should do this in the query....)
2010-09-28 06:42:01 -07:00
eehouse@eehouse.org
ac74cc36a5
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-09-26 20:25:30 -07:00
Andy2
986ac4413f
parse reply to query for number of pending messages for games on
...
device. Not doing anything with the info yet.
2010-09-26 20:25:00 -07:00
Eric House
ae53ce5ea9
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-09-24 20:19:50 -07:00
Eric House
1bfdd1978e
move log directory away each time
2010-09-24 20:19:12 -07:00
Eric House
8f77886f72
make column name shorter
2010-09-24 20:18:20 -07:00
Andy2
14edbd7f18
implement setIsServer(). With this change I've been successful --
...
once -- having two games on the same device play against each other.
2010-09-24 18:49:34 -07:00
Andy2
31c594a06e
everybody starts out as client by default, same as on linux
2010-09-24 18:48:52 -07:00
Andy2
63ac6542c6
add new action to be called when relay make me a client. Seems
...
necessary to get server_initClientConnection connection called when
all's in the right state. It's not working consistently yet, though,
so may need changes.
2010-09-24 18:48:30 -07:00
Andy2
16001e61d0
image forgotten earlier -- for refresh public games list button
2010-09-24 18:46:14 -07:00
Andy2
4ea9ff8226
add server_reset and util_setIsServer to jni
2010-09-24 18:45:42 -07:00
Andy2
f7bad05390
send msg count query and print results
2010-09-24 05:51:42 -07:00
Andy2
b0c6e6da9c
add db method to count messages for connName/hid pairs and handle
...
query using it.
2010-09-24 05:50:02 -07:00
Andy2
c3e1b243b6
add timestamp to msgs db and set it on adding new records. I will
...
likely need to add periodic culling on the server for games that will
never fetch their messages.
2010-09-24 05:46:30 -07:00
Andy2
35ff5a7835
exit on logdir being gone before grepping it
2010-09-23 06:41:37 -07:00
Andy2
c44324a32a
log, for now as I've seen assertions failures suggesting a race, the
...
set of checked-out sockets at insert and remove time.
2010-09-23 06:34:18 -07:00
Andy2
40e1d29243
use new methods to store undeliverable messages in a db rather than in
...
memory. Confirmed that devices can hookup without ever being
connected at the same time and that the messages survive a relay
reboot. No further testing yet.
2010-09-23 06:32:57 -07:00
Andy2
74764a493b
create the new db
2010-09-23 06:31:42 -07:00
Andy2
eee41377f4
new methods for storing/retrieving messages in new db.
2010-09-23 06:31:29 -07:00
Andy2
451ced44ba
cleanup: shorter timeout; set aside games that finish correctly
2010-09-23 06:29:55 -07:00
Andy2
9a035c66ff
add assertion
2010-09-23 06:28:13 -07:00
eehouse@eehouse.org
acb52d11dc
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-09-23 05:34:43 -07:00
Andy2
85b4f3f075
move hostid assignment and tracking into db so it survives reboots and
...
recycling of crefs between when devices in a game connect. This plus
movement of messages into the DB will re-enable games played without
the two devices ever being connected at the same time.
2010-09-23 05:33:27 -07:00
Eric House
82825365d4
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-09-22 05:46:10 -07:00
Eric House
659278448b
changes to work against remote relay
2010-09-22 05:45:40 -07:00
Eric House
076b211cab
tweak to allow to specify host/port for use against remote relay
2010-09-21 20:38:54 -07:00
Andy2
1d0c207521
add test command for proxy feature to fetch for connNames whether
...
there are messages pending for them. Not handled yet on relay.
2010-09-21 18:28:31 -07:00
Andy2
e06baf566f
get public rooms from the db rather than stubbing it out.
2010-09-21 06:54:47 -07:00
Andy2
be23e06b60
use read_packet to replace duplicate code
2010-09-21 06:38:43 -07:00
Andy2
e7b5923883
finish first pass at sending open public room names -- but with actual
...
list harvesting stubbed out.
2010-09-21 06:27:31 -07:00
Andy2
2ec67c8ed1
finish rq to work with current format; add to makefile
2010-09-21 06:26:49 -07:00
Eric House
4ad735124c
add logging and assertions. There's a race condition in cref
...
recycling and may be one in tpool socket checking-out.
2010-09-20 22:11:13 -07:00
Eric House
b6ce74be1c
add timeout after which all games are killed
2010-09-20 22:08:51 -07:00
Eric House
c671f2ab05
plug memory leak
2010-09-20 22:07:10 -07:00
Eric House
047f41b516
send cookieid as part of [RE]CONNECT_RESPONSE in addition to ALL_COND (where it's now redundant).
2010-09-20 22:06:35 -07:00
Andy2
0df651027f
Merge branch 'android_branch' into relay_proxy
...
Conflicts:
xwords4/relay/crefmgr.cpp
2010-09-20 19:55:53 -07:00
Andy2
bca8300495
changes for b16: version strings and changes summary text.
2010-09-20 19:48:52 -07:00
Andy2
ddedcee3eb
remove commented out foo -- needed to save before prev submission.
2010-09-20 19:39:35 -07:00
Andy2
9b98d89722
add mimeType entry to data. This coupled with the right apache
...
AddType config means the browser doesn't get a chance to download
dicts, giving users one less way to get confused.
2010-09-20 19:38:26 -07:00
Andy2
0ac23458ba
use constant
2010-09-20 18:42:43 -07:00
Andy2
a549ade1fa
a bit more work on rc
2010-09-20 18:31:17 -07:00
Andy2
4e9d6e712e
escape apostrophe -- new SDK requires it.
2010-09-20 06:18:53 -07:00
Andy2
15cd3af62a
just a comment
2010-09-20 05:35:29 -07:00
Andy2
e1c99f53cd
work on detecting duplicate packets and devices that have reconnected
...
on a different socket; print all present seeds for debugging.
2010-09-20 05:35:19 -07:00
Andy2
ac8891016f
work on detecting duplicate packets and devices that have reconnected
...
on a different socket; print all present seeds for debugging.
2010-09-20 05:35:09 -07:00
Andy2
d199ec5168
account for possibility client apps won't exit on TERM
2010-09-20 05:33:58 -07:00
Andy2
84a26c2c1a
more to ignore
2010-09-20 05:32:17 -07:00
Andy2
430b033ae0
a bit of progress on cmdline tool
2010-09-20 04:59:09 -07:00
Andy2
6d6ad96cde
don't clear seed when changing roles from guest to host.
2010-09-20 04:56:19 -07:00
Andy2
00cdbc97d3
Install a no-op TERM handler at first then replace later with one that
...
just exits main loop. Do cleanup/file saving on exit from mainloop.
Fixes occasional crash where TERM came in before we were setup to
cleanup.
2010-09-20 04:55:35 -07:00
Andy2
df1ec1628a
replace killSocket(), which jumped right into crefmgr and could get
...
ahead of processing data arrived on the same socket, with EnqueueKill
that adds to same queue from which data's taken. So if device dies
immediately after sending data there won't be a race between closing
the cref (if this is the last open socket) and handling the data. I'm
still dying with assert fails when running 100 games at once, but much
less frequently
2010-09-18 08:47:56 -07:00
Andy2
a4913596db
remove logging
2010-09-18 08:42:15 -07:00
Andy2
c5d113a8da
remove _locked from name of method since it's not called when holding a lock.
2010-09-18 07:46:10 -07:00
Andy2
53b3d7c32f
enque sockets in new object that contains type so later other events
...
(e.g. socket closes) can also be queued; track what sockets are
currently being handled so no two threads are ever processing events
on same socket. This makes running 'NGAMES=50
./scripts/discon_ok2.sh' crash very infrequently rather than every
time, but the race condition in crefmgr remains. Queuing socket
closes should help.
2010-09-18 07:44:14 -07:00
Andy2
54512b9e11
put logs in own dir
2010-09-18 07:35:16 -07:00
Andy2
eec07649a6
put logs in own dir; echo every time game ends successfully.
2010-09-18 07:35:02 -07:00
Andy2
9c8889b429
get rid of mutex guarding reconnect. There shouldn't be any need
...
since game slots are already assigned, and it's slowing down
reconnects in their race with kills.
2010-09-18 05:07:23 -07:00
Andy2
7e1066dbcc
vary room names
2010-09-16 22:20:43 -07:00
Eric House
bb1e46fa81
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-09-16 20:13:54 -07:00
Eric House
d0e707a48e
get started with test/cmdline app to query relay's new proxy interface.
2010-09-16 20:13:24 -07:00
Andy2
c5eef29bcc
some suspicious crashes and subsequent reading say that multiple
...
threads can't share the same db connection. So synchronize all
queries. Multiple threads *can* access the db concurrently as long as
each has its own connection, so I could add connections to the tpool
threads. But this will probably be performant enough for the first
10K simultaneous users. :-)
2010-09-16 20:08:32 -07:00
Andy2
1490b2def9
simplify state table, getting rid of a bunch of states: we never leave
...
ALLCOND until it's time to kill the cref. When one device connects
and leaves the cref is recycled, so when a new device joins and is
assigned the same game and a new cref is initialized the number of
players already registered must be set from the db entry; do that.
2010-09-16 18:59:56 -07:00
Andy2
76e7459a6d
various improvements, e.g. random sleeps before and after starting
2010-09-16 18:56:34 -07:00
Andy2
50c387d75e
remove players from db as well as runtime when ack times out
2010-09-16 06:49:35 -07:00
Andy2
ca6039e890
new test script attempting to mimic real-world usage
2010-09-16 05:39:50 -07:00
Andy2
25c1824c45
fix broken assertion and add missing state transitions to fix crashes.
2010-09-16 05:39:25 -07:00
Andy2
2b702b48d6
need to clear CID of record in DB when killing corresponding in-memory
...
cref or reconnect will fail.
2010-09-16 04:47:17 -07:00
Andy2
452e3fc86b
timeout in milliseconds instead of seconds
2010-09-16 04:46:04 -07:00
Andy2
fa50bd00f1
timeout final scores alert
2010-09-16 03:42:57 -07:00
Andy2
d1a9c3962a
rename cookie->room in db; reposition columns.
2010-09-16 03:30:24 -07:00
Andy2
b25579b893
greatly simplify state machine for connections. Now (with DEVACK=20
...
on conf file) newrelay.sh will complete running 50 4-device gtk games.
Haven't tested reconnect case which I almost certianly broke.
2010-09-16 01:53:43 -07:00
Andy2
0d7165f881
add ability to run gtk from newrelay.sh. Trying to run 50 instances
...
crashes the relay as ACKs take too long to come back.
2010-09-16 01:44:54 -07:00
Andy2
06c8fdc67f
stop tracking seeds separately until have a use for 'em separate from
...
HostRec. This fixes failure to reconnect so that now a complete game
is possible (gtk version) without the two devices every being
connected at the same time.
2010-09-16 01:13:26 -07:00
Andy2
a870cac86d
break connect and reconnect into separate paths to simplify. Be
...
consistent: nJoined in DB tracks players "ever seen and issued
connName" rather than "currently connected". Next step: debug game
between two devices never connected at same time.
2010-09-15 14:05:51 -07:00
Andy2
8961910263
field name change
2010-09-15 14:03:59 -07:00
Eric House
b8a431cf01
fix bug in sql statement
2010-09-14 21:28:18 -07:00
Eric House
54d268b718
pass through to database whether room is public
2010-09-14 21:20:11 -07:00
Eric House
e3053370d0
add cmd to build the database and main table
2010-09-14 21:18:04 -07:00
Eric House
ddcc338ed7
don't break out of loop without unlocking mutex
2010-09-14 21:16:16 -07:00
Eric House
56a920740a
remove unused funtion declaraion
2010-09-14 21:15:24 -07:00
Eric House
9fc39a55ed
add params to set public-room-related booleans; add timeout option on
...
modal dialogs so gtk version can run unattended.
2010-09-14 21:13:45 -07:00
Andy2
3b5b5f0241
factor dbmgr code; add and call method to zero CIDs on boot.
2010-09-15 01:14:28 -07:00
Andy2
821e4d9c39
add ACK to protocol, returned by device after gets connName on initial
...
connection. Space is held for device on assumption ack will come
back, then given up if it fails.
2010-09-14 13:54:52 -07:00
Andy2
f8c1c016cc
remove special-case states and handling of first connect; track number
...
of players sought in the cref itself, adding in constructor, and not
in HostRec instances. This is cleanup with no behavior change.
2010-09-13 13:49:13 -07:00
Andy2
100ed8532f
timestamp records on creation
2010-09-12 05:04:52 -07:00
Andy2
ded6e22180
do finding of open games using database rather than cref list, which
...
requires updating the number of players when new devices join. Drop
requirement that cid be unique.
2010-09-12 04:49:03 -07:00
Andy2
663551fcb5
improve db, adding uniqueness contraints. Pass in connName so can
...
meet that constraint. Figure out next cid using a query at startup.
2010-09-12 03:57:23 -07:00
Andy2
86a1e943ca
make dict settable too
2010-09-12 03:53:39 -07:00
Eric House
c1da64b96a
instantiate and use the new dbmgr class
2010-09-11 19:45:04 -07:00
Eric House
87de53cf96
add new class to interface with postgres database in an experiment to
...
simplify things by using a db to survive a crash/reboot. So far (with
next checkin) manages to update a db. Next need to do queries instead
of searches through in-memory data.
2010-09-11 19:44:37 -07:00
eehouse@eehouse.org
0b46455044
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-09-12 02:34:20 -07:00
Andy2
54d49d450a
add back state and table entries to get rid of an unused cref.
2010-09-11 01:40:40 -07:00
Andy2
8908ca5b1d
ignore new test script's log files
2010-09-11 01:40:05 -07:00
Andy2
1cd2d542f7
new test script
2010-09-11 01:39:20 -07:00
Andy2
d5f2a72227
note that file's out-of-date
2010-09-11 01:28:04 -07:00
Andy2
463e9c3ccf
pass langCode in reconnect case too
2010-09-11 01:23:39 -07:00
Andy2
bd71a15ddc
turn off heartbeats on client side
2010-09-11 01:23:13 -07:00
Andy2
dc957e1a92
add match test on language code and number of players
2010-09-10 13:45:40 -07:00
Eric House
54611df679
nuke unused variable
2010-09-10 05:55:59 -07:00
Andy2
e60495ff93
read, pass, store and display langCode. Not yet used to route
...
connections to crefs.
2010-09-10 01:59:37 -07:00
Andy2
b3d3673dc9
read the langcode out of dict and into common struct
2010-09-10 01:57:22 -07:00
Andy2
2ee9031fdc
langcode belongs in connect, not reconnect, message
2010-09-10 01:56:58 -07:00
Andy2
20312144dd
tons of changes, still rough, snapshoted here: a gtk device vs device
...
game works to completion with both signing up as guests (no -s) with
one local and one remote player (identical commandlines.) Not yet
tested: if any signs up as a host, reconnecting rather than
connecting, etc. This is just a snapshot.
2010-09-10 01:30:40 -07:00
Andy2
34a94f23a0
fix error message to not specify host or guest
2010-09-10 01:24:42 -07:00
Andy2
f7c5ff619d
turn off heartbeats
2010-09-10 01:24:03 -07:00
eehouse@eehouse.org
a79f50053b
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-09-09 04:21:02 -07:00
Eric House
89e7a506a4
reduce amount of logging
2010-09-08 20:28:14 -07:00
Eric House
90d505abea
call accept() in main thread rather than in thread proc to fix
...
long-standing bug where main thread kept finding socket to be readable
and forking new threads to call accept() on it and then block forever.
2010-09-08 20:24:36 -07:00
Eric House
a64b67a54f
reduce amount of logging
2010-09-08 20:17:32 -07:00
Eric House
f8ca35f9b6
call accept() in main thread rather than in thread proc to fix
...
long-standing bug where main thread kept finding socket to be readable
and forking new threads to call accept() on it and then block forever.
2010-09-08 20:16:57 -07:00
Andy2
01fe388f85
remove logging accidentally checked in
2010-09-03 06:40:17 -07:00
Andy2
e6545d8d57
set and save new booleans, etc. Relay params UI seems to work now
...
except for listing public rooms (still hard-coded)
2010-09-03 06:39:46 -07:00
Andy2
b742c7dbb7
add new booleans to relay address record around public rooms
2010-09-03 06:38:46 -07:00
Andy2
e20c63f38c
move toward the UI I want: show public room browser or edittext for
...
new room name depending on checkbox, etc. Still not fully wired.
2010-09-02 05:46:35 -07:00
Andy2
0b91e9634e
save/restore new dictLang field; up stream version
2010-09-01 06:51:44 -07:00
Andy2
c6c1a93de5
copy new dictLang field java<->c
2010-09-01 06:51:09 -07:00
Andy2
6d7ff11dcc
add and set new field, dictLang
2010-09-01 06:50:33 -07:00
Andy2
73746e3664
first cut at relay config section, inline this time, with refresh
...
button and make-public checkbox. Neither wired up nor hidden in
non-networked case.
2010-09-01 06:49:01 -07:00
Andy2
cad2854d08
fix bug by always enabling set of widgets for local player in case
...
prev invocation of dialog hid it.
2010-08-31 06:21:46 -07:00
Andy2
784b5c8cdf
tweak strings
2010-08-31 06:20:48 -07:00
Andy2
4d1d7ae7ce
put space between "Player 1" and "(robot)"
2010-08-31 06:20:29 -07:00
Andy2
9367251b33
lots of changes, still needing cleanup and a bit of debugging, to
...
simplify game settings dialog and remove role: a game is now
standalone or not. Games will be matched on the relay (or over BT, I
assume) based on how many players they provide vs. need -- and other
settings like dictionary
2010-08-31 05:43:41 -07:00
Andy2
adf9c28e0d
make games list item as tall without delete button as is with.
2010-08-30 20:44:01 -07:00
Andy2
785ae531db
add language name to dict names in GameConfig's menu too
2010-08-27 06:26:25 -07:00
Andy2
092236b0dd
cleanup; do formatting inside DictLangCache
2010-08-27 06:25:56 -07:00
Andy2
40e266dda0
move lang strings into cache and add method to get 'em
2010-08-26 18:43:59 -07:00
eehouse@eehouse.org
ecd0280353
Merge branch 'android_branch' into relay_proxy
2010-08-26 18:36:55 -07:00
Andy2
5ddbef7829
update for b15
2010-08-26 18:33:22 -07:00
Andy2
0f3867b995
up constants/version for beta 15
2010-08-26 18:22:18 -07:00
Andy2
d1f6057987
fix stupid typo that meant crosshairs started on top row was only
...
three cols wide at first.
2010-08-26 18:20:24 -07:00
Andy2
0313421634
Add new class to cache lang codes for dicts to prevent expensive
...
operation of loading them each time. Will have other uses later.
2010-08-26 18:14:14 -07:00
Andy2
40d8aede88
use new jni method and array of names to append language to name of dict
2010-08-25 06:34:54 -07:00
Andy2
51e2c61962
add array mapping lang code (the proprietary code stored in dicts) to
...
language name. (Names should be translated.)
2010-08-25 06:34:29 -07:00
Andy2
cf6d8efb29
new jni method to get lang code. Takes a dict's raw bytes and builds
...
a dict object just to fetch the code, which is pretty inefficient, so
caching should be added later on the java side.
2010-08-25 06:33:16 -07:00
Andy2
4208c33ecf
make lang code support non-conditional
2010-08-25 06:31:38 -07:00
Andy2
3dba8ba13b
Fix bug reported by user: if robot finishes a search but fails to find
...
a move it's still done with its turn and must trade or pass.
2010-08-24 18:38:12 -07:00
Andy2
3b52f7bbd0
don't connect proxy unless there's at least one relay game
2010-08-23 18:53:11 -07:00
Andy2
33d60452a3
fork a thread to handle proxy connects. Later may want to use thread
...
pool as for game threads.
2010-08-23 18:52:52 -07:00
Andy2
b586fa1a34
add preference controlling how often proxy connects to relay. Still
...
need to add way to change timer when interval pref is changed and
other cleanup.
2010-08-23 18:39:47 -07:00
Andy2
a34ccb424f
device now passes list of "relayID"s, consisting of connName plus
...
device id, to relay, one for each stored game that's communicating via
the relay. Relay parses out each relayID. Next relay can use these
to look up whether messages are available and reply with that, and
device can put up a notification.
2010-08-22 12:16:57 -07:00
Andy2
56b6a425e2
proxy now writes one byte to relay and reads one byte reply.
2010-08-19 18:34:28 -07:00
Andy2
48ac79be51
GamesList starts a repeating alarm that invokes a new activity that
...
launches the service. Service can now do a single check with the
relay, notify if needed, and exit (but doesn't yet.)
2010-08-19 08:45:18 -07:00
Andy2
25e7889c28
checkpoint: add service that's launched at app start and spawns a
...
thread that stops itself immediately. Eventually that thread will
check the relay for pending moves, put up a notification offering to
open the game that has moves pending, and schedule itself to run again
later before stopping itself.
2010-08-19 07:47:11 -07:00
Andy2
019da83d60
meant to check this in
2010-08-12 06:42:59 -07:00
Andy2
416b379781
add second class of socket to be listened on, meant for per-device
...
rather than per-game connection, and when adding connected sockets to
active set track the type.
2010-08-12 06:42:33 -07:00
Andy2
38ed6e4054
add missing close tag
2010-08-11 21:10:10 -07:00
eehouse@eehouse.org
a791b0e53e
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-08-11 20:00:38 -07:00
Andy2
ac022ea5a5
add java version of new crosshairs flags; draw crosshairs 1/3
...
width/height of cells instead of reusing focus code to color
background.
2010-08-11 18:53:12 -07:00
Andy2
d44b08b609
remove unused and confusing duplicate flags.
2010-08-11 18:51:33 -07:00
Andy2
2d69d8f2b0
use new crosshairs flags to draw a cross in the middle third of cells
2010-08-11 18:51:09 -07:00
Andy2
09bc83429e
add and set new flags for crosshairs so platforms can do better than
...
fill cells as is done for focus.
2010-08-11 18:50:16 -07:00
Andy2
81ad7719b1
list changes since b13
2010-08-10 21:34:44 -07:00
Andy2
fc603645d1
make changes dialog launchable from About dialog (so reachable other
...
than immediately after upgrade)
2010-08-10 20:33:33 -07:00
Andy2
e720fe79ab
wrap in ScrollView so can scroll
2010-08-10 20:32:04 -07:00
Andy2
287ab2485f
add changes summary dialog shown on first launch after an upgrade.
2010-08-10 18:48:19 -07:00
Andy2
269bd15a45
change constants for beta 14
2010-08-10 06:12:09 -07:00
Andy2
205723e03b
add missing event to logging
2010-07-30 17:44:20 -07:00
Andy2
13596f8538
synchronize read and write of files, fixing a race condition between
...
BoardActivity shutdown (save) and GamesList refresh (open) that
resulted in zero-length byte array being passed into the jni. It's
now possible for the list to win the race and display old data, so a
better solution would be to check-out the file in such a way that the
list couldn't read it until it was update, but at least now we won't
crash.
2010-07-30 17:40:46 -07:00
Andy2
d07d90761f
remove logging
2010-07-30 17:38:07 -07:00
Andy2
b4f7a6917f
wrap time in brackets for readability
2010-07-30 07:16:24 -07:00
Andy2
f9afcc0e6f
add ability to tag events as UI or not. CMD_DO is not. Only UI
...
events in queue prevent engine from continuing. This fixes bug where
server running engine on behalf of robot would starve the UI thread by
looping forever seeing the engine bail because a CMD_DO was in the
queue and then adding a CMD_DO to try running the engine yet again.
2010-07-30 06:43:56 -07:00
eehouse@eehouse.org
3b7abc2a31
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-07-29 21:13:00 -07:00
Eric House
e857b01783
ignore logs and core files
2010-07-29 21:07:20 -07:00
Eric House
d7a3795355
add static decl
2010-07-29 21:04:33 -07:00
Eric House
d7d2a7523b
kill cref when in bad state.
2010-07-29 19:46:52 -07:00
Andy2
396a277cb4
dispose of progress dialog if it's been shown, even if Activity is
...
going away. This stops runtime complaints about leaking windows.
2010-07-29 18:11:54 -07:00
Andy2
51d759569a
call srand with current time (attempting to fix what may be duplicate
...
seeds on relay, possible if rand() always starts with same sequence on
different devices in new process); add commented-out logging util_rand
implementation.
2010-07-29 06:53:06 -07:00
Andy2
6be5105eff
don't put up progress dialog (from runnable) after activity pauses.
2010-07-29 06:49:30 -07:00
eehouse@eehouse.org
13ecb2f929
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-07-29 05:41:48 -07:00
Eric House
b170a04dec
drop duplicate [re]connect packets before they enter the state
...
machine. Fixes problems where crefs get stuck in the
XWS_CHK_ALLHERE_2 state. Still should probably kill a cref where
there's no state table entry.
2010-07-28 22:21:01 -07:00
Eric House
f70b9e1d10
use constructor to save some code; no behavior change
2010-07-28 20:17:54 -07:00
Andy2
d67e421541
get rid of excess logging
2010-07-27 21:36:14 -07:00
eehouse@eehouse.org
958ec15a19
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-07-27 21:32:17 -07:00
Eric House
ad1be65236
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-07-27 20:47:42 -07:00
Eric House
b335151172
log when no event pushed while adding players -- this may be how state machine is getting screwed up
2010-07-27 20:47:04 -07:00
Andy2
51ffdce185
comment out pthread_create failure log; seeing it too often and it's
...
just for the web view.
2010-07-26 18:37:44 -07:00
Andy2
9eb424201d
Add credits to About; use style to remove duplicates; credit Sarah.
2010-07-18 19:16:46 -07:00
Andy2
d0a632d3ff
up version to b13 so can be tagged to match.
2010-07-18 14:40:53 -07:00
Andy2
ad1eb053ca
a few final tweaks from Sarah
2010-07-18 14:39:46 -07:00
Andy2
b1f027ce00
latest from Sarah
2010-07-17 21:50:44 -07:00
Andy2
5b3e41f4e9
fix bug: allow switch *to* player whose turn it is even if allowPeek
...
is off (typically because it was turned off after game was loaded and
while non-turn player's tiles are visible)
2010-07-17 07:11:46 -07:00
Andy2
fb8692fb9f
add preference for allowPeek
2010-07-17 07:06:33 -07:00
Andy2
639feb8965
nuke extra line -- change I forgot to save
2010-07-17 06:23:14 -07:00
Andy2
6dc21ae7a8
pass (hard-coded) param controlling non-turn board switching
2010-07-17 06:22:42 -07:00
Andy2
5b8cf716b3
add pref controlling whether can switch to look at tray of user whose
...
turn it isn't
2010-07-17 06:21:24 -07:00
Andy2
8da9a1e8fa
dis/enable shuffle and add-player buttons based on number of players present
2010-07-17 06:03:30 -07:00
Andy2
6ffed8750a
Make delete button smaller and at other end of screen from text.
2010-07-17 05:58:29 -07:00
Andy2
cd20883df3
draw bonus hint summaries using minimum font height even when cells
...
are larger -- keeps from distracting so much from words
2010-07-17 05:42:50 -07:00
eehouse@eehouse.org
f93f6222b2
Merge branch 'android_branch' into toolbar
2010-07-16 21:19:44 -07:00
Andy2
a91c665c45
latest from translator
2010-07-16 21:18:39 -07:00
Andy2
2e15650c4d
button-based zoom by 4, not 8
2010-07-16 21:01:52 -07:00
Andy2
2bf3cbd7e2
turn on CROSSHAIRS -- somehow lost during merge.
2010-07-16 19:18:55 -07:00
Andy2
dbed23e240
change definition of movement during drag to include not just drag of
...
a tile but motion on the board which will include crosshairs. This
prevents miniwindow from coming up and stopping crosshairs movement
when it happened to start on a bonus square.
2010-07-16 18:57:08 -07:00
Andy2
e4feef9bbc
reverse sense of -I since hint region unsupported on Android
2010-07-16 18:24:17 -07:00
Andy2
81694f8392
Sarah's latest icons, converted from .psd using imagemagick
2010-07-16 18:18:37 -07:00
Andy2
a99e8142b0
Merge branch 'android_branch' into toolbar
...
Conflicts:
xwords4/android/XWords4/jni/Android.mk
xwords4/android/XWords4/jni/xwjni.c
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
2010-07-16 06:32:32 -07:00
Andy2
f05bfcb3d8
log when dropping message that would mess up cref player counts
2010-07-16 06:23:20 -07:00
Andy2
73980a3c50
use delete button in XWListItem instead of context menu item for DictsActivity too.
2010-07-16 06:19:19 -07:00
Andy2
f9a561bd2a
first cut at putting a delete button next to players in config list
2010-07-16 05:50:20 -07:00
eehouse@eehouse.org
ea2b6b6df9
Revert "add util_turnChanged"
...
This reverts commit 55d86b15d2
2010-07-16 05:19:52 -07:00
Eric House
55d86b15d2
add util_turnChanged
2010-07-15 18:27:00 -07:00
Eric House
a52fc5a4fd
don't call removeSocket when none was added
2010-07-15 18:21:32 -07:00
Eric House
8e5abb189b
add mutex for reconns too; log socket and ip addr connecting on it
2010-07-15 18:14:44 -07:00
Eric House
5ea1f3b470
list newest crefs first
2010-07-15 18:13:01 -07:00
Eric House
e2c663622f
ignore dicts
2010-07-15 18:09:40 -07:00
Eric House
78f965b979
replace asserts that have been firing on integrating reconn events
...
with dropping the reconn messages; move log of state table lookup failure
into cref so cref id can be included
2010-07-14 21:32:19 -07:00
eehouse@eehouse.org
f9d8df8cea
don't track xwrelay.conf so local changes don't show as local mods
2010-07-14 06:29:50 -07:00
Andy2
f3ffbd94af
remove focus-color pref; add crosshairs-color pref in same place
2010-07-14 06:21:55 -07:00
Andy2
55be90dd12
add preference controlling whether bonus "summaries" are shown on top
...
of bonus squares.
2010-07-13 22:39:45 -07:00
Andy2
7176c7036e
add localizable "pts" to the in-tray pending score display
2010-07-13 18:57:48 -07:00
Andy2
15f2a46279
fix miniwindow getting erased as soon as drawn. Problem was that
...
board code invalidated crosshairs cells in timer callback after
drawing miniwindow but board_draw isn't supposed to get called until
after penup. But java miniwindow drawing code was pushing DRAW event
to get the canvas updated. Instead I'm just invalidating the view
which copies the canvas without calling board_draw().
2010-07-13 18:47:29 -07:00
Andy2
6cb2638a50
if tap-to-play is set, remove play-game item from context menu
2010-07-13 18:09:43 -07:00
Andy2
44907a29a6
cleanup: factor to init in loop from an array
2010-07-13 06:36:33 -07:00
Andy2
f4e0c5f1ad
turn on crosshairs feature
2010-07-13 06:27:07 -07:00
Andy2
a76cdac0c5
don't put up mini window when have penned-down on a draggable tile.
2010-07-13 06:26:55 -07:00
Andy2
d4a23bbaca
fix spacing (whitespace only)
2010-07-12 21:42:04 -07:00
Eric House
7352cd5449
fix so bonus strings are in right order
2010-07-12 21:40:40 -07:00
Andy2
e55bb462d9
include bonus square summaries in grey
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
2010-07-12 21:40:23 -07:00
Andy2
c0819c5a9f
up constants for beta 12
2010-07-12 19:16:11 -07:00
Andy2
f2674ed27c
XWFEATURE_RAISETILE is off by default
2010-07-12 19:11:42 -07:00
Andy2
21d705c6e7
make wrap code for popping tile up above cursor hotspot (or finger)
...
conditionally compiled. I probably want it off on Android now that I
have crosshairs.
2010-07-12 19:11:24 -07:00
Andy2
2f34fc0d35
fix list item not getting updated after its game configuration is changed.
2010-07-12 18:52:11 -07:00
Andy2
0957c95c8e
write and read dummy values to/from stream when KEYBOARD_NAV isn't
...
defined so that the versions are compatible. This will let existing
saved games be read if I turn this off on Android.
2010-07-12 18:49:36 -07:00
Andy2
de32e514ab
cherry-pick three revisions from toolbar branch ( d1c7d4097c, f848473c1a and 6484a2fb9b) and manually fix conflicts.
2010-07-12 18:48:03 -07:00
Andy2
19ea138f8e
turn on crosshairs feature, which seems to work
2010-07-12 18:24:41 -07:00
Andy2
fd9464b909
first cut at crosshairs: drawing in focus color the entire column and
...
row that's currently being touched/dragged through. Meant to aid
users of capacitive touch screens in figuring out what cell they're
on.
2010-07-12 06:39:46 -07:00
Eric House
8d3ea709e0
add CMD_TOGGLEZOOM so zoom state doesn't have to be maintained
2010-07-11 08:05:23 -07:00
Eric House
546ddf33ae
add util_turnChanged
2010-07-10 17:05:17 -07:00
Eric House
177af25617
fix so bonus strings are in right order
2010-07-10 16:54:41 -07:00
Eric House
cedc00c9a6
include bonus square summaries in grey
2010-07-10 16:17:13 -07:00
Andy2
d3548aafb2
Make backgrounds transparent. By me: the artist is not to blame. :-)
2010-07-09 23:02:19 -07:00
Andy2
d1c7d4097c
remove focus-related code and declarations
2010-07-09 18:52:14 -07:00
Andy2
8172e38cef
write and read dummy values to/from stream when KEYBOARD_NAV isn't
...
defined so that the versions are compatible. This will let existing
saved games be read if I turn this off on Android.
2010-07-09 18:21:05 -07:00
Andy2
f848473c1a
turn off KEYBOARD_NAV
2010-07-09 06:51:34 -07:00
Andy2
6484a2fb9b
fix to compile (with or without KEYBOARD_NAV undefined)
2010-07-09 06:50:39 -07:00
Andy2
6b9b97231a
fix to compile with KEYBOARD_NAV undefined
2010-07-09 06:49:32 -07:00
Andy2
2bbdcf46c3
make progress dialog cancellable. Still may want to abort the search
...
when it's cancelled.
2010-07-09 06:14:43 -07:00
Andy2
d7110824df
make undo button the last; make vertical and horizontal toolbar
...
orderings the same. (Really should have just one toolbar and set it's
orientation on the fly.)
2010-07-08 18:42:22 -07:00
Andy2
d68d597c49
Sarah Chu's first cut at icons.
2010-07-08 18:41:03 -07:00
Andy2
3976738990
put up indeterminate progress dialog when engine starts and at least
...
one blank's involved. Still needs to be made cancellable.
2010-07-08 18:26:17 -07:00
Andy2
1c218513f1
define SHOW_PROGRESS: when blanks present search takes too long not to
...
show some sort of progress indicator
2010-07-08 07:04:40 -07:00
Andy2
7595b36037
add engineStopping and engineStarting (stubbed out so far)
2010-07-08 07:03:56 -07:00
Andy2
567d5f4d70
add and connect values button. It's visible when there are any tiles
...
at all on the board.
2010-07-08 06:39:48 -07:00
Andy2
40323b03d2
board_canFlip -> board_visTileCount
2010-07-08 06:38:51 -07:00
Eric House
3716218a1d
ignore files in dawg/
2010-07-07 23:18:14 -07:00
Eric House
48946996b8
ignore file in dawg/
2010-07-07 23:17:13 -07:00
eehouse@eehouse.org
586e0d25f9
Merge branch 'android_branch' into toolbar
2010-07-07 20:44:33 -07:00
Andy2
41f8f574b1
use git describe for version info/stamp
2010-07-07 20:26:25 -07:00
Andy2
5365ea4f4e
fix crash when empty string given on ctrl port
2010-07-07 18:59:48 -07:00
Andy2
f8d1ebd075
use board_canHint to set hint buttons state so buttons don't show for
...
remote or robot players
2010-07-07 18:48:35 -07:00
Andy2
af2d2c71b5
add board_canHint to jni
2010-07-07 18:47:22 -07:00
Andy2
ac6dc400ce
add board_canHint
2010-07-07 18:47:02 -07:00
Andy2
a2e4fd09c4
add missing apostrophe
2010-07-07 18:27:29 -07:00
Andy2
445f6877b6
fix list item not getting updated after its game configuration is changed.
2010-07-07 18:16:55 -07:00
Andy2
b8c905204e
hook up prev hint button -- and finally fix infinite loop that
...
happened when you clicked hint while a hint was being calculated.
2010-07-07 06:51:46 -07:00
Andy2
c98451c62a
remove excess logging
2010-07-07 06:50:47 -07:00
Andy2
07940099ed
add new param to board_requestHint
2010-07-07 06:49:36 -07:00
Andy2
a7c77785f6
return false if no move found -- to really fix the crash
2010-07-07 06:40:34 -07:00
Andy2
5725f36db8
detect when no moves found that meet criteria to fix (I think) crash
...
when iterating from highest to lowest move using prevMove.
2010-07-07 06:33:01 -07:00
Andy2
4425ff838c
add buttons (gtk) to test new prev-move feature; modify to fit new api
...
(curses).
2010-07-07 05:29:04 -07:00
Andy2
992f45e1bf
new feature: previous move. Modify engine to traverse the set of all
...
possible moves in either order both within a cached subset and when
building cached subsets. Still a bit buggy (shows the same move twice
when moving backwards and reaches the top-scoring move) and not well
tested.
2010-07-07 05:27:57 -07:00
Andy2
210a3f033b
disable hint buttons when hint feature's turned off
2010-07-05 09:52:19 -07:00
Andy2
93eca7b936
add layout_weight so buttons expand to fill toolbar. I really want
...
available space distributed as space between rather than as wider
buttons but this is an improvement.
2010-07-05 09:47:26 -07:00
Andy2
b163b45abe
Merge branch 'android_branch' into toolbar
...
Conflicts:
xwords4/android/XWords4/AndroidManifest.xml
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/res/xml/xwprefs.xml
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConstants.java
2010-07-04 13:28:47 -07:00
Andy2
f0a5fa6034
up version numbers/strings for beta 11
2010-07-04 12:56:59 -07:00
Andy2
c2aaa04517
move colors editing prefs screen into appearance prefs screen
2010-07-04 12:53:45 -07:00
Andy2
dfe1d5f245
break separate menu handling from context-menu stuff so can call from
...
onclick handler, then use new preference to decide whether to launch
game or drop context menu on click
2010-07-04 12:52:36 -07:00
Andy2
6264327d63
formatting change; whitespace only
2010-07-04 12:30:09 -07:00
Andy2
ce2182e214
fix crash when copying a new game by testing for null scores array
2010-07-04 12:09:22 -07:00
Andy2
2c2e0b9029
export to jni and use new functions for redoing pending tiles and
...
testing whether undo/redo is possible.
2010-07-03 11:51:27 -07:00
Andy2
3452666231
use board_canTogglePending to disable button
2010-07-03 11:39:10 -07:00
Andy2
5f92491ca3
add and implement board_canTogglePending
2010-07-03 11:38:37 -07:00
Andy2
d44b9907cf
save redoable pending tiles -- and up stream version since format's
...
changed
2010-07-03 11:25:01 -07:00
Andy2
57e246da3b
handle blanks as well in redo of undone pending tiles
2010-07-02 22:44:50 -07:00
Andy2
592d99ba80
add new button and handler to test redo of undone pending moves.
2010-07-02 18:53:37 -07:00
Andy2
f77cf0e23d
add board_redoReplacedTiles and model_redoPendingTiles. The latter
...
works as long as no blanks are involved. And new state isn't being
saved so will be lost unless format changed.
2010-07-02 18:52:55 -07:00
Andy2
5b336146c8
add preference, as yet unused, to control whether tap drops context
...
menu or opens game (as it used to do).
2010-07-02 18:08:22 -07:00
Andy2
4b14e4aeb9
break most top-level prefs into behavior or appearance
2010-07-02 07:14:48 -07:00
Andy2
e22479ba03
add "play game" item to context menu, and invoke that menu on item
...
click. This fixes problem with users apparently not knowing about
long-tap and context menu and so not knowing they can configure a
game. Unfortunately I can't figure out how to disable long-tap
also bringing up the context menu. Yet another preference might be the fix.
2010-07-02 07:04:37 -07:00
Andy2
9b3463c8e0
use local OnClickListener rather than have Activity implement interface
2010-07-02 06:25:10 -07:00
Andy2
e2925ba50a
wire board_canShuffle() to button visibility
2010-07-01 18:57:26 -07:00
Andy2
b5bf895874
let the compiler build the arrays for me
2010-07-01 18:56:41 -07:00
Andy2
6946cbc499
export board_canShuffle via jni
2010-07-01 18:56:18 -07:00
Andy2
491cfe7616
add board_canShuffle and implement
2010-07-01 18:55:49 -07:00
Andy2
0d2ba57186
move more knowledge from Board Activity to Toolbar
2010-07-01 18:45:33 -07:00
Andy2
7895325f74
hook flip button up with board_canFlip result after every draw() call.
...
Begin process of moving knowledge of button layout into Toolbar.
2010-07-01 18:20:53 -07:00
Andy2
2f59836fc4
export board_canFlip
2010-07-01 06:37:22 -07:00
Andy2
650d9f5b45
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into toolbar
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
2010-07-01 05:54:43 -07:00
Andy2
3b9240ca84
up version strings/numbers
2010-06-30 21:24:17 -07:00
Andy2
e150db29ee
use board_canFlip() to prototype disabling flip button when useless.
2010-06-30 20:25:56 -07:00
Andy2
43c34aa466
add board_canFlip and model_canFlip -- which seem to work though
...
there's no test that when a single tile is on the board it's not in
the middle. Sue me.
2010-06-30 20:25:34 -07:00
Andy2
2b23c50a70
change default phonies key name so upgrading users will still get the
...
new value.
2010-06-30 19:35:18 -07:00
Andy2
769d9a6a23
tweak strings
2010-06-30 06:45:37 -07:00
Andy2
0eab25eec9
make warn-phonies the default. Users are complaining about bogus
...
words being accepted; this may may the feature easier to find.
2010-06-30 06:32:21 -07:00
Andy2
cf5f94ffc7
fix crash by providing title id expected by warn-phonies dialog.
2010-06-30 06:31:40 -07:00
Andy2
b83867ff13
Configure -> Game settings
2010-06-30 06:16:23 -07:00
Andy2
6a4e9f2c43
up versions in preparation for new release
2010-06-29 21:15:19 -07:00
Eric House
30087845b5
add preference to hide title bar
2010-06-29 19:25:15 -07:00
Andy2
3998a23f84
add undo button; reorder menus; fix show-values menuitem
2010-06-29 18:26:37 -07:00
Andy2
e218cb7639
add prev hint button triggering notImpl; hide title bar. Really want
...
to hide it only for landscape orientation, but that seems impossible
without having separate layout and reloading whole activity on
orientation change. If you hide it after adding content to the
activity you get a runtime exception. Better way than hiding title,
BTW, is a theme that hides it in AndroidManifest.xml.
2010-06-29 06:51:45 -07:00
Andy2
45b5bef414
new prev_hint button with left-facing arrow
2010-06-29 06:48:20 -07:00
Andy2
953b2bcc55
cleanup; allow setting NUM_SAVED_ENGINE_MOVES per-platform
2010-06-28 21:08:13 -07:00
Andy2
c9dd0c2ddf
use my dummy icons instead of irrelevant builtins
2010-06-28 18:52:20 -07:00
Andy2
d1b2602b42
disable hint button when hints not allowed; cleanup. Still have at
...
least one button to add.
2010-06-28 18:51:41 -07:00
Andy2
cf0c7c9770
"First hint" replaces "Hint" for, I hope, more clarity
2010-06-28 18:49:42 -07:00
Andy2
99d41083bd
xml file not needed now that buttons are declared as part of board
2010-06-28 18:48:16 -07:00
Andy2
521852ddf5
more proof-of-concept icons
2010-06-28 18:47:47 -07:00
Andy2
375111d0f1
draw blank-marking circle white-on-black for pending tiles --
...
otherwise it's invisible.
2010-06-28 18:21:53 -07:00
Andy2
6026ad31ba
nuke remaining zoom-controller artifact
2010-06-28 06:31:15 -07:00
Andy2
29aa4627e9
get rid of zoom controller. Will be replaced by toolbar button.
2010-06-28 06:29:27 -07:00
Andy2
85679dcb2a
(re)add padding on sides and at top
2010-06-28 06:26:49 -07:00
Andy2
4b80dedde7
moving toward ImageButtons rather than (text) Buttons, and toward
...
having them declared in the layout rather than added at runtime. Add
temporary references to built-in ImageButtons, and a one-dimentional
one of my own. Toolbar reduced to handling the orientation change
(and likely to disappear altogether soon.)
2010-06-27 21:48:01 -07:00
Andy2
5b04bc6382
add zoom button that toggles between zooming in and out
2010-06-27 13:13:30 -07:00
Andy2
0c852981e7
make zoomBy param passed to board_zoom give distance rather than just
...
direction.
2010-06-27 13:12:30 -07:00
Andy2
85745d8ab4
add more buttons; rearrange menus on assumption those that duplicate
...
button functionality can be burried.
2010-06-26 22:02:02 -07:00
Andy2
06a7c56ca9
template for toolbar buttons.
2010-06-26 17:53:00 -07:00
Andy2
ad2fce6519
remove built-in buttons from board.xml; add addButton method on
...
Toolbar and call it from BoardActivity to produce a working hint
button. Am using text labels instead of icons for now.
2010-06-26 17:52:36 -07:00
Andy2
6536699dd5
remove unused import
2010-06-26 17:49:23 -07:00
Andy2
1c910d5169
turn off debugging so device builds can be from unmodified source.
2010-06-26 12:40:04 -07:00
Andy2
29ba0cf4f2
add Toolbar class and use it to hide whichever toolbar isn't wanted in
...
the current screen orientation.
2010-06-26 12:39:10 -07:00
Andy2
3e9c94118a
put toolbars at right and bottom. Next step is to hide the one we
...
don't want.
2010-06-25 20:14:15 -07:00
Andy2
1866c5ccab
add toolbar at bottom to test spacing
2010-06-25 08:14:18 -07:00
Andy2
7b52f36925
remove unused string
2010-06-25 08:05:07 -07:00
Andy2
05a208594c
cache games list item views in hashmap by file path, and inval
...
individual items when their views need to change. This seems to
significantly speed [re]rendering the list.
2010-06-25 06:38:00 -07:00
Andy2
10286e0109
explicit mention in about text that it's FOSS
2010-06-21 07:55:00 -07:00
Andy2
8012cbdcd6
beta 8 since b7 was in the about box for prev (first) Market release.
2010-06-21 07:17:44 -07:00
Andy2
8d01060599
gitignores for wince
2010-06-20 22:58:59 -07:00
Eric House
3be95e5d7e
up version string and code
2010-06-20 10:02:53 -07:00
Eric House
f1eecd78fa
nuke debugging echo
2010-06-20 09:31:21 -07:00
Eric House
3d22d9e1b0
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-06-20 09:29:45 -07:00
Eric House
d5eca2027a
remove local.properties, and add a script, run from build.xml before
...
local.properties is loaded, to generate it with a path to sdk
appropriate to the installation.
2010-06-20 09:29:13 -07:00
andy
ddc1d419b2
nuke CVSROOT
2010-06-20 09:23:33 -07:00
eehouse@eehouse.org
1fdf1e1a41
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-06-17 20:40:13 -07:00
Eric House
a6b4e424ba
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-06-17 20:36:25 -07:00
Eric House
afb3f4040a
fix to compile in non-debug mode
2010-06-17 20:35:54 -07:00
Andy2
12cc45617e
don't use query title for informative dialogs reporting robot actions.
2010-06-17 18:56:51 -07:00
Andy2
38ef891268
new preference, on by default, controlling sorting of new tray tiles.
2010-06-17 18:51:46 -07:00
Andy2
adfb4d7a6a
bug: wasn't passing changed prefs to server, only to board. So rather
...
than export server_prefsChanged via jni replace board_prefsChanged
with a new method that calls both.
2010-06-17 18:51:10 -07:00
Andy2
80aa22b2d1
add common prefs field sortNewTiles and way to set on linux cmdline
2010-06-17 18:10:32 -07:00
Andy2
e0dd3701a0
Add model_sortTiles(); use it; fix some comments and const decls.
...
Sorting always happens now when tiles added; needs to be based on a
preference.
2010-06-17 06:43:16 -07:00
Andy2
529f3df726
fix seekbar style so thumb's fully visible on 2.1 (was ok on 1.6); and
...
rename style for clarity.
2010-06-16 18:44:19 -07:00
Andy2
660d86c121
menuitem text change
2010-06-16 18:33:08 -07:00
Andy2
df3ab84b80
shrink rem and timer text to a size between cur player and remaining
...
players. Looks better not so huge.
2010-06-16 18:30:27 -07:00
Andy2
448cb63891
remove TODO
2010-06-16 18:26:37 -07:00
Andy2
66f4b0d2f6
forgot to add this earlier and git didn't complain...
2010-06-16 18:07:01 -07:00
Andy2
95056db997
change meaning of timer setting to be per-player rather than per-game
...
based on information that that's how it's customarily done. Will need
to communicate change with translators.
2010-06-16 06:39:27 -07:00
Andy2
78ad2feed9
rename static variable appropriately
2010-06-14 18:23:18 -07:00
Andy2
391982f16f
synchronize saveSummary and getSummary. They can be called from
...
different threads and that may be the cause of a few crashes I've seen
and had reported.
2010-06-14 18:21:12 -07:00
Andy2
ca2aa982a7
update from translator
2010-06-14 18:18:17 -07:00
Andy2
375789cd02
juggle->shuffle; trade->exchange. Strings only; no code change.
2010-06-13 20:40:12 -07:00
Andy2
ccce9ca85d
incorporate output of 'git describe' in name of .apk file produced
2010-06-10 22:43:11 -07:00
Andy2
74c9e9db92
add second prefs menu to restore all prefs
2010-06-10 21:28:38 -07:00
Andy2
57b74391bc
remove duplicates that the compiler missed at first
2010-06-10 21:27:17 -07:00
Andy2
f9fbe386f5
add menu and menuitem to prefs dialog (shows up for main screen only)
...
to reset colors to defaults
2010-06-10 21:10:06 -07:00
Andy2
f7c737bcde
latest from translator
2010-06-10 19:27:14 -07:00
Andy2
222f30b5ac
hide zoom buttons when laying out board in case they're visible and
...
we're switching to landscape.
2010-06-08 22:55:40 -07:00
Andy2
7b897acfc1
don't put up zoom control in landscape mode. There just isn't room
...
and it in effect disables the tray. Rather, think of landscape as
zoomed mode: no zooming necessary. Volume controls still zoom if
enabled.
2010-06-08 22:40:17 -07:00
Andy2
e727fa7a03
first cut at Slovak from translator
2010-06-08 22:06:18 -07:00
Andy2
aa825bf662
fix for new location. Need to get this out of git somehow.
2010-06-07 06:11:11 -07:00
Andy2
cb5763312d
can't use svnversion for file name any more
2010-06-07 05:50:01 -07:00
Andy2
ab167f51f4
can't use svnversion for file name any more
2010-06-07 05:48:25 -07:00
Andy2
d99241ccbc
accomodate API changes
2010-06-07 05:45:37 -07:00
Eric House
d7d162d474
rearrange menus, promoting undo and hint and demoting flip and turndone
2010-06-06 13:33:19 -07:00
Eric House
34ecac303a
make optional and then turn off feature whereby tap in empty part of
...
tray undoes current move. It's too easy to hit this on a capacitive
display.
2010-06-06 13:32:12 -07:00
Eric House
94b3e16b7b
add versioning codes required by market; up beta so they match.
2010-06-06 09:04:08 -07:00
eehouse@eehouse.org
db2c36eda9
add string
2010-06-06 06:41:45 -07:00
Eric House
e42404a8a6
Allow tray to be shorter when scrolling will be required.
2010-06-05 14:10:29 -07:00
Eric House
c897aefb7e
quick uninstall script since I can't remember the syntax
2010-06-05 10:43:03 -07:00
Eric House
f9518d5a87
try pushing and popping any local changes around the build tag checkout
2010-06-05 10:29:22 -07:00
Eric House
e015bf81d1
add --tag option that causes to build from the tagged tree. Will
...
currently use tagname in about box only if there are no uncommitted
local revisions. git stash might fix this. Also need either to use
user-friendly tag names or provide them as alternatives here.
2010-06-05 10:17:53 -07:00
Eric House
d3eb3233a3
up version string to b6 -- to have something different from tag to work with
2010-06-05 09:22:02 -07:00
Eric House
cbdf32724a
move .gitignore up to cover the whole tree
2010-06-05 09:08:36 -07:00
Eric House
564dfff2c0
rename generated class SvnVersion->GitVersion
2010-06-05 08:30:55 -07:00
Eric House
e10778b2f3
put result of 'git describe --always' into the about box for now.
...
Later will be using tagname if present.
2010-06-05 08:24:43 -07:00
Eric House
f5e8283869
ignore core files
2010-06-05 08:23:52 -07:00
Eric House
08ad0bdfa5
fix assertion failure by passing max size not < actual size
2010-06-05 08:10:02 -07:00
Eric House
d98b2ad5d6
make git version available as a read-only advanced preference. I sure
...
hope I never need to ask a user to transcribe this!
2010-06-05 07:55:40 -07:00
Eric House
cbbaeb57a0
gitignore additions
2010-06-05 07:50:09 -07:00
Eric House
6456165a92
replace svnversion with gitversion.sh
2010-06-05 07:27:14 -07:00
Eric House
8aaaa06bcb
identify rev number as from git
2010-06-05 07:25:24 -07:00
Eric House
21fef0ded8
script to replace, eventually if I'm lucky, svnversion as a way to
...
mark a build's source.
2010-06-05 07:20:49 -07:00
Eric House
d91f3de9a9
again: replace use of dead constant with numerals. git is a pain...
2010-06-04 23:37:16 -07:00
eehouse
ca968d8294
pass only -1 or 1 into board_zoom
2010-06-05 03:40:43 +00:00
eehouse
f514717428
Change board_zoom to indicate direction only of zoom, not number of
...
cols. When figuring internal dimensions zoom out as needed to meet
maxSize value. This fixes problem where rotating a zoomed portrait
board to landscape leaves cells bigger than they can be made by
zooming, but then the desired zoom has been changed and stored and so
on return to portrait cells are smaller/less zoomed. Need to see if I
can live with that.
2010-06-05 03:40:23 +00:00
eehouse
d0b9f0f7aa
add Retry button to dialog announcing client failure to find expected
...
room on relay. From handler call new comms_resetSame and existing
code to init client game connecion.
2010-06-05 03:40:09 +00:00
eehouse
9f797afe73
export comms_resetSame through jni
2010-06-05 03:39:38 +00:00
eehouse
ea6166f8c7
add comms_resetSame that resets relay with existing params.
2010-06-05 03:39:16 +00:00
eehouse
a80d874e9d
change api for board_zoom and change callers. No effect on java and
...
no behavior change.
2010-06-05 03:39:06 +00:00
eehouse
9af9df884b
use same logic to decide to zoom and to report whether can zoom next
...
time. Fixes bug preventing + button from greying out when fully
zoomed in.
2010-06-05 03:38:49 +00:00
eehouse
a2d2b0adbd
quick hack to enable/disable zoom buttons so can debug board.c w/out
...
android.
2010-06-05 03:38:40 +00:00
eehouse
1f246d20a3
oops. Fix assertion by not stopping dragging unless it's been
...
started.
2010-06-04 03:47:56 +00:00
eehouse
57013a9267
stop dragging before putting up miniwindow. This allows to drag
...
finger off of bonus hint just displayed without scrolling the screen.
2010-06-04 03:47:46 +00:00
eehouse
9b81a668ad
move System.loadLibrary("xwjni"); to XwJNI.java which is certain to
...
always be loaded before any jni call is made. Fixes -- I hope --
occasional UnsatisfiedLinkError happening on-device.
2010-06-04 03:47:37 +00:00
eehouse
33a1efd725
save after every network event when running in background
2010-06-04 03:47:22 +00:00
eehouse
e1d956ac09
catch up with board_setPos API change.
2010-06-03 04:58:02 +00:00
eehouse
a3926f42ff
move game save into jnithread so it can be synchronized with other
...
activities accessing the jni, then do it once in onPause and again in
onDestroy before closing the game. Network activities are probably
the only things that can change the game state after onPause is
called, so they'll probably want to be followed by SAVE commands.
2010-06-03 04:57:46 +00:00
eehouse
7b33455799
move game-close logic from onPause to onDestroy. Makes for much
...
faster resume and seems ok. But need to do some saving in onPause so
no data's lost if we're killed without onDestroy getting called.
2010-06-03 04:57:27 +00:00
eehouse
628f8d9cf3
don't zoom in if doing so will make cells larger than the limit passed
...
in.
2010-06-03 04:57:11 +00:00
ehouse
43181f5cd2
accept multiple cref ids and names on console
2010-06-03 03:00:35 +00:00
eehouse
0920eeb6b3
set default font height based on scale rather than assuming Paint's
...
defaults make sense.
2010-06-02 12:46:08 +00:00
eehouse
bcac60b2d4
don't display zoom control at all if both buttons disabled.
2010-06-02 04:59:51 +00:00
eehouse
68bf571f26
figure maxCellSize and pass to jni; call after doing layout to
...
correctly get whether zooming is possible.
2010-06-02 04:59:34 +00:00
eehouse
048e854d4e
no point in triggering a zoom call meant to get state before layout's
...
been done.
2010-06-02 04:59:14 +00:00
eehouse
c7bedc297c
include new param to board_zoom
2010-06-02 04:58:53 +00:00
eehouse
4f16eee1b6
pass maxCellSize into board_setPos, and use it as limit in calculating
...
whether any further zooming is possible.
2010-06-02 04:58:32 +00:00
eehouse
4fe36455c6
Add upper bound on cell size yielding left and right margins for
...
super-wide screens.
2010-06-02 04:58:20 +00:00
ehouse
69cb7bce15
up release to b5
2010-06-01 02:50:11 +00:00
eehouse
a8e705dcc8
mark blanks with a circle around it rather than rects in the corners
2010-05-28 02:31:46 +00:00
eehouse
8bb2fb9b09
track and display in web view the number of games actually joined
...
rather than the number attempted.
2010-05-28 02:31:27 +00:00
eehouse
f5ac51ae73
fix crash using older dict by using current stream version rather than
...
one from before gameSeconds was being preserved in the stream by
write_gi code. I fixed this on a branch a week ago as well, so look
for a merge glitch. Need now to confirm that I'm sending char lists
in initial connect message in the right (null-separated utf8) format.
2010-05-28 02:31:13 +00:00
eehouse
92e02c9c2e
catch up with API changes
2010-05-28 02:31:04 +00:00
eehouse
0d7b09cb01
revert 3407; deleted a string I needed
2010-05-27 12:52:48 +00:00
eehouse
4b7dad5f5c
fix jni reentrancy problem when onPause called while a blocking dialog
...
is up. The fix is to track if there's a thread blocked and to
interrupt it so it can return through the jni as if the dialog were
cancelled. More explanation in comments part of this checkin.
2010-05-27 02:58:56 +00:00
eehouse
b54ffe2b7d
robot move/trade report dialogs need to block in case the next player
...
is also a robot
2010-05-27 02:58:42 +00:00
eehouse
c5a0384d79
include name of game in title of game-configure screen
2010-05-27 02:58:27 +00:00
eehouse
6b9c4a4e0f
shorten pattern to include multi-line elements (I should use
...
xmlstarlet here but need to grok xslt); don't report as missing
strings in the common file
2010-05-27 02:58:08 +00:00
eehouse
cc984f02ab
remove unused string
2010-05-27 02:57:57 +00:00
eehouse
282f9ce237
wrap in scrollview so still usable in landscape orientation
2010-05-27 02:57:46 +00:00
eehouse
4be4a8156a
wire new edittext to seekbar and vice-versa, including hack boolean to
...
prevent loop that resets the cursor to the 0 position on every
keystroke.
2010-05-27 02:57:35 +00:00
eehouse
8c790edd04
add numerical edittexts to left of seekers in color edit view. Not
...
yet wired up but layout's ok
2010-05-27 02:57:21 +00:00
eehouse
8e06ff446a
Preferences->Settings; remove duplicated strings.
2010-05-27 02:56:54 +00:00
eehouse
2449962185
add icons to the games list activity menu, three built-in and one with
...
a CC license.
2010-05-27 02:56:36 +00:00
eehouse
b345938e03
dictionary icon adapted from http://icons2.iconarchive.com/icons/mattahan/buuf/48/Dictionary-icon.png using gimp. Original by Mattahan (Paul Davey) license: CC Attribution-Noncommercial-Share Alike 3.0
2010-05-27 02:56:24 +00:00
eehouse
695c5736e5
fix default phonies value; improve some strings related to default timer
2010-05-26 02:51:15 +00:00
eehouse
dd2693bab0
factor out common code
2010-05-26 02:27:34 +00:00
eehouse
28d9d4559d
add new-game/default prefs for phonies and timer_enabled
2010-05-26 02:27:16 +00:00
eehouse
ec57cbcf1b
actually hide the delete menuitem for builtin dicts; greyed out is too
...
subtle.
2010-05-26 02:26:44 +00:00
eehouse
da7c59a869
subclass ListPreference in order to provide a list of dicts at runtime
...
for setting the default. Remove the hint that says "do it on dicts
screen."
2010-05-26 02:26:24 +00:00
eehouse
c92d919934
log error from read
2010-05-26 02:25:58 +00:00
eehouse
42a4a19911
disable delete menuitem when dicts are builtin (since can't be deleted)
2010-05-20 04:29:29 +00:00
eehouse
70f0a5fe90
fix dict deletion (which broke when extension removed from
...
user-visible name)
2010-05-20 04:29:10 +00:00
eehouse
84f76a8c9a
Add a summary visible before default dict has been set directing user
...
on how to change it. Goes away when it becomes possible to set
directly in prefs activity.
2010-05-20 04:28:53 +00:00
eehouse
1054ba5341
don't replace summary with empty value
2010-05-20 04:28:38 +00:00
eehouse
1ea06352dc
latest from translator
2010-05-20 04:28:20 +00:00
eehouse
7a279702c0
add sterrror to what's logged when pthread_create fails -- as is
...
happening often.
2010-05-20 04:28:07 +00:00
eehouse
3863279013
divider follows last item too on real lists; add spacing above and below it.
2010-05-20 04:27:56 +00:00
eehouse
a76fd7b87a
contributed icon
2010-05-18 02:33:16 +00:00
ehouse
b38fa6c62e
latest from translator (plus my shot at playerf)
2010-05-18 02:31:09 +00:00
eehouse
7913292942
get "Player 1" etc from a resource; don't hard-code!
2010-05-18 02:27:34 +00:00
eehouse
f3f350a12d
Create new prefs screen with per-game defaults, adding existing and
...
new for dicts; use dict pref when creating new game; add menuitem to
dicts view to set that pref. I want to launch the dicts activity from
the preference instead (which is information-only right now) but can't
figure out how to do startActivityForResult from a Preference....
2010-05-18 02:27:14 +00:00
eehouse
4f8c7b3cb8
trying again with the right params to iconv
2010-05-15 03:07:51 +00:00
eehouse
40c25d6137
add initial/default value of gameSeconds as a preference and honor it
...
when creating and copying CurGameInfo instances.
2010-05-14 12:43:17 +00:00
eehouse
4ce0a30b2d
save gameSeconds even if timer not enabled. Means stream version change.
2010-05-14 12:42:53 +00:00
eehouse
bbfa375dfe
erase cached tile rects when doing layout to fix bug where tile
...
letters are partially offtile when a game first opened game in
landscape changes to portrait mode.
2010-05-14 12:42:44 +00:00
eehouse
95460e1685
Draw score entries for players whose turn it isn't in two lines so you
...
can still see the name.
2010-05-14 12:42:28 +00:00
eehouse
c9ca99d3f0
convert (with iconv) to utf8
2010-05-13 04:20:20 +00:00
eehouse
8f0cae4bf2
czech strings as received from translator
2010-05-13 04:16:30 +00:00
eehouse
71e65433d3
figure board dimensions in one place rather than two, then share.
2010-05-12 11:59:40 +00:00
eehouse
51f3412567
Break game- and dict-related static methods from Utils into new GameUtils
2010-05-12 11:58:37 +00:00
eehouse
c85b033ced
Break db-related static methods from Utils into new DBUtils
2010-05-12 11:57:07 +00:00
eehouse
24c1527232
fix yOffsetChanged to follow new API, but still leave commented out;
...
set game file name from resource, and make visible in board title and
as part of games list entries.
2010-05-12 11:56:01 +00:00
eehouse
6bbf7f32dd
don't store Context as a class variable in CommonPrefs. Instead, pass
...
it into every method where it's needed. This should fix occasional
crash where the OS relaunches me into an activity that uses prefs
without passing through the GamesListActivity where that static was
getting set.
2010-05-12 11:54:36 +00:00
eehouse
f154e83a21
draw_scoreBegin now returns a boolean
2010-05-12 11:53:06 +00:00
eehouse
4da3edabbb
draw_scoreBegin now returns a boolean
2010-05-12 11:51:55 +00:00
eehouse
c79b3e2395
make draw_scoreBegin return a boolean like the other two draw_*Begin
...
methods
2010-05-12 11:51:14 +00:00
eehouse
7faaed04f5
remove .xwd from dict names displayed to users.
2010-05-12 11:50:25 +00:00
eehouse
7daa6e33f7
Make first player a robot rather than second. This might make a
...
better first impression on new users.
2010-05-12 11:49:38 +00:00
eehouse
1e560bfd42
move the download-url string into non-localizable strings
2010-05-12 11:48:33 +00:00
eehouse
5617533403
up beta version
2010-05-12 11:47:49 +00:00
eehouse
bfee36bf56
add minSdkVersion and targetSdkVersion
2010-05-12 11:47:22 +00:00
eehouse
772291ea73
add hour to timestamp
2010-05-09 20:40:55 +00:00
eehouse
3159e864b5
add onResume to undo effects of onPause. I'm pretty sure this fixes
...
the white screen on device bug.
2010-05-09 20:40:39 +00:00
eehouse
77f21c6f2e
try passing application context to CommonPrefs. I'm getting a crash
...
on device when app's been running for a while and, perhaps, the
original GamesList activity has been recycled but CommonPrefs instance
with its static has not. The BoardView is being recreated and
CommonPrefs asserts that m_context is null. That shouldn't be
possible, but we'll try this.
2010-05-09 14:42:19 +00:00
eehouse
8f207615e3
remove logging
2010-05-09 14:42:02 +00:00
eehouse
d708365843
add a bit more activity lifecycle logging, and invalidate view when
...
not building it on resuming/restarting/starting
2010-05-08 19:29:54 +00:00
eehouse
922a32ad08
remove per-packet logging
2010-05-08 19:29:36 +00:00
eehouse
8e6c3c7533
Fix problem with entries in summary db outlasting their games and
...
getting applied to new games created with old name: add deleteGame
method that removes summary and file at same time.
2010-05-08 19:29:20 +00:00
eehouse
5542350094
comment out Hidden games menuitem; rearrange menuitems; fix missing
...
string that compiler didn't notice earlier.
2010-05-08 19:29:03 +00:00
eehouse
e3b77aa1f1
add dialog confirming delete_all menu
2010-05-08 19:28:38 +00:00
eehouse
cfbdfac10b
get and save new summary in resetGame so connected games don't show in
...
gameslist as unconnected after being reset or copied.
2010-05-08 19:28:19 +00:00
eehouse
87f5aada74
dereference array inside try to catch oob exception I just saw but
...
whose cause I can't find as well as null array I was previously
testing for.
2010-05-08 15:54:30 +00:00
eehouse
9d86ba9a99
add timestamp fields to DB as long as the format's changing
2010-05-08 15:30:22 +00:00
eehouse
0e3411ecd4
modify configure connection button to reflect conn type chosen; add
...
role-specifig hints to relay config dialog (in a way it'll be easy to
follow for others.)
2010-05-08 15:27:32 +00:00
eehouse
13ab9b233d
comment out sms code; class fails verifier on 1.5 device.
2010-05-08 15:27:06 +00:00
eehouse
2992fd2d1f
add connection separator/title; add prompt to Connection dialog
2010-05-08 15:26:47 +00:00
eehouse
741ab275ec
Add GAMEID column to DB for later lookup when messages arrive for
...
closed games.
2010-05-08 15:26:18 +00:00
eehouse
a4bc872906
provide different players labels for the three roles
2010-05-08 15:25:54 +00:00
eehouse
c5032b9c4f
get rid of whitespace
2010-05-08 15:25:26 +00:00
eehouse
57fe0a6f06
RelativeLayout is broken on 1.5 devices, so add an alternative and use
...
it on 1.5. It might be good enough for the rest too....
2010-05-08 15:25:13 +00:00
eehouse
3632c27f04
comment out unused (until we have SMS) code
2010-05-08 15:24:45 +00:00
eehouse
7e9be7de11
nuke commented-out dup string
2010-05-08 15:24:26 +00:00
eehouse
f8d4b1fd34
fix NPE: scores array isn't always there
2010-05-08 15:24:13 +00:00
eehouse
b62fcfd5ce
improve hint text for Host; call remote players guests where context
...
is limited to host's view.
2010-05-06 12:47:58 +00:00
eehouse
73f441bea9
move user-visible literals into string resource; shame on me :-)
2010-05-06 12:47:46 +00:00
eehouse
2966939a5a
add margins and set text color so hint text matches rest of dialog
2010-05-06 12:47:30 +00:00
eehouse
5a42bd54f0
Add prompt to role spinner. Would really like to add hints to each
...
element but don't know how to do that yet.
2010-05-06 12:47:15 +00:00
eehouse
27222fe336
make it a RelativeLayout, and put dict on same line as state
2010-05-06 12:46:55 +00:00
eehouse
4dc69a762e
combine dict label and name in one View: I can't get 'em to layout
...
side-by-side when a third view's on the same line.
2010-05-06 12:46:43 +00:00
eehouse
03fedd6cbc
remove "State" from state string
2010-05-06 12:46:25 +00:00
eehouse
f03579dd14
break item info into four text areas that can now be positioned to
...
look better.
2010-05-05 04:12:23 +00:00
eehouse
84a98fab4d
get rid of carriage returns in strings formerly consed together in one
...
text field.
2010-05-05 04:12:02 +00:00
eehouse
2025e44aee
include scores with player names in printed summary
2010-05-05 04:11:50 +00:00
eehouse
8704e275d2
save scores array in summary db, converting to and from string. Still
...
need to display them.
2010-05-05 04:11:32 +00:00
eehouse
671461f4d4
extend getSummary() to include array of current scores; add util to set an object
...
field and remove dead code
2010-05-05 04:11:08 +00:00
eehouse
b6a89fd8c1
inherit from XWListAdapter and so get rid of one-line methods
2010-05-04 12:31:29 +00:00
eehouse
3c7d972d85
specify a layout rather than a simple TextView for game list items,
...
step 1 toward better looking list.
2010-05-04 12:31:14 +00:00
eehouse
e48caca6ac
make configure activity default theme like others after finding a
...
divider drawable that shows up.
2010-05-04 12:30:55 +00:00
eehouse
0e60013f59
remove SMS prefs setting
2010-05-04 12:30:39 +00:00
eehouse
964eedf887
get port from preference; don't hardcode
2010-05-01 02:50:25 +00:00
eehouse
fc21139d52
remove onFocusChanged: we won't need it
2010-05-01 02:50:04 +00:00
eehouse
34e6b07da2
use built-in list_selector_background to get appearance of list. Works!
2010-05-01 02:49:46 +00:00
eehouse
60f497d756
first success at showing focus. Just red for now; needs work.
2010-05-01 02:49:35 +00:00
eehouse
3e83f50c84
use strcasecmp rather than strcmp on cookies (room names) to make
...
rooms case insensitive.
2010-05-01 02:49:19 +00:00
eehouse
d143c47aa1
fill new GameSummary fields
2010-05-01 02:49:08 +00:00
eehouse
638ce53661
strings required by new game summary fields
2010-05-01 02:48:57 +00:00
eehouse
4ed87fecb4
add once-per-day date line to logs since they can span weeks now.
2010-05-01 02:48:47 +00:00
eehouse
5052c05390
add new columns to GameSummary db and use for better summary
2010-05-01 02:48:38 +00:00
eehouse
863ef90115
turn off SMS option
2010-05-01 02:48:16 +00:00
eehouse
72587eb023
remove SMS stuff. No point in confusing users before the feature can
...
work.
2010-05-01 02:47:56 +00:00
eehouse
e9f1bbd37d
param name change
2010-05-01 02:47:47 +00:00
eehouse
5a2335f64f
fix pending score (and timer, I suspect) being drawn at different
...
heights depending on what's been drawn before: pull descent out of
Paint after setting text height.
2010-05-01 02:47:37 +00:00
eehouse
276811069c
fix ghosting by tray divider by drawing it 1 pixel shorter at both
...
ends.
2010-05-01 02:47:22 +00:00
eehouse
62c4f7da2d
next release will be beta 3
2010-05-01 02:47:05 +00:00
eehouse
d5d1b04084
set Theme.Light on GameConfig activity again. It doesn't draw
...
correctly with the default (black) theme; in particular, the dividers
between players get a layout height of 0.
2010-04-25 18:13:49 +00:00
eehouse
6d71b7be02
add summaries to PreferenceScreens
2010-04-25 18:13:41 +00:00
eehouse
9d94f557e1
remove vertScrollBoard from java and stub it out in jni since
...
preformance is just as good without it.
2010-04-25 18:13:29 +00:00
eehouse
fa5d80e85f
make larger dict the builtin for a better initial experience, at least
...
for English speakers.
2010-04-25 03:39:24 +00:00
eehouse
6bc3408d8e
move resources not requiring localization, both strings and string
...
arrays, into new file. Remove arrays.xml since it's now empty.
2010-04-25 03:39:13 +00:00
eehouse
1dff9d6e33
up version to b2
2010-04-25 03:39:01 +00:00
eehouse
0b98bb518a
always do a clean build, meaning touching Android.mk before building
...
the jni and removing bin/ and gen/ before building the java code. I'm
doing this manually because anything less can produce a bad binary
(unless it's a clean checkout) so might as well automate it.
2010-04-25 03:38:50 +00:00
eehouse
23747f54ec
implement vertical scrolling on platform by copying one part of bitmap
...
over itself. It's not noticably faster than letting the common code
simply inval everything, probably because I have to make a copy of the
bitmap to serve as the source. But I want to check it in to have a
record.
2010-04-25 03:38:42 +00:00
eehouse
9ced0bb154
Give spinners string arrays as resources rather than via code; remove
...
headers from above spinners and instead include header info in text.
May want to revisit this latter change
2010-04-25 03:38:27 +00:00
eehouse
f2e62f74b5
no subcategory needed for prefs
2010-04-25 03:38:05 +00:00
eehouse
673495985f
better titles for activities
2010-04-25 03:37:52 +00:00
eehouse
ac2b1728a9
first use of a style, for section headings
2010-04-25 03:37:44 +00:00
eehouse
6e626b62cf
remove unused setting
2010-04-25 03:37:33 +00:00
eehouse
0c1e76acaf
use the default white-on-black style for prefs and game config. Not
...
sure why I made it different early on.
2010-04-25 03:37:23 +00:00
eehouse
a513743003
Fix NPE: test before sending obj a message
2010-04-25 03:37:15 +00:00
eehouse
541cfc9925
raise version to b1 and make it a constant so localized strings don't
...
have to change each time.
2010-04-24 15:14:46 +00:00
ehouse
377fc3c87a
Fix to compile and work with recent API changes. Still need to have
...
font caching in draw code work with the cellHt passed into
draw_boardBegin rather than each cell's height since the latter can
change now.
2010-04-24 03:56:50 +00:00
ehouse
71110a195d
for some reason on wince coords are passed to coordToCell() that are
...
above/left of the board firing an assertion. return false to indicate
not on board but don't assert.
2010-04-24 03:51:39 +00:00
eehouse
166c1ac779
make coordToCell() more inclusive to match pointOnSomething(), otherwise
...
the latter says a point is on the board and the former can't assign it
a row.
2010-04-23 09:35:15 +00:00
eehouse
04835a09e1
add missing params so compiles
2010-04-23 09:32:14 +00:00
eehouse
a219b4ae37
remove game config activity's menu. It was down to one item and that
...
(revert) isn't needed if the confirm logic is working.
2010-04-23 08:57:39 +00:00
eehouse
bf0fef5947
reverse comparison with nMoves used to decide if change save
...
confirmation needed. Was just plain backwards. Now e.g. change of
dict on in-progress game gets you reset confirmation dialog on exit.
2010-04-23 08:56:28 +00:00
eehouse
8ba15776d2
get rid of string for discard menu which is gone
2010-04-23 08:55:39 +00:00
eehouse
c82a412317
implement revert menuitem by just finish()ing without saving. Ideally
...
I guess I'd reopen the dialog but this is easier.
2010-04-23 08:54:53 +00:00
eehouse
f78ff6786a
replace menuitem to juggle players with button; place it and add
...
player button below player list; remove heading above phonies, adding
"phonies" to each spinner text; add "game settings" heading. Still
need to find a way to make the headings pop visually.
2010-04-23 08:54:04 +00:00
eehouse
ccd68bf3ef
make SharedPreferences a static ivar rather than look up each time
2010-04-23 08:52:50 +00:00
eehouse
4019c85caf
use new default board size pref in CurGameInfo constuctor
2010-04-23 08:51:44 +00:00
eehouse
8d13050917
add board size to list whose value is set as summary.
2010-04-23 08:50:26 +00:00
