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

3270 commits

Author SHA1 Message Date
Eric House
3635abb17d changes in players matter for local games too 2015-12-21 18:22:04 -08:00
Eric House
ea4e437e94 fix, by inspection, NPE reported through the Play Store. 2015-12-21 18:21:59 -08:00
Eric House
3da798f437 required by prev commit: follow api change to work around marshmallow 
address change.
 2015-12-21 18:00:41 -08:00
Eric House
f78cd0f656 fix another source of bad/marshmallow addresses, and add asserts to 
catch any others.
 2015-12-21 18:00:25 -08:00
Eric House
162ab11f12 fix, at least for most cases, Marshmallow change that doesn't let an 
app know the BT/Mac addr of its own interface. The new bogus addr is
transmitted in common/ structs, and so sending code need to look up by
name when told to use that address.
 2015-12-21 18:00:06 -08:00
Eric House
8e4867eccd add some logging about network state 2015-12-21 17:04:40 -08:00
Eric House
6677a3e402 launch networked rematch games on creation, not just local ones 2015-12-21 16:42:54 -08:00
Eric House
f7df11b923 required by prev commit: follow api change to work around marshmallow 
address change.
 2015-12-21 16:27:11 -08:00
Eric House
7805900c07 fix another source of bad/marshmallow addresses, and add asserts to 
catch any others.
 2015-12-21 16:26:30 -08:00
Eric House
79e1473bf6 fix, at least for most cases, Marshmallow change that doesn't let an 
app know the BT/Mac addr of its own interface. The new bogus addr is
transmitted in common/ structs, and so sending code need to look up by
name when told to use that address.
 2015-12-21 15:56:52 -08:00
Eric House
536d220ba7 remove some logging 2015-12-21 15:42:57 -08:00
Eric House
57ba6ab693 remove org.apache.http (as SDK 23 prefers) 2015-12-13 12:17:33 -08:00
Eric House
87c6b3e0fe use an enum for startActivityForResult requestCode to ensure they're 
unique across the app.
 2015-12-09 06:10:09 -08:00
Eric House
9d42d76ae0 collapse a couple of list-specific classes into their superclasses. 2015-11-24 08:15:27 -08:00
Eric House
87edd09ab6 Cleanup: get rid of ListActivity. Eventually all Activities need to 
inherit from FragmentActivity since there's no List-aware equivalent,
so XWListActivity now extends XWActivity and nearly all its methods go
away. getListView() and friends are all I needed to implement --
apparently.
 2015-11-24 08:01:16 -08:00
Eric House
97f24973e4 Rather than ask player for name on app install, ask every time he 
creates a new game (but with a don't-ask-again check to avoid
annoying.) Make changes to DlgDelegate to support.
 2015-11-23 07:51:31 -08:00
Eric House
8626fdf027 refactor: move inline tests for being on emulator into a static method 2015-11-17 07:19:37 -08:00
Eric House
6f1235492d disable local-game reminders by default 2015-10-29 07:31:21 -07:00
Eric House
2f579832b4 trivial refactor 2015-10-29 07:02:18 -07:00
Eric House
77315b50ba changes in players matter for local games too 2015-10-29 07:01:01 -07:00
Eric House
67fb55ccf2 Clear thumbnail when saving changes. Not sure this is the best place 
to do it, but it fixes the problem I'm after.
 2015-10-29 07:00:22 -07:00
Eric House
83baa5a00c don't allow removing players when game is locked 2015-10-29 06:31:32 -07:00
Eric House
3b6a0cda74 Don't keep game locked the whole time config activity is open: lock to 
load, then again if needed to save.
 2015-10-27 19:18:10 -07:00
Eric House
a2a073067c fix assertion due to lock conflict between game config and context 
menu updating by having updating not insist on getting the lock.
 2015-10-27 07:32:18 -07:00
