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

9270 commits

Author SHA1 Message Date
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
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
29d8a67c36 Makefile for new wordlist 2015-07-08 20:41:13 -07:00
Eric House
1f3959fc71 fix rematch initiated by a guest: needs to be host in the game it 
creates.
 2015-07-06 21:18:51 -07:00
Eric House
08e6c2b358 use a static to remember last devid typed 2015-07-06 20:52:22 -07:00
Eric House
0f33228155 get rematch working on linux, at least for two-device games. (Handling 
the case where one of several guests wants to rematch is a hard
problem for later.) Requires passing old-style relayIDs (connname plus
device index) when devIDs aren't available, which they may not always
be.
 2015-07-06 20:28:16 -07:00
Eric House
fd06bca151 assert stream version being set consistently, not changed 2015-07-06 20:24:45 -07:00
Eric House
33d0db93e8 add some consts 2015-07-06 20:23:22 -07:00
Eric House
3a896df199 show game-over dialog (with its Rematch button) when a over game is 
opened
 2015-07-01 18:38:33 -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
8f794fbd32 beginning of support for invite-by-relay (which is mostly interesting 
for Rematch): works for linux version, provided you know the relayID
of the device you're inviting. Added to common/ a stream-saving
version of java's NetLaunchInfo I'll probably want to use there too
for cross-platform compatibility (there being no jni support for
json.)
 2015-07-01 07:10:45 -07:00
