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
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
