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
9582 commits 21 branches 243 tags 33 MiB
Commit graph

4560 commits

Author SHA1 Message Date
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
0d04b176d2 catch up generated strings 2015-08-17 07:13:02 -07:00
Eric House
592f01a767 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 07:07:59 -07:00
Eric House
6ae73ab99b Merge branch 'android_branch' into android_translate 
Conflicts:
	xwords4/android/XWords4/res_src/values-nl/strings.xml
 2015-08-17 07:05:58 -07:00
Eric House
cbe2c6f5f3 copy over new translations from translation branch. 2015-08-17 07:04:10 -07:00
Eric House
d6d1bbe2e0 Merge remote-tracking branch 'weblate/android_translate' into android_translate 
# 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:46:55 -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
4b14176386 Merge branch 'android_branch' into android_translate 
# 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:35:41 -07:00
Eric House
55d67f7599 don't show toast after message send unless user-triggered 2015-08-17 06:34:58 -07:00
Sylvie
29f410a2e0 Translated using Weblate (Dutch) 
Currently translated at 100.0% (688 of 688 strings)
 2015-08-14 16:11:02 +02:00
Joan Montané
fe86eb9dbf Translated using Weblate (Catalan) 
Currently translated at 100.0% (688 of 688 strings)
 2015-08-14 12:17:17 +02: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
fd55d27a63 changes left out of previous merge commit for some reason 2015-08-13 07:24:49 -07:00
Eric House
0c39c61725 Merge branch 'android_branch' into android_translate 
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:24:05 -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
dea75a815e vary common-code logging tag by variant 2015-08-13 07:02:57 -07:00
Eric House
7824df67f5 copy over VARIANT compile-time flag stuff. Not sure how it got dropped 
in this branch.
 2015-08-13 06:54:07 -07:00
Eric House
19eb677f7c copy over from android_translate branch 2015-08-12 21:36:33 -07:00
Eric House
bae6b3f119 copy over from android_translate branch 2015-08-12 21:34:46 -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
b2970069c1 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:38:18 -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
49e2503146 Merge branch 'android_branch' into android_translate 2015-08-11 07:31:06 -07:00
Eric House
be9b8977e5 turn off email invite attachments 2015-08-11 07:30:34 -07:00
Eric House
ef853d2784 cleanup; include generated file 2015-08-11 07:11:03 -07:00
Eric House
b7cb902775 Merge remote-tracking branch 'weblate/android_translate' into android_translate 2015-08-11 07:01:03 -07:00
Eric House
5d2a5b7649 Merge branch 'android_branch' into android_translate 2015-08-11 06:57:27 -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
Sylvie
28bb7f84be Translated using Weblate (Dutch) 
Currently translated at 100.0% (687 of 687 strings)
 2015-08-11 12:48:40 +02:00
Sylvie
bdf44dfdb2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (683 of 683 strings)
 2015-08-10 11:40:09 +02:00
Eric House
5bae2dbbd9 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-07 08:00:12 -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
f06071fb39 new generated strings 2015-08-06 07:37:18 -07:00
Eric House
9e0f72e68b bring over variant-related changes that somehow got dropped from this 
branch
 2015-08-06 07:25:56 -07:00
Eric House
87fef6b186 delete strings no longer used (missing from english strings.xml) 2015-08-05 07:16:25 -07:00
Eric House
74eedbb314 where a plurals has a "one" quantity and an empty "other", delete the 
empty "other" and make the "one" an "other" instead
 2015-08-05 07:00:02 -07:00
Eric House
64c5c4c416 remove empty line 2015-08-04 21:01:02 -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
debe424c8a copy over from android_translate branch 2015-08-04 20:13:19 -07:00
Eric House
68f72451cd Merge remote-tracking branch 'weblate/android_translate' into android_translate 
# 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-04 19:48:58 -07:00
Eric House
96ef94fead changes from translator 2015-08-04 19:11:07 -07:00
Eric House
ed7d44c8ad add (generated) to-be-translated plurals element 2015-08-04 07:57:39 -07:00
Eric House
dfa6226c1a fix a few plurals' formatting 2015-08-04 07:56:29 -07:00
Eric House
a79d9272b1 fix a bit of formatting (plurals) 2015-08-04 07:56:12 -07:00
Eric House
f4d53ab076 remove string not in English 2015-08-04 07:05:34 -07:00
Eric House
dc4d4aad0e insert missing string 2015-08-03 21:10:32 -07:00
Eric House
59ac6ecddf print in canonical format -- whitespace changes only 2015-08-03 21:09:01 -07:00
Joan Montané
9bbff68eda Translated using Weblate (Catalan) 
Currently translated at 100.0% (683 of 683 strings)
 2015-08-03 21:12:35 +02:00