Eric House
6d768972db fix compile warning. (Not really tested...it's a test app) 2015-07-01 06:35:47 -07:00
Eric House
0102cde2c3 add and handle new INVITE message types. (This can safely be added to shipping relay.) 2015-07-01 06:34:57 -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
1b6ce4861f don't crash when invitation dialog cancelled 2015-06-28 09:00:41 -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
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
8e21c69a55 add reinstall option 2015-06-02 08:04:06 -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
49dc8e7d10 print index of game being killed so easier to find it in the list of 
tiles-per-game
 2015-05-17 11:53:48 -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
1d6d8e46a3 add missing <CR> to game history (game over case only) 2015-05-13 06:36:43 -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
6721f52ae9 fix to use ANDROID_NDK instead of NDK_ROOT, following fdroid's 
convention, but also not to require either if ndk-build is on PATH.
 2015-04-07 20:29:10 -07:00
Eric House
6dee7e3784 remove warning about not using checked-in debug keystore from release 
builds that won't use it regardless
 2015-04-07 20:28:48 -07:00
Eric House
07615ff9d7 Remove name property to silence warning. This didn't work with earlier 
version of ant but I'll hope it's ok for everybody now.
 2015-04-07 20:28:36 -07:00
Eric House
429d1c1972 fix crash sorting tiles when there are fewer to sort than there is 
space to the left of the divider, i.e. when the game's nearly over.
 2015-04-07 20:28:21 -07:00
Eric House
09b36814bd fix to be able to open android xwdb files again. For the record, 
here's a command that works, providing the game's wordlist and rowid:
run --game-db-file /tmp/xwdb --game-db-id 799809255 --dict-dir \
/var/www/and_wordlists/English --dict-name TWL06_2to15.xwd
 2015-04-07 20:22:48 -07:00
Eric House
e52d5c4077 fix crash sorting tiles when there are fewer to sort than there is 
space to the left of the divider, i.e. when the game's nearly over.
 2015-04-07 20:20:40 -07:00
Eric House
d00a89b8b0 Remove name property to silence warning. This didn't work with earlier 
version of ant but I'll hope it's ok for everybody now.
 2015-04-07 07:31:41 -07:00
Eric House
3e624a6829 remove warning about not using checked-in debug keystore from release 
builds that won't use it regardless
 2015-04-07 07:20:48 -07:00
Eric House
e00938aeb1 fix to use ANDROID_NDK instead of NDK_ROOT, following fdroid's 
convention, but also not to require either if ndk-build is on PATH.
 2015-04-07 07:07:24 -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
7d4aa8dd17 fix warning 2015-03-31 20:38: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
51e6892c32 add option to list a single language code's wordlists 2015-03-27 21:54:56 -07:00
Eric House
31f3e71704 remove repeated code 2015-03-27 21:53:37 -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
c0199e8768 include copy-strings.py in the build 2015-03-27 07:46:50 -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
d5984a34b7 include language code in available dicts json 2015-03-25 06:51:13 -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
669ef0745b increase buffer size to remove overlow formatting history in French 2015-03-25 05:45:13 -07:00
Eric House
1cd450bb7b use <plurals> for dictionary deletion string 2015-03-25 04:52:02 -07:00
Eric House
51e86269ac use try for better usage error message 2015-03-25 04:51:30 -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
899d2073b2 towards a script to sanity-check localized strings.xml files against 
English
 2015-03-25 04:43:33 -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
69aa57d951 fix to output unicode 2015-03-19 06:58:28 -07:00
Eric House
75a805634f increase buffer size so French strings don't overflow and get 
truncated.
 2015-03-19 06:28:40 -07:00
Eric House
5f33d99c2e toward making full use of getQuantityString(): add util method to pass 
quantity through to java world, use it, convert English <string>
resources to <plurals> (using python script) based on parallel changes
in French, and modify callsites to call getQuantityString() where
R.string.xxx became R.plurals.xxx.
 2015-03-18 21:23:30 -07:00
Eric House
e89fdf7dc4 first cut at script to convert <string> to <plurals> (with only one "other" <item>) 2015-03-18 07:13:27 -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
4514fc4449 fake <plurals> too 2015-03-17 20:47:17 -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
57c727e3cd add new flag to usage() 2015-03-10 19:56:22 -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
9a551c51f8 add option to print only strings missing from the localized file 2015-03-10 07:41:25 -07:00
Eric House
59f9ebc13d cleanup 2015-03-10 07:41:10 -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
1e051e835c Merge remote-tracking branch 'sf/android_branch' into android_multi2 2015-03-03 21:23:30 -08:00
Eric House
7e7305c1be I want to be able to switch dev machines without having to uninstall 
the latest debug build from my phones, and that requires using the
same debug.keystore everywhere. So check one in, and add a script that
symlinks to it from the machine's global location if necessary.
 2015-03-03 21:19:07 -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
4e7dbbfa30 update build/install instructions 2015-03-03 07:14:03 -08:00
Eric House
22dada5a1a update build/install instructions 2015-03-03 07:12:44 -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
e9cab298d9 makefile for new Czech wordlist 2015-02-24 06:45:32 -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
24de5cc486 change order, showing newest first 2015-02-23 18:24:01 -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
958ca38002 don't log normal case as error 2015-02-20 07:53:24 -08:00
Eric House
6fe0940187 don't log normal case as error 2015-02-20 07:52:19 -08:00
Eric House
6d8f13df9e 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-19 06:45:11 -08:00
Eric House
59bf77c871 fix occasional assert by increasing buffer size 2015-02-19 06:39:32 -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
b23c4d0a73 change comms header format to add a version and flags, marking with an 
almost unique 16-bit quantity. 1 in 2^16 new games will fail because
its connID will match, but that's ok in part because it can only
happen during the time between when this is released and follow-on
version that assumes all older versions are gone.
 2015-02-18 19:19:36 -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
159a1a8dd2 use TAGFMT stuff for comms_resendAll() 2015-02-17 20:45:39 -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
615ec72ea7 fix channelNo equality test so it doesn't break relay games, which 
connect a bit differently.
 2015-02-10 07:26:23 -08:00
Eric House
72a1d8b7d4 clear any server bits that happen to have been set in older games. 2015-02-10 07:05:34 -08:00
Eric House
cf4431402b additional check for misdelivered messages that fixes 
three-participant SMS games on a single device: if message arrived on
a different channel from what its header says it was meant for, drop
it.
 2015-02-10 06:55:08 -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
a34f4e4954 don't save unset channelSeed 2015-02-09 07:28:11 -08:00
Eric House
bdc298b222 remove logging 2015-02-09 07:27:18 -08:00
Eric House
9e403ac6b2 add assert around the new bit that's -- bitten -- me once already 2015-02-09 06:46:34 -08:00
Eric House
5a28f8dedf fix recent message header hack to not break addressing of messages 2015-02-08 18:42:38 -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
88dd25fb21 fix channel comparison so messages actually get deleted after they're 
ack'd.
 2015-02-08 13:39:35 -08:00
Eric House
acf5a01374 Fix assertion failure: comms_msgProcessed() must be called whenever 
comms_checkIncomingStream() is
 2015-02-08 11:29:27 -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
fb011624bb add another assertion meant to find threading problems, and fix assert 
firing because flag was set too late and sometimes bypassed.
 2015-02-08 10:37:54 -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
7e634ecc64 hijack a bit from channelNo to indicate whether message sender is 
server or guest so that sender can tell when it receives a message
from itself (and reject it.) This fixes a lot of confusion in testing
where both participants in a networked game are on the same device,
but might also work around e.g. relay bugs.
 2015-02-08 09:58:34 -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
f039ee8338 reject message for client that arrives for server rather than asserting 2015-02-07 13:20:47 -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
cf3c219b69 fix non-DEBUG compile 2015-02-07 12:54:46 -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
Eric House
17f4e35bf4 tweak wording 2015-01-24 12:57:42 -08:00
Eric House
b2781afeb3 offer to hide newgame buttons via augmented showNotAgainDlgThen shown 
when player has five or more games in list.
 2015-01-24 12:47:22 -08:00
Eric House
3a1e091852 fix crash on receiving end: inviteID is optional 2015-01-24 11:26:48 -08:00
Eric House
95f761d664 cleanup for better logging, including replacing constants with an enum 2015-01-24 11:01:50 -08:00
Eric House
027cd319e6 Merge branch 'android_branch' into android_multi2 
Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-01-24 10:10:10 -08:00
Eric House
7b2a6fddf8 add an assert toward figuring out google-reported assert 2015-01-24 09:48:11 -08:00
Eric House
6da910ea07 merge with remote head 2015-01-24 09:38:05 -08:00
Eric House
44624b20d9 up strings and changes list for release 2015-01-24 08:59:44 -08:00
Eric House
9b0eba8be6 up copyright for the new year 2015-01-24 08:54:06 -08:00
Eric House
f48d79d4c8 provide default default language name (and rename string constant 
being used that way now too)

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-01-23 08:35:04 -08:00
Eric House
e0c9d626ae rename script 2015-01-23 08:30:19 -08:00
Eric House
178156b7d7 Add UI to invite via SMS more than one player per device (if the 
"Advanced" option is enabled).
 2015-01-23 08:19:20 -08:00
Eric House
bfd6b2162d swap two config positions 2015-01-22 07:39:07 -08:00
Eric House
aec70782f4 tweaks to get game initialization working, including not looking on 
startup for incoming text messages if on KITKAT or above.
 2015-01-22 07:37:06 -08:00
Eric House
c3482925b4 Send NLI data for invitation instead of field-by-field. Try to prevent 
duplicate phone number entries when the same number is formatted
differently.
 2015-01-20 07:57:08 -08:00
Eric House
4b345ff28e new methods to store and retrieve byte arrays 2015-01-20 07:52:49 -08:00
Eric House
f8e530da9b Snapshot toward making SMS work again: invites now work via 
user-visible SMS, providing a URL same as email that launches the app
with a new game. Game works sending via NBS (data SMS) when both
devices are on GSM (T-mobile, anyway.) Plan is to use os version and
gsm info included in invite to warn user when the game can't
communicate, but that test isn't done yet. Also removed debug pref
allowing to force send by NBS.
 2015-01-18 10:49:15 -08:00
Eric House
f05d8c774e include class name in log 2015-01-17 22:11:20 -08:00
Eric House
71839b1e85 add READ_PHONE_STATE permission so I can send my phone number in invitatiosn 2015-01-17 22:00:43 -08:00
Eric House
182b651d21 remove unused import 2015-01-17 14:54:37 -08:00
Eric House
1da2ba7220 move commas -- no code change 2015-01-17 08:52:24 -08:00
Eric House
5f657bdfc4 add new change-connect-via button to set disabled when game in play 2015-01-17 08:13:54 -08:00
Eric House
e5ac525087 provide default default language name (and rename string constant 
being used that way now too)
 2015-01-16 21:28:59 -08:00
Eric House
004cd350fc fix uri encoding/decoding so that invite-by-email works 2015-01-16 21:07:55 -08:00
Eric House
31b524e6c0 include forceChannel in emailed invitations 2015-01-15 07:03:35 -08:00
Eric House
306c9ef4b6 hide relay-related stuff when relay communication not enabled; remove 
sms status stuff altogether.
 2015-01-13 21:59:54 -08:00
Eric House
d035396371 string tweak 2015-01-13 21:51:36 -08:00
Eric House
d1c300d752 string tweak 2015-01-13 21:51:27 -08:00
Eric House
af7335c729 refactor 2015-01-13 21:38:27 -08:00
Eric House
7e28d2004b add button to game config activity for changing the connection types to be used in that game 2015-01-13 21:27:51 -08:00
Eric House
2073098a5e fix crash: adding wrong item to list 2015-01-13 19:53:02 -08:00
Eric House
1139b1d5d1 put some space before all but the first heading 2015-01-13 19:42:19 -08:00
Eric House
ea62b90f61 show conn status based on most recently successful connType 2015-01-12 08:00:20 -08:00
Eric House
fc9c262796 catch exception whose cause I'm not sure of but that make it 
impossible to launch the app when a game gets into a certain
state. Probably need to catch exceptions at a top level of game
listing process and offer to discard those in which non-recoverable
exceptions occur. Later...
 2015-01-12 07:27:24 -08:00
Eric House
5c00e31d95 BT sends fail all the time, e.g. when BT isn't enabled on 
remote. Until I figure out how to not try BT after some point, don't
log exceptions.
 2015-01-12 07:24:39 -08:00
Eric House
951f5462b3 remove assert. Can't always get forceChannel right on creation, and 
it's mean to be advisory.
 2015-01-12 07:23:50 -08:00
Eric House
a49e732371 remove logging 2015-01-12 06:26:03 -08:00
Eric House
2fa0ea3375 fix new game alert titles to differ depending on type being created 2015-01-12 06:25:28 -08:00
Eric House
70e4d06e73 don't crash when ctrl-d hit in console 2015-01-07 07:23:40 -08:00
Eric House
861aeeb53a don't crash when ctrl-d hit in console 2015-01-07 07:22:45 -08:00
Eric House
0caf30c4e7 fix forceChannel for NFC invite 2015-01-07 06:53:36 -08:00
Eric House
688b3944bb fixes to invite: don't allow non-servers to invite; have common code 
inform of number of missing even when it hasn't dropped to 0 (so
second invite can be sent for 3+ device games); take down older alerts
before posting new (again since number of missing may have changed)
 2015-01-05 07:43:45 -08:00
