Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
8899 commits 21 branches 243 tags 33 MiB
Commit graph

8819 commits

Author SHA1 Message Date
Eric House
d67245282b merge in a year's worth of changes 2015-07-25 08:45:28 -07:00
Eric House
48e019f216 upgrade crittercism jar 2015-07-25 08:44:46 -07:00
Eric House
e62993f60e ignore all the new files being copied over 2015-07-25 08:23:12 -07:00
Eric House
59ab1736ca include res_src in set of directories copied for -dbg variant 2015-07-25 08:21:44 -07:00
Eric House
1484a27daf add option to send/receive invite data in binary/common form (as relay invites do) 2015-07-24 22:37:41 -07:00
Eric House
ed8d2ba0f6 fix NPE and remove assertion: moving from anon to GCM-based relayID is 
common
 2015-07-24 06:39:39 -07:00
Eric House
3c2a56166c move static final to where it can be private 2015-07-24 06:10:26 -07:00
Eric House
04c263fe28 for testing relay switch, add optional override of hostname 2015-07-23 07:46:46 -07:00
Eric House
d4e5c9dfdf convert string to plurals and add some "one" items to others to allow 
removing [s]. There's more to do still.

Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
	xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
 2015-07-23 07:03:47 -07:00
Eric House
b48f83ace4 fix NPE on clean install 2015-07-22 07:56:34 -07:00
Eric House
1d5249f139 respect game dict and language in rematch! NOTE: this doesn't handle 
the case where players have different dicts.
 2015-07-22 07:32:36 -07:00
Eric House
f8acd68e09 remove unused constants 2015-07-22 07:31:26 -07:00
Eric House
4a4219bc9c rematch invitations are sent simultaneously on all known channels, so 
on recipient device check that we aren't trying to handle more than
one. The test is for duplicate inviteIDs, and won't catch them if
received other than close together, but the existing test against the
set of saved games (getRowIDsFor(gameID)) will catch that.
 2015-07-22 06:52:53 -07:00
Eric House
59f9dd51b8 remove mistaken test: relay's an option too and always supported 2015-07-22 06:50:05 -07:00
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