Eric House
10c40089e2 fix formatting, mostly of plurals elements 2015-08-03 07:46:09 -07:00
Eric House
a45b698ea9 don't crash when first run without network connection 2015-08-03 05:25:35 -07:00
Eric House
3064420c78 don't crash when first run without network connection 2015-08-03 05:25:10 -07:00
Eric House
013e0e3a4c Merge branch 'android_branch' into android_translate 2015-08-03 05:10:06 -07:00
Eric House
bcd620a4f9 clean up to make cherry-picked changes work 2015-08-03 05:07:49 -07:00
Eric House
cfa101350a add logdf, logging for DEBUG builds only 2015-08-03 05:06:38 -07:00
Eric House
a612a89ac6 fix variant crashes: had forgotten PKG_PATH on new method 2015-08-03 04:59:15 -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
1e7f51a88d move last-pressed button to bottom of screen where it's natural to look for it 2015-08-03 04:58:18 -07:00
Eric House
a5f332dd1d different logging TAG for different variants 2015-08-03 04:57:35 -07:00
Eric House
6871ef24a6 move several strings, including app name, NBS port, and url prefix, into generated 
.xml file so Dbg and regular variants can co-exist better

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-08-03 04:55:59 -07:00
Eric House
1959ff3b2d fix NPE reported by crittercism 2015-08-03 04:54:42 -07:00
Eric House
b500a4646d use different uuid for dbg variant so it's not cross-sending BT 
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
 2015-08-03 04:50:56 -07:00
Eric House
2b286fd7ac Merge branch 'android_branch' into android_translate 
# 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-03 04:45:48 -07:00
Eric House
b56924b030 fix off-by-one error that probably had me slowly leaking local obj 
references for the last few years.
 2015-08-02 16:43:52 -07:00
Eric House
a148680e44 catch up: it's been a few commits since I included this. 2015-08-02 16:43:23 -07:00
Eric House
a349ab4bee add commented-out getClassName() in case it's useful in the future. 2015-08-02 16:41:28 -07:00
Eric House
b3ca4ee223 fix off-by-one error that probably had me slowly leaking local obj 
references for the last few years.
 2015-08-02 16:29:53 -07:00
Eric House
56082d2f7b fix variant crashes: had forgotten PKG_PATH on new method 2015-08-02 16:15:32 -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
1fb55c8a78 move last-pressed button to bottom of screen where it's natural to look for it 2015-08-02 14:14:19 -07:00
Eric House
af8c6d618d different logging TAG for different variants 2015-08-02 10:29:17 -07:00
Eric House
0425df7a5e move several strings, including app name, NBS port, and url prefix, into generated 
.xml file so Dbg and regular variants can co-exist better
 2015-08-01 22:39:00 -07:00
Eric House
8aef67dba4 fix NPE reported by crittercism 2015-08-01 22:17:13 -07:00
Eric House
6c863155ef clean up BT UUID assignment, replacing runtime strcmp with compile 
time macro magic
 2015-07-31 07:35:44 -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
65606607ab use different uuid for dbg variant so it's not cross-sending BT 
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
 2015-07-29 19:48:56 -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
dfc3ca5289 Merge branch 'android_branch' into relay_noconn 2015-07-29 05:54:10 -07:00
Eric House
9b785e230c Merge branch 'android_branch' into android_translate 
Conflicts:
	xwords4/android/XWords4/res_src/values-ca/strings.xml
 2015-07-29 05:49:11 -07:00
Eric House
cb7b8660dc bring in Catalan changes from android_translate branch, and fix a 
couple of typos
 2015-07-29 05:47:08 -07:00
Eric House
d94f7bbf49 Merge remote-tracking branch 'weblate/android_translate' into android_translate 
Conflicts:
	xwords4/android/XWords4/res_src/values-nl/strings.xml
 2015-07-29 05:28:07 -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
5bf674ca76 Merge branch 'android_branch' into android_translate 2015-07-28 20:35:30 -07:00
Joan Montané
0e797e2679 Translated using Weblate (Catalan) 
Currently translated at 100.0% (682 of 682 strings)
 2015-07-28 20:53:21 +02: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
0b9e53df96 Fix misspelling. Thanks Frank. :-) 2015-07-26 22:24:16 -07:00
Joan Montané
0cb49e7379 Translated using Weblate (Catalan) 
Currently translated at 90.9% (620 of 682 strings)
 2015-07-27 01:04:01 +02:00