Eric House
50f29383f5 tweak invite message to not require all invitations to be sent at once 2015-01-05 07:41:31 -08:00
Eric House
e394bf01e8 add assertion 2015-01-05 07:40:01 -08:00
Eric House
6da1b54636 add preference controlling whether more than on player is invited per 
remote device
 2015-01-05 06:32:16 -08:00
Eric House
05aaffb933 cleanup 2015-01-05 06:31:46 -08:00
Eric House
af6f01fd9c tweak drawing and size of status icon background 2015-01-03 22:18:30 -08:00
Eric House
f39b5e8e82 separate heads in new game icon too 2015-01-03 17:22:57 -08:00
Eric House
327b20a9fe add white space between the heads 2015-01-03 17:20:31 -08:00
Eric House
ddd1efd8dd modify new game actionbar icons to derive from game status icons 2015-01-03 16:44:13 -08:00
Eric House
641d83ab48 use new game type icons 2015-01-03 15:17:12 -08:00
Eric House
d1d6a2669b snapshots of icons 2015-01-03 14:57:19 -08:00
Eric House
6f64ff062e one shot at new one-device game icon 2015-01-03 10:33:32 -08:00
Eric House
4701fe2b90 pass in number of devices already connected so forceChannel can be set 
more correctly; put up alert when device rejects an invitation as a
duplicate.
 2015-01-03 09:50:07 -08:00
