Eric House
0e7fcf7b51
ignore new obj dir
2012-01-03 18:27:15 -08:00
Eric House
de269f1e3d
up copyright for the new year
2012-01-03 06:20:23 -08:00
Eric House
a2c4114d0b
fix uninitialized variable error
2012-01-02 18:25:01 -08:00
Eric House
1b395b637b
use the full name
2012-01-02 18:17:29 -08:00
Eric House
6344db199a
go with target==7 for consistency.
2012-01-02 18:15:43 -08:00
Eric House
d0999d1944
update build scripts to use newer NDK.
2012-01-02 18:11:36 -08:00
eehouse@eehouse.org
aeb073d4b8
Merge branch 'send_in_background' into android_branch
2011-12-21 18:51:12 -08:00
Andy2
9879f96729
cleanup -- no code change
2011-12-21 18:50:55 -08:00
Andy2
2a34cd1e05
remove second param from server_do() -- it doesn't work anyway.
2011-12-21 18:45:05 -08:00
Andy2
75f79ee036
get 'svn' out of the version string variable
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2011-12-21 18:35:14 -08:00
Eric House
cb04eb8840
finally got the socket leak: use keepalive ioctl to detect sockets
...
whose other ends have gone down without closing properly.
2011-12-21 18:18:30 -08:00
eehouse@eehouse.org
d5d3ad2cb0
Merge branch 'android_branch' into send_in_background
2011-12-21 06:49:03 -08:00
Andy2
f475356c87
up strings for new release
2011-12-21 06:46:42 -08:00
eehouse@eehouse.org
aebe6c159d
Merge remote branch 'origin/send_in_background' into send_in_background
2011-12-20 17:35:17 -08:00
eehouse@eehouse.org
abd6727b10
Merge branch 'android_branch' into send_in_background
2011-12-20 17:34:26 -08:00
Andy2
0e487a4a42
When creating game in response to new-from menuitem, juggle players if
...
the juggle newgame preference is set.
2011-12-20 17:31:13 -08:00
Andy2
3e42c68091
add randomly-generated inviteID to set of params transmitted with an
...
invitation and stored in a summary. On receipe of an invitation, if
the room/inviteID exists just drop it -- don't even bring app to the
foreground. This is meant to stop people from getting lots of
games/warnings about dupes if they happen to trigger a refresh of the
negame.php page in their browsers.
2011-12-20 17:29:05 -08:00
Andy2
9023806b5f
cleanup: move instanceof/cast from use of vector elements to addition
...
of elements to save memory and time.
2011-12-20 17:24:38 -08:00
Andy2
f40174ea30
update to add new optional param -- invite ID
2011-12-20 17:14:21 -08:00
Andy2
6cc1a2d672
Add new column and up db version number.
2011-12-20 17:12:23 -08:00
Andy2
9a26ccf1c8
prevent long names from forcing linewrap
2011-12-20 17:10:41 -08:00
Eric House
559b6761ef
Merge branch 'android_branch' into send_in_background
2011-12-19 18:48:49 -08:00
Andy2
8eaeb9c2d0
reword SMS invite so URL isn't split across messages (which makes it
...
not recognized by recipient as a clickable URL).
2011-12-18 16:23:14 -08:00
Andy2
431a01ef0a
remove logging I didn't mean to check in
2011-12-18 15:55:54 -08:00
Andy2
d03fc77990
list changes for next release
2011-12-18 12:27:13 -08:00
Andy2
c2c2c7e766
NEW_TASK plus CLEAR_TOP is the magic combination -- says one set of
...
docs. Looks good so far.
2011-12-18 12:23:00 -08:00
Andy2
dd8da6d312
tweak wording
2011-12-18 12:22:06 -08:00
Andy2
a86ffa39ba
up strings for next beta
2011-12-16 20:59:40 -08:00
Andy2
0d6b5914b9
revert to standard launchMode to get proper from-Launcher behavior and
...
specify a pair of flags when background-launching GamesList that
strips any stack it has and doesn't launch a new instance. Seems to
fix the problems with launching from notifications and invite emails.
But then I've thought this fixed before.
2011-12-16 19:02:20 -08:00
eehouse@eehouse.org
14bddb0e45
Merge branch 'android_branch' into send_in_background
2011-12-15 18:46:24 -08:00
Eric House
888b4f6701
fix undeclared variable.
2011-12-15 18:45:22 -08:00
eehouse@eehouse.org
0cdc604649
Merge remote branch 'origin/android_branch' into android_branch
2011-12-15 18:44:10 -08:00
Eric House
166d8f8c03
log number of sockets tracked -- it's climbing on server and I need to
...
figure out why. This and listening for POLLRDHUP are a start (but not
sufficient).
2011-12-15 18:41:07 -08:00
Eric House
b04604595f
change assertion to log -- fails very infrequently which is probably to be expected.
2011-12-15 18:37:20 -08:00
Eric House
af7398ce20
fix undeclared variable.
2011-12-15 18:36:47 -08:00
Andy2
2ff4338797
Move more oft-used button. Thanks JB.
2011-12-15 18:33:10 -08:00
Eric House
02a85c5aa8
Merge remote branch 'origin/android_branch' into android_branch
2011-12-15 08:24:30 -08:00
Andy2
494652518a
comment out dead code (entire class)
2011-12-15 07:44:16 -08:00
Andy2
f504c3688c
reverse sense of test done on receiving invitation whether game
...
already exists. Unless I'm missing something I have it wrong.
2011-12-14 20:09:57 -08:00
Andy2
420661bf9f
put back the URL in parens. Not all email clients show the link otherwise.
2011-12-14 20:08:38 -08:00
Andy2
d6ce11b084
fix to compile with DEBUG off
2011-12-14 18:17:52 -08:00
Andy2
867d9d68b0
script to install onto multiple emulators
2011-12-14 18:17:37 -08:00
Andy2
5cd8694569
ignore dicts in main wince dir
2011-12-14 07:37:59 -08:00
Eric House
7e0de34caa
hide file debuild builds
2011-12-13 21:41:24 -08:00
Eric House
de59408cb0
Merge remote branch 'origin/android_branch' into android_branch
2011-12-13 21:34:58 -08:00
Eric House
1d0b554283
add debian/ files as generated by dh_make: no changes yet, so debuild
...
builds an empty .deb.
2011-12-13 18:57:19 -08:00
Andy2
0dfc1312ff
set up intents to limit choices in sending invites to SMS and email,
...
and recast choices offered users from text vs. html to SMS vs. email.
Revert recent change (88986b49d5
2011-12-13 17:24:21 -08:00
Andy2
e5294f2393
add to commented out code
2011-12-12 19:09:50 -08:00
Andy2
fa39db7fc6
comment out file not being used now
2011-12-12 19:01:04 -08:00
Andy2
f07e1c5ea1
use same email address for both ways you can send to me, and rfc822
...
instead of text type to prevent giving handler options that aren't
email clients.
2011-12-12 19:00:30 -08:00
