Eric House
3a657eb40d
Merge remote-tracking branch 'origin/android_branch' into android_branch
2012-02-15 18:09:45 -08:00
Eric House
8590aae9b2
fix emacs compile-commands
2012-02-15 18:07:19 -08:00
Eric House
914fa857be
return COMMS_CONN_NONE as address type of null comms rather than asserting.
2012-02-14 16:54:19 -08:00
Eric House
45f2134ab5
fix variant generation -- seems to work now. JNI was broken.
2012-02-13 23:35:41 -08:00
Eric House
e3ffbd57ba
add .gitignore files generated by script
2012-02-13 22:27:08 -08:00
Eric House
cf9ab45e6f
finish first pass at build variant generation. This works well enough
...
that the app so generated runs in emulator, talks to relay, and does
not crash. Makefile has rules for .java, .xml and .h that run through
sed to xw4 in import statements, package names etc so the variant app
is in a different namespace. Also honors any files in the variant
tree that are actually checked into git should it be necessary to make
changes beyond what sed can manage.
2012-02-13 22:25:27 -08:00
Eric House
8590466229
stop changing directiories/assuing where it'll be run from
2012-02-13 22:15:34 -08:00
Eric House
05c220cf40
launch NDK build from inside build.xml.
2012-02-13 22:15:12 -08:00
Eric House
82b232cf74
use a macro instead of lots of repetitions of the package path to make
...
it easier to modify.
2012-02-13 22:13:23 -08:00
Eric House
0f8ddadd69
make work from more than one directory
2012-02-12 21:23:50 -08:00
Eric House
f2b86b2a71
work-in-progress on scripts to generate a second app from the same source tree.
2012-02-12 21:22:36 -08:00
Eric House
bf5b6ada77
include public-room column
2012-02-07 18:59:17 -08:00
Eric House
49a3f1cad6
git-copied (using checkout) from android_bt
2012-02-07 06:20:51 -08:00
Eric House
e0ee197888
make relay check happen on demand, not many minutes later.
2012-02-06 21:35:11 -08:00
Eric House
c8d4090510
another change for b42
2012-02-06 19:26:56 -08:00
Eric House
d3bb7d490a
simplify cursor code
2012-02-06 18:12:28 -08:00
Eric House
bfe04a08b5
removed unneeded null-byte addition
2012-02-06 18:11:30 -08:00
Eric House
a2b5274b6c
on ICS CreateGlobalRef doesn't return the same value as is passed in.
...
So stop assuming it does! Fixes multiple crashes on ICS and need to
be ported to android_branch.
2012-02-05 19:12:09 -08:00
Eric House
6b600f4d9b
Merge remote branch 'origin/android_branch' into android_branch
2012-02-01 07:13:15 -08:00
Eric House
0b197bf12e
include DbgUtils to make debug changes easier. No code change.
2012-01-30 18:46:51 -08:00
Eric House
ad5b42121b
revert recently-added typo
2012-01-30 18:39:11 -08:00
Eric House
b4f9553579
install into devices too
2012-01-30 18:38:43 -08:00
Eric House
edaef7f0a4
add new column
2012-01-26 23:02:56 -08:00
Eric House
adf49dffd7
init/take down thread local storage in constructor/destructor rather
...
than as static initializer (and then leaking on shutdown.)
2012-01-26 05:48:10 -08:00
Eric House
866aeb2387
change relay connect message format to include client version (meaning
...
of which is TBD). When a new-version client connects, store the value
it's passed. At first this will let me track how quickly people
upgrade. Later I can use it to let different clients have different
formats to their messages e.g. to proxy.
2012-01-26 05:43:54 -08:00
Eric House
af26ebfff9
fix usage hint
2012-01-26 05:40:22 -08:00
Eric House
813e31ada8
fix crash by checking for null socket (meaning unable to open
...
connection to relay)
2012-01-25 18:09:26 -08:00
Eric House
adb5ce541d
add room name to subject of invite
2012-01-20 17:35:50 -08:00
Eric House
8a66cd4c1f
Address reports of crashes tapping wordlist button when device is
...
having trouble making initial relay connection for a game (which I
can't reproduce) by disabling that button when there isn't a current
player.
2012-01-17 18:58:45 -08:00
Eric House
00575c6d4e
Don't assert when don't have expected connType (likely as result of
...
race condition. Just don't show the type in summary. Likely fixes
once-seen assertion failure.
2012-01-17 18:48:33 -08:00
Eric House
7a90f71d41
up version strings
2012-01-17 18:23:26 -08:00
Eric House
07e93971d3
makefile for latest CSW
2012-01-17 18:19:57 -08:00
Eric House
4a52ad4d0c
cleanup: remove logging
2012-01-17 06:54:07 -08:00
Eric House
2a51f8d621
cleanup
2012-01-17 06:53:47 -08:00
Eric House
960dfc7825
draw alternating game lines in alternating colors
2012-01-16 12:13:35 -08:00
Eric House
edd1dd95dd
Merge remote branch 'origin/android_branch' into android_branch
2012-01-13 07:54:40 -08:00
Eric House
546ec8a3f4
get non-printing column out of cols array to be treated separately.
2012-01-13 07:54:11 -08:00
Eric House
2902b38405
Merge remote-tracking branch 'origin/android_branch' into android_branch
...
Conflicts:
xwords4/relay/scripts/showgames.php
2012-01-13 07:50:53 -08:00
Eric House
ca49078730
improve to print each game as multiple rows, one per device.
2012-01-12 19:17:38 -08:00
Eric House
8c52836f9d
php file to display state of relay's DB. This is the first and rough cut.
2012-01-12 06:30:30 -08:00
Eric House
bd35f8363f
cast enum to int inside switch to avoid new compiler error
2012-01-11 18:43:51 -08:00
Eric House
7de8a90df3
silence compiler warning.
2012-01-11 18:29:14 -08:00
Eric House
37b333001b
outline of php script to print contents of games DB
2012-01-05 20:25:34 -08:00
Eric House
db78b986c9
I've seen index OOB exceptions from lookup code, so assert at likely
...
entry point that null array isn't being passed. This should probably
not ship.
2012-01-05 17:19:58 -08:00
Eric House
1fc286ee95
show in collapsed summary if game is over
2012-01-05 17:18:07 -08:00
Eric House
1ae2879fb7
tweak logging
2012-01-04 18:35:21 -08:00
Eric House
5b9b531cb9
log one line before honoring logging-on preference.
2012-01-04 18:34:15 -08:00
Eric House
b8528145b3
explicitly store bool as int
2012-01-04 18:21:52 -08:00
Eric House
4a8a52a921
Merge remote branch 'origin/android_branch' into android_branch
2012-01-04 18:16:32 -08:00
Eric House
caa40fa023
store most recent IP address each device has come in on. Requires new
...
column in db. Not really used yet but interesting to watch....
2012-01-04 18:14:12 -08:00
Eric House
72dd8f6b6a
ignore debian build files
2012-01-04 18:11:29 -08:00
Eric House
32988413dd
cleanup: remove unneeded private constructor and make statics private
2012-01-04 06:26:17 -08:00
Eric House
814e4dd088
cut some logging
2012-01-03 18:53:58 -08:00
Eric House
8e62cf10c7
script to uninstall
2012-01-03 18:53:42 -08:00
Eric House
03e6db5107
remove logging
2012-01-03 18:27:25 -08:00
Eric House
0e7fcf7b51
ignore new obj dir
2012-01-03 18:27:15 -08:00
Eric House
de269f1e3d
up copyright for the new year
2012-01-03 06:20:23 -08:00
Eric House
a2c4114d0b
fix uninitialized variable error
2012-01-02 18:25:01 -08:00
Eric House
1b395b637b
use the full name
2012-01-02 18:17:29 -08:00
Eric House
6344db199a
go with target==7 for consistency.
2012-01-02 18:15:43 -08:00
Eric House
d0999d1944
update build scripts to use newer NDK.
2012-01-02 18:11:36 -08:00
Andy2
9879f96729
cleanup -- no code change
2011-12-21 18:50:55 -08:00
Andy2
2a34cd1e05
remove second param from server_do() -- it doesn't work anyway.
2011-12-21 18:45:05 -08:00
Eric House
cb04eb8840
finally got the socket leak: use keepalive ioctl to detect sockets
...
whose other ends have gone down without closing properly.
2011-12-21 18:18:30 -08:00
eehouse@eehouse.org
d5d3ad2cb0
Merge branch 'android_branch' into send_in_background
2011-12-21 06:49:03 -08:00
Andy2
f475356c87
up strings for new release
2011-12-21 06:46:42 -08:00
eehouse@eehouse.org
abd6727b10
Merge branch 'android_branch' into send_in_background
2011-12-20 17:34:26 -08:00
Andy2
0e487a4a42
When creating game in response to new-from menuitem, juggle players if
...
the juggle newgame preference is set.
2011-12-20 17:31:13 -08:00
Andy2
3e42c68091
add randomly-generated inviteID to set of params transmitted with an
...
invitation and stored in a summary. On receipe of an invitation, if
the room/inviteID exists just drop it -- don't even bring app to the
foreground. This is meant to stop people from getting lots of
games/warnings about dupes if they happen to trigger a refresh of the
negame.php page in their browsers.
2011-12-20 17:29:05 -08:00
Andy2
9023806b5f
cleanup: move instanceof/cast from use of vector elements to addition
...
of elements to save memory and time.
2011-12-20 17:24:38 -08:00
Andy2
f40174ea30
update to add new optional param -- invite ID
2011-12-20 17:14:21 -08:00
Andy2
6cc1a2d672
Add new column and up db version number.
2011-12-20 17:12:23 -08:00
Andy2
9a26ccf1c8
prevent long names from forcing linewrap
2011-12-20 17:10:41 -08:00
Andy2
8eaeb9c2d0
reword SMS invite so URL isn't split across messages (which makes it
...
not recognized by recipient as a clickable URL).
2011-12-18 16:23:14 -08:00
Andy2
431a01ef0a
remove logging I didn't mean to check in
2011-12-18 15:55:54 -08:00
Andy2
d03fc77990
list changes for next release
2011-12-18 12:27:13 -08:00
Andy2
c2c2c7e766
NEW_TASK plus CLEAR_TOP is the magic combination -- says one set of
...
docs. Looks good so far.
2011-12-18 12:23:00 -08:00
Andy2
dd8da6d312
tweak wording
2011-12-18 12:22:06 -08:00
Andy2
a86ffa39ba
up strings for next beta
2011-12-16 20:59:40 -08:00
Andy2
0d6b5914b9
revert to standard launchMode to get proper from-Launcher behavior and
...
specify a pair of flags when background-launching GamesList that
strips any stack it has and doesn't launch a new instance. Seems to
fix the problems with launching from notifications and invite emails.
But then I've thought this fixed before.
2011-12-16 19:02:20 -08:00
eehouse@eehouse.org
14bddb0e45
Merge branch 'android_branch' into send_in_background
2011-12-15 18:46:24 -08:00
Eric House
888b4f6701
fix undeclared variable.
2011-12-15 18:45:22 -08:00
Eric House
166d8f8c03
log number of sockets tracked -- it's climbing on server and I need to
...
figure out why. This and listening for POLLRDHUP are a start (but not
sufficient).
2011-12-15 18:41:07 -08:00
Eric House
b04604595f
change assertion to log -- fails very infrequently which is probably to be expected.
2011-12-15 18:37:20 -08:00
Eric House
af7398ce20
fix undeclared variable.
2011-12-15 18:36:47 -08:00
Andy2
2ff4338797
Move more oft-used button. Thanks JB.
2011-12-15 18:33:10 -08:00
Andy2
494652518a
comment out dead code (entire class)
2011-12-15 07:44:16 -08:00
Andy2
f504c3688c
reverse sense of test done on receiving invitation whether game
...
already exists. Unless I'm missing something I have it wrong.
2011-12-14 20:09:57 -08:00
Andy2
420661bf9f
put back the URL in parens. Not all email clients show the link otherwise.
2011-12-14 20:08:38 -08:00
Andy2
d6ce11b084
fix to compile with DEBUG off
2011-12-14 18:17:52 -08:00
Andy2
867d9d68b0
script to install onto multiple emulators
2011-12-14 18:17:37 -08:00
Andy2
5cd8694569
ignore dicts in main wince dir
2011-12-14 07:37:59 -08:00
Eric House
de59408cb0
Merge remote branch 'origin/android_branch' into android_branch
2011-12-13 21:34:58 -08:00
Eric House
1d0b554283
add debian/ files as generated by dh_make: no changes yet, so debuild
...
builds an empty .deb.
2011-12-13 18:57:19 -08:00
Andy2
0dfc1312ff
set up intents to limit choices in sending invites to SMS and email,
...
and recast choices offered users from text vs. html to SMS vs. email.
Revert recent change (88986b49d5
2011-12-13 17:24:21 -08:00
Andy2
e5294f2393
add to commented out code
2011-12-12 19:09:50 -08:00
Andy2
fa39db7fc6
comment out file not being used now
2011-12-12 19:01:04 -08:00
Andy2
f07e1c5ea1
use same email address for both ways you can send to me, and rfc822
...
instead of text type to prevent giving handler options that aren't
email clients.
2011-12-12 19:00:30 -08:00
Andy2
fe98d4983c
fix to compile for win32 with new APIs and to some extent to run
...
(under WINE only). Randomness is pretty screwed up -- typical initial
tray is all As.
2011-12-12 18:53:40 -08:00
Andy2
3b13f047d7
fix to accept new dict format with 4-byte header
2011-12-12 18:51:49 -08:00