Eric House
9e67106adc fix crash by always initializing 2015-01-03 09:49:10 -08:00
Eric House
a7cc96c697 add ability to invite more than one player per device. This is mostly 
for testing and needs to be hidden by an "advanced" pref so folks
don't stumble onto it. Works for BT (SMS will crash), but needs
cleaning up.
 2014-12-31 06:54:31 -08:00
Eric House
d46c7a39f1 pass forceChannel as part of invitation 2014-12-30 07:25:26 -08:00
Eric House
28bfa3c904 make forceChannel part of CurGameInfo rather than comms, since Android 
needs to save it there on receipt of an invitation (doesn't create
full game with comms until later.)  Passes discon2 tests and seems to
work on a single Android device. (Haven't tested inviting on Android
yet.)
 2014-12-29 07:39:28 -08:00
Eric House
e8bb624b0b add preference checkbox for hiding newgame buttons (which are 
duplicated by menu items)
 2014-12-29 07:02:56 -08:00
Eric House
3209fc1b74 log sqlite error codes as strings in attempt to track down the 
occasional assertions failure.
 2014-12-28 21:40:31 -08:00
Eric House
3b7afa4557 pass --server if not setting forceChannel 2014-12-28 21:39:11 -08:00
Eric House
897c4d5786 add param to force a client to connect to host requesting a particular 
channel. Works well enough that relay test script works. Not yet
integrated for let alone tested on Android.
 2014-12-21 17:40:00 -08:00
