Commit graph

8883 commits

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