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

8755 commits

Author SHA1 Message Date
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