Eric House
d81f022c78 Merge branch 'android_branch' into android_multi2 
Conflicts:
	xwords4/linux/scripts/discon_ok2.sh
 2014-12-15 16:48:10 -08:00
Eric House
4123de3560 merge android branch heads 2014-12-15 16:44:32 -08:00
Eric House
30d2c84dcc so tests can continue, comment out an assertion that indicates a relay 
bug that neverless doesn't prevent games from running to completion.
 2014-12-15 16:43:24 -08:00
Eric House
26b01acf23 fix crash on duplicate connect packet: drop it, but keep the 
connection alive if the duplicated packet set up addressing correctly.
 2014-12-15 16:42:34 -08:00
Eric House
eb5ae9edd3 declare as little-a array so key will be listed in numeric order 2014-12-15 16:41:15 -08:00
Eric House
45ef4fcb65 add --dup-packets calling through to linux client 2014-12-15 16:14:59 -08:00
Eric House
92fd048eef signature change: return void instead of always returning true 2014-12-15 15:33:12 -08:00
Eric House
4835afbe4a simplify and print in order 2014-12-15 15:29:37 -08:00
Eric House
7560156351 summarize the number of tiles left every 20 passes to give better view 
into games' progress
 2014-12-15 15:11:29 -08:00
Eric House
1eb7d01be5 add option to turn on duplicate packets -- which fires an assert on 
the relay instantly.
 2014-12-11 20:23:51 -08:00
Eric House
ddc9f7994c Merge remote-tracking branch 'sf/android_branch' into android_multi2 
Conflicts:
	xwords4/relay/crefmgr.h
 2014-12-11 06:22:17 -08:00
Eric House
bf53481aad log unexpected condition rather than asserting 2014-12-11 06:18:30 -08:00
Eric House
16c4e74e04 ignore client index of 0, since it means the device needs a slot 
assigned.
 2014-12-10 08:04:56 -08:00
Eric House
2e9c033a29 If client provides its index, honor that when placing it in game. This 
allows a game where indices have already been established over some
transport other than relay to start using the relay mid-game.
 2014-12-10 08:03:39 -08:00
Eric House
39b0d40e41 add local variable to prevent some dereferencing 2014-12-10 08:02:20 -08:00
Eric House
f0cf77d7d6 fix overwriting of addresses that happened for most (relay-only) games 
run by my test script: match records based on channel number only.
This has yet to be tested on multi-addressing Android builds.
 2014-12-10 07:54:50 -08:00
Eric House
00d19eada6 log a few more message checksums 2014-12-10 07:48:51 -08:00
Eric House
68441c60f6 add local variable to prevent some dereferencing 2014-12-10 07:48:38 -08:00
Eric House
9ff7cd1ff9 comment out dead code so I stop trying to debug it 2014-12-10 07:47:36 -08:00
Eric House
e961756f12 give up on hard-coding size of thread->env map: expand it as needed. 2014-12-08 20:43:24 -08:00
Eric House
97092e361c update grepped string to match changes in logging 2014-12-08 06:23:18 -08:00
Eric House
c70fcf64a7 ignore client index of 0, since it means the device needs a slot 
assigned.
 2014-12-08 06:22:30 -08:00
Eric House
f84f9aa85f include timestamp of switch to UDP -- in case it needs to be 
correlated with logs
 2014-12-08 06:20:47 -08:00
Eric House
a80293ba82 include timestamp in "new day" post-crash line 2014-12-05 06:39:10 -08:00
Eric House
b8660470f7 include timestamp in "new day" post-crash line 2014-12-05 06:35:31 -08:00
Eric House
5935681b82 in getDestID, deal with possibility game was consumated via a 
non-relay channel, and allow client to use HOST_ID_SERVER.
 2014-12-05 06:19:02 -08:00
Eric House
9ba9d258f3 If client provides its index, honor that when placing it in game. This 
allows a game where indices have already been established over some
transport other than relay to start using the relay mid-game.
 2014-12-04 06:03:42 -08:00
