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

4167 commits

Author SHA1 Message Date
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
6d6c345f94 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-23 21:18:05 -07:00
Sylvie
ec3af948e3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:17:16 -07:00
Joan Montané
ab791fb430 Translated using Weblate (Catalan) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:14:34 -07:00
Bernard Massot
8da25dcdd4 Translated using Weblate (French) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:14:20 -07:00
Eric House
1df48d2792 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-21 07:17:31 -07:00
Eric House
8f93630350 shorten string to make action bar more obvious (and catch up with 
generated string file changes)
 2015-08-21 06:56:47 -07:00
Eric House
e0327b0f62 ignore files 2015-08-20 07:41:48 -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
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
cbe2c6f5f3 copy over new translations from translation branch. 2015-08-17 07:04:10 -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
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
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
debe424c8a copy over from android_translate branch 2015-08-04 20:13:19 -07:00
Eric House
a45b698ea9 don't crash when first run without network connection 2015-08-03 05:25:35 -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
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
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
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
0b9e53df96 Fix misspelling. Thanks Frank. :-) 2015-07-26 22:24:16 -07: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
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