Eric House
dad39eedde
Remove devID from comms address. It's not needed yet, may never be,
...
and I don't want to store it until it is.
2015-07-22 06:16:29 -07:00
Eric House
9e533f82db
remove redundant constant
2015-07-21 06:55:43 -07:00
Eric House
190ce42b0e
when version check fails, log the version numbers
2015-07-17 07:42:54 -07:00
Eric House
d33681770f
log every packet send on debug builds
2015-07-17 07:42:37 -07:00
Eric House
c98a724611
add a bit of logging around transport sends
2015-07-17 07:41:55 -07:00
Eric House
a920ce455b
assert addressing problems earlier
2015-07-17 07:41:29 -07:00
Eric House
63441453ef
clear the net status rect for standalone games' boards to avoid ghost
...
button effect when they're opened after a networked game.
2015-07-17 06:27:01 -07:00
Eric House
ac34250bf3
use rowid for invitation notifications so they'll be replaced by
...
subsequent notifications for the same game and removed when the game's
opened.
2015-07-16 06:57:30 -07:00
Eric House
c9e8655eea
pass utilctxt when making new game in response to relay invitation so
...
the game can communicate. This lets the game reply and otherwise get
started the way BT- and SMS-invite-created ones do.
2015-07-16 06:46:39 -07:00
Eric House
9a7220554f
print DevID as part of status header for relay, DEBUG builds only
2015-07-15 07:24:40 -07:00
Eric House
440e85f3a5
use new DevID class instead of methods in XWPrefs, which are removed.
2015-07-15 07:18:54 -07:00
Eric House
23f803bb98
new class to track devIDs (GCM and relay-assigned) separate from prefs
...
so easier to debug and don't get reset.
2015-07-15 07:08:47 -07:00
Eric House
dfff282b25
add storage for ints and booleans separate from prefs so they don't get reset
2015-07-15 07:08:01 -07:00
Eric House
d77914d216
add debug option to allow device to send relay-invitation to
...
itself. When that's set, in inviter UI add a button that adds own
relayID to the list (gross!, but how that whole thing works is TBD),
and when receiving invitation don't drop it if there's already a game
with the same ID.
2015-07-12 20:49:53 -07:00
Eric House
03555f2f83
support relay inviting based on an explicit constant rather than
...
whether it's a debug build.
2015-07-11 17:54:34 -07:00
Eric House
a96afb2892
fix NPE rematching standalone games
2015-07-11 17:30:43 -07:00
Eric House
7ac5d2259d
add explanation for why rematch doesn't work for games with more than
...
two players. (The hard part is really more than two devices, but I bet
two players per device in networked games is rarest of all.)
2015-07-11 17:06:13 -07:00
Eric House
eebf27d051
fix warning
2015-07-11 16:25:01 -07:00
Eric House
5dc8291981
show a toast when hint can't find anything, on the principle that user
...
should see some response to every action.
2015-07-11 16:24:21 -07:00
Eric House
fb80032b38
funnel invitation notifications from all three channels into same
...
method: only difference between them is the body.
2015-07-11 15:47:35 -07:00
Eric House
d084ccec2b
provide non-empty default names for linux players
2015-07-11 15:16:32 -07:00
Eric House
d26ae4a1b0
always assign a random invite ID
2015-07-11 14:35:48 -07:00
Eric House
93d2ef959c
convert a bunch of logf to logdf, but also don't pass message sink
...
when creating game in response to relay invitation. Opening game in
background (so it can connect) makes it crash trying to use stuff it
failed to get because it has no Utils instance.
2015-07-11 14:35:00 -07:00
Eric House
351cb13184
turn on rematch feature
2015-07-11 14:33:04 -07:00
Eric House
0c5e230942
use comms_formatRelayID to get the opponent's relayID
2015-07-11 14:27:48 -07:00
Eric House
1eb82d5285
android doesn't send its devid in the nli struct, so don't assert it's
...
there.
2015-07-11 14:27:01 -07:00
Eric House
587f3b7630
export comms_formatRelayID via jni.
2015-07-11 14:25:16 -07:00
Eric House
d6651a0404
show relay DevID in debug section of prefs
2015-07-11 11:26:03 -07:00
Eric House
099337eb3a
add logdf, logging for DEBUG builds only
2015-07-11 10:52:00 -07:00
Eric House
8c72866b03
remove old compile-command
2015-07-11 10:27:02 -07:00
Eric House
1423bc933d
rename common file and methods for consistency with android. No logic
...
change.
2015-07-11 08:40:49 -07:00
Eric House
6800c2afe5
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-07-11 08:27:24 -07:00
Eric House
6851fd9746
include teaser from server, and launch an alert in-game instead of
...
having the notification display everything. I've committed this
before; not sure where it went.
2015-07-11 08:25:10 -07:00
Eric House
5e63d03e76
apparently I forgot to check this in
2015-07-11 08:23:22 -07:00
Eric House
384721d68d
Merge branch 'android_branch' of ssh://maidu2/home/eehouse/src/git/repos/xwords into android_branch
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-07-11 08:09:47 -07:00
Eric House
67f4e4475c
manual bring-over of relay changes for invite support
2015-07-11 08:08:22 -07:00
Eric House
ec393bc0c8
don't crash if intent is null
2015-07-11 07:53:22 -07:00
Relay User
9c7213e42b
Make it possible to launch relay early in machine boot cycle before
...
postgres is running (e.g. from a @reboot shortcut in a crontab) by
having it wait, sleeping periodically, until a connection is
available. Requires new flag be passed into main.
2015-07-11 07:04:24 -07:00
Relay User
8f863f0369
Make it possible to launch relay early in machine boot cycle before
...
postgres is running (e.g. from a @reboot shortcut in a crontab) by
having it wait, sleeping periodically, until a connection is
available. Requires new flag be passed into main.
2015-07-11 07:04:24 -07:00
Relay User
d605686fd6
add teaser to gcm message (matches android client change)
2015-07-11 07:04:24 -07:00
Eric House
dba86a657f
add and handle new INVITE message types. (This can safely be added to shipping relay.)
2015-07-10 23:25:06 -07:00
Eric House
b5ae54f313
use common/native NetLaunchInfo to implement invite-via-relay that
...
works between linux and Android clients. Required renaming so struct
names and names of fields within match in c and java code. The point
is to test this as the foundation of rematch: now you have to type in
a deviceID in order to invite, which clearly sucks for users. Either
that goes away, or it's replaced with something that scans existing
games and lists past opponents as possible invitees.
2015-07-10 23:19:38 -07:00
Eric House
29d8a67c36
Makefile for new wordlist
2015-07-08 20:41:13 -07:00
Eric House
1f3959fc71
fix rematch initiated by a guest: needs to be host in the game it
...
creates.
2015-07-06 21:18:51 -07:00
Eric House
08e6c2b358
use a static to remember last devid typed
2015-07-06 20:52:22 -07:00
Eric House
0f33228155
get rematch working on linux, at least for two-device games. (Handling
...
the case where one of several guests wants to rematch is a hard
problem for later.) Requires passing old-style relayIDs (connname plus
device index) when devIDs aren't available, which they may not always
be.
2015-07-06 20:28:16 -07:00
Eric House
fd06bca151
assert stream version being set consistently, not changed
2015-07-06 20:24:45 -07:00
Eric House
33d0db93e8
add some consts
2015-07-06 20:23:22 -07:00
Eric House
3a896df199
show game-over dialog (with its Rematch button) when a over game is
...
opened
2015-07-01 18:38:33 -07:00
Eric House
b451b936e7
fix assertion failure, probably due to some freak accident of missaved
...
timestamp. Whatever.
2015-07-01 07:18:44 -07:00