Eric House
a6f9f6608a drop relay connect meta-messages (as well as game messages) when relay 
send is disabled.
 2014-12-02 06:52:48 -08:00
Eric House
b2b60d6c48 add commandline params that disable comms types on game creation so 
relay not connecting initally can be tested.
 2014-12-02 06:49:35 -08:00
Eric House
c8e55a85a3 use a constant; log a bit more for now 2014-12-02 06:08:58 -08:00
Eric House
a1b967033f summarize role based on relay if in use, bt or sms otherwise 2014-12-02 06:08:18 -08:00
Eric House
73851b285e fix a couple of NPEs 2014-12-01 07:01:10 -08:00
Eric House
fe76cfa1a1 remove logging 2014-11-26 07:21:27 -08:00
Eric House
9bdf9b2f5e pass conType into java world from jni send proc, eliminating loops 
e.g. sending relay setup traffic over BT.
 2014-11-26 07:18:29 -08:00
Eric House
eac026a1a1 remove unused string 2014-11-25 07:18:16 -08:00
Eric House
0250f42b36 remove dead invite code 2014-11-25 07:17:52 -08:00
Eric House
8974407a67 setTitle: it's either networked or not 2014-11-25 07:17:03 -08:00
Eric House
2df8c68e60 remove commented-out logging 2014-11-25 07:16:43 -08:00
Eric House
938756a34f switch for loop to using C99-style variable declarations; no other change 2014-11-25 06:09:18 -08:00
Eric House
53bfe9812d add const 2014-11-24 07:52:03 -08:00
Eric House
363215841d add assert 2014-11-24 07:50:54 -08:00
Eric House
a1cdef6ad8 fix log format 2014-11-24 06:30:58 -08:00
Eric House
f3828ab7c9 merge android_branch -> android_multi2 2014-11-22 17:15:22 -08:00
Eric House
83a79963d4 Merge remote branch 'origin/android_branch' into android_branch 2014-11-22 17:11:40 -08:00
Eric House
4b635791d7 crash fix: provide missing param to format string 2014-11-22 17:08:17 -08:00
Eric House
963b0e23cf don't send bt pings on non-bt addresses 2014-11-21 23:00:16 -08:00
Eric House
142861656e don't send when channel address doesn't have the right type yet 2014-11-21 22:53:48 -08:00
Eric House
80229376e9 include connection types string in header text 2014-11-21 08:02:55 -08:00
Eric House
38e37bfbb9 use gameID as inviteID when it's not provided. Originally it was a 
relay-only thing, but it's associated with being not-standalone in
places and this seems like the easiest fix.
 2014-11-21 08:02:18 -08:00
Eric House
67d41f34a3 remove loggin 2014-11-21 07:58:17 -08:00
Eric House
6c917f34ba fix race-condition assert by dropping message. This needs a better fix. 2014-11-21 07:57:58 -08:00
Eric House
c3ca257a10 oops: new style 2014-11-20 19:13:15 -08:00
Eric House
d08a7f8d24 use a style for new game buttons 2014-11-20 19:12:56 -08:00
Eric House
8d021aa11e trying to hide the buttons when they take too much space. Leaving 
commented out for now
 2014-11-20 19:11:22 -08:00
Eric House
301ce8bc3c spelling error in comment :-) 2014-11-20 18:57:57 -08:00
Eric House
4b30d98bd0 fix to compile with DEBUG off 2014-11-20 07:16:37 -08:00
Eric House
fbea67e479 don't kill relay when bluetooth turned off: pass comms type into 
comms_transportFailed()
 2014-11-20 07:12:25 -08:00
Eric House
d3d83b3557 cleanup 2014-11-20 06:21:22 -08:00
Eric House
a35527ae88 need to copy in BT address too 2014-11-20 06:21:14 -08:00
Eric House
e236a32c20 forgot a mutex 2014-11-20 06:04:11 -08:00
Eric House
56121fdcd4 stop (or at least greatly reduce) leakage of thread->env mappings in 
jni, mostly by having jnithread explicitly announce that it's closing.
Yuck. This stuff *should* obey a stacking protocol but the callback
stuff I'm doing makes me unsure that can work.
 2014-11-19 21:42:21 -08:00
