Eric House
38e37bfbb9
use gameID as inviteID when it's not provided. Originally it was a
...
relay-only thing, but it's associated with being not-standalone in
places and this seems like the easiest fix.
2014-11-21 08:02:18 -08:00
Eric House
67d41f34a3
remove loggin
2014-11-21 07:58:17 -08:00
Eric House
6c917f34ba
fix race-condition assert by dropping message. This needs a better fix.
2014-11-21 07:57:58 -08:00
Eric House
c3ca257a10
oops: new style
2014-11-20 19:13:15 -08:00
Eric House
d08a7f8d24
use a style for new game buttons
2014-11-20 19:12:56 -08:00
Eric House
8d021aa11e
trying to hide the buttons when they take too much space. Leaving
...
commented out for now
2014-11-20 19:11:22 -08:00
Eric House
301ce8bc3c
spelling error in comment :-)
2014-11-20 18:57:57 -08:00
Eric House
4b30d98bd0
fix to compile with DEBUG off
2014-11-20 07:16:37 -08:00
Eric House
fbea67e479
don't kill relay when bluetooth turned off: pass comms type into
...
comms_transportFailed()
2014-11-20 07:12:25 -08:00
Eric House
d3d83b3557
cleanup
2014-11-20 06:21:22 -08:00
Eric House
a35527ae88
need to copy in BT address too
2014-11-20 06:21:14 -08:00
Eric House
e236a32c20
forgot a mutex
2014-11-20 06:04:11 -08:00
Eric House
56121fdcd4
stop (or at least greatly reduce) leakage of thread->env mappings in
...
jni, mostly by having jnithread explicitly announce that it's closing.
Yuck. This stuff *should* obey a stacking protocol but the callback
stuff I'm doing makes me unsure that can work.
2014-11-19 21:42:21 -08:00
Eric House
a1bbbe3371
separate the new-game icons into two (as stubs)
2014-11-19 19:26:08 -08:00
Eric House
ae81404215
remove assert that was firing
2014-11-19 19:25:42 -08:00
Eric House
7977c8f799
cleanup
2014-11-19 19:19:12 -08:00
Eric House
1962371fe2
flesh out MultiMsgSink so that subclasses invoked e.g. in response to
...
BT traffic can send messages via other means as well. Relay games
with both participants on one device work again.
2014-11-19 18:46:35 -08:00
Eric House
f14a1c095f
print all conn types, not just the first
2014-11-17 07:06:56 -08:00
Eric House
11f7083eb6
remove dead classes and layouts; add menu to create networked games.
2014-11-15 20:42:09 -08:00
Eric House
64276b041e
echo so I know it's doing something
2014-11-15 20:37:22 -08:00
Eric House
2465017e46
add buttons that create new games, bypassing the NewGame activity for
...
a simpler experience.
2014-11-15 17:59:59 -08:00
Eric House
d848c17d03
use real strings rather than enum's toString() result in prefs UI
2014-11-14 07:53:12 -08:00
Eric House
e750811836
add relay and bt as default address types when there's no preference set
2014-11-14 07:32:27 -08:00
Eric House
76fe26a057
include the list of currently selected conn types as pref summary
2014-11-14 07:24:24 -08:00
Eric House
2e8f4097d9
remove unused widget
2014-11-14 07:23:54 -08:00
Eric House
15e380291b
snapshot: invite by BT now works well enough that moves can be
...
exchanged. Haven't checked whether the relay's also seeing traffic.
2014-11-14 07:12:03 -08:00
Eric House
1d1af9ffb3
fix some asserts: we have BT working now
2014-11-14 07:06:02 -08:00
Eric House
f625332782
add preference (dialog) to set default address types. Not used yet,
...
and still ugly.
2014-11-13 07:27:29 -08:00
Eric House
f2ecefd573
copy bt address info too
2014-11-13 07:27:03 -08:00
Eric House
74afdbd8b6
add more asserts
2014-11-12 06:52:58 -08:00
Eric House
c008f55133
add invite button only if I'm a host and am missing players
2014-11-12 06:52:40 -08:00
Eric House
0e2bbfc1ad
augment addresses even when message received is a duplicate. Now games
...
using (fake) SMS and relay work whichever of the address modes is
disabled during the game, on either side. At least for two-device
games.
2014-11-11 07:46:01 -08:00
Eric House
552ab8fa48
fix assertion (leaving the confusion in the code about tracking the
...
open relay socket)
2014-11-11 07:36:55 -08:00
Eric House
ba44863381
add simple tell() as wrapper on ask()
2014-11-11 07:35:56 -08:00
Eric House
10a960930c
collect number to be invited. (Not tested: whether a number other than 1 works)
2014-11-11 07:35:14 -08:00
Eric House
ba6151c385
remove param that causes assert to fire
2014-11-10 07:31:51 -08:00
Eric House
c704b7ff4f
remove dead code
2014-11-10 07:31:33 -08:00
Eric House
94cfaecfb1
replace overloaded method with diff-named one, avoiding call to wrong
...
one when compiled on old 32-bit Atom. 32-bit issue, or what? This is
quick and sure to fix it. Should be grafted back to main branch.
2014-11-08 23:07:34 -08:00
Eric House
c087824b47
snapshot with a bit of debugging added, mostly to tranfer to another machine
2014-11-07 20:26:02 -08:00
Eric House
786d775878
don't pass null address
2014-11-07 20:25:13 -08:00
Eric House
8e616095ad
add a bit more logging of channelNos
2014-11-06 20:28:51 -08:00
Eric House
70f4541bbe
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/common/comms.c
2014-11-06 20:09:20 -08:00
Eric House
a34a859d18
log channelNo more consistently
2014-11-06 18:44:19 -08:00
Eric House
540d3e9622
wire disabling checkboxes into comms. They work -- and show that
...
multi-addressing needs debugging still.
2014-11-06 06:35:28 -08:00
Eric House
b1de8663d6
fix to compile with DEBUG undefined
2014-11-06 06:32:00 -08:00
Eric House
2426e04a70
fix overwriting of address info so that, AFAICT, both address types
...
are successfully being used through much of a test game.
2014-11-05 21:57:25 -08:00
Eric House
3d9ee4b9f9
use app define, not relay's
2014-11-05 21:45:14 -08:00
Eric House
68e7f303b0
oops -- here's the relay md5sum logging. app side went in prior.
2014-11-05 21:42:45 -08:00
Eric House
c516e1f77c
add code to log md5 sums of udp packets sent and received. These match
...
relaycon logging to be added shortly.
2014-11-05 21:42:03 -08:00
Eric House
405b3eef93
remove dead/commented out code
2014-11-05 21:33:54 -08:00