Eric House
59d01dc6a2 cleanup debug stack printing 2015-10-27 07:26:06 -07:00
Eric House
564b682e64 fix to correctly show stack of lock owner (in debug mode) 2015-10-27 07:25:42 -07:00
Eric House
4e7b2dc727 implement rematch menu: create a new game that will invite when opened 2015-10-27 06:22:52 -07:00
Eric House
ddc9c5f920 beginning of rematch menu: enabled correctly, but not yet handled 2015-10-23 05:41:20 -07:00
Eric House
2c558ab905 Turn off relay invite. I want to get a release out before I'm like to 
resolve all issues.
 2015-10-22 06:30:19 -07:00
Eric House
058be41265 change file name 2015-10-22 06:18:47 -07:00
Eric House
f29d302f06 implement context menus for group items too, and add select/deselect 
items for both -- for groups because there's no other way to select
now. Still not sure how to educate users about the change or to
provide a choice (if it's worth doing).
 2015-10-21 06:31:09 -07:00
Eric House
6aa994e2c6 first cut at putting back context menus. For games only (not groups), 
and done by duplicating the .xml file. TODO: support groups, unify
menu .xml files, and have a user preference controlling whether
context menus are available or at least a newbie info explaining the
change.
 2015-10-20 06:21:43 -07:00
Eric House
1da2dd5330 snapshot of effort to add listing of previous opponent devices to be 
invited. So far it creates the list of devices ok, and inviting from
it works, but they're not yet named, and the list isn't persisted.
 2015-10-15 06:44:10 -07:00
Eric House
27312f7853 add comment 2015-10-15 06:32:47 -07:00
Eric House
590ae6bd8c fix test to hide menu when it'll otherwise cause an array 
out-of-bounds exception. Thanks Aidan.
 2015-10-07 08:06:26 -07:00
Eric House
4c1786e65b remove unused imports 2015-09-30 06:54:07 -07:00
Eric House
87517edd6f fix counting of messages sent by "Resend messages" menuitem: actually 
count them, and do so based on new msgNo passed from comms that's
concatenation of channelNo and msgID so that duplicates (over multiple
transports) aren't counted twice.
 2015-09-30 06:50:04 -07:00
Eric House
f363fadf39 fix, by inspection, NPE reported through the Play Store. 2015-09-28 06:46:37 -07:00
Eric House
e9059cba47 provide default rematch game name that makes sense on both devices 2015-09-24 20:26:43 -07:00
Eric House
8a3bc943c8 give user a chance to name game during rematch of solo games too 2015-09-24 06:51:55 -07:00
Eric House
5e3ae54e2e cleanup 2015-09-24 06:50:26 -07:00
Eric House
37094b72f3 fix crash, and clean up rematch game naming code. Deals with solo 
games too though not used.
 2015-09-23 19:11:43 -07:00
Eric House
7783021fd7 give player a chance to name rematch game, and provide default that 
includes opponent's name
 2015-09-23 07:53:49 -07:00
Eric House
b73b29fcca log what's sent too -- for debugging update process 2015-09-22 20:39:37 -07:00
Eric House
8a2ca8195e log bad json data 2015-09-22 20:23:08 -07:00
Eric House
bfce38c088 use a hash map instead of a bunch of str-compares. 2015-09-22 20:18:27 -07:00
Eric House
b3a93cc474 Make separate turn reminder disable prefs for solo and networked 
games, as some folks playing against the robot don't need to be
reminded. From a feature request submitted via sourceforge.
 2015-09-22 07:35:02 -07:00
Eric House
3040d7f487 use new protocol for next release 2015-09-17 07:06:59 -07:00
Eric House
122335c53c 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-09-17 07:00:04 -07:00
Eric House
db1f569430 in chat window, don't show send menu item unless text is non-empty 2015-09-17 06:59:02 -07:00
Eric House
5d59bcd011 Revert to old proto since the version that's out there now won't work 
with the new. Can switch once this version's distributed.
 2015-09-16 06:42:01 -07:00
Eric House
be44613773 Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-08-27 07:53:14 -07:00
Eric House
53025f8a99 clean up plurals, adding quantity="one" elements in a few places where 
they make sense, collapsing a plurals to a string where that made
sense (there will probably never be a one-word wordlist), and removing
an unused plurals.
 2015-08-27 07:42:16 -07:00
Eric House
db7aa3923b 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-08-26 07:09:56 -07:00
Eric House
83d3163f0e rename variable 2015-08-25 22:19:00 -07:00
Eric House
c81f035133 Merge branch 'android_branch' into relay_noconn 2015-08-25 06:40:42 -07:00
Eric House
26114f83a6 fix chat view not being opened if move had arrived after chat by 
removing unneeded variable whose presence was clearing flags.
 2015-08-25 06:38:14 -07:00
Eric House
b79836c61b Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
 2015-08-24 07:52:46 -07:00
Eric House
5fd477be75 use existing string -- Copy to clipboard 2015-08-23 21:52:07 -07:00
Eric House
98bd41bc14 experimental option that puts invite url text into clipboard so user 
can invite using app of her choice.

Conflicts:
	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/DlgDelegate.java
 2015-08-23 21:44:45 -07:00
Eric House
79ab1214e7 replace send button with menuitem, and add icons for it and clear 2015-08-20 07:38:09 -07:00
Eric House
6b455bf743 make chat compose space multi-line; scroll chat history to bottom on 
open
 2015-08-20 07:37:51 -07:00
Eric House
07e97107ce confirm before deleting chat history 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2015-08-20 07:37:30 -07:00
Eric House
d08e82220d replace send button with menuitem, and add icons for it and clear 2015-08-20 07:35:01 -07:00
Eric House
ec6b7207b4 make chat compose space multi-line; scroll chat history to bottom on 
open
 2015-08-20 07:15:20 -07:00
Eric House
f4b39287a5 confirm before deleting chat history 2015-08-20 07:03:21 -07:00
Eric House
e5cf0ee4fb 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-08-19 07:44:17 -07:00
Eric House
a11e5beded goes with prev commit 2015-08-18 06:41:57 -07:00
Eric House
ff3d587179 really only post messages sent toast when user chose the menuitem 2015-08-18 06:41:34 -07:00
Eric House
aee4d9d6a4 goes with prev commit 2015-08-18 06:40:50 -07:00
Eric House
1703a15aca really only post messages sent toast when user chose the menuitem 2015-08-18 06:40:31 -07:00
Eric House
0d8fef5c56 cleanup 2015-08-17 08:01:36 -07:00
Eric House
f5e645f62a 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-08-17 06:41:58 -07:00
Eric House
55d67f7599 don't show toast after message send unless user-triggered 2015-08-17 06:34:58 -07:00
Eric House
389a09ac1a Merge branch 'android_branch' into relay_noconn 
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
 2015-08-13 07:30:55 -07:00
Eric House
34c70825b9 toward figuring out why relay communication stalls: log network 
availability state changes.
 2015-08-13 07:06:12 -07:00
Eric House
3a32d3a17b return count of messages sent from comms_resendAll(), and post it as a 
toast so user sees something happened.
 2015-08-13 07:05:06 -07:00
Eric House
47954f82d0 add index of sending player to chat transmission, and on receiving 
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-08-12 07:43:20 -07:00
Eric House
8f7267b3ec add index of sending player to chat transmission, and on receiving 
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
 2015-08-12 07:36:36 -07:00
Eric House
4e1a382f1e Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2015-08-11 07:42:05 -07:00
Eric House
be9b8977e5 turn off email invite attachments 2015-08-11 07:30:34 -07:00
Eric House
4a28da1348 Show specific notification on receipt of chat, not rehash of last move 
played.

Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
 2015-08-11 06:50:16 -07:00
Eric House
5853b0c5c6 Show specific notification on receipt of chat, not rehash of last move 
played.
 2015-08-11 06:47:10 -07:00
Eric House
c99decaf32 experimental option that puts invite url text into clipboard so user 
can invite using app of her choice.
 2015-08-07 07:55:26 -07:00
Eric House
ec581d1dbd Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/jni/xwjni.c
	xwords4/android/XWords4/res/values/common_rsrc.xml
 2015-08-04 20:17:56 -07:00
Eric House
a45b698ea9 don't crash when first run without network connection 2015-08-03 05:25:35 -07:00
Eric House
cfa101350a add logdf, logging for DEBUG builds only 2015-08-03 05:06:38 -07:00
Eric House
97bf616db1 Problem: NBS port is being ignored by dispatcher to broadcast 
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
 2015-08-03 04:58:46 -07:00
Eric House
a5f332dd1d different logging TAG for different variants 2015-08-03 04:57:35 -07:00
Eric House
1959ff3b2d fix NPE reported by crittercism 2015-08-03 04:54:42 -07:00
Eric House
a26e642c8e Problem: NBS port is being ignored by dispatcher to broadcast 
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
 2015-08-02 14:35:05 -07:00
Eric House
af8c6d618d different logging TAG for different variants 2015-08-02 10:29:17 -07:00
Eric House
8aef67dba4 fix NPE reported by crittercism 2015-08-01 22:17:13 -07:00
Eric House
36adf7f86c get rid of About menuitem in board -- in main view is enough 2015-07-31 07:14:04 -07:00
Eric House
d9bc713b7b get rid of About menuitem in board -- in main view is enough 2015-07-31 07:12:27 -07:00
Eric House
f45cafad29 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-31 07:05:39 -07:00
Eric House
4a580eabda handle maintenance messages from relay 2015-07-31 06:36:35 -07:00
Eric House
2dc536dfeb change button text to Wait (per Kati) 2015-07-30 06:36:47 -07:00
Eric House
8acba7e092 add only phones and computers to list of possible BT opponent devices 2015-07-29 06:39:03 -07:00
Eric House
6b5596590e catch NumberFormatException: strings come from users (if this feature 
ships) so this can happen.
 2015-07-28 21:10:40 -07:00
Eric House
f6aa4e6d3c 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-28 06:28:01 -07:00
Eric House
2ec2972b9b invalidate menubar when minimizing group. (Thanks Aidan.) 2015-07-28 06:26:25 -07:00
Eric House
037cc73f3e add rematch menu item shown whenever the game's finished (but not 
shown for games with > 2 players.
 2015-07-27 06:26:28 -07:00
Eric House
0bb51e8b93 show a toast when hint can't find anything, on the principle that user 
should see some response to every action.

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-07-26 12:09:15 -07:00
Eric House
3ea8102e1e Revert "add app package name to params to update check script (info.py) which" 
This reverts part of commit 3579256ef9.
 2015-07-25 22:10:53 -07:00
Eric House
3579256ef9 add app package name to params to update check script (info.py) which 
can then decide what variant to look for.
 2015-07-25 09:10:16 -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
fa00eef151 convert string to plurals and add some "one" items to others to allow 
removing [s]. There's more to do still.
 2015-07-23 06:57:37 -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
f626d6ca4c remove redundant constant 2015-07-21 06:55:15 -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
c796e7d4cc 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:10:08 -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
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
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
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
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
ec393bc0c8 don't crash if intent is null 2015-07-11 07:53:22 -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
b451b936e7 fix assertion failure, probably due to some freak accident of missaved 
timestamp. Whatever.
 2015-07-01 07:18:44 -07:00
Eric House
fe25060255 fix assertion failure, probably due to some freak accident of missaved 
timestamp. Whatever.
 2015-07-01 05:52:02 -07:00
Eric House
d426db7a49 move httppost stuff into NetUtils 2015-06-26 06:37:34 -07:00
Eric House
e60a16be1e add onPrepareDialog, without which we crash turning on SMS from 
prefs. Note: I've committed this before and somehow lost it, so there
may be some git anomolies here.
 2015-06-26 06:13:11 -07:00
Eric House
63aae3d4e8 add newbie hints to checkboxes enabling communication types (bt, sms, 
etc.)
 2015-06-25 06:38:40 -07:00
Eric House
4f53ccd5db cleanup; log dropped messages on DEBUG builds 2015-06-24 07:48:25 -07:00
Eric House
fd765c6cb0 turn invite-by-sms on 2015-06-24 07:46:48 -07:00
Eric House
b8193d635d SMS-enable alert: Add cancel button, and disable OK button until user 
selects an enabling option
 2015-06-23 08:11:18 -07:00
Eric House
8354f45548 deal with case where invitation includes only conntypes not supported 
on device, e.g. sms-only sent to a tablet. Strip the unsupported types
when creating the game, and then on game open suggest to user he
delete (with explanation)
 2015-06-19 07:51:51 -07:00
Eric House
d27fdbd748 It's now possible for a game to have no address modes, so don't assert 
otherwise.
 2015-06-19 07:45:47 -07:00
Eric House
d89c0d2847 on receipt of invitation, remove address modes the device doesn't 
support.
 2015-06-18 08:48:03 -07:00
Eric House
f93f0cd926 Yet another attempt to deal with bad connectivity: when can't connect 
to relay but other address modes are present, offer to remove the
relay from the game, and if that choice is taken confirm with an
explanation of the limits of what remains.
 2015-06-18 08:14:33 -07:00
Eric House
9d25b0cb65 test for language, not full locale, in deciding to show English-only 
release note
 2015-06-16 07:27:01 -07:00
Eric House
d4bfaca127 cleanup: mostly removing logging and wrapping rematch code in an 
if(false) so it goes away.
 2015-06-14 22:39:47 -07:00
Eric House
4b6ea57e70 revert earlier change not running update check timer on DEBUG builds 
since they're now upgradable too.
 2015-06-14 22:34:58 -07:00
Eric House
9a46d0713a don't post notifications for "moves" about which there's nothing to be 
said. I think these are admin messages, e.g. "The move you reported is
legal", that are not of interest to users.
 2015-06-14 07:39:10 -07:00
Eric House
7190706eaf when game doesn't have connection to relay but has another way to 
connect, give user the option of inviting "anyway", but warn that
there will be no relay connection used in that game. And then remove
the relay addressing from the invitation info.
 2015-06-13 07:35:02 -07:00
Eric House
82e0de6c40 test for BT being on, not airplane mode, to fix showing as disabled in 
airplane mode when BT's been enabled manually.
 2015-06-12 07:52:27 -07:00
Eric House
b000564278 show connection status as green/connected if ANY of the connection 
types has succeeded more recently than it's failed.
 2015-06-11 07:26:36 -07:00
Eric House
9e92af7c1f put dbg field in app object, not its parent 2015-06-09 06:39:46 -07:00
Eric House
f296ab4dc3 add additional warning about failure to connect when user's on WiFi, 
since paranoid WiFi settings are probably a leading cause of my not
being able to connect.
 2015-06-08 07:36:47 -07:00
Eric House
7eb6c17623 Restart service on socket exception. This gives the service a chance 
to reconnect when the network connection changes (e.g. user switches
from wifi connection to cellular). The packet is still dropped, so a
lower level will need to send it again. Eventually the relay needs to
keep a queue of un-acked packets, or track stuff needing resending the
way BTService does.
 2015-06-08 06:46:51 -07:00
Eric House
faba6c856f enable check-for-updated menu even on DEBUG builds (though the server 
doesn't respond with anything yet)
 2015-06-08 06:31:36 -07:00
Eric House
f4f9d11c3b remove logging 2015-06-07 14:27:16 -07:00
Eric House
9cdd9f4419 add loggin 2015-06-07 13:44:24 -07:00
Eric House
6379df0cdf add to upgrade state info whether build is debug or release 2015-06-07 13:44:07 -07:00
Eric House
d0d81483e3 When relay-configured game is opened that hasn't yet managed to 
connect to relay, instead of suggesting user invite another player
warn him/her that it's unconnected and suggest opening again
later. The problem this addresses is that a game must be opened to
make the initial relay connection, and that doesn't happen in the
background. This is a temporary fix that should prevent sending
invitations to games that the relay doesn't yet know about.
 2015-06-05 22:12:08 -07:00
Eric House
766a814019 make dismissDialog() catch and ignore exception raised when the dailog 
wasn't up.
 2015-06-05 22:03:59 -07:00
Eric House
0107f7d16b capitalize wordlist entries 2015-06-05 06:29:10 -07:00
Eric House
6bfb20d2f0 feature request: show toast after writing to DB so user knows 
something was done
 2015-06-05 06:20:43 -07:00
Eric House
b661e59ae2 Use debug settings' language code in deciding whether to look for a 
wordlist to download, and don't crash when it's a bogus value.
 2015-06-04 07:06:06 -07:00
Eric House
276666dd1a add progress to initial fetch of dict info from server for non-English 
devices
 2015-06-03 07:50:38 -07:00
Eric House
23e6f97778 allow games to load in parallel, and when another async task is 
running. This is fairly high-risk -- Google runs one AsyncTask at a
time because people get themselves in trouble otherwise -- but without
it the games don't load until the initial dict-fetch task finishes.
 2015-06-03 07:49:52 -07:00
Eric House
22add3fefd remove logging 2015-06-03 07:48:01 -07:00
Eric House
01d9dcc371 remove logging 2015-06-03 07:45:11 -07:00
Eric House
39298931d2 revert calling finish() to avoid there being two activity instances, 
as it leads to there often being none.
 2015-06-03 06:27:09 -07:00
Eric House
74c13fa2cf fix (I hope) crash: don't show alert on activity that's finishing 2015-06-03 06:16:01 -07:00
Eric House
802ec24023 Sometimes Android launches a second GamesList activity. Detect that, 
and get out.
 2015-06-02 07:43:07 -07:00
Eric House
7a1b9701c5 use local instead of ivar 2015-06-01 07:23:08 -07:00
Eric House
9922a8fdd1 log 'this' (no impact unless LOG_LIFECYLE is true) 2015-05-31 19:44:14 -07:00
Eric House
fcb2791f39 Revert "don't capitalize language in games list item context" 
This reverts commit 101da00761.
 2015-05-29 20:51:18 -07:00
Eric House
59368e6c95 keep UDP connection alive for one day after last packet received, not 
a week. The algorithm needs revisiting, but this is low-risk enough to
do now.
 2015-05-27 07:24:51 -07:00
Eric House
dd24f86eb8 use android's build-in OK and Cancel strings 2015-05-27 07:05:59 -07:00
Eric House
101da00761 don't capitalize language in games list item context 2015-05-25 18:22:31 -07:00
Eric House
282e66e54e deal with case where board is opened on a game that no longer exists, 
which I think can happen when a move arrives for a game after it's
been deleted. (This is to fix a crash I couldn't duplicate, so there's
some conjecture involved.)
 2015-05-24 20:43:50 -07:00
Eric House
1630389391 find and fix a few more places where language name needed translation 
or to be capitalized.
 2015-05-22 22:55:30 -07:00
Eric House
52269e6675 capitalize language names in stand-alone context, which I think French 
wants. I hope other languages do too.
 2015-05-22 22:18:34 -07:00
Eric House
3dc555d719 deal with case where dict that's set as default for new games is 
delete, possibly making the language no longer represented. Before
setting up prefs, check for the dict and language, and revert to
English if not found.
 2015-05-22 22:06:20 -07:00
Eric House
e97e9c4a2d translate language name 2015-05-22 21:46:43 -07:00
Eric House
ea68ea015e force wordlists and language to match when newgame default list 
changed from wordlist browser.
 2015-05-21 07:09:54 -07:00
Eric House
e9c40e5a75 change method name 2015-05-21 07:09:54 -07:00
Eric House
1e5f08c740 reclaim net status icon's space for standalone games 2015-05-21 07:09:54 -07:00
Eric House
ac2d46d109 Don't show network status icon, nor respond to taps, for standalone 
games.
 2015-05-21 07:09:54 -07:00
Eric House
f08c0c8b5e Sanity check NBS message header values to stop the occasional bogus 
source-unknown incomming.
 2015-05-21 07:09:54 -07:00
Eric House
ef28886bc8 turn off the green top and bottom of the network status icon for solo games 2015-05-15 07:50:10 -07:00
Eric House
563d447d5e remove menuitem to launch dicts browser (and clean up a bit) 2015-05-15 07:36:48 -07:00
Eric House
a4ce83f9cf don't pop up dict picker menu in response to dict button if there's 
only one for the game's language; open the browser instead.
 2015-05-15 07:29:37 -07:00
Eric House
fe472e0e9a fix use of InputStream, whose available() method can't be relied upon. 2015-05-15 07:07:39 -07:00
Eric House
e66260950e change final score formatting so it can be properly localized. 
Note: because the substitution is done in common code I can't use the
positional specifiers (%1$s vs %s) and so this breaks the generated
"translations". The scripts that do the generation need to be fixed to
understand the formatted="false" attribute.
 2015-05-13 07:51:32 -07:00
Eric House
520611399b in popup from dict icon in game toolbar, show only those wordlists in 
same language as game, and show "wordlist browser" item last rather
than first.
 2015-05-13 06:56:23 -07:00
Eric House
60509f7c8b set check-relay timer when saving a game with a relay connection 2015-05-13 06:26:46 -07:00
Eric House
38b958751c Make timer to check relay for messages non-repeating, and don't 
[re]set it when there are no networked games on the device. I didn't
add a change to explicitly set it when creating the first networked
game, but that doesn't seem to be necessary.
 2015-05-05 07:47:10 -07:00
Eric House
4c76cc09cf fix another place where language name needed translation 2015-04-06 06:59:33 -07:00
Eric House
b2894d4857 fix (via patch from translator) case where langauge name needed 
translation
 2015-04-06 06:59:15 -07:00
Eric House
6a74cdba44 make description of human and robot wordlists in prefs localizable 2015-04-02 06:47:35 -07:00
Eric House
27dde57660 add xlateLang() to delegate base class 2015-04-02 06:22:34 -07:00
Eric House
6d39a0fdca translate language being offered to download 2015-04-02 06:19:37 -07:00
Eric House
3a460fa58d use localized language names in prefs 2015-04-01 21:53:51 -07:00
Eric House
34f1d4aeeb fix some confusion between language name used as key (unlocalized 
value that should have been the iso standard two-letter code) and
localized language name, including subclass of ArrayAdapter that keeps
a hash from visible/localized language and the corresponding code.
 2015-04-01 07:45:04 -07:00
Eric House
827b24b0ee add capitalize() 2015-04-01 06:57:52 -07:00
Eric House
f48ed0cd9c don't show both on-first-launch alerts at the same time 2015-04-01 06:45:18 -07:00
Eric House
be7effa65b cleanup 2015-03-31 06:53:07 -07:00
Eric House
c330b53d89 add a "do not show again" checkbox to confirmThen alerts, and use it 
to offer that option to the alert asking if you want to download the
wordlist for your phone's language.
 2015-03-30 19:23:12 -07:00
Eric House
be017747b3 don't keep trying to download wordlist when there isn't one 2015-03-30 08:27:44 -07:00
Eric House
789c9c20a0 fix mistaken commit: don't hard-code Italian 2015-03-30 08:27:17 -07:00
Eric House
7cbec919ef set default language and wordlist after downloading for non-english 
device
 2015-03-30 08:18:42 -07:00
Eric House
e1f0c176d5 confirm before downloading wordlist, and only check-and-offer once. 2015-03-30 08:04:37 -07:00
Eric House
d826af9c03 disable downloadable localization via a static final in XWApp 2015-03-27 08:17:32 -07:00
Eric House
2c1ee29c2f on startup, if you don't have a wordlist installed for your locale 
install one.  TODO: only do it once, since if user later deletes the
wordlist he's presumed not to want it or to know how to install again;
better completion message; set default language to match wordlist;
deal with case where language has no wordlist (don't try again.)
 2015-03-26 07:33:55 -07:00
Eric House
398d5de369 toward debugging network stalls: log when state changes, and provide 
debug-build-only reset.
 2015-03-26 05:49:41 -07:00
Eric House
a3378d89a8 only show upgrade dialog on English systems 2015-03-25 06:20:53 -07:00
Eric House
b684e32dca remove duplicate lookup URLs 2015-03-25 05:45:47 -07:00
Eric House
1cd450bb7b use <plurals> for dictionary deletion string 2015-03-25 04:52:02 -07:00
Eric House
3b53d05746 translate language names downloaded as part of dict info. 2015-03-24 07:36:11 -07:00
Eric House
2631ab1094 add prefs checkbox to disable it's-your-turn notifications 2015-03-23 07:30:42 -07:00
Eric House
bd7bfb328e use localized language names; add some quantity="one" plurals items 
for English; revert one <plural> to <string> because the quantity is
fixed and knowable and a pain to pass to getQuantityString().
 2015-03-20 07:28:40 -07:00
Eric House
5f33d99c2e toward making full use of getQuantityString(): add util method to pass 
quantity through to java world, use it, convert English <string>
resources to <plurals> (using python script) based on parallel changes
in French, and modify callsites to call getQuantityString() where
R.string.xxx became R.plurals.xxx.
 2015-03-18 21:23:30 -07:00
Eric House
fff57a5638 use plurals for another string, and add getQuantityString to delegates 
baseclass.
 2015-03-17 21:22:37 -07:00
Eric House
caf4d73e46 Use plurals for first time as test case. More to follow, along with 
accomodating fixes to the LocUtils system.
 2015-03-17 07:20:56 -07:00
Eric House
80c8a7231d use Android's longer date/time format 2015-03-16 07:42:16 -07:00
Eric House
3ddbb6be0f include build timestamp as a long, and let android utilities format it 
based on locale and timezone.
 2015-03-16 07:38:20 -07:00
Eric House
a055815b70 fix so prefs doesn't crash when pct_suffix is translated 2015-03-16 07:10:41 -07:00
Eric House
84a291216e move a few more debug strings out where they can be translated; fix 
(via hack!) so translator credit is shown.
 2015-03-15 21:46:03 -07:00
Eric House
d0b2ac5f06 don't list game as not-in-play when it's in play but just not via relay 2015-03-09 07:51:35 -07:00
Eric House
3282c1fbdb tweak invite alert strings 2015-03-09 07:39:21 -07:00
Eric House
0d4f96d3f6 fix NPE: abort more quickly when unbundling a NLI that's not there 2015-03-09 07:16:41 -07:00
Eric House
353014e1ee tweak strings and dialog titles around inviting 2015-03-07 18:18:27 -08:00
Eric House
bcaacc9d19 show newbie offer to re-enable public rooms but only for those who are 
upgrading rather than installing for the first time. (This should be
reverted once a version ships with it since it'll otherwise show on
every upgrade.)
 2015-03-07 10:18:47 -08:00
Eric House
8ac48528be hide public rooms stuff unless a new preference is set. And mark that 
preference "advanced." TODO: add an alert for users for whom this
isn't a new install that it's moved.
 2015-03-07 08:15:09 -08:00
Eric House
2f13cadbb9 set default new game name to include count of all games created (count 
of game names created, actually)
 2015-03-07 07:20:13 -08:00
Eric House
ecc2ced1c7 include game name in emailed invitations 2015-03-07 07:15:30 -08:00
Eric House
425c800d73 pass to game name util whether new game is to be solo (but don't use info yet) 2015-03-05 07:40:21 -08:00