Eric House
a1bbbe3371 separate the new-game icons into two (as stubs) 2014-11-19 19:26:08 -08:00
Eric House
ae81404215 remove assert that was firing 2014-11-19 19:25:42 -08:00
Eric House
7977c8f799 cleanup 2014-11-19 19:19:12 -08:00
Eric House
1962371fe2 flesh out MultiMsgSink so that subclasses invoked e.g. in response to 
BT traffic can send messages via other means as well.  Relay games
with both participants on one device work again.
 2014-11-19 18:46:35 -08:00
Eric House
f14a1c095f print all conn types, not just the first 2014-11-17 07:06:56 -08:00
Eric House
11f7083eb6 remove dead classes and layouts; add menu to create networked games. 2014-11-15 20:42:09 -08:00
Eric House
64276b041e echo so I know it's doing something 2014-11-15 20:37:22 -08:00
Eric House
2465017e46 add buttons that create new games, bypassing the NewGame activity for 
a simpler experience.
 2014-11-15 17:59:59 -08:00
Eric House
d848c17d03 use real strings rather than enum's toString() result in prefs UI 2014-11-14 07:53:12 -08:00
Eric House
e750811836 add relay and bt as default address types when there's no preference set 2014-11-14 07:32:27 -08:00
Eric House
76fe26a057 include the list of currently selected conn types as pref summary 2014-11-14 07:24:24 -08:00
Eric House
2e8f4097d9 remove unused widget 2014-11-14 07:23:54 -08:00
Eric House
15e380291b snapshot: invite by BT now works well enough that moves can be 
exchanged. Haven't checked whether the relay's also seeing traffic.
 2014-11-14 07:12:03 -08:00
Eric House
1d1af9ffb3 fix some asserts: we have BT working now 2014-11-14 07:06:02 -08:00
Eric House
f625332782 add preference (dialog) to set default address types. Not used yet, 
and still ugly.
 2014-11-13 07:27:29 -08:00
Eric House
f2ecefd573 copy bt address info too 2014-11-13 07:27:03 -08:00
Eric House
74afdbd8b6 add more asserts 2014-11-12 06:52:58 -08:00
Eric House
c008f55133 add invite button only if I'm a host and am missing players 2014-11-12 06:52:40 -08:00
Eric House
0e2bbfc1ad augment addresses even when message received is a duplicate. Now games 
using (fake) SMS and relay work whichever of the address modes is
disabled during the game, on either side.  At least for two-device
games.
 2014-11-11 07:46:01 -08:00
Eric House
552ab8fa48 fix assertion (leaving the confusion in the code about tracking the 
open relay socket)
 2014-11-11 07:36:55 -08:00
Eric House
ba44863381 add simple tell() as wrapper on ask() 2014-11-11 07:35:56 -08:00
Eric House
10a960930c collect number to be invited. (Not tested: whether a number other than 1 works) 2014-11-11 07:35:14 -08:00
Eric House
ba6151c385 remove param that causes assert to fire 2014-11-10 07:31:51 -08:00
Eric House
c704b7ff4f remove dead code 2014-11-10 07:31:33 -08:00
Eric House
e82589a526 replace overloaded method with diff-named one, avoiding call to wrong 
one when compiled on old 32-bit Atom. 32-bit issue, or what?  This is
quick and sure to fix it. Should be grafted back to main branch.
 2014-11-10 06:43:42 -08:00
Eric House
94cfaecfb1 replace overloaded method with diff-named one, avoiding call to wrong 
one when compiled on old 32-bit Atom. 32-bit issue, or what?  This is
quick and sure to fix it. Should be grafted back to main branch.
 2014-11-08 23:07:34 -08:00
Eric House
c087824b47 snapshot with a bit of debugging added, mostly to tranfer to another machine 2014-11-07 20:26:02 -08:00
Eric House
786d775878 don't pass null address 2014-11-07 20:25:13 -08:00
Eric House
8e616095ad add a bit more logging of channelNos 2014-11-06 20:28:51 -08:00
Eric House
70f4541bbe Merge branch 'android_branch' into android_multi2 
Conflicts:
	xwords4/common/comms.c
 2014-11-06 20:09:20 -08:00
Eric House
a34a859d18 log channelNo more consistently 2014-11-06 18:44:19 -08:00
Eric House
540d3e9622 wire disabling checkboxes into comms. They work -- and show that 
multi-addressing needs debugging still.
 2014-11-06 06:35:28 -08:00