Eric House
3c58267d4e goes with cherrypick 2015-07-26 12:09:51 -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
7c8c6bb55b move app name into resource that's not copied to fix dbg variant 
having empty name (though it didn't before)
 2015-07-25 08:52:33 -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
a40ee96439 first set of Dutch strings 2015-07-23 19:37:31 -07:00
Weblate
c58fdd0273 Merge remote-tracking branch 'origin/android_translate' into android_translate 2015-07-23 18:45:26 +02:00
Sylvie
235d4d232c Translated using Weblate (Dutch) 
Currently translated at 19.3% (132 of 682 strings)
 2015-07-23 18:45:25 +02: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
a48468eca1 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:56:12 -07:00
Eric House
2a009e620b empty file for Dutch strings 2015-07-22 20:59:13 -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
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
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
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
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
8a575bc789 fill in help text for communication means 2015-06-26 06:18:42 -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
54b18c898d more, and hopefully last, French strings 2015-06-19 20:52:40 -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
13f4e66f84 More French strings, and fix typo in English 2015-06-16 06:45:23 -07:00
Eric House
568e3fdfe8 wrap email in changes log in a mailto url 2015-06-15 07:49:59 -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
6a36c1252d fix assert that wasn't asserting anything 2015-06-14 19:39:51 -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
4251d08248 generated strings 2015-06-13 07:39:29 -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
f353a70c89 catch up with recent changes 2015-06-10 07:29:28 -07:00
Eric House
a20797aab1 more translated French strings 2015-06-09 06:40:13 -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
281b438594 up client version. There are no protocol-related changes to require 
it, but this might make debugging easier by telling me who has a new
client.
 2015-06-06 11:53:43 -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
2f93760c6e generated strings from last commit 2015-06-05 06:28:48 -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
11849d6430 two more French strings 2015-06-05 06:14:21 -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
8e2d19e712 tweak string 2015-06-03 07:58:49 -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
6a03b994ed catch up with recent changes 2015-05-25 18:07:29 -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
bf334054e8 three new French strings 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
3e077a2dc2 remove unused string 2015-05-14 06:21:12 -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
5bba268ede change I apparently should have committed earlier 2015-05-05 07:11:38 -07:00
Eric House
e7dc14a4e7 Merge branch 'for_android_beta_96' into android_branch (and up version strings) 
Conflicts:
	xwords4/android/XWords4/assets/changes.html
 2015-04-07 21:08:00 -07:00
Eric House
fe9b70b7e1 up strings for release 2015-04-07 20:45:45 -07:00
Eric House
b618091c0f tweak menu text 2015-04-06 07:01:19 -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
676bbf5610 new French string 2015-04-02 19:15:35 -07:00
Eric House
75bb77b901 generated files 2015-04-02 07:19:14 -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
0df1e696f8 more translated strings 2015-03-31 20:40:45 -07:00
Eric House
be7effa65b cleanup 2015-03-31 06:53:07 -07:00
Eric House
d16552327b tweaks to French strings 2015-03-31 06:13:08 -07:00
Eric House
c2179664d8 make some debug strings localizable 2015-03-30 19:34:38 -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
a4e24ec566 forgot generated strings 2015-03-30 08:05:05 -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
427b652c27 add pref and strings for the key that'll be used to prevent multiple 
attempts to download wordlist for non-English phone
 2015-03-27 22:00:24 -07:00
Eric House
10fe016785 tweaks to strings.xml copying: add comment warning files are 
generated, and don't copy over strings that say "XLATE ME"
 2015-03-27 21:37:29 -07:00
Eric House
9ee5c0d0eb French string tweak: add plurals item 2015-03-27 21:33:09 -07:00
Eric House
d826af9c03 disable downloadable localization via a static final in XWApp 2015-03-27 08:17:32 -07:00
Eric House
3995d96a9f this is now a generated file 2015-03-27 07:28:52 -07:00
Eric House
ac811f1690 move French strings into res_src/, and add script to filter/copy all 
strings.xml files from there to res/, effectively including them in
the app the way the Android SDK intends. This will allow me to turn
off the downloadable localization stuff which is tripping over having
more than English built in. ToDo: incorporate the copy into the build.
 2015-03-27 07:26:51 -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
7c45ec5f8c add Wiktionary as a lookup option. This overlaps Catalan, so duplicate 
links need to be detected and suppressed.
 2015-03-25 04:50:35 -07:00
Eric House
6f556f7264 latest French strings 2015-03-24 07:41:53 -07:00
Eric House
3b53d05746 translate language names downloaded as part of dict info. 2015-03-24 07:36:11 -07:00
Eric House
16e3ef9246 assert I've got the plurals vs singular strings right 2015-03-24 07:33:24 -07:00
Eric House
930d72402d fix crash due to mis-numbered format specifier 2015-03-23 07:50:29 -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
36839ac82b fix so multiple strings can be cached per id to support <plurals> 
strings crossing jni boundary.
 2015-03-19 23:03:15 -07:00
Eric House
328300c8a2 add translations of language names 2015-03-19 22:34:08 -07:00
Eric House
1dcc40df02 latest French strings 2015-03-19 22:25:44 -07:00
Eric House
ddfe5839d2 fake versions of language names 2015-03-19 22:20:24 -07:00
Eric House
202bcef034 undo utf8->ascii changes made by old version of script; add language 
names so they can be localized (though the strings aren't used yet)
 2015-03-19 22:20:06 -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
5d64089a5b first faked plurals 2015-03-17 20:47: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
632332363e latest French translations 2015-03-15 21:09:57 -07:00
Eric House
4718056344 more French strings 2015-03-12 21:14:55 -07:00
Eric House
1debad42bc make paired buttons height fill their container, forcing them to be 
the same size in the case where one has two lines of text and the other
doesn't. Should make no difference in English, but matters for French.
 2015-03-12 21:06:31 -07:00
Eric House
60c320d1ae fix buttons being unaligned when one has longer text (e.g. in French) 2015-03-12 07:17:33 -07:00
Eric House
e871819a9d move strings used for debug features, e.g. debug menu, into 
strings.xml so they can be translated.
 2015-03-10 20:24:54 -07:00
Eric House
52b8427fb1 list major changes for next release 2015-03-10 20:23:51 -07:00
Eric House
b01b43d5d8 tweak string 2015-03-10 08:06:44 -07:00
Eric House
78f8b2aff4 include comments from French file -- work in progress 2015-03-10 07:42:05 -07:00
Eric House
1851485d66 add missing strings (using script) 2015-03-10 07:40:50 -07:00
Eric House
6466f1aff9 more French translations 2015-03-10 07:13:54 -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
81a780d2ff tweak strings and dialog titles around inviting 2015-03-07 18:18:42 -08:00
Eric House
353014e1ee tweak strings and dialog titles around inviting 2015-03-07 18:18:27 -08:00
Eric House
4d4e0ed2f8 add french strings.xml file with first 52 translated strings. (It also 
contains a lot of English which is causing comments to duplicte in
R.java. Harmless, but will be fixed.)
 2015-03-07 11:07:53 -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
Eric House
4481b1db39 revert recent change hiding buttons: re-layout of games list that 
results is too visually disruptive.
 2015-03-05 07:22:29 -08:00
Eric House
db8620451c add compile-time option to show green above and below status icon. I 
don't like the look so may turn it off.
 2015-03-05 06:55:48 -08:00
Eric House
29a202ee2e cleanup 2015-03-05 06:55:21 -08:00
Eric House
9565df7c69 hide rather than disable newgame buttons when they can't be used 2015-03-05 06:42:33 -08:00
Eric House
ed9ffc229d don't show comms-related stuff for local-only game 2015-03-05 06:38:35 -08:00
Eric House
4d921ad2d2 If a group is selected when new game explicitly created, place new 
game there. If created for rematch, place in same group as game it's a
rematch of.
 2015-03-04 19:42:02 -08:00
Eric House
43a5bbacdb disable new game buttons at same time as corresponding menu items are disabled 2015-03-04 19:14:53 -08:00
Eric House
fa6c043433 Merge remote-tracking branch 'sf/android_branch' into android_multi2 
# 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-03-04 07:32:43 -08:00
Eric House
b967c39c20 up strings for release 2015-03-04 06:56:12 -08:00
Eric House
e9ccf5a305 fix crash copying game (by replacing assertion with a stricter one) 2015-03-04 06:49:52 -08:00
Eric House
4ab846ee60 remove assertion that fired on creation of every standalone game 2015-03-04 06:35:53 -08:00
Eric House
736e5f1ea0 prevent keyboard from coming up on launch of game config activity; 
instead wait until room name is tapped. (I did this in two places
though one might have been enough. On some devices anyway that
AndroidManifest change is needed to close a keyboard if it's open
prior to opening the activity.)
 2015-03-04 06:17:18 -08:00
Eric House
2371111edf add warning to rename game alert that the name won't sync, but only 
for networked games in progress.
 2015-03-03 07:55:43 -08:00
Eric House
e3b5848d5d don't post notification if there's no explanation to be offered. I've 
been seeing ghost notifications where there should be none; this will
fix that, but I need to observe that it doesn't remove notifications
that are needed.
 2015-03-03 07:05:20 -08:00
Eric House
4cd75abaa9 Don't unbundle an invalid NLI: use a static factory method rather than 
a constructor since the factory is allowed to fail.
 2015-03-03 07:03:42 -08:00
Eric House
797cb23de2 rewrite to track by BT address rather than position since the latter 
can change. Fixes occasional assertion failure.
 2015-03-02 19:09:56 -08:00
Eric House
2b2b9982d0 remove unused method 2015-03-02 19:07:24 -08:00
Eric House
863d83bf44 reorder prefs 2015-03-02 07:11:34 -08:00
Eric House
61649aab2d when game opens and SMS is off, offer to turn it not rather than just 
to open the Android settings app (as done in game config already)
 2015-03-02 06:45:46 -08:00
Eric House
0233ad6b79 turn off rematch 2015-03-02 06:41:11 -08:00
Eric House
a003cf686f offer to rematch via relay too, but leave the server communication 
part stubbed out. I'm disabling rematch for now because there are
several issues to be worked out, chief among them how to handle
simultaneous receipt of identical invitations (via different
channels.)
 2015-03-02 06:28:42 -08:00
Eric House
cdf7a88302 change method signature to be more clear what it's doing 2015-03-02 06:22:57 -08:00
Eric House
6964458c84 fix string 2015-03-02 06:20:17 -08:00
Eric House
e03be955a6 make ivar private 2015-03-02 06:19:47 -08:00
Eric House
25beb1b8d4 cleanup: remove unnecessary Context params 2015-02-28 19:36:07 -08:00
Eric House
13b3905458 fix so emailed invitations from current shipping version can be 
received. I think NFC works too. Bluetooth doesn't, and isn't worth
the time to fix since users get a very clear "upgrade already"
message.
 2015-02-26 21:39:21 -08:00
Eric House
3e27721ca4 cleanup 2015-02-26 21:35:45 -08:00
Eric House
6e7c1cb73f include set of addresses in rematch so that even though invite by 
relay doesn't work yet games can communicate that way.
 2015-02-26 06:54:56 -08:00
Eric House
3cccb0cb11 move (effective) [de]serialization logic into class 2015-02-26 06:18:19 -08:00
Eric House
ed212801c8 first pass at enabling Rematch, which seems to work for SMS and 
Bluetooth. Relay will take a bit more work, and there are rough edges
still.
 2015-02-26 06:01:17 -08:00
Eric House
8538b1b293 remove assert. Not sure why I wanted it before. 2015-02-26 06:00:03 -08:00
Eric House
a3a88463a5 get and put new game summary extras in DB 2015-02-26 05:56:46 -08:00
Eric House
add93c83de add methods for getting and putting strings as part of summary and 
testing if any of them constitute rematch info
 2015-02-26 05:56:08 -08:00
Eric House
187e55e4ad add column for arbitrary & extensible data in GameSummary 2015-02-26 05:52:40 -08:00
Eric House
e2f3963667 wrap static Boolean to avoid NPE when uninitialized 2015-02-25 07:35:14 -08:00
Eric House
da3452f3fa Merge remote-tracking branch 'sf/android_branch' into android_multi2 
# 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-02-24 06:46:16 -08:00
Eric House
7229d110a0 go ahead an up the beta version number too 2015-02-23 21:51:25 -08:00
Eric House
64cf060c4e up version code and add to changelist 2015-02-23 21:35:42 -08:00
Eric House
4d0a825e43 fix NPE downloading .xwd files 2015-02-23 21:16:53 -08:00
Eric House
f2f5fb22e6 use new comms header to transmit isServer bit 2015-02-23 18:28:31 -08:00
Eric House
dc1f08a7ac up protocol number so old clients know to upgrade 2015-02-23 18:25:34 -08:00
Eric House
eca87d3755 don't crash on null set 2015-02-23 18:19:16 -08:00
Eric House
d4515c4930 Merge remote-tracking branch 'sf/android_branch' into android_multi2 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
 2015-02-23 08:02:56 -08:00
Eric House
0cb549abcc add another change summary item 2015-02-23 07:11:43 -08:00
Eric House
f9ddca8316 tweak explanation 2015-02-23 07:03:25 -08:00
Eric House
825577a762 manually bring in db71c4e4e2: force 
resend_all() when opening game
 2015-02-21 17:37:10 -08:00
Eric House
5940a7e860 Merge remote-tracking branch 'sf/android_branch' into android_multi2 
# 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-02-18 19:56:48 -08:00
Eric House
9fd5e71e3d up client version so we can tell when adoption's getting close to complete 2015-02-18 19:55:40 -08:00
Eric House
86d8a46da2 Merge branch 'android_branch' into android_multi2 
Conflicts:
	xwords4/common/comms.c
 2015-02-18 19:40:36 -08:00
Eric House
b89395ffb9 up strings for new release 2015-02-18 19:24:17 -08:00
Eric House
3dd16b5883 alert on receiving phone when SMS sender is using older/incompatible protocol. 2015-02-18 06:49:43 -08:00
Eric House
7e8c30f2ab add preference controlling whether radio-free short-circuiting is used 
for SMS sends when sending and receiving number are the
same. Short-circuiting is faster and tests 99% of the code without
triggering Android's annoying OS-level too-many-sms-sends alerts, but
sometimes you need to test the radio too.
 2015-02-17 20:16:44 -08:00
Eric House
1592ac3ede cleanup -- no meaningful code change 2015-02-17 19:49:32 -08:00
Eric House
db71c4e4e2 force resend_all() when opening game. This unsticks some new games 
that for some reason connected to having several ways of sending some
of which aren't working wind up running a backoff timer by the time
they want to connect. This fixes the cases I'm seeing. I don't know if
it's at the price of generating too much traffic, but at least it's
limited to when the user actually opens the game.
 2015-02-17 19:46:54 -08:00
Eric House
1a87812f2b don't check for updates on DEBUG builds as the server doesn't handle 
that case (yet)
 2015-02-17 06:59:40 -08:00
Eric House
749b9a5c19 changes in generated IDs: apparently different dev machines generate 
different IDs, perhaps because they're running different SDK versions.
 2015-02-17 06:52:36 -08:00
Eric House
d97dd6aff1 if fake-radio pref has changed to make something (SMS) unsupported, 
try to recover from that (otherwise impossible) change in phone
capability by checking when fetching pref if it's all still possible.
 2015-02-17 06:52:00 -08:00
Eric House
4d9465a3e2 fix crash on initial install, when pref won't be set yet 2015-02-17 06:49:34 -08:00
Eric House
eb1ad5cdc3 use fake radio preference in setting phone info, and rely on that for 
isgsm test
 2015-02-17 06:15:34 -08:00
Eric House
55714d81bf remove unused method 2015-02-14 22:42:26 -08:00
Eric House
385220cf92 add debug preference, unused so far, for faking the type of radio I 
have. Goal's to debug non-GSM devices correctly hiding all references
to play-via-SMS.
 2015-02-13 18:52:13 -08:00
Eric House
98fe7eb343 if BT's off, offer to turn it on programatically rather than telling 
user to do it himself
 2015-02-13 18:38:24 -08:00
Eric House
49024ae070 offer to turn SMS on when setting the global pref too 2015-02-13 18:16:30 -08:00
Eric House
9399ddd0ab add a bit of space to the custom view 2015-02-12 21:12:28 -08:00
Eric House
6cfedf7fb5 fix button being missing at the wrong time 2015-02-12 19:24:32 -08:00
Eric House
270f2922b1 include game name in invitation 2015-02-12 07:48:15 -08:00
Eric House
f4a691da6b add name, mostly as a way of passing it around in the java world since 
the C version doesn't know about it.
 2015-02-12 07:44:37 -08:00
Eric House
1a94bab9e8 add naming of game to game creation, including adding custom view to alert 2015-02-12 07:41:28 -08:00
Eric House
e5957866b4 cleanup by adding an import -- no code change 2015-02-12 07:38:17 -08:00
Eric House
2142c752bf factor confirm-unlimited-SMS stuff out into utility dialog so I can 
turn on SMS from outside preferences -- which is a much better
experience than sending somebody into the prefs labyrinth
 2015-02-11 07:51:19 -08:00
Eric House
ad6be1bb7e add debug-only "tag" to open games so logging can more easily track 
what's going on when multiple participants in a single game are on the
same device. But for a couple of strings passed into the jni the
changes are only in DEBUG code.
 2015-02-09 19:15:43 -08:00
Eric House
bdc298b222 remove logging 2015-02-09 07:27:18 -08:00
Eric House
534bb37224 only show every 5th toast 2015-02-08 18:36:55 -08:00
Eric House
aa77413116 remove logging 2015-02-08 18:35:34 -08:00
Eric House
0620bc0443 remove extra carriage return 2015-02-08 11:03:55 -08:00
Eric House
9ab0113e85 tweak debug toast strings 2015-02-08 10:48:17 -08:00
Eric House
994bd4fc5c format status time to seconds rather than minutes 2015-02-08 10:48:05 -08:00
Eric House
b7dfc169bf add commented-out mutex protecting comms. I don't think I need it, but 
this makes it easier to put back if comms->processingMsg assertions
start failing.
 2015-02-08 10:37:06 -08:00
Eric House
9a0da56158 fix NPE: onActivityResult gets called before onResume, so reload game 
there instead.
 2015-02-08 10:35:52 -08:00
Eric House
c6b42c539c add assert to ensure there are no thread issues: mutex may be required 
if the assert winds up getting hit.
 2015-02-08 07:51:08 -08:00
Eric House
01c4fa620e when nbs send is to my own phone number, just put the packet in the 
incoming queue. T-mobile will deliver the message, but it's much
faster this way and while I'm still sending too many messages avoids
triggering the undismissable "this app is sending too many SMS
messages" Android warning alert.
 2015-02-07 22:37:06 -08:00
Eric House
fa856e1db0 don't send sms messages in queue if sms support has been turned off 2015-02-07 13:37:14 -08:00
Eric House
17307f910b fix problem with misdelivered message forever locking out future 
messages: when comms thinks a message is an init but server drops it,
give comms that info so it can remove it and give the next one a
chance.
 2015-02-07 13:24:09 -08:00
Eric House
2202639606 feed messages by rowid, not gameID, in case a device has more than one 
participant. This is toward fixing SMS same-device games (useful for
testing only, but VERY useful for that.)
 2015-02-07 13:11:52 -08:00
Eric House
b12cf55a83 remove unused variable 2015-02-07 12:56:03 -08:00
Eric House
e4b0cd89c2 In invite means choice dialog, OK button is enabled until a choice is 
made. Required piping prepareDialog() into DlgDelegate.
 2015-02-06 08:02:04 -08:00
Eric House
1b9341bef3 change ivar name -- no code change 2015-02-06 07:58:48 -08:00
Eric House
63ef10ebb1 remove or change logging 2015-02-06 06:11:04 -08:00
Eric House
1b8389c6b1 hide Reconnect button except on debug builds; it doesn't seem to be 
doing anything, and I'm not sure how to communicate that it's
relay-only.
 2015-02-06 06:10:12 -08:00
Eric House
4ddf11387f make send-nfc-to-self available through a debug-only preference rather 
than only on DEBUG builds.
 2015-02-05 06:56:04 -08:00
Eric House
c2a87c187d as a DEBUG-only feature, enable "send" of NFC to self to better 
duplicate on a single device how real devices are meant to be
inviting.
 2015-02-04 22:15:20 -08:00
Eric House
019d9987c7 fix bug where email didn't get launched when the only choice 2015-02-04 21:50:23 -08:00
Eric House
2c7469f228 emphasize button by centering it rather than making it green, since 
color replacing a drawable looks like crap and the ways of doing it
right are too complicated and may not look good on all devices/OS
versions.
 2015-02-04 07:21:17 -08:00
Eric House
cb40600293 cleanup -- no code changes 2015-02-04 07:07:23 -08:00
Eric House
11c8c01c7b remove dead code 2015-02-04 06:59:15 -08:00
Eric House
3b41752382 show no conn options as a localizable, non-empty string rather than 
empty string
 2015-02-03 22:23:11 -08:00
Eric House
e0a337ff4c deal with case where user removes existing game's ability to connect: 
refuse to save until something's put back
 2015-02-03 22:11:13 -08:00
Eric House
c55bba5aab for game config replace onKeyDown() with onBackPressed() since only 
one key was handled.
 2015-02-03 21:49:33 -08:00
Eric House
5e6bb507b7 shift responsibility for deleting new game when config activity is 
cancelled from games list to config activity. Fixes race condition
that on emulator, and less often on device, left a game highlighted
after config was cancelled that should have been deleted.
 2015-02-03 21:43:28 -08:00
Eric House
35525d62a4 give newgame alert an icon to remind folks what's up. 2015-02-03 19:16:37 -08:00
Eric House
46c361028e move config of ConnViaViewLayout to prepareDialog() so checkboxes get 
reset each time, fixing problem of checks sticking across invocations.
 2015-02-03 07:45:12 -08:00
Eric House
70545eb3f2 more fixing assuming a connection-means-less game is solo 2015-02-01 22:54:15 -08:00
Eric House
e383d9c7ad show the multi-game icon for multi-games even if they have no conn 
options set.
 2015-02-01 22:31:03 -08:00
Eric House
8abe7720c8 don't allow saving/playing a multi-divice game that doesn't have at 
least one way of connecting. Instead, give a choice between discarding
it and editing, and if the latter choice it taken open the alert for
picking ways to connect. Requires a new version of showConfirmThen()
that lets the negative button be other than "Cancel".
 2015-02-01 22:15:06 -08:00
Eric House
02da56ce9c add populate() that can be called to add defaults when new type is added 2015-02-01 19:55:06 -08:00
Eric House
4bd15c072b add isFinishing() to base class 2015-02-01 19:51:32 -08:00
Eric House
46c4cc0669 warn when user disables all communication options in prefs 2015-01-31 23:17:13 -08:00
Eric House
5d58c09120 remove must-invite alert when game connects 2015-01-28 06:17:27 -08:00
Eric House
0972e07b4e give download button a green background for greater visibility 2015-01-27 21:42:42 -08:00
Eric House
a4842bdaab just hide the "hide title" pref on devices where it's a no-op -- 
rather than explain to a user why his action is being ignored
 2015-01-27 21:40:22 -08:00
Eric House
1b6f0de8e6 inset checkbox for better visibility 2015-01-27 08:24:06 -08:00
Eric House
fb13c949e8 re-enable ActionPairs stuff now that an additional button works/fits. 2015-01-27 08:14:06 -08:00
Eric House
5cece9f3cc Merge remote-tracking branch 'sf/android_branch' into android_multi2 
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
 2015-01-27 07:53:42 -08:00
Eric House
828b620c44 make "do not show again" a checkbox instead of a button -- requires a 
trivial custom view.
 2015-01-27 07:46:18 -08:00
Eric House
41a2655248 move newbie hint about hiding newgame buttons to the buttons 
themselves, and disable third button because it isn't shown on the
devices I'm testing on. Not sure why. Tweak text to make sense in that
context.
 2015-01-27 07:11:49 -08:00
Eric House
8044fb0fc7 exit board when invite alert cancelled 2015-01-26 07:25:46 -08:00
Eric House
5f5e35e885 hide (the right way) play-via-sms preference on non-gsm phones 2015-01-26 07:06:43 -08:00
Eric House
74ce8116ea don't allow to enable SMS or BT if the feature's off on the phone, and 
warn via an alert (varies by whether in prefs or game config) in that case.
 2015-01-25 17:40:23 -08:00
Eric House
2c5cf9da39 move conn-via set manipulation into a custom view prefs and game 
config can both use.
 2015-01-25 16:14:34 -08:00
Eric House
c506805235 show SMS and BT as connect-via options only when available on the 
device -- which for SMS means it's a GSM phone.
 2015-01-25 15:18:20 -08:00
Eric House
b3f1b6ae3e hide SMS as invite option (for now) 2015-01-25 15:17:49 -08:00
Eric House
b851427fd9 tweak string 2015-01-25 15:17:28 -08:00
Eric House
2710ef7243 turn off invite via SMS (for now) 2015-01-25 14:00:03 -08:00
Eric House
f983e477a2 remove all code for sending and receiving non-data SMS. The plan is 
that SMS will only be supported for GSM phones from here out (unless
Google figure out how to make the Data SMS APIs work on CDMA devices.)
 2015-01-25 13:56:33 -08:00
Eric House
1ec5df0914 fix so button is correctly enabled from the start 2015-01-24 21:55:44 -08:00
Eric House
9806b01d6b get rid of send-invitation menuitem, since it's never there unless 
there's a dialog in front of the board forcing you to send an
invitation.
 2015-01-24 16:32:11 -08:00
Eric House
b8ff064819 turn another set of constants into an enum: no code change 2015-01-24 16:20:13 -08:00
Eric House
bd55ed025e fix handling bt invitations when the wordlist specified is missing 2015-01-24 15:59:36 -08:00
Eric House
9031885eb0 fix duplicate NFC invites being accepted (but not working to create 
usable games) by fixing broken query used by getMostRecentCreate()
 2015-01-24 14:59:15 -08:00
Eric House
56e61061be add alert explaining "just tap" when user picks nfc for sending invite 2015-01-24 14:29:49 -08:00
Eric House
dd6aa95068 force invite alert to stay up as long as a host has players missing. 2015-01-24 14:18:30 -08:00
Eric House
445d44e773 import child class to cut a few characters from file -- no code change 2015-01-24 13:48:03 -08:00
Eric House
da374db1bc fix progress alert thinging being left after BT invites accepted in 
case where more than one device being invited. Really should
incorporate progress into the dialog showing missing players, but this
is better than before.
 2015-01-24 13:22:51 -08:00
Eric House
f87dd30bd6 don't create new using-defaults game is if from a received invitation 2015-01-24 13:07:52 -08:00