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

8848 commits

Author SHA1 Message Date
Eric House
517cfe6fda bring over saved file format change from relay_conn branch so builds 
from each will be able to open each other's files.
 2015-08-10 06:24:40 -07:00
Eric House
87e3108296 cleanup: make work based on location if target not specified 2015-08-10 06:23:24 -07:00
Eric House
8b90f211ed progress: compares english and other languages use of format 
specifiers, but I think is missing mismatches in plurals still.
 2015-08-05 07:19:39 -07:00
Eric House
97ebdd0d63 copy changes over from android_translate branch 2015-08-04 20:15:38 -07:00
Eric House
adceab1ed1 name change 2015-08-04 20:15:00 -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
c83d3368ad allow using script for any project with an AndroidManifest.xml 2015-08-03 04:58:34 -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
81834bcbfa provide app name in variant too to fix empty substitution errors 
(e.g. About menutem)
 2015-07-31 07:14:11 -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
4a580eabda handle maintenance messages from relay 2015-07-31 06:36:35 -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
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
a2705ca821 uninstall dbg variant too 2015-07-28 21:01:46 -07:00
Eric House
2ec2972b9b invalidate menubar when minimizing group. (Thanks Aidan.) 2015-07-28 06:26:25 -07:00
Eric House
aa78ec2701 echo name of new .apk for easier scping 2015-07-27 07:29:09 -07:00
Eric House
82f1406df7 incorporate git rev number in name of debug .apk 2015-07-27 07:28:58 -07:00
Eric House
7cc58de6e5 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch 
Conflicts:
	xwords4/android/scripts/info.py
 2015-07-27 07:14:54 -07:00
Eric House
e31c7ae4f5 update to not notify of debug build updates when version matches what's installed 2015-07-27 07:12:44 -07:00
Eric House
75cd6c6693 fix logic behind "unable to find move" alert 2015-07-26 13:17:59 -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
2e6154e920 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch 
Conflicts:
	xwords4/android/scripts/info.py
 2015-07-25 22:03:05 -07:00
Eric House
fe91c9e04e update to serve newest debug as well as release builds, and to know about variants 2015-07-25 21:56:48 -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
f626d6ca4c remove redundant constant 2015-07-21 06:55:15 -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
6851fd9746 include teaser from server, and launch an alert in-game instead of 
having the notification display everything. I've committed this
before; not sure where it went.
 2015-07-11 08:25:10 -07:00
Eric House
5e63d03e76 apparently I forgot to check this in 2015-07-11 08:23:22 -07:00
Eric House
384721d68d Merge branch 'android_branch' of ssh://maidu2/home/eehouse/src/git/repos/xwords into android_branch 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2015-07-11 08:09:47 -07:00
Eric House
67f4e4475c manual bring-over of relay changes for invite support 2015-07-11 08:08:22 -07:00
Eric House
ec393bc0c8 don't crash if intent is null 2015-07-11 07:53:22 -07:00
Relay User
9c7213e42b Make it possible to launch relay early in machine boot cycle before 
postgres is running (e.g. from a @reboot shortcut in a crontab) by
having it wait, sleeping periodically, until a connection is
available. Requires new flag be passed into main.
 2015-07-11 07:04:24 -07:00
Relay User
8f863f0369 Make it possible to launch relay early in machine boot cycle before 
postgres is running (e.g. from a @reboot shortcut in a crontab) by
having it wait, sleeping periodically, until a connection is
available. Requires new flag be passed into main.
 2015-07-11 07:04:24 -07:00
Relay User
d605686fd6 add teaser to gcm message (matches android client change) 2015-07-11 07:04:24 -07:00
Eric House
dba86a657f add and handle new INVITE message types. (This can safely be added to shipping relay.) 2015-07-10 23:25:06 -07:00
Eric House
29d8a67c36 Makefile for new wordlist 2015-07-08 20:41:13 -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
d479486521 change defaults so a with-games-ui/udp game interface comes up by 
default.
 2015-06-26 07:35:24 -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
d096b8e8a2 cleanup -- no code change 2015-06-26 06:10:47 -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
2e8c7695f3 fix failure to connect using means (e.g. BT) that becomes available 
partway through a game. Problem was that once a channel was working
with one means we wouldn't fall back to default addressing for the
means for which we didn't have a return address yet. (NOTE: Not yet
fully tested...)
 2015-06-11 07:29:47 -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
90dbd52bfd On client, when game ends locally set turn to -1 (nobody) so that 
display won't be confusing during the interval before the server
receives the move and responds with a game-over message.
 2015-06-10 07:35:39 -07:00
Eric House
f0c3c11dc8 invalidate all tiles after committing a turn in order to force redraw 
of the Pts. display in case where fewer than seven tiles remain and
the board isn't being switched.
 2015-06-10 07:31:00 -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
5e10febe0e actually serve debug build 2015-06-09 06:39:57 -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
aeae648afc look for new dbg key and drop message if it's set. Later we can keep a 
separate set of binaries.
 2015-06-07 13:42:19 -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