Eric House
b1de8663d6 fix to compile with DEBUG undefined 2014-11-06 06:32:00 -08:00
Eric House
2426e04a70 fix overwriting of address info so that, AFAICT, both address types 
are successfully being used through much of a test game.
 2014-11-05 21:57:25 -08:00
Eric House
3d9ee4b9f9 use app define, not relay's 2014-11-05 21:45:14 -08:00
Eric House
68e7f303b0 oops -- here's the relay md5sum logging. app side went in prior. 2014-11-05 21:42:45 -08:00
Eric House
c516e1f77c add code to log md5 sums of udp packets sent and received. These match 
relaycon logging to be added shortly.
 2014-11-05 21:42:03 -08:00
Eric House
405b3eef93 remove dead/commented out code 2014-11-05 21:33:54 -08:00
Eric House
564e671b47 quick hack to add checkboxes for turning off transport sends and 
receives to be used for testing after it's actually hooked up.  This
is just the UI.
 2014-11-05 18:48:53 -08:00
Eric House
8aae7ae10a fix crash: don't use comms before initialized 2014-11-05 07:49:17 -08:00
Eric House
17bc0ab47c snapshot of work toward communicating when two addresses are in use. 
An invitation works with relay and (fake) SMS on, and the invited
client connects successfully using both (the second to arrive being
correctly identified as a dupe.)  While the game can be played after,
only SMS messages are being received. And opening a saved game
crashes.
 2014-11-05 07:41:20 -08:00
Eric House
fc6ccf217f fix formatting of types: don't crash on too-small buffer, and add 
separator only when needed.
 2014-11-02 17:25:56 -08:00
Eric House
e1a10508e1 when preprocessing a message, limit search to the address type of the 
channel it came in on if known.
 2014-11-02 17:24:37 -08:00
Eric House
f853aad904 add checkbox to tab label when selected 2014-11-02 11:55:46 -08:00
Eric House
71fbae622a clean up code a bit 2014-10-28 20:13:48 -07:00
Eric House
1ca5515b07 Add checkbox to each type tab indicating whther the game will use that 
addressing type to communicate.
 2014-10-28 08:08:11 -07:00
Eric House
9b336bde49 fix crash: must iterate when multiple types are possible 2014-10-28 08:04:05 -07:00
Eric House
b624867cb4 add addr_rmType() 2014-10-28 08:03:19 -07:00
Eric House
1789d442ba let me look at another player's tiles, regardless of pref setting, 
when game is over
 2014-10-27 19:24:22 -07:00
Eric House
2163d25a27 let me look at another player's tiles, regardless of pref setting, 
when game is over
 2014-10-27 19:23:52 -07:00
Eric House
3024bcbd50 get rid of bt and sms new game options 2014-10-27 19:12:38 -07:00
Eric House
93f0b626af snapshot: invite sent by NFC connects two devices using relay with BT 
ability passed too (though not yet used.)
 2014-10-27 07:51:25 -07:00
Eric House
7a1cd06486 fix crash in dict iteration: add to thread map the env that creates globals 2014-10-23 07:44:41 -07:00
Eric House
c3e7b12103 merge android_branch 2014-10-23 06:33:28 -07:00
Eric House
51a1ddfe39 include robot name in report of his score 2014-10-23 06:32:24 -07:00
Eric House
8486bad44b add default robot name to prefs 2014-10-23 06:21:16 -07:00
Eric House
9886d5a6e6 merge over changes to run with new bash 2014-10-22 18:57:33 -07:00
Eric House
3fe3b1724a replace stacked tracking of env with explicit mapping from pthread to 
env for that thread to fix occasional assertion failure that indicated
I was using the wrong env occasionally.  I'm not super confident in
this because I've seen the env for a thread change, but that could be
due to reuse of the thread id.
 2014-10-22 06:58:42 -07:00
Eric House
452729fb9d merge android_branch 2014-10-17 18:36:08 -07:00
Eric House
53d2c2f0f2 rename method 2014-10-17 18:35:14 -07:00
Eric House
f1e6e2f8f5 can't assert yet -- breaks upgrade 2014-10-17 07:58:26 -07:00
Eric House
df093e1c10 preexisting db field now a set, so treat it that way in the other place it's read 2014-10-17 07:55:04 -07:00
Eric House
4e37947d94 assert, for now at least, no unexpected types being added from jni world 2014-10-17 07:54:34 -07:00