Commit graph

5777 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
363215841d add assert 2014-11-24 07:50:54 -08:00
Eric House
963b0e23cf don't send bt pings on non-bt addresses 2014-11-21 23:00:16 -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
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
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
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
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
Eric House
7cef0c8c06 un-stub-out summary info 2014-10-17 07:47:48 -07:00
Eric House
2e74b97b4a oops: set typeset field in java struct 2014-10-17 07:46:32 -07:00
Eric House
3dfb4ae6f8 Merge remote branch 'origin/android_branch' into android_branch 2014-10-16 20:48:39 -07:00
Eric House
39f8ec4734 expand pattern to match newer .apks 2014-10-16 20:47:43 -07:00
Eric House
ed1b6af246 turn on -std=c99 2014-10-16 20:21:32 -07:00
Eric House
ebfe8ceb28 use Collections.toArray() rather than roll my own 2014-10-16 20:16:50 -07:00
Eric House
dd00ba477b fix mistaken commit: uncomment 2014-10-16 20:16:35 -07:00
Eric House
878a16b3bc snapshot: android compiles, and works well enough to exchange moves
via relay!  Lots of changes, mostly around treating connTypes as a Set
inside the java world.  Jni to translate to that is a pain.
2014-10-16 06:45:24 -07:00
Eric House
215cbe94ba turn on -std=c99 2014-10-15 21:43:34 -07:00
Eric House
76db94effc move git rev pref to bottom 2014-10-14 06:35:12 -07:00
Eric House
5c4242ac62 Fix (by inspection) NPE reported to google: test for null lock before
trying to save its game. Also remove empty overridden method.
2014-10-14 06:31:57 -07:00
Eric House
f14c3216a5 commit changes that have been running for a while 2014-10-13 19:10:56 -07:00
Eric House
bf1f0485df include git hash in name of .apk file 2014-10-13 19:06:40 -07:00
Eric House
858187b9d7 include git rev hash in update info -- for later use detecting when a
tagged build has changed
2014-10-13 07:20:17 -07:00
Eric House
518a6a903d list one more change 2014-10-13 06:48:00 -07:00
Eric House
fd7a03dfc4 remove logging 2014-10-13 06:47:49 -07:00
Eric House
4914e5b564 up strings and change log for new release 2014-10-12 21:12:25 -07:00
Eric House
501f9ad3d9 don't assume group will be found among visible views 2014-10-12 20:51:54 -07:00
Eric House
509df4cad5 add comment 2014-10-12 08:55:07 -07:00
Eric House
0770062559 when it becomes the turn of a game in a non-expanded group, update
that group to show it now contains an in-turn game.
2014-10-12 08:13:02 -07:00
Eric House
e87457cfbe cleanup: a view can always call getContext() 2014-10-10 08:01:08 -07:00
Eric House
9d038d13e4 add "new group" button to move game alert, and logic to relaunch the
move game alert after new group alert exits.
2014-10-10 07:29:36 -07:00
Eric House
019daa6b84 Fix robot and human default dicts being able to be of different
languages: add new languages pref above the two, filter their choices
to be limited to that language, and change them to the first dict of
the new language when it's changed.
2014-10-09 08:03:25 -07:00
Eric House
4f22caafe9 don't assume there was only one missing after downloading first
missing dict
2014-10-09 06:31:43 -07:00
Eric House
d308baca8c add blank line so easier to read 2014-10-09 06:30:00 -07:00
Eric House
74eb6890b9 when user while configuring game chooses to download a new wordlist,
make it the new selection in the spinner from which "Download more"
was chosen.
2014-10-08 19:12:00 -07:00
Eric House
e4e5d599cd Fix new game process to not leave unconfigured new game behind when
user chooses to configure then cancels.
2014-10-07 06:52:55 -07:00
Eric House
095011020d cleanup 2014-10-07 06:07:30 -07:00
Eric House
6d5a556c78 break up chained method calls so stack crawls can more accurately show
source of a crash.
2014-10-07 06:02:00 -07:00
Eric House
a28dc8c182 catch up with comments added 2014-10-01 22:11:58 -07:00
Eric House
618d180aab fix broken about dialog 2014-10-01 22:10:42 -07:00
Eric House
731e2c49e0 call server_do even if not a client, fixing weeks-old breakage of
local-only games.  git bisect rocks!!
2014-10-01 21:54:23 -07:00
Eric House
aade0a9aae cleanup 2014-10-01 08:08:45 -07:00
Eric House
76fb527b11 Handle NFC-invite case same as BT one: create a needs-download
notification rather than a broken game when required wordlist is
missing
2014-10-01 07:36:34 -07:00
Eric House
c1445f11b8 tweak text 2014-10-01 06:45:24 -07:00
Eric House
615d558fac revert 44e0f30520: no longer required
and I'm afraid of changes elsewhere the function's used
2014-10-01 06:32:09 -07:00
Eric House
8b15895380 forget about creating games when wordlists are missing. Instead adopt
the SMS strategy and post a notification response to which opens a
download-or-decline dialog. On finishing the download open and connect
the game.
2014-10-01 06:24:52 -07:00
Eric House
2be0db06ea revert list item change (but keep the padding) 2014-10-01 06:06:47 -07:00
Eric House
e5ae23bf67 try again on dict download to open game, but test first. 2014-09-30 22:02:17 -07:00
Eric House
3c79ea51c3 more helpful hint 2014-09-30 21:56:13 -07:00
Eric House
8b95cbb68a remove unnecessary level of layout nesting, and add padding. 2014-09-30 21:55:52 -07:00
Eric House
d8f93080bf force the language that's the point of opening the dicts downloader to
be displayed expanded to make it a bit easier to figure out what to
do.
2014-09-30 21:48:01 -07:00
Eric House
44e0f30520 modify anyMissing[dict] logic: having some null is ok, but all null is
not.
2014-09-30 21:26:34 -07:00
Eric House
8cc6f8b7cd don't open games created by BT invitation without checking that they
have the dicts they need.
2014-09-30 21:26:02 -07:00
Eric House
b62e4db8d2 better string 2014-09-30 21:21:03 -07:00
Eric House
fa3a2c1c5e don't crash if somehow a game gets opened without a dict 2014-09-30 21:20:47 -07:00
Eric House
8e9ca8603d don't recalc menu and title too early 2014-09-29 20:12:56 -07:00
Eric House
69889c4382 don't set as selected a game inside a collapsed group 2014-09-29 08:16:24 -07:00
Eric House
55ea4d7a04 cleanup 2014-09-29 08:15:41 -07:00
Eric House
afedc8d9f5 fix prev optimization clearing board on load so it only happens when a
different board is about to be drawn.  Fixes flash when btinvite
dialog goes away.
2014-09-29 07:26:39 -07:00
Eric House
0f90538598 track whether invite progress is up and cancel only if it is 2014-09-29 06:19:52 -07:00
Eric House
321a6e7e73 add activity lifecycle logging, off by default 2014-09-29 06:18:48 -07:00
Eric House
9b845634e0 show progress when sending BT invitation -- since it might be a
headset and take a while to time out.
2014-09-27 07:16:36 -07:00
Eric House
75981f52ca up strings for new release, including changelog 2014-09-25 18:36:50 -07:00
Eric House
f3acdfc78a remove bt error count toast 2014-09-25 18:36:22 -07:00
Eric House
a0881b1041 add titles to SMS and BT invite alerts 2014-09-25 07:49:22 -07:00
Eric House
47591fb8c6 For SMS and BT, text contains the text of a button. Substitute in
button text rather than have to keep the two in sync.
2014-09-25 07:34:58 -07:00
Eric House
e0eb22854f save changes to address list 2014-09-25 07:06:33 -07:00
Eric House
2beb897b2c replace scan that tries to connect to all paired devices, taking 20
seconds to discover that some 20-miles-away device isn't here and
resisting use of concurrency, with simple listing of paired
devices. If user tries to invite a headset, try and fail with an error
message.  Fix up re-invite and detection of whether players are
missing to support this.
2014-09-25 06:40:44 -07:00
Eric House
4c2c6e5814 improve bad-protocol messaging: suggestion to upgrade is displayed on
both sides.
2014-09-22 08:09:58 -07:00
Eric House
59f5c17e78 remove debugging toast 2014-09-22 08:00:37 -07:00
Eric House
46907ec03d tweak string 2014-09-22 06:59:23 -07:00
Eric House
45317678b7 a better way of cleaning up 2014-09-21 21:59:21 -07:00
Eric House
73e5f946b2 cleanup: private method to reduce number of params required 2014-09-21 21:54:00 -07:00
Eric House
c5b948b464 offer to launch Setting app when there are no paired devices 2014-09-21 18:03:31 -07:00
Eric House
7964f96b28 include gameID in bt ping, and in reply a boolean indicating if it's
been deleted. Means you open a game and if you have a connection know
immediately that it's no longer there.
2014-09-21 17:32:35 -07:00
Eric House
dbb09241ec save known bt addresses only; names can be looked up 2014-09-21 17:03:25 -07:00
Eric House
e69f0179cc fix script 2014-09-21 16:59:00 -07:00
Eric House
0073cba698 cleanup: get rid of btName wherever possible 2014-09-21 14:59:28 -07:00
Eric House
653ad7c62a cleanup how bt names and addresses are handled, working with addresses
except when something has to be shown in the UI.  Because names can be
duplicated but never addresses....
2014-09-21 14:40:44 -07:00
Eric House
0d04fd138d ping remote BT hosts on game open and on radio on in order to update
the status of the connection arrows.
2014-09-21 13:06:12 -07:00
Eric House
4695619c63 refactor: add methods to be called from elsewhere 2014-09-21 11:35:32 -07:00
Eric House
e52422afcc reflect bt radio state in in-game net status handler 2014-09-21 10:55:13 -07:00
Eric House
ff82ff1e7c add connType param to resendAllIf(): no point resending relay messages
when it's the BT radio that just turned on.
2014-09-19 05:53:49 -07:00
Eric House
645da39e51 use new convenience method 2014-09-18 06:10:55 -07:00
Eric House
2e6993cce0 show bt status red when bt radio turned off 2014-09-18 06:08:43 -07:00
Eric House
36bed8a2c8 call super 2014-09-17 08:03:43 -07:00
Eric House
e6203182ec resend pending messages when BT radio comes back on 2014-09-17 08:03:12 -07:00
Eric House
b97a9518f7 better newbie hint title 2014-09-17 08:02:33 -07:00
Eric House
2321b36bec better newbie hint title 2014-09-17 08:01:58 -07:00
Eric House
e018d136e1 don't disable general beaming, since that prevents default behavior of
launching the store to install on a device that doesn't have the app
yet.
2014-09-17 07:10:41 -07:00
Eric House
810ccb5555 add padding 2014-09-17 07:05:32 -07:00
Eric House
e3667dde2f remove do-you-want-to-invite dialog when NFC used for relay case too 2014-09-17 06:52:57 -07:00
Eric House
e7e04fc2bb don't offer to nfc-invite a SMS game since that doesn't work, and DO a
relay game since that does.
2014-09-16 07:41:09 -07:00
Eric House
9df2d0c1dc keep track of BT IOExceptions, and report the number back to callers.
At least one app I've seen tells the user to restart BT if that number
gets too high; this makes that easy.
2014-09-16 07:25:31 -07:00
Eric House
cfba0411fe hide the expandable headers completely when BT or SMS isn't available 2014-09-16 06:42:53 -07:00
Eric House
3e72da8e3f when sms pref changes, clear cached value 2014-09-16 06:39:46 -07:00
Eric House
82b25d1956 add utility method 2014-09-16 06:39:06 -07:00
Eric House
567f6a2ac0 turn off beaming except where I provide an explicit message
(callback), since it's confusing to have the game offer to beam where
all that's being sent is the install URL.  Hmmm -- maybe we do want
that.  Consider....
2014-09-15 08:03:14 -07:00
Eric House
aeeb3dc3bc fix so when BT invite is tapped for game requiring a missing wordlist,
an offer's made to download and only then is game created.
2014-09-15 07:41:26 -07:00
Eric House
77192bf3bd clear/erase board bitmap before reusing for new game 2014-09-14 15:18:36 -07:00
Eric House
2c8d356ac0 changes to generated files that should have gone with prev commit 2014-09-14 14:50:19 -07:00
Eric House
808e01b428 cleanup: there's no progress to be shown now when inviting 2014-09-14 14:42:58 -07:00
Eric House
45a1dcd5f9 This comment meant for this fix, not prev! :
Fix board sometimes coming up half-height by indicating that it should
never have a soft keyboard associated with it.  It's otherwise getting
told its height is half what it should be, and I can't find any way to
get the layout redone when the keyboard goes away.  (The keyboard in
this case is leftover from the previous activity.)
2014-09-14 14:37:01 -07:00
Eric House
134f7dbe2b fix board sometimes coming up half-height by indicating that it should
never have a soft keyboard associated with it.  It's otherwise getting
told its height is half what it should be, and I can't find any way to
get the layout redone when the keyboard goes away.  (The keyboard in
this case is leftover from the previous activity.)
2014-09-14 14:36:13 -07:00
Eric House
434bbf74cb when inviting to a new BT game, make it so the games come up on both
sides already connected and ready to play.  That requires creating the
game on the sending side before the send so it's ready to receive
messages, and on the receiving side giving the new game a message sink
via which to send its initial registration message.
2014-09-14 13:43:41 -07:00
Eric House
6f07098cf3 return succes from server_initClientConnection() 2014-09-14 13:42:11 -07:00
Eric House
b6f708ee75 add text to missing player alert suggesting tap-to-invite, and dismiss
it if user does so while it's still up (via a bit of a hack).
2014-09-12 07:10:18 -07:00
Eric House
94b51cf53b cleanup; log non-hex gameid too for easier searching 2014-09-12 06:07:32 -07:00
Eric House
b1ea1185f1 tweak invite-received strings. Alas, the inviting player's name isn't
there yet.
2014-09-12 05:56:30 -07:00
Eric House
ebb9684cc9 remove bt variant files too, at least on this branch 2014-09-12 05:47:03 -07:00
Eric House
172d01137a copy stuff required to make main app support BT 2014-09-11 20:42:15 -07:00
Eric House
0924a20a66 sometimes a null addr comes in; check 2014-09-11 19:55:12 -07:00
Eric House
640283263a remove XWords4-sms files; that ship has sailed 2014-09-11 19:40:31 -07:00
Eric House
2a0489889c when the number of available BT devices matches the number of players
sought, check them all initially.  Speeds inviting for most common
case.
2014-09-11 08:05:43 -07:00
Eric House
588e5245d5 log dropped result 2014-09-11 07:20:59 -07:00
Eric House
c47c8928ec open BT game after creating it on invite/nfc reception; remove game
from games list selection when it's deleted by board when open so
action bar is in correct state.
2014-09-11 07:06:12 -07:00
Eric House
a08292a918 Handle invite to BT game via NFC. 2014-09-10 07:24:12 -07:00
Eric House
3b2a537e93 fix crash trying to create new game immediately after allowing board
to delete one.
2014-09-10 07:01:56 -07:00
Eric House
39b9c32fd7 don't track and refuse to connect to deleted games: the tracking was
incomplete (didn't persist) and gameIDs couldn't be reused.  Fix later
when it's not blocking development if the feature still makes sense.
2014-09-09 07:27:04 -07:00
Eric House
95eb140461 cleanup 2014-09-09 07:24:27 -07:00
Eric House
4029af955d inval cache twice, fixing a race condition around creating new BT games 2014-09-09 07:24:17 -07:00
Eric House
46e648933a Log, but don't assert, when an event isn't handled. 2014-09-09 07:23:52 -07:00
Eric House
df6a117c5c cleanup 2014-09-09 07:21:33 -07:00
Eric House
4f6fb61d4b put BT ahead of SMS, and use a style to reduce repeated layout code 2014-09-08 20:42:18 -07:00
Eric House
2400029b8b force all comms-type icons to have same width 2014-09-08 08:02:12 -07:00
Eric House
03c6db78db add new class that's a header-styled label with an expander, and use
that as separator in NewGame activity.  Save expanded state so people
who don't play networked games don't have to see all that text
forever.
2014-09-08 07:30:07 -07:00
Eric House
473bea77d6 get rid of -i param; instead install to all devices instead of passing
'install' to ant.
2014-09-08 07:25:05 -07:00
Eric House
fdde7b67bc ignore dirs for another branch (local only so far) 2014-09-08 07:06:45 -07:00
Eric House
5fbe98e4e2 remove unused string 2014-09-06 06:56:06 -07:00
Eric House
9c0fc39478 add move summary to SMS notifications too 2014-09-06 06:54:43 -07:00
Eric House
c6a9f303f0 include last move summary in BT notifications 2014-09-06 06:47:24 -07:00
Eric House
c1ee254c4f echo what's going on 2014-09-05 21:19:32 -07:00
Eric House
ddc4ab9844 oops: MultiEventListener installation got dropped with the move to
activity delegates; fix
2014-09-05 21:12:35 -07:00
Eric House
1d4d3a7a32 don't use same title for all progress dialogs 2014-09-05 07:49:37 -07:00
Eric House
d949028006 set names as properties; param doesn't seem to work 2014-09-05 07:41:06 -07:00
Eric House
a2853046d4 set names as properties; param doesn't seem to work 2014-09-05 07:40:54 -07:00
Eric House
b9aa335027 log dropped event 2014-09-05 07:40:37 -07:00
Eric House
5035042ce4 rename script, and add install option so can work with multiple devices 2014-09-05 07:29:03 -07:00
Eric House
0b2c029e67 ignore new file 2014-09-05 07:28:10 -07:00
Eric House
eb2cd37980 fix crash by overriding with correct signature 2014-09-05 07:05:14 -07:00
Eric House
b9d9fc2520 put back auto-scp of finished file to server 2014-08-29 07:33:21 -07:00
Eric House
4df0f7ffd2 add option to get new .apk file name into a file 2014-08-29 07:21:54 -07:00
Eric House
ec3168e27d fix, I hope, the occasional misssing notification body by handling the
case where multiple move messages are handled at once.
2014-08-29 07:00:27 -07:00
Eric House
72b506b2e7 if unset in jni world this thing is invalid 2014-08-29 06:59:24 -07:00
Eric House
9e86874e77 catch bt version up 2014-08-27 20:23:57 -07:00
Eric House
3858eb2f1d up strings for release 2014-08-27 07:06:35 -07:00
Eric House
78581490eb don't show survey link yet: it's not ready 2014-08-27 07:06:29 -07:00
Eric House
8407d3b300 cleanup and list changes 2014-08-26 22:17:34 -07:00
Eric House
5343b054a5 include number of tiles in trade confirm message 2014-08-26 21:58:55 -07:00
Eric House
d8266f6a2c tweak title and body of notification 2014-08-26 21:53:28 -07:00
Eric House
88248131da show new client-formatted turn summary in notification; remove old
common-formatting code.
2014-08-26 21:37:33 -07:00
Eric House
2d08848715 snapshot: toward having a better description of the last move in
notifications.
2014-08-26 06:55:26 -07:00
Eric House
d255231179 enable changing reminder intervals via debug setting, and format time
since last move dynamically using days, hours and minutes.
2014-08-22 20:37:50 -07:00
Eric House
880f8f123a list rest of changes 2014-08-20 07:10:53 -07:00
Eric House
e7af6949fe cleanup after code review 2014-08-20 07:10:40 -07:00
Eric House
a464b61a15 fix so net status icon isn't on top of timer 2014-08-19 07:50:15 -07:00
Eric House
815bc9544e don't crash when player has a password set! (was inflating view from
background thread, now a no-no)
2014-08-19 07:30:14 -07:00
Eric House
36afbb7330 fix nag timer math 2014-08-19 06:50:10 -07:00
Eric House
69482bf442 cleanup: move functions from Utils to DelegateBase (and make non-static) 2014-08-19 06:46:03 -07:00
Eric House
38b9420fa0 move survey-display logic into one place so it's always right 2014-08-18 07:53:23 -07:00
Eric House
432badf889 trying again to get survey display logic right 2014-08-18 07:35:40 -07:00
Eric House
e04f7c8f35 fix survey request display logic 2014-08-18 07:28:28 -07:00
Eric House
b278696a30 up strings for new version 2014-08-18 07:17:45 -07:00
Eric House
f374d67aab only show the survey invitation when this isn't the first version
you've installed, i.e. after at least one upgrade.
2014-08-18 07:12:50 -07:00
Eric House
ad7a32504a switch to nag times for ship 2014-08-18 06:53:40 -07:00
Eric House
c83e7773fb make changes an html file in assets, and load via url; add
surveymonkey url
2014-08-15 20:59:28 -07:00
Eric House
1f9be1d03c cleanup 2014-08-14 06:13:23 -07:00
Eric House
bee97f8862 tweak text of reminder (prev-known-as "nag") message to be less harsh 2014-08-12 07:17:36 -07:00
Eric House
67c18f4653 tweak nag message to include the name of the player who last moved 2014-08-11 19:16:39 -07:00
Eric House
50cb87901e warn in hours hours; tweak final warning 2014-08-11 06:27:16 -07:00
Eric House
ac6cda33aa tweak text and test intervals 2014-08-10 20:18:05 -07:00
Eric House
4f514c2e16 cancel notifications by rowid for non-networked games too 2014-08-10 20:13:13 -07:00
Eric House
3655d0c9ff nag based on a array of times rather than a fixed interval, and append
an additional warning after the last is used.
2014-08-10 19:58:03 -07:00
Eric House
8c3180573a pass milliseconds, not seconds (and be careful to cast early) 2014-08-10 19:46:00 -07:00
Eric House
1493895428 add utility date formatting functions 2014-08-10 19:45:04 -07:00
Eric House
bc33d0b81f add comment 2014-08-10 19:44:40 -07:00
Eric House
feb9510b9d deselect games in group when it's collapsed 2014-08-10 15:42:43 -07:00
Eric House
007b390c42 fix crash downloading updates: requestWindowFeature() must be called
earlier, from activity's onCreate
2014-08-10 11:32:46 -07:00
Eric House
9e763b4049 post actual notifications (with text yet to be improved) 2014-08-09 21:00:53 -07:00
Eric House
5230593276 update with new receivers 2014-08-09 18:09:49 -07:00
Eric House
4d4548adc7 toward tagging players who're waiting too long to make a move: store a
nagTime when saving a game that's some interval in the future IFF it's
a local player's turn.  Set an alarm for the soonest nagTime.  The
alarm seems to be firing at the right time, so what remains is to post
notifications.  Also, rather than have two Receivers listening on boot
event added a new one whose sole job that is (and that kicks off other
stuff on boot.)
2014-08-09 18:07:49 -07:00
Eric House
bed04e36c8 add new DB field to track when user should next be nagged about not
having taken his turn.
2014-08-09 17:53:04 -07:00
Eric House
8b4519da74 merge in one more Delegate change from dualpane2 2014-08-09 10:54:21 -07:00
Eric House
59640f59e1 remove unused method added by merge 2014-08-09 10:45:43 -07:00
Eric House
409085dd25 cleanup: remove duplicate methods
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java
2014-08-09 10:45:05 -07:00
Eric House
91e2edecf4 manually merge in improvements to activity/delegate interaction made
toward dual-pane effort.
2014-08-09 10:33:05 -07:00
Eric House
20509d8449 cleanup: remove duplicate methods 2014-08-09 07:20:00 -07:00
Eric House
b7db0125ba add and use NewGameFrag (but the game it launches is as an activity);
cleanup so delegate is only source of what its layout is.
2014-08-07 07:26:53 -07:00
Eric House
4f4a84ccf5 fix showDialog to work when parent activity is the FragActivity
(shared by all DelegateBase instances).  Fix is a hack to continue
using old-style managed alerts because the DialogFragment
implementation takes over onDismissListener and onCancelListener and I
use them too much.
2014-08-07 06:36:41 -07:00
Eric House
7329cb842d add assertion 2014-08-07 06:26:04 -07:00
Eric House
ff5df01b28 pass layout and menu into delegate constructor so it can handle
inflation for fragments and activitites.
2014-08-05 07:02:39 -07:00
Eric House
f4f486403e make it possible to open a second game 2014-08-01 08:09:41 -07:00
Eric House
6d3f56fa45 add studylist as fragment; fix so board displays beside games list 2014-08-01 07:48:24 -07:00
Eric House
96eacabf10 snapshot: tons of changes toward dual-pane. Board opening is about
all that works.
2014-08-01 06:39:09 -07:00
Eric House
bbc3d0e8e3 merge fix_android_beta_86 -> android_branch 2014-07-30 07:24:47 -07:00
Eric House
b532883361 up strings for new release 2014-07-30 07:10:53 -07:00
Eric House
7f880627ec don't create toolbar unless required widgets are present in layout,
then test for null toolbar before use. Fixes NPEs on small screens.
2014-07-30 07:07:00 -07:00
Eric House
f01d12035b test for null (though should not be required to fix this) 2014-07-30 07:05:49 -07:00
Eric House
f093aba1a6 add missing ID so background coloring can work 2014-07-30 07:05:34 -07:00
Eric House
129f404026 do setup correctly from both constructors 2014-07-30 07:03:44 -07:00
Eric House
d51dd6ae7a pass new interfaces into Delegates rather than Activities to get ready for Fragments 2014-07-25 11:17:22 -07:00
Eric House
2d00a7d1ed add bug fix comments 2014-07-24 21:46:37 -07:00
Eric House
683302f40e remove views before adding new one. This shouldn't be possible, but
google's received reports of it happening.
2014-07-24 21:46:23 -07:00
Eric House
c3f4e5323c Fix (by inspection) NPE reported through google 2014-07-24 21:20:15 -07:00
Eric House
33bbbfeec7 change strings for next release 2014-07-24 20:47:54 -07:00
Eric House
3f9ed94ddc final tweak to changelog 2014-07-23 07:08:14 -07:00
Eric House
454ef51cf1 use a single toolbar layout inflated from its own xml rather than
hard-coded as part of board
2014-07-22 19:38:32 -07:00
Eric House
9c1b4454eb add back vertical version of toolbar so board can be bigger in
landscape mode
2014-07-22 08:11:15 -07:00
Eric House
e4c3e9fe13 remove dead code 2014-07-21 22:24:50 -07:00
Eric House
6ac5f2177f catch up with recent changes 2014-07-21 22:13:32 -07:00
Eric House
a84194c180 ignore new files 2014-07-21 21:57:28 -07:00
Eric House
46bc0e01fe up strings for new release 2014-07-21 21:42:10 -07:00
Eric House
83636b6736 clean up trade UI setup 2014-07-21 21:34:52 -07:00
Eric House
38afc4494a fix board toolbar to be centered AND fully available 2014-07-21 20:00:17 -07:00
Eric House
f305e6dc8d center toolbar. This isn't ideal, especially for the existing portrait
layout, but it's much better for landscape.
2014-07-20 19:52:17 -07:00
Eric House
71b2afefbc use cell width for status width 2014-07-20 14:22:35 -07:00
Eric House
8b26a5316d toward putting the status icon in the right place 2014-07-19 21:04:33 -07:00
Eric House
5825b9e056 don't set rect that won't be used 2014-07-18 21:31:21 -07:00
Eric House
0f617d359b fix so space opening up in landscape board layout is colored in
user-settable background color rather than white
2014-07-18 21:29:29 -07:00
Eric House
550e637440 cleanup 2014-07-18 21:28:31 -07:00
Eric House
a902bdcbad limit width of scoreboard too 2014-07-17 21:31:17 -07:00
Eric House
aa811f11eb test screen size in deciding to allow rotation 2014-07-17 21:30:53 -07:00
Eric House
d51a5e67f0 fix for super-wide screen: tiles are never wider than tall. Next:
scoreboard.
2014-07-17 08:01:00 -07:00
Eric House
35248cbef4 reduce min font size 2014-07-16 21:36:42 -07:00
Eric House
694d88bbdb Add preference that, if set, allows board to display in landscape
orientation.  Later a test for screen size will do the same (with
debug pref overriding it to ease testing.)  Board looks like crap in
that mode; will fix next.
2014-07-16 20:11:55 -07:00
Eric House
d37ed8ca2a move onWindowFocusChanged() into superclass 2014-07-16 19:54:13 -07:00
Eric House
6e3563aefc remove french strings: translator hasn't seen them let alone approved
for release
2014-07-16 06:35:15 -07:00
Eric House
ddd1ef70b6 prevent games reset at the same time from all having the same seed by
passing rand()'s seed from java world rather than using current
seconds.
2014-07-15 07:32:57 -07:00
Eric House
467477843b turn proguard back Off. Will get it working on another branch. 2014-07-14 22:37:10 -07:00
Eric House
591926b46c adding file required for proguard 2014-07-14 21:46:09 -07:00
Eric House
3277ffab82 turn on proguard 2014-07-14 21:44:54 -07:00
Eric House
031cd613c1 Don't upload .apk as part of this script. Maybe later as part of -clone.sh. 2014-07-14 21:40:31 -07:00
Eric House
5da0a78710 remove logging 2014-07-14 07:34:16 -07:00
Eric House
079859f510 fix new game creation putting list into state where games couldn't be
launched: don't use m_launchedGame except to track that the UI's
launched a game.
2014-07-13 09:09:48 -07:00
Eric House
229d179b46 "studylist" more consistent than "list" 2014-07-13 09:06:14 -07:00
Eric House
d841a1b00d tweak to encourage crash reporting 2014-07-13 09:05:50 -07:00
Eric House
e6d817e687 add partial French translation (for testing) 2014-07-12 16:19:40 -07:00
Eric House
58a18534b0 tweak changes 2014-07-12 16:12:18 -07:00
Eric House
37c6db8ffc include language in toast confirming addition to wordlist 2014-07-12 16:06:18 -07:00
Eric House
03843e77d1 on return from selecting a new language while creating a game, change
players' wordlists to match
2014-07-12 15:50:01 -07:00
Eric House
7e9c156747 expand/contract wordlist groups via tap on group as well as its arrow
button
2014-07-12 15:34:30 -07:00
Eric House
75e54fa727 don't reuse game list group if it's had its background changed since
that can't be undone (yet)
2014-07-12 11:04:41 -07:00
Eric House
3530e51102 remove unused variable 2014-07-12 10:51:57 -07:00
Eric House
a19437e2d2 use a style for elements common to group headers 2014-07-11 21:38:17 -07:00
Eric House
25d4b0a375 add groups info cache inval so when empty group gets a new game it
grows an expand button
2014-07-11 07:31:50 -07:00
Eric House
8dd1771a37 fix crash deleting two games in a row: don't set a game as selected
after it's been deleted, and delete games in-place from the list
rather than remaking the adapter.
2014-07-11 06:59:23 -07:00
Eric House
6fd0bcec49 Optimization: keep ivars pointing at subviews rather than calling
findViewById each time a GameListItem is recycled.
2014-07-10 06:31:43 -07:00
Eric House
e674ae4a3c recycle views for games list elements too 2014-07-10 06:24:35 -07:00
Eric House
f3f5bf10a5 Recycle convertView for dicts list elements. Next: games list. 2014-07-10 06:15:09 -07:00
Eric House
1864675196 toward being able to reuse views 2014-07-09 21:45:22 -07:00
Eric House
272fabacfc fix studylist option being ignored when launching lookup where
language has only one lookup url
2014-07-09 06:44:48 -07:00
Eric House
5d31671514 save dict to tmp file, renaming only after download is successful.
Fixes crashes when half-saved files are loaded.
2014-07-08 20:53:09 -07:00
Eric House
501227858b make two activities handle config changes like all the others 2014-07-08 20:50:26 -07:00
Eric House
3472296bf4 generated translations 2014-07-08 07:11:24 -07:00
Eric House
9cc4c146aa add newbie hint about wordlist browser 2014-07-08 06:50:39 -07:00
Eric House
1942628584 up strings for release 2014-07-08 06:17:20 -07:00
Eric House
71fce9bf15 make dict (or app) download cancellable 2014-07-07 07:58:41 -07:00
Eric House
7b556af135 remove unused string 2014-07-06 21:38:36 -07:00
Eric House
6a94741c61 fix so game most recently opened is selected after return to list 2014-07-03 17:42:03 -07:00
Eric House
41dbc5dfa3 remove logging when file-not-found 2014-07-03 17:25:29 -07:00
Eric House
8af99e39d1 implement move-groups inside superclass (though only one subclass uses it now) 2014-07-02 21:56:42 -07:00
Eric House
653a1082d9 give list adapters a common superclass and move expand/contract logic
there.  To do: moving of group-moving logic.
2014-07-02 06:28:15 -07:00
Eric House
812d533d10 move list adapter for games list into GamesListDelegate, simplifying
it and speeding it up.  It still gets tossed out too often; next task
is to call mkListAdapter() less frequently.
2014-06-28 15:39:06 -07:00
Eric House
cdf5d6ec9a new commented-out formatting utility 2014-06-28 15:38:14 -07:00
Eric House
177fbb0bad uncheck box as soon as download cancelled (and dismiss rather than
cancel the progress dialog so cancel listener doesn't get called on
normal completion)
2014-06-28 10:57:18 -07:00
Eric House
aa7c3a18e3 when user has to download a dict in order to reset a game (bad, but
too hard a requirement to remove), once the dict's downloaded continue
to reset, not open, the game.
2014-06-28 10:42:33 -07:00
Eric House
a20339df99 tweak newbie message 2014-06-28 10:13:18 -07:00
Eric House
5c5ddd5ecd fix delete dicts warning to catch case of nuking all the lists for a
language at once.  To simplify (coding and user experience), don't
bother with case where user will have to switch to another list before
opening a game.  May want to reconsider this.
2014-06-27 08:29:42 -07:00
Eric House
38b37643f4 call mkListAdapter in a couple of places exposed now that it's not called in onResume 2014-06-24 22:04:59 -07:00
Eric House
f2eea61a76 name lang 0 "unknown", and display dicts with langs outside the known range there. 2014-06-24 21:33:44 -07:00
Eric House
d062508929 no need to rebuild list onResume 2014-06-24 21:32:49 -07:00
Eric House
c82ec8b646 use lang name, not code, to build download URL. Fixes download of Experimental lists. 2014-06-24 08:18:42 -07:00
Eric House
e36f68a1d0 make list item text elements single-line to prevent long-named
wordlists from looking ugly
2014-06-24 08:18:42 -07:00
Eric House
eac5e1dd65 cancel wordlist download/digesting when progress dialog dismissed 2014-06-24 08:18:42 -07:00
Eric House
39809e49aa fix another NPE (though these don't occur on older devices) 2014-06-24 08:18:42 -07:00
Eric House
7e515b19c9 fix NPE in studylist; cleanup duplicated method 2014-06-24 08:18:42 -07:00
Eric House
4d9c7c97ba Merge remote branch 'origin/android_localize' into android_localize 2014-06-24 08:16:56 -07:00
Eric House
d1f3648390 better shelf clearing 2014-06-24 08:16:01 -07:00
Eric House
23aa211a75 don't insist on presence of game's dict when deleting game 2014-06-23 08:14:19 -07:00
Eric House
91db8d9cdb track which list items are expanded so when rebuilt (e.g. after
scrolling out of sight) the retain their state.  (Not preserved across
invocations of the activity.)
2014-06-23 08:03:48 -07:00
Eric House
0749266ec3 remove padding 2014-06-22 16:05:46 -07:00
Eric House
46fba6204a switch to providing details about remote wordlist via expanding view
rather than a separate alert.
2014-06-22 13:36:25 -07:00
Eric House
91fe1537cb specify orientation (no change, since it's the default) and make
formatting standard.
2014-06-22 12:41:25 -07:00
Eric House
0c1d9661df make downloadable checkbox bigger and easier to hit 2014-06-22 12:00:30 -07:00
Eric House
4f093d13c1 change download checkbox string 2014-06-22 11:59:35 -07:00
Eric House
e3ca40c221 make prompt clearer 2014-06-22 11:15:44 -07:00
Eric House
8783822bdc fix crash after lookup of word when language has only one URL
(e.g. Dutch) by not skipping the LookupAlert dialog in that case.
2014-06-22 11:12:31 -07:00
Eric House
e9608a867e use existing wrapper method rather than calling on activity 2014-06-22 10:40:20 -07:00
Eric House
e1f7c13fc7 print wordlist count as part of group title 2014-06-22 09:42:08 -07:00
Eric House
cf0c864553 rename method 2014-06-20 18:44:47 -07:00
Eric House
509dfb4b4f launch DictsActivity for result, and have it return the last language
and wordlist downloaded. Use that information to update the spinner
that launched it so that choosing "download more" then downloading a
German wordlist causes German to be selected.
2014-06-19 20:42:34 -07:00
Eric House
c31697ea47 tweak DictsDelegate so it works when invoked via "Download more..."
from GameConfig spinners to add langs and dicts within a lang.
2014-06-19 07:57:46 -07:00
Eric House
770679daa0 combine window titles since windows are also combined 2014-06-19 07:53:28 -07:00
Eric House
0c2f85d534 put back missing string for game config dialog (missed from prev commit) 2014-06-18 20:51:24 -07:00
Eric House
5568f00dd8 put back missing string for game config dialog 2014-06-18 20:51:00 -07:00
Eric House
975c37ddae add note to info alert, blank if not present 2014-06-18 20:25:45 -07:00
Eric House
927ba028fb cleanup 2014-06-18 20:24:13 -07:00
Eric House
27972d10e7 new files to ignore 2014-06-18 20:23:58 -07:00
Eric House
2c7128ad30 pull note out of dict header 2014-06-18 20:18:09 -07:00
Eric House
44e2c988ad treat nBytes as a long 2014-06-18 06:51:33 -07:00
Eric House
b6d316134d more tweaks to wordlists: display names of those that can be updated;
click on available list shows info and offers to download; etc.
2014-06-18 06:48:04 -07:00
Eric House
03b0b041fc Fix NPE 2014-06-18 06:48:04 -07:00
Eric House
0fe9949449 log when we don't have lang name 2014-06-18 06:48:04 -07:00
Eric House
b3852ba603 cast to int so doesn't get turned into a string on the java side 2014-06-18 06:46:45 -07:00
Eric House
3e107a82e2 include word count and file size 2014-06-18 05:18:22 -07:00
Eric House
99db1cef51 snapshot on the way to removing RemoteDicts in favor of DictsActivity
with a "show remote" checkbox at the top.  Works, but incomplete.
2014-06-17 06:42:07 -07:00
Eric House
2fa9b9151c remove firefox warning and unused method 2014-06-13 07:34:15 -07:00
Eric House
26a8bf418f move into superclass 2014-06-12 23:52:20 -07:00
Eric House
9cfacf6667 don't download already-installed dicts 2014-06-12 07:30:13 -07:00
Eric House
3cfd29fb2e update dict to show 'installed' after successful download 2014-06-12 07:18:32 -07:00
Eric House
f375defc0b preserve scroll position across recreation of list adapters 2014-06-12 06:51:17 -07:00
Eric House
ac2c960ef5 fix stupid listadapters, and preserve selection for remotedicts list too 2014-06-11 19:07:05 -07:00
Eric House
6de515e75e use a hashmap to track selected wordlists so selection survives
orientation change (which typically creates new views).  TODO: apply
same trick to remotedicts display.
2014-06-11 08:15:33 -07:00
Eric House
b3823bacb1 label dicts that are installed and that need updating 2014-06-11 07:07:14 -07:00
Eric House
42225e314e center emtpy list text 2014-06-11 06:57:51 -07:00
Eric House
281bee2e18 snapshot: mark already-installed wordlists as such. TODO: don't enable
download menuitem when they're selected, and also compare md5 sums to
deal with anything that's installed but out-of-date.
2014-06-10 07:25:21 -07:00
Eric House
4e4175f486 add ability to look up by language name. Note: this code is hitting
the DB way too often and needs to be optimized!
2014-06-10 07:08:56 -07:00
Eric House
45ebb8d3b9 put dict list info in shelf for faster response 2014-06-07 17:57:43 -07:00
Eric House
f4a098e75b add progress wheel 2014-06-07 17:52:06 -07:00
Eric House
874aa72009 get rid of handler 2014-06-07 17:52:06 -07:00
Eric House
f790b9dfda Merge remote branch 'origin/android_localize' into android_localize 2014-06-07 17:51:07 -07:00
Eric House
d54bbb3beb don't barf when something not found in git history -- just return nothing, as it's the dev case 2014-06-07 17:50:35 -07:00
Eric House
d0f901481b change prepareDialog signature to make harder to confuse with onPrepareDialog 2014-06-06 07:02:20 -07:00
Eric House
ab15037076 fix method name that prevented its getting called 2014-06-06 06:52:22 -07:00
Eric House
60dc482e76 move method into superclasses 2014-06-06 06:33:28 -07:00
Eric House
164199335a oops: this activity doesn't have a menu 2014-06-06 06:10:46 -07:00
Eric House
4ff473ed41 need to call super to avoid a crash 2014-06-06 05:56:37 -07:00
Eric House
bfe3e1303f conform with static member naming convention (no code change) 2014-06-06 05:46:05 -07:00
Eric House
93446a1760 tweak: don't redo adapter once the last download finishes 2014-06-06 05:31:08 -07:00
Eric House
c184d68976 fix NPE -- but something's still wrong with player config dict spinner 2014-06-06 05:24:41 -07:00
Eric House
202c942ab0 remove progress trackers as downloads come in 2014-06-05 07:17:55 -07:00
Eric House
b0912f3fa2 oops: needed to rename in manifest too 2014-06-05 06:19:42 -07:00
Eric House
fe7bb09d46 rename class: it's not just for wordlist any more 2014-06-05 06:10:15 -07:00
Eric House
f8612e727d Support download of multiple dicts at once. (Download of apps not tested and may be broken. Next...) 2014-06-05 06:05:23 -07:00
Eric House
08b96dac82 center empty list message 2014-06-03 07:49:20 -07:00
Eric House
f3daed2e12 add menu to remote dicts display, track selected dicts, and implement
download. Which works. Still need to clean up UI for multiple
downloads, track selection across rebuilds of list adapter, etc.
2014-06-03 07:45:08 -07:00
Eric House
11178845fc remove extension from dict name in download progress bar 2014-06-03 07:45:08 -07:00
Eric House
7c95c36025 cleanup imports 2014-06-03 07:45:08 -07:00
Eric House
064ef0c137 display languages in sorted order 2014-06-03 07:45:08 -07:00
Eric House
ae4260a259 snapshot: handle json data (hardcoded for now) from server and display
collapsible list of selectable dict names.
2014-06-03 07:45:08 -07:00
Eric House
b1705e6073 make lang group header expand button actually expand/contract. 2014-06-03 07:45:08 -07:00
Eric House
03f16a1e0b avoid NPE 2014-06-03 07:45:08 -07:00
Eric House
4596ed5d7b snapshot on the way to removing last expandablelist use: dictsdelegate
lists languages and wordlists under them, but nothing's colapsable yet.
2014-06-03 07:45:08 -07:00
Eric House
393d419056 cleanup: remove unused imports 2014-06-03 07:45:08 -07:00
Eric House
d55dd7e206 change format of downloadable dict info. Late checkin: Android code's
been counting on this for several days.
2014-06-03 07:43:47 -07:00
Eric House
a6205f3dca move onBackPressed() into activity superclasses 2014-05-29 07:15:34 -07:00
Eric House
092c0f54c8 include md5sums of dicts in json 2014-05-28 20:45:55 -07:00
Eric House
ef970efc7a don't crash: call setContentView() from delegate rather than activity 2014-05-28 20:45:14 -07:00
Eric House
5d0a6babae add function to list all wordlists by lang in a json -- toward not
using webview for download function.
2014-05-28 07:14:45 -07:00
Eric House
937e1fa9a9 don't upgrade app and translations at the same time (since new app may
behave differently once installed)
2014-05-28 06:43:37 -07:00
Eric House
9d23aef31d when a string has format specifiers, highlight them, and offer a
newbie tip explaining the translation must match.
2014-05-22 23:50:44 -07:00
Eric House
a6d8a74102 move a few methods, and add utilities, to superclass. 2014-05-22 23:35:51 -07:00
Eric House
4b26e04691 fix update when text cleared: passing null to setText() is ok 2014-05-22 06:46:59 -07:00
Eric House
91d7213be6 fix strings.xml files, syncing names and removing obsolete elements 2014-05-22 06:35:08 -07:00
Eric House
f87bf2f95d allow non-English strings.xml files to have duplicate text 2014-05-22 06:07:55 -07:00
Eric House
d1aa5d73f2 don't allow to save translation where format specifiers don't match; cleanup 2014-05-22 05:59:43 -07:00
Eric House
6f6781ceed move dialog creation stuff into activity base class 2014-05-21 22:03:56 -07:00
Eric House
174ee22a4b use inherited invalidateOptionsMenuIf() 2014-05-21 20:08:57 -07:00
Eric House
0b379a941b snapshot: add menu to xlation item editor. 2014-05-21 06:59:38 -07:00
Eric House
2293e6a730 remove unused imports 2014-05-21 06:56:51 -07:00
Eric House
3055a0a1e4 result of running fix_loc_xmls.py with new -% option 2014-05-20 20:54:12 -07:00
Eric House
9a9a4e2991 add option to replace %s with %1$d etc. 2014-05-20 20:53:48 -07:00
Eric House
0b6549d829 as formatted by python scripts, but without any non-whitespace changes 2014-05-20 20:52:18 -07:00
Eric House
dbaa28de5e don't refuse to delete local translation 2014-05-20 07:00:03 -07:00
Eric House
9bf92257b9 ignore more stuff 2014-05-19 07:54:08 -07:00
Eric House
af5cbe5325 need to call super when don't handle an id locally 2014-05-19 07:53:41 -07:00
Eric House
4452adf33d no blank Translate menu titles 2014-05-19 07:26:10 -07:00
Eric House
1ebf51d3ab when building from modified tree, still use latest commit number for
about box for easier debugging. Shouldn't matter for releases.
2014-05-19 07:15:21 -07:00
Eric House
f8dbc91cb0 don't set constant if R.java has uncommitted changes 2014-05-19 07:10:29 -07:00
Eric House
8f15f76fed label xlations with the language name 2014-05-17 16:57:24 -07:00
Eric House
018424e6e8 modify item text after the db backing it is modified by covering edit
activity.
2014-05-16 22:11:18 -07:00
Eric House
dfbb1bae71 derive context from menu that's triggered from it rather than trying
to set it from onResume() calls.
2014-05-16 22:05:48 -07:00
Eric House
3c4ed7de46 associate strings with the contexts in which they're looked up and
implement that filter.  I'm tracking by the name of the class rather
than a WeakReference, which means that the hashsets of keys will never
be freed.  Will need to see how much memory that means I'm using.
2014-05-16 06:40:01 -07:00
Eric House
c44a676808 derive from XWListActivity 2014-05-15 21:47:46 -07:00
Eric House
750393a5e6 oops: get the translation activity translated! 2014-05-15 06:53:03 -07:00
Eric House
891af6a84d use iter.remove to avoid ConcurrentModificationException 2014-05-15 06:43:59 -07:00
Eric House
6ce47f8208 use WeakReference rather than hashCode to associate menu with its strings 2014-05-15 06:37:03 -07:00
Eric House
5364f31da0 add filter and state-tracking for most recent menu. Used hashCode to
identify menu (since keeping a reference to it would cause it to
leak.) Will try WeakReference instead, or just dumping when another
comes along.
2014-05-15 05:41:15 -07:00
Eric House
e8efd70bdc tweak strings 2014-05-15 05:39:29 -07:00
Eric House
cbb10f6994 remove logging 2014-05-15 05:31:40 -07:00
Eric House
5e70d28ea1 first cut at filtering: all and modified work, but the other two
require that I track strings by the contexts in which they appear.
2014-05-14 21:24:29 -07:00
Eric House
6426e41d30 show locally-translated strings in red 2014-05-14 19:04:58 -07:00
Eric House
d00e49f843 save edited translations 2014-05-14 06:46:08 -07:00
Eric House
3040003126 oops -- include auto-modified files 2014-05-13 21:23:53 -07:00
Eric House
c4598f2bf9 tweak main translations strings layout 2014-05-13 21:22:50 -07:00
Eric House
4d42768f83 add separate activity/delegate for editing translations, launched by
tapping on a line in the list-o-strings.
2014-05-13 21:07:56 -07:00
Eric House
47eaca3d71 add filter spinner to translate dialog (though there's not yet data to filter on) 2014-05-13 06:30:38 -07:00
Eric House
049c55e2d2 toward adding default menu to all activities and eventually tracking
translations by where they're used so most relevant can be shown: put
back common superclasses XWActivity and XWListActivity with default
implemenations of activity lifecycle methods that call through to
delegates (and that later can help LocUtils track what's been seen
when.) Not thoroughly tested, but seems to work for the main screens
anyway.
2014-05-12 21:26:31 -07:00
Eric House
19204d5720 remove unused/commented-out file 2014-05-12 21:23:27 -07:00
Eric House
c42e5f2c0f keep elipses char where it belongs when reversing rest of strings 2014-05-11 20:15:10 -07:00
Eric House
49001c6893 various changes so dbg and bt versions build again -- and may work, but
that's not tested yet.
2014-05-11 19:55:05 -07:00
Eric House
2a3b8c7a74 when reversing words, preserve capitalization (i.e. start don't end with a cap) 2014-05-10 06:52:26 -07:00
Eric House
c06f0e157d first cut at file to clean up variant trees by removing anything not
under version control
2014-05-10 06:50:55 -07:00
Eric House
b085aeeb46 translate DialogPreference title, message and buttons 2014-05-06 21:13:10 -07:00
Eric House
30b966b902 generate fake translations automatically 2014-05-06 07:47:29 -07:00
Eric House
c0afd40337 update test section to work again 2014-05-06 07:25:00 -07:00
Eric House
806851057c update translations, late. This needs to be automated!! 2014-05-06 07:24:17 -07:00
Eric House
0ff09868cb Query user before removing build dir 2014-05-06 06:58:57 -07:00
Eric House
a4cd137cef get rid of #1 used to make strings unique: remove duplicates where
possible, and where not replace it with a non-printing zero-width
unicode char.
2014-05-06 06:27:33 -07:00
Eric House
d566bd63ae break the last Activities out into Delegates, and move a bunch of
stuff info the delegate base class so fewer calls required on
m_activity and LocUtils.
2014-05-06 05:56:43 -07:00
Eric House
5d9e846316 make constructor protected 2014-05-06 05:55:33 -07:00
Eric House
ce77f09588 the new spinner adapter override works much better for game config's
spinners
2014-05-05 07:38:37 -07:00
Eric House
96ca4f9946 fix NPE: not all spinners have adapters 2014-05-05 07:27:06 -07:00
Eric House
1170a31385 translate spinners by replacing their adapters with new class that
delegates to old then translates any views returned
2014-05-05 07:19:35 -07:00
Eric House
6165fc2201 translate list summary 2014-05-05 06:45:37 -07:00
Eric House
22a9fbdb3e translate color setting pref dialog 2014-05-05 06:37:05 -07:00
Eric House
3a7111c098 translate ListPreference lists 2014-05-05 06:03:33 -07:00
Eric House
477019757e make getopt flags match what usage says is there 2014-05-04 16:39:56 -07:00
Eric House
1fcf9027cb when looking for a translation for locale xx_YY, if there is none try
again for just xx. And silently drop strings in the translation file
with names that don't exist in English, though eventually that
shouldn't happen.  With this change a newly installed app on a
claiming-to-be-Czech emulator picks up the Czech translation within
moments.
2014-05-04 16:26:35 -07:00
Eric House
edcd29c88d in order that non-English versions not go long after installation
without translations, try immediately after any install or upgrade to
get translations from server.  (Triggered from the Application rather
than an Activity, so initializing the preferences DB had to be moved
there too.) Should probably post a notification after installing
localizations, ideally with a message in the language, offering to
restart with all new strings.
2014-05-04 15:41:02 -07:00
Eric House
6d60e45eb9 tweak fake translation generation (and include new strings) 2014-05-02 22:08:44 -07:00
Eric House
43f90cb3b0 use -1 as array index 2014-05-02 22:03:02 -07:00
Eric House
ad65b93ef2 changes necessary to actually return a translation based on revision
hash of R.java passed by client, or none if it already has it.  Rough,
but works.
2014-05-02 22:00:25 -07:00
Eric House
56a057f06c when translations get out of sync with R.java values, there's often a
format exception.  Catch that, and strip out the locale's translations
so the app at least doesn't crash.  This should not happen once I have
the server side right, but it'll help now and provide a safety net
later.
2014-05-01 22:05:57 -07:00
Eric House
8d6f46fa22 snapshot. Should work for current case where the newest R.java is older than the app connecting 2014-05-01 08:15:42 -07:00
Eric House
7b40abfa2f more features and some refactoring 2014-05-01 08:14:40 -07:00
Eric House
5a22e08664 no need for package name in app info as it's in the top-level obj 2014-04-30 07:28:42 -07:00
Eric House
164387b37d update to use mygit 2014-04-30 07:25:23 -07:00
Eric House
6d194e5362 don't chdir (which isn't cool when a cgi); use subprocess's cwd param instead 2014-04-30 07:08:59 -07:00
Eric House
d91c307792 include hash of current R.java in xlation update json, not of the entire app 2014-04-30 03:29:47 -07:00
Eric House
a3bcef18f0 add more functionality 2014-04-29 21:15:50 -07:00
Eric House
a7c4730eb5 start of a file to interact with git for getting xlations 2014-04-29 06:53:02 -07:00
Eric House
d463ea3f30 commented-out line to copy xwdb into /sdcard from which it can be retrieved 2014-04-29 06:43:11 -07:00
Eric House
4279457471 name change to remind what script is doing 2014-04-29 06:43:11 -07:00
Eric House
b4d5130588 Merge remote branch 'origin/android_localize' into android_localize 2014-04-29 06:39:35 -07:00
Eric House
7ea037d56a work with arrays of locales 2014-04-29 06:33:14 -07:00
Eric House
6c46ce2297 send and receive array of locales for translation info, one of which
is the device's current default.  Plan's to include a fake as well if
set, but currently that replaces the default.
2014-04-28 07:58:23 -07:00
Eric House
b42c372c79 send git version code, app package name, and git hash with all messages 2014-04-27 20:03:40 -07:00
Eric House
be817feb55 add git rev hash as constant (and usage()) 2014-04-27 20:03:08 -07:00
Eric House
19badff420 tweak text 2014-04-27 19:21:21 -07:00
Eric House
b87a7e808c don't fail building if scp fails 2014-04-27 19:08:04 -07:00
Eric House
33a83b0e2f toward use of data text messages for games: don't let CDMA phone users
turn data messages on, and when checking if SMS is supported say yes
for KitKat users if they've successfully turned data on.
2014-04-27 13:34:09 -07:00
Eric House
f386cd5c1b for consistency, createDialog -> onCreateDialog 2014-04-27 13:17:48 -07:00
Eric House
716109e979 Merge branch 'android_branch' into android_localize
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
2014-04-26 22:04:57 -07:00
Eric House
c82c59d985 experimental: enable SMS on KitKat if debug setting to use Data SMS is on 2014-04-26 20:04:55 -07:00
Eric House
fbb042ffee merge android_branch -> android_sms_kitkat 2014-04-26 18:31:05 -07:00
Eric House
ae4c6e98f2 replace escaped carraige returns and unicode from resources to get
closer to what getString returns.  If I can't find an Android API to
do this it should be done on the server, but this is an improvement
until I do.
2014-04-25 20:58:14 -07:00
Eric House
540eb73aec merge android_branch 2014-04-25 20:33:57 -07:00
Eric House
ead0fdf668 merge from_android_beta_82-> 2014-04-25 20:29:54 -07:00
Eric House
a7c1724bb8 another change 2014-04-25 07:46:33 -07:00
Eric House
2f3a7f4bd2 allow board screen to be "upside down" on OS version new enough to
support it (and make SMS Invite Activity go any way, just like
everything else)

Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
2014-04-25 07:46:22 -07:00
Eric House
7818cd002b merge android_branch->android_localize 2014-04-24 20:00:38 -07:00
Eric House
6e011ab36f allow board screen to be "upside down" on OS version new enough to
support it (and make SMS Invite Activity go any way, just like
everything else)
2014-04-24 19:59:20 -07:00
Eric House
808e342cd4 clean up 2014-04-24 19:58:18 -07:00
Eric House
28e81e3a74 translate preferences -- finally. 2014-04-24 07:56:27 -07:00
Eric House
3b4c672492 toward substituting what getString (or the resource compiler) normally does. 2014-04-24 07:08:57 -07:00
Eric House
ed3370133f use lowercase \u instead; \U isn't acceptable in java 2014-04-24 07:01:53 -07:00
Eric House
00ecf0d9d0 be consistent using capital-U \U to indicate unicode 2014-04-24 06:53:13 -07:00
Eric House
28c0862604 translations come in with ids rather than English strings as keys 2014-04-24 06:31:27 -07:00
Eric House
8612a5f624 use IDs rather than english strings as keys in passing
translations. Requires parallel change on client, and currently
doesn't quite work because e.g. \n is not replaced before the
translation is rendered.
2014-04-24 06:24:38 -07:00
Eric House
1e5a474692 remove unneeded param 2014-04-24 06:21:10 -07:00
Eric House
7434c6a3a7 cleanup 2014-04-23 19:41:44 -07:00
Eric House
6d7d4955a0 more informative log message 2014-04-23 19:38:16 -07:00
Eric House
780b22678e add param caller expects 2014-04-23 19:35:35 -07:00
Eric House
36f839f8d1 more stuff to not reverse/capitalize (e.g. "\n"); print to stdout by default 2014-04-23 19:35:10 -07:00
Eric House
19c32b0444 Merge branch 'android_branch' into android_localize
# 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.
2014-04-23 07:44:51 -07:00
Eric House
6a4c599da5 Merge remote branch 'origin/android_branch' into android_branch 2014-04-23 07:40:46 -07:00
Eric House
e25a0e7dbc changes for translation downloading 2014-04-23 07:39:36 -07:00
Eric House
cb96960446 let's track changes in the fake translations for a bit 2014-04-23 06:28:03 -07:00
Eric House
e643e9d5c0 add debug preference via which Translate menuitems must be enabled 2014-04-22 21:06:05 -07:00
Eric House
0a3371a82f break most of PrefsActivity into PrefsDelegate 2014-04-22 20:59:58 -07:00
Eric House
f410f8bb1a separate local and blessed (server) translations, fix to update or insert correctly and handle keys with embedded quotes, etc. Works to download translations, but a lot of longer keys don't seem to be matching. 2014-04-22 07:43:55 -07:00
Eric House
0e9790ee7c new string 2014-04-22 07:42:26 -07:00
Eric House
66768c7e7d better formatting and key identity checking 2014-04-22 07:30:32 -07:00
Eric House
ec0443b2ce add constraint to loc table 2014-04-22 07:29:35 -07:00
Eric House
94597ee287 record R.java where it won't be used. I want to see how often, and in what ways, it changes. 2014-04-21 19:46:27 -07:00
Eric House
45b1b0bfa8 script to produce the translation array that's downloaded to device 2014-04-21 07:13:41 -07:00
Eric House
0bf8b45157 implement reverse fake-locale 2014-04-20 21:36:41 -07:00
Eric House
5d3beb6404 script to generate fake locales from English strings.xml for use testing downloading translations 2014-04-20 21:26:43 -07:00
Eric House
155dd6f19a snapshot: now receives updates from the server and they show up in
menus etc. (after a restart.)
2014-04-20 06:49:26 -07:00
Eric House
f0bd300f1b add setter for new table 2014-04-20 06:45:00 -07:00
Eric House
ed7da84da6 fix compile: add missing param 2014-04-18 19:38:12 -07:00
Eric House
e0404801ba fix clean builds 2014-04-18 19:25:40 -07:00
Eric House
dbc42c3ad2 include xlation info in update request to server. It's not handled yet
and so the handling of the result is untested.
2014-04-18 08:03:01 -07:00
Eric House
901e07c0aa getter for new pairs DB 2014-04-18 08:02:25 -07:00
Eric House
b636fe263b new table for generic key/value pairs, and fix crash on new install by
not requiring localization db to exist during db creation.
2014-04-18 08:01:26 -07:00
Eric House
96c7f301d0 replace the last of the context.getString(...) calls with LocUtils.getString(context,...) 2014-04-18 07:14:27 -07:00
Eric House
ce59793458 use table to recover from too-new db. (tables are ugly in java) 2014-04-18 07:06:51 -07:00
Eric House
62ecd00971 remove redundant code 2014-04-18 06:26:25 -07:00
Eric House
4d08c7cef9 merge android_branch->android_localize 2014-04-18 06:21:45 -07:00
Eric House
48eb900212 merge -> android_branch 2014-04-18 06:10:25 -07:00
Eric House
c576ec7d7d up client version so relay knows we're cool 2014-04-18 06:05:15 -07:00
Eric House
8ba19184a0 merge from_android_beta_82->android_branch 2014-04-17 08:32:39 -07:00
Eric House
529e6733d0 up strings for new release 2014-04-17 08:27:42 -07:00
Eric House
56ce5761d7 fix malformed utf-8: writeBytes just strips all but the last byte of multi-byte utf8 chars! 2014-04-17 07:42:34 -07:00
Eric House
843518af4d use antcall with params rather than dependency with global properties 2014-04-17 05:34:27 -07:00
Eric House
538cd7b154 disallow duplicate strings in strings.xml, manually appending #<digit>. Will eventually filter that out of displayed strings. 2014-04-16 21:14:53 -07:00
Eric House
f5f7428683 fix debug tree to build again, this time with a paramaterized common
xml file
2014-04-16 21:06:41 -07:00
Eric House
79dc66b3a7 add array index as comment 2014-04-16 07:44:10 -07:00
Eric House
be581e762e fix more getString calls -- just keeps going 2014-04-16 07:12:45 -07:00
Eric House
85ffd0cad9 fix getStrings() calls for studylists 2014-04-16 07:02:09 -07:00
Eric House
1eea5bfed5 route more getString() calls through LocUtils 2014-04-16 06:52:20 -07:00
Eric House
1c35bd2a1b call init from outside after constructor completes rather than from inside constructor 2014-04-16 06:46:24 -07:00
Eric House
e2ed445fca complete rename of activity 2014-04-16 06:44:38 -07:00
Eric House
57f9182a4d inval group cache after deleting a game 2014-04-16 06:44:24 -07:00
Eric House
6198992fcd rename file 2014-04-16 06:07:59 -07:00
Eric House
e5151c32be make constructor private 2014-04-15 21:22:56 -07:00
Eric House
9e78d23014 break up more activities into delegates, using all the new methods in
the base. Crashes a lot, but this is a snapshot to work from.
2014-04-15 21:02:40 -07:00
Eric House
2e89b95e70 add methods subclasses will be able to use 2014-04-15 20:31:29 -07:00
Eric House
d9a407c9f3 move to superclass 2014-04-15 08:07:04 -07:00
Eric House
3465605481 more moving stuff into superclass 2014-04-15 08:02:57 -07:00
Eric House
548ba63dda more use of overridden AlertBuilder and getString 2014-04-15 07:49:21 -07:00
Eric House
8432500541 override setPositiveButton and friends so ids can be translated 2014-04-15 07:40:27 -07:00
Eric House
e12fbcce8e more use of LocUtils.getString() 2014-04-15 07:34:14 -07:00
Eric House
01c94d91cd I apparently don't understand how varargs works in java 2014-04-15 07:31:57 -07:00
Eric House
3c76de6851 call method on superclass rather than activity 2014-04-15 06:38:51 -07:00
Eric House
dc8b5b073e use superclass's getString() where possible instead of LocUtils's static version 2014-04-15 06:36:18 -07:00
Eric House
9720684ce7 break activity up into delegate 2014-04-15 06:27:17 -07:00
Eric House
1cf7e70091 use superclass's setContentView() 2014-04-15 06:26:55 -07:00
Eric House
0ae63c37ac add convenience methods for subclasses 2014-04-15 06:26:37 -07:00
Eric House
f0b5584e38 translate activity window titles 2014-04-14 08:10:49 -07:00
Eric House
7f48783fb2 get translations working in dicts browser (save title) 2014-04-14 08:05:11 -07:00
Eric House
67ca205774 remove compile command -- which never worked 2014-04-14 08:04:44 -07:00
Eric House
d3c5aeb977 add param 2014-04-14 07:40:35 -07:00
Eric House
a0fd457ad1 add stuff, including ability to list strings missing in english or translated version 2014-04-14 07:40:24 -07:00
Eric House
a04f091d7f more cleanup: copy over comments and manually fix what script couldn't 2014-04-14 07:38:48 -07:00
Eric House
9a4474ac1e ignore .pyc file 2014-04-14 06:28:48 -07:00
Eric House
1249fa5849 call getString on LocUtils instead of context 2014-04-14 06:28:29 -07:00
Eric House
13e900695e call new AlertBuilder only once 2014-04-14 06:28:05 -07:00
Eric House
9abc7b3212 add comment 2014-04-14 06:24:09 -07:00
Eric House
5d5a828dc2 as new printer prints -- no changes but whitespace 2014-04-12 09:33:52 -07:00
Eric House
e227038354 move not-to-be-localized string out of string.xml 2014-04-12 09:22:45 -07:00
Eric House
42ba1baaf7 include preceeding comments with string text 2014-04-12 08:19:48 -07:00
Eric House
6b30248af0 one more _fmt add 2014-04-12 08:17:23 -07:00
Eric House
1b79bcb1c4 add and use ability to remove nodes 2014-04-12 06:37:55 -07:00
Eric House
fe287719eb more fixes 2014-04-12 06:32:50 -07:00
Eric House
b2c6aabd74 start updating: swap %1$[sd] for %[sd] 2014-04-12 06:20:37 -07:00
Eric House
64ebbcfbae mods to export getString 2014-04-12 06:16:32 -07:00
Eric House
539f1205c9 more script-generated changes 2014-04-11 23:34:15 -07:00
Eric House
5434a3c03c more changes by script 2014-04-11 23:17:25 -07:00
Eric House
ac4fc367bb first changes made by script 2014-04-11 23:12:16 -07:00
Eric House
30b861879a first modification made by script 2014-04-11 22:54:13 -07:00
Eric House
77b87c6458 localized files as read in and printed back out, unmodifed but for how
python prints them differently.  This is a baseline: modifications
will follow.
2014-04-11 22:43:56 -07:00
Eric House
258b81dfb5 add localized string files exactly as copied from android_branch 2014-04-11 22:19:25 -07:00
Eric House
a22763298a extend AlertDialog.Builder and override setTitle so string ids can be
translated when passed.
2014-04-10 21:34:08 -07:00
Eric House
10d6969930 fix release builds: generate empty version of checker function 2014-04-10 07:43:57 -07:00
Eric House
ff03284c5c for debugging (testing what strings aren't yet reachable), uppercase
all strings without a tranlation.
2014-04-10 07:31:56 -07:00
Eric House
5c5a353d12 add string array to spinner manually so it can be translated -- sucks
to have to change code for this, but...  The dropdown views look
crappy though I'm using identical code to what's in DictLangCache
building similar arrays that look fine.  Needs work.
2014-04-10 06:44:33 -07:00
Eric House
f3b5cbb794 fix NPE 2014-04-09 21:14:30 -07:00
Eric House
67bca0dd4e Because loc: strings can't be supplied for all Views, don't do
that. Instead use the English strings themselves as keys.  Generate a
java array of all R.string.whatever contants at build time, and use
that at runtime to build a hashmap of localizable strings that may be
found in UI widgets.  When one is found and there's a translation,
substitute.
2014-04-09 21:09:46 -07:00
Eric House
b4016eaec3 get rid of loc: stuff 2014-04-09 21:05:12 -07:00
Eric House
ce3fab3b15 don't try to write file if not specified 2014-04-09 07:29:56 -07:00
Eric House
7e72cb506d add some more logging/tracking. 2014-04-09 07:28:53 -07:00
Eric House
edf720c58c add EditText's hint. But Spinner's prompt MUST be a reference -- fuck you Android -- so I need another way to do this 2014-04-09 07:28:31 -07:00
Eric House
812c54f598 CheckBoxes get translated too 2014-04-09 07:10:55 -07:00
Eric House
291d4f0217 create table in new DB as well as when upgrading 2014-04-09 06:25:07 -07:00
Eric House
c96e848a05 remove unused method 2014-04-09 05:58:53 -07:00
Eric House
b61f1fbac9 fix crash adding first game to newly installed app by counting games and groups the same way getView determines if they exist. 2014-04-09 05:58:44 -07:00
Eric House
051cc5eb1d call init from outside constructor since constructor can call back into callee 2014-04-09 05:57:33 -07:00
Eric House
0aa2a03760 remove unused method 2014-04-09 05:54:36 -07:00
Eric House
5e03e0cc75 fix crash adding first game to newly installed app by counting games and groups the same way getView determines if they exist. 2014-04-09 05:52:36 -07:00
Eric House
1035c94c3f call init from outside constructor since constructor can call back into callee 2014-04-09 05:38:46 -07:00
Eric House
ccf84135a0 fix NPE on fresh install 2014-04-09 05:08:49 -07:00
Eric House
5d83d2f318 translate GameConfig view -- though it really needs to be broken to have a Delegate.... 2014-04-08 19:12:00 -07:00
Eric House
0ac951c096 remove format() in favor of LocUtils call 2014-04-08 19:00:49 -07:00
Eric House
0b93e77018 combine the xml-manipulation and java-class-generation scripts 2014-04-08 18:57:31 -07:00
Eric House
9e228ab368 use version of getString that translates 2014-04-08 06:54:16 -07:00
Eric House
d27f2d580a (more of prev commit) generate xml layout files from res_src, and run all inflation through LocUtils that tries to substitute strings 2014-04-08 06:48:42 -07:00
Eric House
201e808b4a move layout files into res_src, and modify script to mark their localizable strings with loc:; run all layout inflation through new function that substitutes for loc: 2014-04-08 06:47:33 -07:00
Eric House
848f6ff221 no longer need these custom classes 2014-04-08 06:44:41 -07:00
Eric House
dfb3ea842b get rid of the Loc* classes -- will be transforming xml at buildtime as with menus 2014-04-08 05:20:22 -07:00
Eric House
aad4872f68 generate menu resources from the old files, adding the 'loc:' key for those title strings listed in strings.xml 2014-04-07 08:14:09 -07:00
Eric House
96194671e2 move menu xml files outside build tree: scripts will generate now 2014-04-07 08:00:18 -07:00
Eric House
1bed9e3bec move menu xml files outside build tree: scripts will generate now 2014-04-07 07:59:55 -07:00
Eric House
4ce7f923c1 revert changes adding loc: to mark localizable strings: will be doing that automatically 2014-04-07 07:54:59 -07:00
Eric House
36672395ff store new column, always false for now 2014-04-07 07:47:08 -07:00
Eric House
227a25e259 add column for tracking xlation source 2014-04-07 07:09:43 -07:00
Eric House
437e2024cc generate hashmap from strings.xml -- all of them -- making it
unmodifiable, and test for stuff not being in it.
2014-04-06 18:58:33 -07:00
Eric House
86cc8f6dbf move onCreateOptionsMenu into superclass 2014-04-06 16:48:17 -07:00
Eric House
2ae6ecb125 get rid of allcaps translation, instead using translations where
available. Works -- but app needs to be restarted for menus to change.
2014-04-06 16:08:45 -07:00
Eric House
a351b2a5b9 implement search through loc dialog 2014-04-06 06:43:48 -07:00
Eric House
7e16d7abc5 add getContentView -- since I can never remember how to do it 2014-04-06 06:37:51 -07:00
Eric House
6b59093d84 use new loc db to save translation data (per locale) across boots. 2014-04-05 14:04:02 -07:00
Eric House
47ea2b8b62 add loc table to store translation data, mapping key and locale to text 2014-04-05 14:00:41 -07:00
Eric House
527685da79 preserve translation changes in memory. Next: write to DB. 2014-04-05 13:33:12 -07:00
Eric House
7dfa042b77 rename style and use it to align table header with columns 2014-04-05 12:12:00 -07:00
Eric House
663f4293a9 display English text on left side of table 2014-04-05 11:45:20 -07:00
Eric House
2494f7b8d4 add activity for localizing strings and add menuitem to localizable activities to trigger it. Does nothing yet, including populating itself. 2014-04-05 10:27:05 -07:00
Eric House
16346beeb1 enforce new convention: strings containing formatting must be names whatever_fmt (and strings containing formatting must be so named.) I'm going to have to parse such strings, which will be expensive, so being able to determine from the name whether there's a need should help. 2014-04-04 23:42:57 -07:00
Eric House
2b2fd32951 replace %s and %d (and enforce) 2014-04-04 23:09:50 -07:00
Eric House
409940adae remove localized files. They'll get used somehow but not in this form on this branch. 2014-04-04 23:09:22 -07:00
Eric House
073c461693 new type of problem: make a string array in ListPreference localizable 2014-04-04 08:00:30 -07:00
Eric House
589b740af6 include loc: strings from common_rsrc.xml 2014-04-04 07:59:16 -07:00
Eric House
2c9dc526c2 convert most of GamesList to be localizable 2014-04-04 06:50:08 -07:00
Eric House
9531c6939e add getString() variants to LocUtils and use from BoardActivity 2014-04-04 06:34:46 -07:00
Eric House
f6b2e5a3c2 transform submenus too 2014-04-04 06:20:46 -07:00
Eric House
0e7676b301 make board menu localizable -- but submenus don't work yet 2014-04-03 22:37:13 -07:00
Eric House
a6954a71dc menu title can be null 2014-04-03 22:36:47 -07:00
Eric House
11dabca721 generate mapping from actual strings to R.string.id that can be used at runtime to convert/lookup menu titles. Works to uppercase a menu! Changes break dbg and bt builds -- to be fixed. 2014-04-03 22:27:50 -07:00
Eric House
f2bfd36780 menus are broken: you don't get access to an AttributeSet when inflating them. So replace string references with strings equal to the name of the id (xxx in R.string.xxx); next I'll need to harvest the strings from R.java and map them to their numbers in a way that's runtime-accessible. 2014-04-03 06:21:02 -07:00
Eric House
2afe048095 fix formatting 2014-04-03 06:19:17 -07:00
Eric House
bd02a10fc3 beginnings of framework to allow localized strings to be read from downloaded modules: in xml replace string references with a custom attribute that's the same thing, then in overridden view subclasses pull the reference from the AttributeSet and look it up myself. Works to uppercase all strings in the NewGames dialog. 2014-04-02 08:06:51 -07:00
Eric House
eff00c1743 use setBackground rather than setBackgroundColor to fix not reverting on 4.4 (and maybe earlier) 2014-04-01 06:27:19 -07:00
Eric House
9351eb257b call setPct on new group item if appropriate 2014-03-31 07:57:31 -07:00
Eric House
9a55c97793 add new style for expander buttons 2014-03-31 07:20:19 -07:00
Eric House
3ff60861f7 derive GameListGroup from ExpiringLinearLayout 2014-03-31 07:14:40 -07:00
Eric House
d896670c21 remove unneeded paramter 2014-03-31 06:34:35 -07:00
Eric House
256dda85c0 don't show resend messages menu when anything's selected 2014-03-30 17:15:26 -07:00
Eric House
6f373c6c11 drop click event when don't have any games (easier than uninstalling the handler when there are no child games) 2014-03-28 22:41:57 -07:00
Eric House
fe14c88685 fix so gameless groups are still shown (but don't have an expand button) 2014-03-28 22:32:35 -07:00
Eric House
52d2436903 snapshot on the way to fixing query that failed to show empty groups 2014-03-28 07:46:46 -07:00
Eric House
fe64f89788 fix assertion on newer devices by letting the compiler do its job 2014-03-28 06:20:28 -07:00
Eric House
fb3b6ff96d expand/contract in response to click anywhere 2014-03-27 08:45:12 -07:00
Eric House
3f3e9f5389 implement expand/contract of groups. Still skanky, but works. 2014-03-27 08:28:34 -07:00
Eric House
64d0e0c867 toggle image when clicked 2014-03-26 21:12:43 -07:00
Eric House
84698273a5 fix selection of group item by adding a delegate all selectable items can call. 2014-03-26 21:03:51 -07:00
Eric House
31b65e659d make GamesList list- not expandable-list-based for future compatibility with Fragments. Groups still don't contract since they need arrows. Next... 2014-03-26 20:01:55 -07:00
Eric House
0a1449859a add countGames and to group info the count of games in each 2014-03-26 19:55:05 -07:00
Eric House
af0522b0f4 always serve the newest .apk for debug builds wanting to upgrade 2014-03-26 18:44:14 -07:00
Eric House
9993ef1e4c add function to return all apks sorted by creation time 2014-03-26 08:22:17 -07:00
Eric House
e70bb33537 break ChatActivity up 2014-03-25 22:29:20 -07:00
Eric House
558d34bc98 break part of BoardActivity out into BoardDelegate (and make a bunch of little changes that required) 2014-03-25 21:53:38 -07:00
Eric House
609962df58 cleanup 2014-03-25 07:21:12 -07:00
Eric House
0430cfbd24 break parts of StudyListActivity into StudyListDelegate 2014-03-25 07:14:22 -07:00
Eric House
dae0c7208f rename StudyList -> StudyListActivity 2014-03-25 06:31:59 -07:00
Eric House
8084e63d09 add and use a showDialog() that takes a DlgID 2014-03-25 06:26:28 -07:00
Eric House
e0c0ff219f rename onCreateDialog createDialog where it's not an overridden method 2014-03-25 06:16:46 -07:00
Eric House
cae30c61e8 need onCreateDialog() to get into DlgDelegate; onContentChanged needs to call super() 2014-03-25 06:03:25 -07:00
Eric House
1da9d36f3a emacs added missing file-terminating NL 2014-03-25 06:02:07 -07:00
Eric House
c988859063 get rid of XWExpandableListActivity 2014-03-24 22:18:58 -07:00
Eric House
b78514ca6c break parts of DictsActivity into DictsDelegate 2014-03-24 21:48:03 -07:00
Eric House
6c8cedf5bb rename GamesList -> GamesListActivity, then move most of it into GamesListDelegate. This is part of exploring what it'll take to separate Activity-ness from the rest that can then also be used, say, from a Fragment. 2014-03-24 21:10:02 -07:00
Eric House
5ff5074180 yet another version of showConfirmThen() 2014-03-24 21:08:06 -07:00
Eric House
ef381f1d71 hide more files (changes generated) 2014-03-24 20:27:19 -07:00
Eric House
c60da510cb add new source file 2014-03-24 20:26:56 -07:00
Eric House
9af9e2089b ignore more files in dbg dir 2014-03-24 19:54:35 -07:00
Eric House
6256e2a843 don't show check-for-updates menuitem unless we can update something: we're not installed from the Play store OR we've installed at least one wordlist. 2014-03-24 07:37:44 -07:00
Eric House
b4df0125cc make formatting uniform (no code change) 2014-03-24 06:56:21 -07:00
Eric House
57e2dd5492 make remote/robot score report dialog non-blocking to fix ugly first-game experience 2014-03-24 06:55:13 -07:00
Eric House
a842363be1 rename file: Lookup dialog is no longer an Activity 2014-03-23 18:53:38 -07:00
Eric House
73a1083dff only show lookup menuitem when there's a single word selected, and include that word in the menu title 2014-03-22 10:37:48 -07:00
Eric House
e2cd275459 cleanup 2014-03-22 10:14:27 -07:00
Eric House
c426741fa1 use same counter title for wordlist and studylist browsers 2014-03-21 19:54:30 -07:00
Eric House
0b01caf262 add missing image, fixing build breakage 2014-03-21 19:48:28 -07:00
Eric House
9dab6bc772 add studylist menu to lookup selected words -- same as tapping, but maybe easier to discover. 2014-03-21 19:42:23 -07:00
Eric House
b776b7cd71 try inverting it 2014-03-21 19:07:12 -07:00
Eric House
13b64871d5 update strings for release 2014-03-21 18:57:00 -07:00
Eric House
638f9725e3 new versions of placeholders 2014-03-20 18:57:15 -07:00
Eric House
2f49f64c4f clear selection in onResume since we're rebuilding list; fixes it being forever out of sync after a wordslist is opened 2014-03-20 18:56:56 -07:00
Eric House
5d32fce43e don't allocate new Runnable on every draw 2014-03-20 05:18:40 -07:00
Eric House
673ab53a61 go back to extending XWListAdapter 2014-03-20 05:11:52 -07:00
Eric House
3717035150 include number to be deleted in comfirm message 2014-03-19 22:56:17 -07:00
Eric House
c7818bd364 build query a bit more effeciently 2014-03-19 22:52:33 -07:00
Eric House
38fe8ec3fd invalidate menubar when might change 2014-03-19 22:39:21 -07:00
Eric House
426e939b61 hook up onClick to launch lookup 2014-03-19 22:25:14 -07:00
Eric House
64a5aab456 hook up long click to [de]select 2014-03-19 21:36:49 -07:00
Eric House
fd817a98da implement menus, including adding crappy placeholder icons 2014-03-19 21:29:20 -07:00
Eric House
aa6fbf8605 snapshot on the way to making studylists editable: add checkbox to xwlistitem. It's to be an alterative to long tap to select. Implement selectAll and deselectAll. 2014-03-19 20:42:29 -07:00
Eric House
e7708ef439 fix NPE when serializing 2014-03-19 20:17:53 -07:00
Eric House
c333e561af use a global enum for DlgDelegate actions -- should be no real code change 2014-03-18 06:06:21 -07:00
Eric House
12e77e8c47 get rid of three Utils.format calls 2014-03-17 08:20:43 -07:00
Eric House
a5f0c797bb use one message for deletion of groups, whether one or many 2014-03-17 07:45:09 -07:00
Eric House
37b2458140 add number being reset to message 2014-03-17 06:56:10 -07:00
Eric House
cb5bb00ef0 remove LookupActivity 2014-03-14 19:21:31 -07:00
Eric House
94a838d88e give lookup alert a title 2014-03-14 18:55:06 -07:00
Eric House
be440c8abf try, again, making lookup dialog an alert rather than an activity. It's a much better experience on a nexus 5 but I've lost my records of why I made it an activity in the first place -- what phones it sucked on as an alert. Still probably doesn't bundle itself correctly and is missing a title. 2014-03-14 18:41:54 -07:00
Eric House
d4930e157b make method private 2014-03-14 07:12:53 -07:00
Eric House
ea189c5717 turn study lists on by default 2014-03-14 06:45:17 -07:00
Eric House
94d9a03d51 add enum to hold all dialogIDs so they're forced to be unique across the app. (The diff's big but there's no behavior change.) 2014-03-14 06:37:32 -07:00
Eric House
1ee16ca09d remove unnecessary import 2014-03-11 22:01:30 -07:00
Eric House
640837f318 up strings for new release 2014-03-11 19:16:41 -07:00
Eric House
dee75f5a0a don't ref dicts from dmgr_get() 2014-03-10 21:50:06 -07:00
Eric House
f601f2bf57 use dictmgr in java. This requires jni globals that live across boards being opened and that include a mempool dicts will be allocated out of. Seems to work, and to get ref counts as high as 6 or so before they drop down to one when all boards are closed. (The final is held by the dictmgr which won't give it up until the app itself is GC'd) 2014-03-10 19:14:59 -07:00
Eric House
a2671f5ef0 add global mempool that can survive individual games, and include it every game's globals. Use it instead of game's mempool to create dictionaries so they can outlive a game and not trip asserts on pool delete. Wrap dicts in a java class that refcounts them when BoardCanvas wants to keep one so that, I hope, the bug using a deleted dict will go away. 2014-03-09 14:46:33 -07:00
Eric House
9f5d470c07 no need for final 2014-03-09 14:39:18 -07:00
Eric House
9d9c822bb8 save, commented out, how to call the contstructor of a nested class -- in case I go back to doing things that way. 2014-03-09 14:23:24 -07:00
Eric House
a7c114e3f9 refcount dicts. Model "owns" its copy and so increments the refcount when gaining one and decrements the count on any being replaced (and on all on exit). This is setting up the real change, which is to let the java world wrap dicts in objects that hang onto them until they're destroyed, which should fix problems where dicts are referenced after they've been destroyed. 2014-03-08 20:57:27 -08:00
Eric House
e0c17c50b3 catch off-thrown exception. This should prevent a crash, but the fix is probably to figure out why it's happening -- later. 2014-03-08 12:55:46 -08:00
Eric House
fb7c1682b4 tweak string 2014-03-07 19:10:06 -08:00
Eric House
3b971e0153 tweak build timestamp format 2014-03-06 22:11:13 -08:00
Eric House
c31c9cb365 don't show resend menuitem unless there are moves to resend 2014-03-06 07:43:20 -08:00
Eric House
c982fb54d9 up strings and notes for new release 2014-03-06 06:47:43 -08:00
Eric House
3daa877bee Send from resend asyncTask using factored-out code in CommsTransport. Works for SMS at least. 2014-03-05 07:15:34 -08:00
Eric House
923ac6db98 show loadDB menuitem only when nothing's selected 2014-03-05 06:37:02 -08:00
Eric House
45ace48490 tweak string 2014-03-05 06:32:03 -08:00
Eric House
bcfd27ee7f don't crash when there's a SMS game with pending messages 2014-03-04 21:38:22 -08:00
Eric House
5ebbf87c24 don't kick off async task if there's nothing to send 2014-03-04 21:13:23 -08:00
Eric House
811be34a20 remove logging 2014-03-04 21:12:40 -08:00
Eric House
cfee7ef8ac resend all messages from the network change broadcast receiver itself instead of GamesList, which will not be listening if another activity is in front or if the app's in the background. 2014-03-04 19:03:39 -08:00
Eric House
3c0b4a899f resend all unacked messages each time we regain network, but only up to four times/hour. 2014-03-04 18:36:46 -08:00
Eric House
431b24409f Fix kitkat-only problem where expiring rects are clipped at top and left 2014-03-04 07:40:25 -08:00
Eric House
0a601a73a4 (commented out) line to cause ndk to be built without optimization for better source-level debugging 2014-03-04 07:07:44 -08:00
Eric House
df771f50c4 add function that resends all pending (un-ackd, at the comms level) messages for unlocked games and, for testing mostly, a menuitem on the main activity to trigger it. Probably crashes if there's a message for a game connected by other than relay. 2014-03-04 07:05:55 -08:00
Eric House
60bce8f22b add menuitems recently added to non-small-devices' menu 2014-03-02 20:34:58 -08:00
Eric House
9d174740c8 don't show "send pending messages" menuitem when there are none 2014-03-01 16:15:35 -08:00
Eric House
386c28e596 don't notify network change listeners unless a change is in fact a change and until there's been two seconds without changes. There's a lot of connection up-and-down spam when connecting and maybe with iffy connectivity, and no point in passing that through to code that will do stuff like stopping a send thread in response. 2014-03-01 15:17:14 -08:00
Eric House
23638310bc register for net state changes, and toast/log on debug builds. This is toward resending from all games with packets pending on reconnect. 2014-03-01 14:59:17 -08:00
Eric House
56c05869da allow to run from bin directory, which turns out to be useful 2014-03-01 12:39:51 -08:00
Eric House
c1e22dd3cf add summary DB column and jni code to fetch it to store and display number of unacked messages a game has. And add debug-only option to display it in the main list. In the future I want to be able to iterate over all these games and resend their packets (without opening them visually) when an internet connection comes back up. 2014-02-28 18:59:12 -08:00
Eric House
e536a6d3ee format build timestamp added to about dialog 2014-02-28 06:47:44 -08:00
Eric House
1d85a74a6c readd old assertions -- and fix compile error 2014-02-28 06:47:27 -08:00
Eric House
9a94663fb8 log when we drop a message because two possible receiving games are open 2014-02-28 06:13:52 -08:00
Eric House
61080e1b62 revert changes pausing instead of exiting JNI thread (and so not saving game data) from BoardActivity's onPause() when onFinishing() returned false. This is necessary because there are cases where moves were generated and sent without local state ever being saved because onPause() was called only once on what turned out to be activity termination. 2014-02-28 05:57:32 -08:00
Eric House
2f7839f7e0 cleanup 2014-02-28 04:35:39 -08:00
Eric House
5274a803b2 move menuitem 2014-02-27 19:13:22 -08:00
Eric House
29d08b95ce expose comms_getStats() via a debug-build-only menu and dialog 2014-02-26 21:41:49 -08:00
Eric House
1f9a4180e8 remove misleading comments 2014-02-25 07:56:22 -08:00
Eric House
fc799449e9 save game and summary in a synchronized block so lock doesn't get released halfway through 2014-02-24 21:50:17 -08:00
Eric House
a72932486b toward having networking and activity swaps work without fully
shutting down the game in onPause(): use pause() and resume() to
suspend the jnithread when the game's been unlocked.
2014-02-13 19:29:35 -08:00
Eric House
7c45e3c5b3 add pause() and resume() 2014-02-13 19:26:09 -08:00
Eric House
1e30582c3b more logging 2014-02-13 07:50:21 -08:00
Eric House
802e798180 refactor 2014-02-13 06:44:57 -08:00
Eric House
89435fc688 fix to compile 2014-02-13 06:40:39 -08:00
Eric House
b3cce8c535 reduce verbosity and add info to GameLock logging 2014-02-13 06:33:30 -08:00
Eric House
de7638525a commit sdk-generated file (might be better to ignore it?) 2014-02-13 06:31:31 -08:00
Eric House
44e52278a4 remove unused method 2014-02-12 07:52:39 -08:00
Eric House
218d232798 add dictNames() variant that takes a GameLock 2014-02-12 07:35:49 -08:00
Eric House
61334efa1a fix to generate rather than copy 2014-02-12 07:35:12 -08:00
Eric House
536a1e3b13 install dbg variant too 2014-02-11 22:11:28 -08:00
Eric House
c0e7c0bf88 only log stack for first and last attempts to get lock 2014-02-11 22:11:16 -08:00
Eric House
80c3374728 add build timestamp to about dialog (needs better formatting) 2014-02-10 19:20:35 -08:00
Eric House
ea6da8cd74 add crittercism library 2014-02-10 18:55:16 -08:00
Eric House
9b43fed03f rule for .jar files: copy 2014-02-10 18:32:00 -08:00
Eric House
bdfbb3ffca update bt build, adding new .java file and logic to copy gcm.jar rather than commit a copy of it. 2014-02-10 18:30:19 -08:00
Eric House
6332bbbcbe use ccache 2014-02-10 18:24:42 -08:00
Eric House
339e784d7c fix compile warnings 2014-02-10 18:23:03 -08:00
Eric House
4b293ac89b add Crittercism App ID if available 2014-02-10 07:32:16 -08:00
Eric House
d02481879b catch debug variant up with recent changes and lay groundwork for including crittercism in it. 2014-02-10 07:31:52 -08:00
Eric House
daa59ee03d pass Context to CrashTrack 2014-02-10 07:14:00 -08:00
Eric House
f27394ca03 framework for calling Crashlytics from debug variant 2014-02-10 06:53:39 -08:00
Eric House
f2ad4fd3d5 add StudyList activity and otherwise catch up 2014-02-10 06:19:16 -08:00
Eric House
0d80511a1a remove logging 2014-02-09 19:35:35 -08:00
Eric House
b56d990a04 go back to overriding onPause and onResume, but don't tear down the game unless isFinishing() returns true 2014-02-08 16:50:27 -08:00
Eric House
5e3c26d453 track current BoardActivity instance using HashSet rather than single instance since during transitions there can be two. Fixes asserts from recent commit. 2014-02-07 21:22:13 -08:00
Eric House
a4e65f667d add ok button to about dialog 2014-02-07 07:59:34 -08:00
Eric House
a388351219 save/load games in onStop/onStart rather than onPause/onResume so we don't do it as often, and specifically not every time the LookupActivity is pushed. This is an experiment. 2014-02-07 07:40:34 -08:00
Eric House
d97784ba13 track which dialog is blocking rather than just that there is one 2014-02-07 07:38:07 -08:00
Eric House
ed9b9646e7 launch app after installing 2014-02-07 07:34:09 -08:00
Eric House
048ae63802 make bad-words reporting dialog blocking so robot doesn't go ahead and move and put its moved dialog up on top of the bad words one before it's dismissed; also change name of string to reflect that it's a format. 2014-02-06 07:22:57 -08:00
Eric House
f6a1e06d41 create myGames group only on upgrade and only if there are existing games to put into it. 2014-02-05 19:46:42 -08:00
Eric House
ca57da44c6 fix duplicate column crash when upgrading 2014-02-05 19:34:42 -08:00
Eric House
18f31ad9d6 up strings for new version 2014-02-03 07:42:59 -08:00
Eric House
46b02d49c1 generated gitignore changes in bt directory 2014-02-03 07:29:12 -08:00
Eric House
6dfaf8127f fix reported crash: assertion copying non-network game 2014-02-03 07:28:38 -08:00
Eric House
f805d7309f modify emacs compile command to use find-and-ant.sh 2014-02-02 11:40:40 -08:00
Eric House
2b653dcf9b add build script 2014-02-02 11:27:09 -08:00
Eric House
babb02898e credit BRS 2014-01-31 18:22:32 -08:00
Eric House
f65b5fda71 don't disable button after it's used: feels as if the device is hanging 2014-01-31 18:22:21 -08:00
Eric House
b29dcb1d2c add debug-only logging toward figuring out occasional bad-dict crash 2014-01-31 07:55:07 -08:00
Eric House
57cd547078 remove apparently gratuitous second call to srandom 2014-01-31 07:54:43 -08:00
Eric House
dd38543398 add toast to confirm that word's been added 2014-01-31 07:25:28 -08:00
Eric House
cb574ca156 up version strings 2014-01-31 07:25:07 -08:00
Eric House
ff2615fbc6 Merge branch 'android_studylist' into android_branch 2014-01-31 06:43:36 -08:00
Eric House
c40cef2101 add newbie tip for studylist copy feature 2014-01-30 21:31:14 -08:00
Eric House
426b5b59b2 for better discoverability, always show the studylist menus when the feature's on and supply explantions when there's nothing to show 2014-01-30 19:16:00 -08:00
Eric House
9dc94c97b2 put some of DlgDelegate's methods into an interface that can be passed around to be called by non-activities. 2014-01-30 19:14:23 -08:00
Eric House
647282968a hide the label and spinner when there's only one language 2014-01-30 08:15:43 -08:00
Eric House
433993a384 remove early -- should not have gone out 2014-01-30 07:30:34 -08:00
Eric House
3ea86e630d add label before lang-pick spinner 2014-01-30 07:12:32 -08:00
Eric House
a8d01f6de2 remove mistaken break 2014-01-30 07:00:30 -08:00
Eric House
cd6293fbd3 ignore img_src/ -- for now anyway 2014-01-30 06:39:50 -08:00
Eric House
652ce75277 add actionbar icon for copy 2014-01-30 06:38:03 -08:00
Eric House
f78af55cd1 disable add-to-list button after adding so there's feedback 2014-01-30 06:26:40 -08:00
Eric House
8e3cbdc1e3 Merge branch 'android_branch' into android_studylist 2014-01-29 21:56:28 -08:00
Eric House
32ecd1d026 more studylist: add lookup-on-tap, show language in title bar, and add
menuitem to board menu too
2014-01-29 19:37:04 -08:00
Eric House
253be9a48e ignore more stuff 2014-01-29 19:29:43 -08:00
Eric House
11767a41e4 show toast on successful paste 2014-01-29 07:49:57 -08:00
Eric House
21f2936e87 confirm before deleting all words 2014-01-29 07:43:45 -08:00
Eric House
b5d4b6b778 implement clear (without warning) 2014-01-29 07:36:05 -08:00
Eric House
2520fb4c05 add menu and implement copy-to-clipboard 2014-01-29 07:15:25 -08:00
Eric House
d02787f591 fix capitalization 2014-01-28 18:52:35 -08:00
Eric House
42f35cb3d9 populate study list, doing the sorting in the DB query for now 2014-01-28 07:48:08 -08:00
Eric House
3f8e456db2 populate language chooser 2014-01-28 07:15:59 -08:00
Eric House
4421472391 add (empty so far) studylist browser and menu to invoke it 2014-01-28 06:50:27 -08:00
Eric House
9d19bed3b7 add studyListLangCount() 2014-01-28 06:32:25 -08:00
Eric House
aab876bf6d remove toast 2014-01-27 21:25:22 -08:00
Eric House
49d26dab07 rough out UI for adding selected or played words to study list DB. Next: add a UI for displaying it etc. 2014-01-27 21:24:57 -08:00
Eric House
af035962e6 revise release notes; up version code 2014-01-27 18:58:41 -08:00
Eric House
b3ebadfde5 test for null that should never happen but google play says does. 2014-01-25 19:03:22 -08:00
Eric House
e9ffcdbbc5 fix, by inspection, NPE reported via Play dev console 2014-01-25 18:04:32 -08:00
Eric House
843c6389cf use the same key to set and get bundle item, probably fixing a couple of recent Dev Console-reported crashes. 2014-01-25 17:56:15 -08:00
Eric House
4499639d73 up version strings 2014-01-23 19:46:21 -08:00
Eric House
acb090154d add rate-me menu 2014-01-23 19:32:06 -08:00
Eric House
cb9f095d93 remove unused variable 2014-01-23 07:48:02 -08:00
Eric House
e72beaa265 add and use isGooglePlayApp() 2014-01-23 07:47:32 -08:00
Eric House
710f9c68ff don't launch intent if null 2014-01-23 07:46:58 -08:00
Eric House
1b185d1575 use ccache for jni if present 2014-01-21 07:20:51 -08:00
Eric House
5ea1a799ec fail if script fails 2014-01-20 07:33:16 -08:00
Eric House
af801997ef update name of target SDK version (but not the version itself) 2014-01-07 07:19:47 -08:00
Eric House
633a9d190a up copyright for the new year 2014-01-07 07:07:22 -08:00
Eric House
e34cc9007d fix problems with opening and using wordlists on 64-bit linux by
making XP_U32 32 rather than 64 bits. Duh. Do same on Android jni just
in case.
2014-01-07 06:58:20 -08:00
Eric House
29d5cc5d13 fix crash when incoming sms invite includes an apostrope in the room
name -- by using rawQuery()
2013-12-28 11:30:49 -08:00
Eric House
d25e20221b update send success status 2013-12-06 08:00:16 -08:00
Eric House
bbbc8124ba uninstall based on where called from 2013-12-06 08:00:03 -08:00
Eric House
fa5649501e update send success status 2013-12-06 07:39:16 -08:00
Eric House
ad60fcc610 uninstall based on where called from 2013-12-06 07:37:56 -08:00
Eric House
1f3bd63769 Merge branch 'android_branch' into android_sms_kitkat 2013-12-05 20:03:47 -08:00
Eric House
c1bdaa13ee another directory to be cloned 2013-12-05 07:55:36 -08:00
Eric House
856474a9b9 remove mistaken echo 2013-12-05 07:55:25 -08:00
Eric House
ea3347ad4a fix to install and launch based on location run from 2013-12-05 07:47:13 -08:00
Eric House
be28630109 pass dict with bt invite and otherwise catch up with how invites work.
Can now invite and play a game.
2013-12-05 07:31:17 -08:00
Eric House
5fb2d9c82a catch up with features etc. that must be on to not crash opening a game 2013-12-05 07:17:33 -08:00
Eric House
9252705901 mods required to get bt variant compiling again. I have no idea if it works. 2013-12-04 20:45:03 -08:00
Eric House
0c15a0000e pass package to script so can work from variants 2013-12-04 20:32:15 -08:00
Eric House
2eefd14231 fix so --clean gets respected 2013-12-04 19:42:18 -08:00
Eric House
ca428d6a63 fix NPEs occurring when loading in a games DB (debug feature) whose
groups were different: recreate GameListAdapter and make it correctly
deal with having no group selection data (as that's stored in prefs)
2013-12-03 08:30:47 -08:00
Eric House
7c2b3b3d15 add clearGroupPositions 2013-12-03 08:27:29 -08:00
Eric House
0c30dd6bf4 new script to uninstall then install 2013-12-03 08:26:41 -08:00
Eric House
742a94783f launch app after installing 2013-12-03 08:26:26 -08:00
Eric House
e9efc27d7a toss cache after reading in new DB 2013-12-03 07:54:38 -08:00
Eric House
3ccc9ac0f1 use auto-generated BuildConstants class instead of my own act-alike 2013-12-03 07:15:03 -08:00
Eric House
b5d6c513a6 add canUndo to GameStateInfo and use to hide the undo menu 2013-12-03 07:06:48 -08:00
Eric House
fdc807ceb8 up version strings for new release 2013-12-03 06:41:45 -08:00
Eric House
24eb63f109 Revert "replace ARGB_8888 with RGB_565 where possible to halve memory"
This reverts commit b7e44195c6.
2013-12-03 06:28:56 -08:00
Eric House
6402ae56d2 remove now-redundant response to prefs change 2013-12-02 07:08:43 -08:00
Eric House
431ab75336 register for sms prefs changes so they can take effect immediately 2013-12-02 07:01:04 -08:00
Eric House
94216a5fb9 add canTrade to GameStateInfo, pass through to java world, and use to
determine whether to show trade menuitem
2013-12-01 21:53:41 -08:00
Eric House
40a4bf348e Merge branch 'android_branch' into android_sms_kitkat 2013-12-01 21:37:43 -08:00
Eric House
ace545a682 up version strings 2013-12-01 21:11:43 -08:00
Eric House
17dcb5c4f0 remove comment not meant to be checked in 2013-12-01 20:49:38 -08:00
Eric House
a4fe0adb62 allow missing items -- since menus are different on different devices 2013-12-01 20:40:04 -08:00
Eric House
3e6791c66f remove method and use existing Util static instead 2013-12-01 20:32:17 -08:00
Eric House
968b1ba321 fix crash on small-screen devices by adding missing menuitem 2013-12-01 20:31:35 -08:00
Eric House
9b6f8d18e0 fix timer: don't reinit secondsUsed to 0 every time game loaded 2013-12-01 19:04:44 -08:00
Eric House
041385049d add a bit of space separating explanatory text from spinner 2013-11-30 00:28:43 -08:00
Eric House
b7e44195c6 replace ARGB_8888 with RGB_565 where possible to halve memory
footprint of bitmaps
2013-11-29 16:14:18 -08:00
Eric House
dd5aaa41fa erase full divider rect to fix leftover tile bottom after it's been moved. 2013-11-29 10:21:06 -08:00
Eric House
79b60ae895 cleanup 2013-11-29 08:48:13 -08:00
Eric House
60026b6ef2 move BoardDims into jni/ 2013-11-29 08:43:34 -08:00
Eric House
26eff37c6b move BoardDims into jni/ 2013-11-29 08:43:21 -08:00
Eric House
69285d46a9 up version strings for release 2013-11-29 07:35:31 -08:00
Eric House
08b72bbc55 add asserts 2013-11-29 07:35:13 -08:00
Eric House
d3ce4aa4c7 fix NPE: jniThread gets turned to null sometimes, so test 2013-11-29 07:26:30 -08:00
Eric House
2dd56d08af tweak string 2013-11-29 07:15:47 -08:00
Eric House
991c042e78 add newbie warning against using Firefox for wordlist downloads. 2013-11-28 19:01:07 -08:00
Eric House
6a6e5b2f4f script to ... fetch screenshots 2013-11-28 11:42:07 -08:00
Eric House
11bde2b7fd remove logging 2013-11-27 07:10:08 -08:00
Eric House
07a0e0ed93 fix crash: make thumbnail BEFORE closing game 2013-11-27 07:10:00 -08:00
Eric House
72341a085a start out sending as data, but on first NPE, the symptom of CDMAness,
set the pref to send as text and do that from then on (unless the pref
is reset manually)
2013-11-27 07:08:58 -08:00
Eric House
605b45f6a0 remove logging 2013-11-27 07:06:27 -08:00
Eric House
b1d8d62c6c fix crash: make thumbnail BEFORE closing game 2013-11-27 07:06:14 -08:00
Eric House
85ae5973eb Merge branch 'android_branch' into android_sms_kitkat 2013-11-27 06:10:24 -08:00
Eric House
83bd5f773c take snapshot after feeding background messages to game, which
required making snapshotting code work with a Context rather than a
full Activity.  Untested with network play as the net's down now.
2013-11-27 06:09:49 -08:00
Eric House
f50badc428 rename script 2013-11-26 08:06:53 -08:00
Eric House
66eb96dce2 notify BoardCanvas when we're closing a game so that it won't try to
use, in callback on UI thread, a dict that may no longer be valid.
Theory is this is why I'm seeing odd crashes in the jni.
2013-11-26 08:06:38 -08:00
Eric House
8976d26f00 clear thumbnail after resetting game 2013-11-26 08:04:30 -08:00
Eric House
29a4634a40 add assertOnUIThread() 2013-11-26 07:59:20 -08:00
Eric House
eab12200af add debug preference to determine whether to use sendDataMessage() 2013-11-26 07:11:22 -08:00
Eric House
f7a09551d5 Merge branch 'android_branch' into android_sms_kitkat 2013-11-26 06:56:49 -08:00
Eric House
15cbad340a clear thumbnail after processing background move so it'll get redrawn.
Better would be to just draw it since the game is already open, but
that takes more changes.
2013-11-25 08:08:04 -08:00
Eric House
d02bbf2d50 up version strings 2013-11-25 08:03:57 -08:00
Eric House
42800851d3 combine thumbnail prefs to reduce nesting 2013-11-25 07:58:11 -08:00
Eric House
0b00f303bb cleanup after code review 2013-11-25 07:46:25 -08:00
Eric House
538fa20ffd fix broken deleteGroup() 2013-11-25 07:45:43 -08:00
Eric House
2491051f65 don't require NFC 2013-11-25 05:52:09 -08:00
Eric House
3ff241f739 Merge branch 'android_branch' into android_sms_kitkat 2013-11-24 18:18:03 -08:00
Eric House
8260fb1437 fix NPE on older phones 2013-11-24 18:13:54 -08:00
Eric House
7743fc52d5 fix assertion: rowid of -1 means all 2013-11-24 18:13:36 -08:00
Eric House
75b976449f turn SMS back on, and modify to send/receive "data" SMS rather than
text.  This works between two t-mobile devices without filling the
kitkat one's message box. TBD: does it work on CDMA?
2013-11-23 19:02:57 -08:00
Eric House
97fbbf8897 changelog for next release 2013-11-23 15:33:08 -08:00
Eric House
478ed9a12a change method name 2013-11-23 15:32:58 -08:00
Eric House
ba181221dd select newly created game too on return of focus 2013-11-23 12:17:42 -08:00
Eric House
7876e2cded use constant 2013-11-23 12:17:21 -08:00
Eric House
f85bb082fc optimization: return null quickly if param is invalid 2013-11-23 12:16:38 -08:00
Eric House
6f4cb4b0ca fix (I hope) OOM errors when there are a ton of games by doing
snapshot creation and loading sequentially on a single thread so that
peak memory consumed by bitmap operations is lower.  Remove snapshots
from GameSummary: the db is the only source now.
2013-11-22 22:58:39 -08:00
Eric House
d2c87647cd reverse test so games db can be loaded 2013-11-22 18:51:42 -08:00
Eric House
25144b8e82 script to push a .xwd file onto a device -- or mine anyway 2013-11-21 19:20:23 -08:00
Eric House
f2ff596ff3 fix NPE by checking 2013-11-21 18:57:58 -08:00
Eric House
9820f6bf6b set selection on children being reused 2013-11-21 18:57:32 -08:00
Eric House
4748d9f459 create groups opened 2013-11-21 08:08:44 -08:00
Eric House
ec2fb210be on return from opening a game, select that game after clearing the selection 2013-11-21 08:00:59 -08:00
Eric House
8be57116ab revert previous change: the right way to save selections is to add
screenSize to the list of changes handled so that Activities aren't
recreated each time, so do that instead.
2013-11-21 07:34:38 -08:00
Eric House
03b7a6d45f preserve selection across orientation changes 2013-11-21 07:10:36 -08:00
Eric House
f88e7a89f0 tweak text 2013-11-21 06:47:00 -08:00
Eric House
75d9752024 use "pct." to indicate what thumb scale choices mean. '%' triggers a
known crasher in Android.
2013-11-21 06:44:19 -08:00
Eric House
7be3a3bef8 express thumb size as percent of screen with options, generated, in 5%
increments.
2013-11-21 06:27:09 -08:00
Eric House
b874406b7b add newbie message about how NFC works 2013-11-21 05:53:38 -08:00
Eric House
c42271ee31 fix NPE 2013-11-21 05:26:45 -08:00
Eric House
08205637de disable SMS play/invite on KitKat (until workarounds found) 2013-11-21 05:26:12 -08:00
Eric House
2d7c845ebb Merge remote branch 'origin/android_branch' into android_branch 2013-11-21 05:25:23 -08:00
Eric House
8de638a047 update explaining kitkat 2013-11-21 05:24:36 -08:00
Eric House
24e015f259 don't make snapshots for non-expanded game list items; make when first
expanded instead.
2013-11-20 08:15:18 -08:00
Eric House
2e5e10ef6d move dialog asking to enable NFC into NFCUtils, and use it when
creating a new game to be invited via (disabled) NFC
2013-11-20 07:56:05 -08:00
Eric House
5f7242f01b tweak string 2013-11-20 07:34:11 -08:00
Eric House
b1ae563ae6 fix NPE when installed with existing SMS invites in inbox 2013-11-20 06:54:51 -08:00
Eric House
51a561077c when action-bar-equipped device tries to hide title bar warn and then
disable pref.
2013-11-19 07:22:14 -08:00
Eric House
63ba7d45d3 use gameID as inviteID for non-NFC invites too 2013-11-19 06:37:39 -08:00
Eric House
0cef5fce50 display gameid as hex 2013-11-19 06:26:07 -08:00
Eric House
9fa715f096 add German to what thefreedictionary.com can look up 2013-11-19 05:42:00 -08:00
Eric House
45fcd19e6e use gameID as inviteID, so that all devices in a game will be using
the same gameID -- and use that to reject as duplicates attempts to
use the same invitation more than once.
2013-11-18 21:38:59 -08:00
Eric House
d7239323bc add gameid as option for what's shown in summary (debug only) 2013-11-18 07:25:40 -08:00
Eric House
6d06197c45 hide trade menuitem when board's in invite mode 2013-11-18 06:48:12 -08:00
Eric House
7ff9496d23 remove some logging 2013-11-18 06:33:59 -08:00
Eric House
03f532374b put up NFC button even if turned off, and when it's used offer to turn
it on.
2013-11-18 06:27:24 -08:00
Eric House
37083c3ea1 fix menu titles -- were reversed 2013-11-18 06:17:26 -08:00
Eric House
3278b55819 return whether NFC *can* be enabled as well as whether it is 2013-11-17 21:21:06 -08:00
Eric House
e701af7262 tweak text 2013-11-17 21:18:33 -08:00
Eric House
0cc45ad865 add new field canHideRack to GameStateInfo and use it to disable menu. 2013-11-17 13:54:21 -08:00
Eric House
cae89a60a8 include hint in subtitle 2013-11-16 18:31:32 -08:00
Eric House
0bf28c133d always have board ready to send invite via NFC 2013-11-16 09:03:17 -08:00
Eric House
deff81cfd1 move query setup outside of synchronized blocks where possible 2013-11-16 06:30:34 -08:00
Eric House
f303fa2653 debug features and logging are always on/available for debug builds 2013-11-15 20:52:05 -08:00
Eric House
088dd1bd75 center board when it must be narrower than screen 2013-11-15 20:46:22 -08:00
Eric House
c0f6f6a959 don't enable delete menu when default group is among those selected 2013-11-15 19:14:51 -08:00
Eric House
e4e0f57676 put up different help text depending on whether user has buttons or
menus (since the text mentions them)
2013-11-15 19:02:13 -08:00
Eric House
d461268b8c tweak newbie hint 2013-11-15 18:44:11 -08:00
Eric House
d8ea672f6c now that getDefaultNewGameGroup works, allow/pass undefined group
further down where appropriate
2013-11-15 07:53:57 -08:00
Eric House
cd922ba8e2 fix getDefaultNewGameGroup to use a (new) DBUtils method that actually
works.
2013-11-15 07:47:14 -08:00
Eric House
3ba470573d when there's no default new-game group, get *some* group from the DB
and make that the default, with caution to avoid any -1==groupID games
saved by previous buggy versions
2013-11-15 06:50:34 -08:00
Eric House
edadc962f8 rename generated file; set logging on by default for debug builds 2013-11-14 21:56:37 -08:00
Eric House
8488dc1055 script to fetch db from sd card 2013-11-14 21:56:37 -08:00
Eric House
5f346d94b0 scp automatically if the right ENV variable is set 2013-11-14 21:56:37 -08:00
Eric House
53748e352a fix games created after reset of prefs from disappearing: they were
being saved with groupid of -1, so now when the default's not been sit
choose and pass in the first group.
2013-11-14 21:47:01 -08:00
Eric House
5826f080be don't hide titlebar for board if there's no menu key, since on such
devices there's no other way to get to the menu.
2013-11-14 08:07:00 -08:00
Eric House
85a533c74f use interface trick to avoid NFC code crashing on 2.1 2013-11-14 08:03:28 -08:00
Eric House
bdf5a43686 always update nMissing so invite menuitem can go away 2013-11-14 06:19:04 -08:00
Eric House
e20a72e527 remove and turn off active rect stuff 2013-11-14 05:59:51 -08:00
Eric House
4d6a37b048 don't force NFC messages to ascii -- it breaks special chars and isn't
required, even with special chars.
2013-11-14 05:46:47 -08:00
Eric House
e9bdf3c4f8 don't show trade buttons when have actionbar since they're redundant
and the AB icons are visible; hide resign menuitem when in trade mode.
2013-11-13 19:00:34 -08:00
Eric House
3b5bc3a786 fix OOB per http://stackoverflow.com/questions/12133404/indexoutofboundsexception-in-a-baseexpandablelistadapter-implementing-sectionind 2013-11-13 18:39:03 -08:00
Eric House
2fbf0fca50 up sdk version 2013-11-13 07:55:41 -08:00
Eric House
64b783da38 ignore generated file 2013-11-13 07:52:52 -08:00
Eric House
263a4d7170 move action bar stuff into its own class; in wordlist browser, show
only one of download button and download menu
2013-11-13 07:42:51 -08:00
Eric House
41f61e3748 use setNdefPushMessageCallback instead of setNdefPushMessage; seems to
make invitations work more reliably.
2013-11-13 07:11:56 -08:00
Eric House
3b3746d2e5 fix invites dialog to show the right buttons for all cases. 2013-11-13 06:52:45 -08:00
Eric House
d119033333 use resource strings and apis rather than quoted strings for nfc constants 2013-11-13 06:51:36 -08:00
Eric House
735e42cd90 launch on tap even if selected 2013-11-13 06:50:30 -08:00
Eric House
b7d756957c test also whether NFC turned on 2013-11-12 19:12:47 -08:00
Eric House
b3bc738cae move nfc stuff into separate utility class, and check API version for
whether to support it. Oddly the app runs on 2.1 emulator without
classnotfound error -- I was expecting to have to use the interface trick.
2013-11-12 19:06:26 -08:00
Eric House
f291ef7377 remove dup import 2013-11-12 18:58:13 -08:00
Eric House
e63e5b6102 Merge branch 'android_branch' into android_nfc 2013-11-12 18:39:31 -08:00
Eric House
8704efd38e add send-invites menuitem that's at top of board menu but only visible
when game's unconnected
2013-11-12 18:39:13 -08:00
Eric House
e040aa388b don't try to save to read-only lock; check for non-existant games when
summarizing: together these fix crash when deleting after opening game
whose remote partner has been deleted.
2013-11-12 08:08:30 -08:00
Eric House
6719704117 remove excessive logging 2013-11-12 08:02:14 -08:00
Eric House
10608b137f Mark the current player's wordlist in wordlists popup 2013-11-12 07:05:37 -08:00
Eric House
148da01fdc use save icon for commit/trade too 2013-11-12 06:43:56 -08:00
Eric House
e2aea4a39e call through to canvas for current score to correctly update menu 2013-11-12 06:40:40 -08:00
Eric House
f14be36bbc eliminate flicker on opening board: don't start drawing tile if can't
finish
2013-11-12 06:34:56 -08:00
Eric House
282b32396f don't log the one command that's supposed to get posted post-stop 2013-11-12 06:29:57 -08:00
Eric House
d0313d3c4b package game-start data into a json and send it via nfc, then open it
on the other end. Works to start a game!
2013-11-11 22:06:28 -08:00
Eric House
a88835a4a1 Successfully send text via NFC and log it on receiver 2013-11-11 21:36:19 -08:00
Eric House
98989abb14 don't log the one command that's supposed to get posted post-stop 2013-11-11 21:35:42 -08:00
Eric House
8099b77e52 refuse to a create second game from an invitation unless a debug pref
is set.
2013-11-11 20:44:08 -08:00
Eric House
360479bff5 string tweak 2013-11-11 20:27:50 -08:00
Eric House
7cf297ad0e fix so board still works after reloading, e.g. after turning screen
off and back on.
2013-11-11 08:09:15 -08:00
Eric House
da3215c116 reduce logging 2013-11-11 08:00:56 -08:00
Eric House
a7b1e00cc2 remove trade menuitem when game over 2013-11-11 05:31:18 -08:00
Eric House
35721975db add menuitems for back/commit for trade mode parallel to the buttons
at bottom (which should go when you have an action bar)
2013-11-11 05:23:25 -08:00
Eric House
37aa4a9adf set tile border (highlighted and not) proportional to tile size for
greater visibility on high-res devices
2013-11-10 09:05:31 -08:00
Eric House
ad464b8861 fix to work when both -e and -d passed 2013-11-10 09:01:52 -08:00
Eric House
f27e798966 need to requestLayout(), not just invalidate(), after common code
layout is finished.
2013-11-10 08:37:28 -08:00
Eric House
7457ce9b80 fix so board draws correctly when loaded in trade mode 2013-11-10 06:55:01 -08:00
Eric House
82a82b5ae1 set trade mode in canvas where it'll do some good 2013-11-10 06:41:43 -08:00
Eric House
d598dde86e inval view even if board_draw says there's more drawing to do -- as
there's probably still a lot that got drawn.
2013-11-10 06:41:12 -08:00
Eric House
f6e0febd6d fix NPE 2013-11-09 08:20:32 -08:00
Eric House
397b03b074 save thumbnail along with summary to fix reset game keeping its old
(and populated) thumbnail until opened
2013-11-09 07:27:05 -08:00
Eric House
3142069adb save bitmap after generating it 2013-11-09 07:19:54 -08:00
Eric House
26a464aae4 set a minimum width for rem tiles display based on screen width rather
than pixels
2013-11-09 07:15:28 -08:00
Eric House
3e6a7418b1 move snapshoting code into GameUtils, and use it whenever loading a
GameListItem that should have a snapshot but doesn't.  This lets games
have snapshots immediately rather than only after they've been opened
once.
2013-11-09 06:59:33 -08:00
Eric House
e0dd481393 restore missing ivar init so remaining tiles square comes back 2013-11-09 06:48:09 -08:00
Eric House
049b8247ff clear all thumbnails whenever a thumb-related pref changes 2013-11-09 06:40:31 -08:00
Eric House
82f61b43f2 add utility to erase all thumbnails 2013-11-09 06:36:47 -08:00
Eric House
dfdbd9a8a2 pass scoreWidth separately into formatting code so space can be left
for network status icon.
2013-11-09 05:34:23 -08:00
Eric House
57c887b8cd don't touch Application.mk unless it's changed to avoid recompiling every .c file each time 2013-11-09 05:20:21 -08:00
Eric House
6107400835 improve thumb strings 2013-11-08 06:34:58 -08:00
Eric House
9f6baf39c4 don't insert rowid in any prefs list except the right one 2013-11-08 06:31:20 -08:00
Eric House
0a3a1623df DRAW message not needed (using invalidate instead) 2013-11-08 06:08:09 -08:00
Eric House
ea6ad877ca draw after changing/adding dict chars -- this may be the final step
required to be able to render a board.
2013-11-08 06:06:18 -08:00
Eric House
5a555b11b0 tweak appearance of snapshots preferences 2013-11-08 05:54:30 -08:00
Eric House
b2f864c7ce frame thumbnail in grey; tweak defaults 2013-11-08 05:44:16 -08:00
Eric House
ecb225a6a8 try larger font size on high-res screens 2013-11-07 20:06:51 -08:00
Eric House
9e87a5ee92 implement getting active rect when that pref is set 2013-11-07 19:55:01 -08:00
Eric House
71d83e188e null param ok for board_getActiveRect in jni 2013-11-07 19:54:13 -08:00
Eric House
e780b536f9 obey thumb size preference. Currently "1/3" means 1/3 the size of the
smaller screen dimension.  There may be a better scale.
2013-11-07 19:28:00 -08:00
Eric House
41df94af31 new separate set of three prefs for thumbnails, and make the first,
enable/disable, work.
2013-11-07 19:07:19 -08:00
Eric House
fba7aee83a take thumb setting into account (though not in the rigth way yet, and
changes are still reflected only after the list item's been forced to
reload)
2013-11-07 07:51:57 -08:00
Eric House
a26dced506 drawing tray tiles can fail, e.g. when font info not yet available, so
only clear bits when successful. Fixes problem where tray didn't get
drawn until tiles were somehow invalidated.
2013-11-07 07:29:54 -08:00
Eric House
56f9f5f88e remove unused method 2013-11-07 05:48:39 -08:00
Eric House
16923eb27e save thumbnail in separate step, creating new square board-only
drawctxt to render it without scaling.  Draw whole board rather than
just the active rect.
2013-11-07 05:44:16 -08:00
Eric House
baba78535f fixes to the merge 2013-11-07 05:30:02 -08:00
Eric House
bb80cdfb08 Merge branch 'android_branch' into android_thumbnail
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
2013-11-07 05:25:51 -08:00
Eric House
929399793b Merge branch 'android_x86_release' into android_branch 2013-11-06 22:28:36 -08:00
Eric House
272fc6e812 Move board_layout call onto jni thread, and change order in which it's
done to make that work. This is a snapshot: not all boards draw completely,
and there's other debugging to be done.
2013-11-06 06:49:27 -08:00
Eric House
7c47c27cee dispose any existing draw ctxt before setting another. 2013-11-05 07:36:56 -08:00
Eric House
499e07d84b follow convention: width usually comes before height 2013-11-05 06:38:48 -08:00
Eric House
de284588f7 test for X86 developers too 2013-11-05 06:36:16 -08:00
Eric House
f0bfbedfb9 call script from build.xml to generate Application.mk 2013-11-04 19:23:47 -08:00
Eric House
f1f02df355 remove file to be generated by build system 2013-11-04 19:19:09 -08:00
Eric House
e6c08a83ab tweak text: including both processors after all 2013-11-04 07:40:49 -08:00
Eric House
633d41a6ef Revert "x86-only for this one release"
This reverts commit 67c6c635e4.
2013-11-04 07:35:12 -08:00
Eric House
03b023d506 dispose any existing draw ctxt before setting another. 2013-11-04 07:33:12 -08:00
Eric House
d4cf98553c Merge branch 'android_branch' into android_thumbnail 2013-11-04 06:37:13 -08:00
Eric House
2d7392a16d pass new score- and tray-size params through 2013-11-04 06:36:52 -08:00
Eric House
9c9a04025a Merge branch 'android_branch' into android_thumbnail
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
2013-11-04 06:20:53 -08:00
Eric House
9f1b0c5121 Specify relative height of scoreboard and tray in board_figureLayout,
and allow those to be 0.
2013-11-04 06:19:33 -08:00
Eric House
ccb07a67da update strings for this x86-only release 2013-11-03 13:04:22 -08:00
Eric House
67c6c635e4 x86-only for this one release 2013-11-03 12:52:53 -08:00
Eric House
d11375b5f5 apply contributed patch adding x86 version of libxwjni.so 2013-11-03 12:21:52 -08:00
Eric House
59dc69c0d9 apply contributed patch making Makefile variable naming match required
conventions for CLEAR_VARS.
2013-11-03 12:21:28 -08:00
Eric House
e01af60dab build with COMMON_LAYOUT defined, and when off-by-default debug pref
is on use it instead of java-side layout.
2013-11-03 12:17:20 -08:00
Eric House
b151cb977e apply patches from Brendan Le Foll <brendan.le.foll@intel.com> to
enable x86 ndk support
2013-11-03 05:22:20 -08:00
Eric House
cc994368aa move ints and booleans between java and c structs using arrays of data
rather than a ton of nearly identical function calls.
2013-11-01 19:10:08 -07:00
Eric House
5dd209ef27 init summaries earlier 2013-10-31 20:33:23 -07:00
Eric House
9cd7dd6c98 fix to compile post-merge 2013-10-31 08:14:14 -07:00
Eric House
d7a1f53157 Merge branch 'android_branch' into android_thumbnail
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
2013-10-31 08:13:39 -07:00
Eric House
45ad3499c5 (rough) move BoardView's Canvas into a new class so that, ideally, it
can be used separately e.g. to draw thumbnails without opening a game
into a board.  Works well enough to render a full board, but not
otherwise tested.
2013-10-31 08:08:41 -07:00
Eric House
bfa6132ade add board_setDraw() to jni 2013-10-31 08:07:07 -07:00
Eric House
3858893ab2 don't crash on null dctxt 2013-10-31 06:35:23 -07:00
Eric House
8ddc9a7770 Merge branch 'android_branch' into android_thumbnail
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
2013-10-30 21:46:45 -07:00
Eric House
3bfcc0cedd implement menu items, including being able to move or delete multiple
dicts at once.
2013-10-30 21:45:16 -07:00
Eric House
886f9100e1 implement delete and make default menuitems 2013-10-30 19:02:28 -07:00
Eric House
a0b1cddf7a comment out strings that are changing in English 2013-10-30 18:57:32 -07:00
Eric House
eefcd18fa8 part one of modernizing wordlists browser: long-tap selects and
de-selects, but menus aren't updated and don't work.
2013-10-30 07:03:15 -07:00
Eric House
dbf76287a8 move interfaces out of GameListAdapter and into own file; should be no
change beyond renaming.
2013-10-30 06:29:31 -07:00
Eric House
571b1d9d49 turn thumbnails on by default 2013-10-29 21:00:50 -07:00
Eric House
0960e5510c add board_getActiveRect to jni, and use it to capture a thumbnail
that's smaller.  Scaling is still a problem, though: some but not all
grid lines show up.
2013-10-29 07:51:35 -07:00
Eric House
d72526ff84 enable turning thumbnail featuren on/off via a line in build.xml 2013-10-29 06:49:06 -07:00
Eric House
8bdde9765d Merge branch 'android_branch' into android_thumbnail 2013-10-29 06:30:03 -07:00
Eric House
1d7a443c8d cleanup 2013-10-28 21:25:44 -07:00
Eric House
969d0d0a71 cleanup 2013-10-28 07:50:43 -07:00
Eric House
cfcca8ec25 remove unused strings 2013-10-28 07:16:56 -07:00
Eric House
8ab202dd27 cleanup menu config code 2013-10-28 06:21:24 -07:00
Eric House
e197e7499f add new thumbnail/blob column to DB 2013-10-27 21:56:00 -07:00
Eric House
2c9cd311a5 add thumbnail: save scaled-down image when closing board, store it in
summaries db, and display as part of game list item.  Preference
governs whether saved/displayed and the scale.
2013-10-25 21:08:37 -07:00
Eric House
e3c99595b1 add new thumbnail/blob column to DB 2013-10-25 21:02:34 -07:00
Eric House
9e79c7db9c Revert "thinner up icon; leave down thicker pending opinions"
This reverts commit 479bb0b236.
2013-10-25 18:33:57 -07:00
Eric House
b0a4d529a5 do copy in a Runnable so selection clearing works as with everything
else; make not clearing selection the default since it's more common.
2013-10-25 07:38:09 -07:00
Eric House
3067b5f9c1 make menu id names more consistent 2013-10-25 07:15:43 -07:00
Eric House
788102b5f6 replace ... with …, and add to a few menu items' strings 2013-10-25 06:31:49 -07:00
Eric House
4881164067 finish list of changes 2013-10-25 06:17:22 -07:00
Eric House
94e7bebc26 call super with unknown menuitem rather than assert.fail()ing -- which
I've seen.
2013-10-25 06:17:22 -07:00
Eric House
256d6eed90 remove unused strings 2013-10-24 19:58:43 -07:00
Eric House
521f0e3cf3 more tweaks, e.g. name the group that's preventing deletion, and
select newly created game copy
2013-10-24 19:58:21 -07:00
Eric House
73e1ac0a93 make newFrom highlight the new game; make reset preserve the selection 2013-10-24 19:20:20 -07:00
Eric House
33252c929c fix showNotAgainDlgThen(): when the pref is set to skip the hint, we
still can't call the callback directly because then
showNotAgainDlgThen() is synchronous only in that case.  For
consistency, post the callback call to a handler.
2013-10-24 19:18:42 -07:00
Eric House
266cd6fe85 add newbie hint for new back-button-clear-selection behavior 2013-10-24 18:51:55 -07:00
Eric House
3ff063a490 up version strings and start changelist 2013-10-24 07:30:39 -07:00
Eric House
3422b27f97 add reset (rewind) icon 2013-10-24 06:47:54 -07:00
Eric House
2bba9f66ca remove unused images 2013-10-24 06:40:20 -07:00
Eric House
6827350f7a rearrange menus and add some new icons 2013-10-24 06:33:33 -07:00
Eric House
479bb0b236 thinner up icon; leave down thicker pending opinions 2013-10-24 06:16:08 -07:00
Eric House
60ae8b97c2 try giving the generated pngs transparent backgrounds 2013-10-23 21:07:38 -07:00
Eric House
c605368cba make the group up/down arrows just plain arrows 2013-10-23 20:58:58 -07:00
Eric House
788542c874 When games moved, the destination group is opened and the games that
were moved stay selected.
2013-10-23 20:45:14 -07:00
Eric House
8f8911c7d1 add feature controlled by "debug features" preference, to add rowids
to the list of game properties that can be part of the game's summary
display.
2013-10-23 20:26:19 -07:00
Eric House
0a5e891d5e for deletes, don't clear selection until after it's confirmed and
finished.
2013-10-23 19:29:32 -07:00
Eric House
e6860a734c don't clear selection after moving a group up or down (first of
several cases where we want to preserve)
2013-10-23 19:20:12 -07:00
Eric House
77d38fe230 set selected when creating group header nodes, fixing problem where
they stop showing as selected when other nodes are expanded or
contracted (which winds up reallocating all group nodes).
2013-10-23 19:16:55 -07:00
Eric House
ddb64d3dc9 fix NPE (possible race condition) 2013-10-23 08:01:11 -07:00
Eric House
ea4a2ea609 support reset of multiple games 2013-10-23 07:56:36 -07:00
Eric House
76bbdafadd add varargs option to another showConfirmThen variant 2013-10-23 07:55:59 -07:00
Eric House
6759a5af95 support moving multiple groups 2013-10-23 07:45:57 -07:00
Eric House
ab3209ca70 When there's a selection change title bar text to show count 2013-10-23 07:15:09 -07:00
Eric House
2c63be81e8 don't delete selected groups if one is the default 2013-10-23 06:46:33 -07:00
Eric House
bf15f12fe4 shorten a couple of variable names 2013-10-23 06:38:37 -07:00
Eric House
5658d9c3ae make New From create dup in same group as source game 2013-10-23 06:31:03 -07:00
Eric House
001445435b fix formatting 2013-10-23 06:18:43 -07:00
Eric House
3af3e4052f rename method 2013-10-22 08:02:38 -07:00
Eric House
9ed1c21cf8 honor selected group when creating net and sms games too 2013-10-22 07:40:46 -07:00
Eric House
9997c43298 start new groups out expanded 2013-10-22 07:06:54 -07:00
Eric House
8c5cd9ebe3 store selected groups by id rather than position, fixing problems like
clearing the selection after moving a group
2013-10-22 07:02:49 -07:00
Eric House
8f8fd22c7f make strings consistent 2013-10-22 07:00:36 -07:00
Eric House
1bb0c49c71 assert that we don't use an unprepared menu. 2013-10-21 20:44:47 -07:00
Eric House
d96b092b42 fix crash on tiny-screen devices: rename menu to match change on other
devices' menu
2013-10-21 20:38:07 -07:00
Eric House
ccc46a819c supress output for png-generating script 2013-10-21 07:48:08 -07:00
Eric House
1b3c8ed661 ExpiringDelegate rather than ExpiringTextView needs to draw selected
state so can coordinate with expiring state representation.
2013-10-21 07:46:58 -07:00
Eric House
7a4d3093a1 on ICS+, onPrepareOptionsMenu can get called several times while
adjusting selections, so just bail when they're in an incomplete state.
2013-10-21 07:43:31 -07:00
Eric House
b7edbf14a4 placeholder svg files 2013-10-21 06:55:18 -07:00
Eric House
a38370c2f5 fix so groups correctly redraw unselected on ICS+. TODO: integrate
with the expiring stuff.
2013-10-21 06:29:02 -07:00
Eric House
b9afc47a25 placeholder icons for up and down, and fix to show only when there's room to move 2013-10-19 22:09:07 -07:00
Eric House
93425fe1e7 snapshot: fix crash on ICS; create game in selected group rather than
default (probably works local games only); etc.
2013-10-19 21:58:44 -07:00
Eric House
7712ee15e3 Clear selections after every menuitem call. Since that means the
selection's not available after a confirm dialog, modify
showConfirmThen() to take optional params like showNotAgainDlgThen(),
and make deleting games use it.
2013-10-19 10:12:57 -07:00
Eric House
df48c5d142 rename ivar 2013-10-19 10:07:03 -07:00
Eric House
91142b1976 replace three more pngs with an .svg 2013-10-18 22:47:57 -07:00
Eric House
33a8c30ade replace checked-in images with another generated 2013-10-18 22:40:53 -07:00
Eric House
d838151c0c modify build system to generate .png files from .svg files, with one
.svg as an example.
2013-10-18 22:36:45 -07:00
Eric House
07bfc3de37 snapshot: handle more menus. (Add game seems broken, though) 2013-10-18 21:37:13 -07:00
Eric House
4fe402e636 pass parent, not self 2013-10-18 21:33:33 -07:00
Eric House
43e69c7627 make group head view selectable, and separate group and game selection
so that only one type can be selected at once.  Combine all three
menus into one, but only enable subsets equivalent to the old menus
depending on what's selected.  Snapshot: menus pretty much don't work.
2013-10-18 20:40:20 -07:00
Eric House
9fe34e4183 Merge branch 'from_android_beta_69' into android_branch 2013-10-17 06:31:17 -07:00
Eric House
bf13046d98 add -> to submenu title to indicate it's a submenu 2013-10-17 06:13:47 -07:00
Eric House
b4dc0dbcbd tweak changes description 2013-10-17 06:13:27 -07:00
Eric House
055b4ce04e don't try to hide whole submenu -- crashes on 2.3 devices 2013-10-17 06:12:37 -07:00
Eric House
5979566772 hide title bar by default for pre-ICS devices but not for those where
I'm using the action bar.
2013-10-17 06:12:04 -07:00
Eric House
ea4c705bc6 up strings for new release 2013-10-17 05:43:57 -07:00
Eric House
1455c448c1 fix formatting 2013-10-16 21:04:30 -07:00
Eric House
2a01d25a29 fix NPE: update menu after deleting games 2013-10-16 21:03:19 -07:00
Eric House
85382c982c remove words from main games list. People don't read them, and now
there's a '+' in the menubar.
2013-10-16 08:13:18 -07:00
Eric House
f4160c178d hide Add button/menuitem when there's a selection 2013-10-16 07:36:36 -07:00
Eric House
9d6facce84 name the number of selected games in delete confirm dialog 2013-10-16 07:21:34 -07:00
Eric House
b6aa0e19a6 tweak text 2013-10-16 06:20:10 -07:00
Eric House
dab8ba88e5 use darker selection color from alarm clock app, which has a similar dark theme. 2013-10-16 06:20:01 -07:00
Eric House
7fd535b141 tap on selected item deselects rather than opening game 2013-10-16 06:13:10 -07:00
Eric House
0c3057f75c use different icon 2013-10-15 22:20:59 -07:00
Eric House
7414247ed1 add pencil/edit actionbar icons 2013-10-15 22:12:49 -07:00
Eric House
9217eb71dd move config into actionbar from context menu, deprecating it there. 2013-10-15 22:06:29 -07:00
Eric House
9beef6d51e move Trade menu into actionbar 2013-10-15 22:04:50 -07:00
Eric House
972629db8e string tweaks, including calling Exchange "Trade" because it's smaller. 2013-10-15 22:04:33 -07:00
Eric House
bfea8dad49 fix NPE. I think it's a bug that null appears there, but better not to
crash.
2013-10-15 22:03:14 -07:00
Eric House
44bae9246b use enum instead of a bunch of constants 2013-10-15 21:17:34 -07:00
Eric House
f30203bb22 fix NPE when choosing not to see new hint dialog again 2013-10-15 21:15:44 -07:00
Eric House
27fa9bf203 deprecate delete context menu item 2013-10-15 19:14:49 -07:00
Eric House
4bc554bc40 use new params-passing DlgDelegate to add hint about new selecting
feature.
2013-10-15 19:04:58 -07:00
Eric House
2ec0a7ba8d new param to interface to allow passing closure to delayed dialog
handling.  Unused, so no behavior change yet.
2013-10-15 18:48:02 -07:00
Eric House
6a6c528d36 new newbie message (not yet used) 2013-10-15 18:44:10 -07:00
Eric House
4af68196a6 use same icon for both add menuitems 2013-10-15 07:37:31 -07:00
Eric House
c2605344e0 remove padding that was causing redraw after unselected 2013-10-15 07:33:24 -07:00
Eric House
8816e590f2 copy gmail app's selection color 2013-10-14 19:01:51 -07:00
Eric House
638ad7b2c2 use proper Holo icons for delete and add 2013-10-14 08:08:46 -07:00
Eric House
44b9afe709 reuse code at cost of some extra allocs 2013-10-14 07:54:19 -07:00
Eric House
2f0f4996ac don't persist selection: goal is that it remains only while the
GamesList activity is frontmost within the app (including if app
itself is backgrounded); clear selection on back button (copying
gmail); be more effecient getting multiple child views.
2013-10-14 07:50:42 -07:00
Eric House
cc39953358 2013-10-14 06:54:43 -07:00
Eric House
45c632b735 deselect items inside collapsing group 2013-10-14 06:54:02 -07:00
Eric House
ddb87516ab don't turn on selection if already on (fixes Assertion) 2013-10-13 21:39:13 -07:00
Eric House
f305cbb9fe On resume of GamesList, remove from selected set any game that no
longer exists.
2013-10-13 21:26:59 -07:00
Eric House
a6d8806a7c change button text to match description 2013-10-13 21:24:55 -07:00
Eric House
938140a2c4 use custom color for game selection 2013-10-13 20:59:22 -07:00
Eric House
ec8a4119a9 give network icon a bit of padding now that it's a tap target 2013-10-13 20:46:24 -07:00
Eric House
ac229e4ae7 implement delete of selected games with confirmation 2013-10-13 20:33:55 -07:00
Eric House
e7a23afc4a add delete item to menu/actionbar, visible only if number of selected
games > 0
2013-10-13 20:15:51 -07:00
Eric House
1d0ccf97af copy in change to select games in games list and to remember which are
selected.
2013-10-13 20:03:52 -07:00
Eric House
e56fd06c09 mention menubar change 2013-10-11 22:40:29 -07:00
Eric House
5f177ac62f remove logging 2013-10-11 22:30:13 -07:00
Eric House
2acd59e08e give credit for report 2013-10-11 22:11:14 -07:00
Eric House
7dfc800fcb reregister using GCM id if it's changed (or been received) since last registered 2013-10-11 21:42:34 -07:00
Eric House
512c080634 don't try to register more than once per 10 seconds. I hope this
fixes the two-packet-in-a-row I'm seeing on the relay.
2013-10-11 20:53:04 -07:00
Eric House
7714bdc84f up version strings 2013-10-11 20:42:22 -07:00
Eric House
9a8ed72ea1 when new GCM ID is received, force re-register. 2013-10-11 07:51:10 -07:00
Eric House
253073efc5 cleanup and rename variable 2013-10-09 07:35:21 -07:00
Eric House
ec77be8a2a put the pass/turn done menuitem in the action bar as a first cut 2013-10-01 07:50:01 -07:00
Eric House
c294ad45cf don't recomment tapping the pts area of tray when it's not visible 2013-10-01 07:50:01 -07:00
Eric House
4abc9623f9 add invalidateOptionsMenuIf(), for working with action bar in a
safe-before-sdk-11 way
2013-10-01 07:50:01 -07:00
Eric House
f4881dd00e make default value false (though doesn't matter as caller sets that:
prev commit)
2013-10-01 07:50:01 -07:00
Eric House
552fa28b39 export model_getNumTilesInTray() via jni 2013-09-30 21:59:12 -07:00
Eric House
fddd159e57 by default, don't hide the title bar 2013-09-30 21:58:17 -07:00
Eric House
6dcb08594e remove unused strings 2013-09-30 07:09:25 -07:00
Eric House
f3e41486ca handle mailto: url, and add one. Note that everything about the url
is ignored, just routes to existing Utils.email() method.
2013-09-30 07:09:25 -07:00
Eric House
ce9c345aa9 add changelog and up version strings for new release 2013-09-30 07:09:25 -07:00
Eric House
9640d0c5f9 fail build when jni compile fails 2013-09-26 06:39:32 -07:00
Eric House
c9daf91b06 remove excess logging 2013-09-23 07:19:53 -07:00
Eric House
74546d183f better log message 2013-09-23 07:00:20 -07:00
Eric House
8ab832a136 wrap a bunch of tcp-connection code in !XWApp.UDP_ENABLED so compiler
can make it go away.
2013-09-23 07:00:05 -07:00
Eric House
107ba4c940 new gcc setting required, I assume, by new ndk version 2013-09-22 21:35:22 -07:00
Eric House
f74a82ee07 make background for exchange buttons black so they look
enabled/disabled when in fact they are.  Apparently now that the
theme's changed they don't look right without it, perhaps because the
old theme gave their layout a background other than white.
2013-09-22 20:37:42 -07:00
Eric House
9d722e0b13 follow relay reg protocol change to always send relayID even if empty;
track whether current registration is good, but DON'T throw current
relayID away when gcm id changes, rather, reregister with same
relayID.
2013-09-20 05:35:08 -07:00
Eric House
aa13fa07a7 Merge branch 'from_android_beta_65' into android_branch 2013-09-17 07:30:36 -07:00
Eric House
6225ec1d87 fix name string 2013-09-15 13:12:34 -07:00
Eric House
59d32d36b0 up version strings 2013-09-15 10:32:26 -07:00
Eric House
37a79b25f6 fix reported NPE (by inspection, as I can't repro) 2013-09-15 10:28:23 -07:00
Eric House
3499af3ac4 fix reported NPE (by inspection, as I can't repro) 2013-09-14 21:22:06 -07:00
Eric House
91a0dc5ecd turn chat back on -- and make it configurable via a single property in
build.xml that's turned into both a -D option to the jni compiler and
a constant in the java world.
2013-09-11 22:18:00 -07:00
Eric House
91e78eccf9 make download progress determinate 2013-09-11 08:37:12 -07:00
Eric House
51850ad019 remove strings no longer used 2013-09-11 07:19:35 -07:00
Eric House
ae79da9842 Merge branch 'from_android_beta_65' into android_branch 2013-09-10 08:00:57 -07:00
Eric House
a1300e9fe2 can't use &amp; in the changes file 2013-09-09 19:45:09 -07:00
Eric House
1669687f19 wrap a bit more chat code in test so java can leave it out 2013-09-09 19:31:17 -07:00
Eric House
a25d664eb5 Merge branch 'from_android_beta_65' into android_branch
Conflicts:
	xwords4/android/XWords4/res/raw/changes
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
2013-09-09 08:01:28 -07:00
Eric House
bd81eb4bbe list another change 2013-09-09 07:44:46 -07:00
Eric House
cf71479931 cleanup formatting 2013-09-09 07:42:27 -07:00
Eric House
00aa53dd3a up version strings 2013-09-09 06:56:48 -07:00
Eric House
4c36207822 comment out toast that's showing on every connection -- too annoying 2013-09-08 22:33:37 -07:00
Eric House
5d7cc9e9e8 disable chat, and include reason in change log 2013-09-08 19:09:49 -07:00
Eric House
04eeebc3a4 fix so still compiles when chat feature is disabled 2013-09-08 19:08:58 -07:00
Eric House
1cf676e86b stop menu button (or "action bar overflow") from being invisible on
tablet devices.
2013-09-07 16:09:53 -07:00
Eric House
4ed9078f3f add new exception thrown when can't open game for rowid, and catch the
one place it seems to happen.
2013-09-07 16:09:53 -07:00
Eric House
afab7ab33a up version strings 2013-09-07 08:16:44 -07:00
Eric House
de2c938f41 stop menu button (or "action bar overflow") from being invisible on
tablet devices.
2013-09-07 08:10:00 -07:00
Eric House
fdbdfa5911 add OS release number to reg data 2013-09-04 21:05:39 -07:00
Eric House
810dfac8b8 postpone packet creation and id assignment until send time so id can
be logged along with send.
2013-09-04 08:11:42 -07:00
Eric House
42a517b246 support UPGRADE message; don't queue KEEPALIVE packets when network is
down (as it is on Kindle when screen off)
2013-09-03 06:57:21 -07:00
Eric House
70fc4c448c print the exception's stack trace 2013-09-03 06:54:13 -07:00
Eric House
40215337c9 cleanup 2013-09-03 06:53:25 -07:00
Eric House
23bdec0ea1 Remove debug prefs checkboxes for ignoring gcm and using the udp relay
mechanism.  Replace with static finals with shipping settings.
2013-09-01 09:40:08 -07:00
Eric House
0003065571 handle dev (not game) messages arriving via gcm 2013-08-31 08:58:12 -07:00
Eric House
f6a91464ac don't update db unless value's changed 2013-08-31 07:59:58 -07:00
Eric House
593bb91ee6 saving last packet timestamp in onDestroy then reading in in onCreate
wasn't working because they're not always called in that order.  So
for now save every time we get a message.  Should be every time it
changes...
2013-08-31 07:59:58 -07:00
Eric House
7b9f6adf6d preserve most recent maxInterval rather than counting on getting it
from relay.
2013-08-31 07:59:58 -07:00
Eric House
3592c2a1ab add logging 2013-08-29 21:54:36 -07:00
Eric House
99ec44809a use random number rather than incrementing static int (which can be
reset) to keep Intents from being reused
2013-08-29 21:54:17 -07:00
Eric House
b6fd850d04 improve logging 2013-08-29 21:53:22 -07:00
Eric House
49ab62d521 set DEBUG when building ndk based on target in build.xml 2013-08-29 07:28:08 -07:00
Eric House
ad9615709e test whether gcm being ignored not when receiving messages but when
deciding whether to stay connected to relay.
2013-08-28 08:02:48 -07:00
Eric House
668cc27f35 lots of logging; handle GCM messages for device as well as for a
single game; tweak for more reliable connection or messages to help
diagnose.
2013-08-27 07:57:36 -07:00
Eric House
a7d5d261d3 replace static final ints with enum 2013-08-27 07:03:25 -07:00
Eric House
57ea3cd77e wasn't supposed to check this in with debugging on 2013-08-26 07:22:07 -07:00
Eric House
063b01d3d8 change most len-as-short+bytes strings to vli+bytes; add device model
to what's passed for device registration, and store it in a new column
in devices table.
2013-08-25 21:20:26 -07:00
Eric House
d10e9f6235 use vlis for acks in both directions 2013-08-25 16:59:07 -07:00
Eric House
47414beeb2 catch up with changes in udp proto: use vli for packet num in header. 2013-08-25 16:15:37 -07:00
Eric House
4be1653ab7 remove logging 2013-08-23 07:41:10 -07:00
Eric House
235346b7a4 fix signature string (and log when there's a mismatch) 2013-08-23 07:41:10 -07:00
Eric House
f728f7459b pass INITIAL_CLIENT_VERS and git version to relay 2013-08-20 08:42:41 -07:00
Eric House
5197033de3 In the spirit of setting constants in only one place, pass
INITIAL_CLIENT_VERS in from build.xml rather than the jni makefile,
and make it available in java world as well.
2013-08-20 08:42:12 -07:00
Eric House
a8d67830d8 add missing enum 2013-08-19 20:51:03 -07:00
Eric House
7bce97f78a post notification, not alert, on receipt of relay alert message 2013-08-19 07:02:03 -07:00
Eric House
31a3a593a4 handle alert command by posting message (if app's in foreground;
should otherwise post an intent...); remove some of excessive logging
2013-08-18 20:13:08 -07:00
Eric House
5412119a6f add hexDump (commented out) 2013-08-18 15:49:13 -07:00
Eric House
e776f7b230 comment out toast that's showing on every connection -- too annoying 2013-08-15 22:32:00 -07:00
Eric House
8c56f55445 track time since last game-related packet, not any packet from relay. 2013-08-15 22:32:00 -07:00
Eric House
10ef75113f factor common code 2013-08-15 22:32:00 -07:00
Eric House
652a8ec905 toward staying reachable as-if GCM were there: note whether GCM
working, and if so skip keeping the connection up.  But otherwise stay
reachable by relay for a week after last udp packet was received.
2013-08-12 08:24:52 -07:00
Eric House
09494dcf09 remove unused param 2013-08-12 08:15:55 -07:00
Eric House
0ba0530bf3 set global before informing of change so if there's a query result
will match what was sent
2013-08-12 08:13:58 -07:00
Eric House
a96c0c548f switch from static final ints to an enum; no other change. 2013-08-11 10:47:01 -07:00
Eric House
1d52a9afea add reset button to ConnStatusHandler on-click dialog that calls to
stubbed-out function in RelayService
2013-08-10 23:24:46 -07:00
Eric House
de1803c9dd cleanup: reduce number of params required 2013-08-10 17:36:37 -07:00
Eric House
758c6a6c5c add interface to ConnStatusHandler as part of moving UI-based response
into Activity.
2013-08-10 14:25:28 -07:00
Eric House
dbc1bb1cd5 use getHandler() 2013-08-10 08:54:51 -07:00
Eric House
f96155f12b merge changes for quick b65 2013-08-08 01:14:23 -07:00
Eric House
20056153aa up version strings 2013-08-07 23:54:47 -07:00
Eric House
6bb2a9bb9a fix crash upgrading from beta 30 (which is two years old!) 2013-08-07 23:52:37 -07:00
Eric House
d8e6979bcc cleanup: store db schema as arrays of arrays rather than arrays whose
odd- and even-indexed members have different roles.  Uses slightly
more memory but is better code.
2013-08-07 23:48:33 -07:00
Eric House
d00e9edf55 fix crash upgrading from beta 30 (which is two years old!) 2013-08-07 23:36:17 -07:00
Eric House
da3f62729b Merge tag 'android_beta_64' into android_branch
beta 64
2013-08-07 06:18:15 -07:00
Eric House
b33991486c up strings for next beta (a quick fix) 2013-08-06 22:03:09 -07:00
Eric House
ed0c0fe3a5 add methods that don't require handler but use any set 2013-08-02 08:03:35 -07:00
Eric House
1e94e217b8 collapse catch statements since all do the same thing 2013-08-02 08:02:46 -07:00
Eric House
64b89536b0 Test whether game is on device before starting process of opening it.
Fixes problem caused by relay sending messages for games that have
been deleted.
2013-07-30 07:43:52 -07:00
Eric House
4ce2368e90 remove unused variable and functions that set it 2013-07-30 07:35:13 -07:00
Eric House
b40533230a fix OS warning by unregistering SMS receivers in onDestroy 2013-07-29 07:50:01 -07:00
Eric House
d8a4b5ce29 include udp maxInterval, the number of seconds the relay's configured
to assume an address is still good when it hasn't heard from it, in
reg response reply, send that reply always, and read and log the new
field on clients.  It will eventually be used to implement a
keepalive.
2013-07-29 07:27:30 -07:00
Eric House
27d9f3de45 Don't enable chat when more than 128 messages are in queue to prevent
an extremely unlikely cause of stalls -- and make tests trip over full
queues less often.
2013-07-18 07:37:45 -07:00
Eric House
bf39f9194c kill service after 3 minutes of no socket activity 2013-07-17 06:42:54 -07:00
Eric House
3d9539b42b don't stop comms before every save, but only when stopping 2013-07-16 08:06:23 -07:00
Eric House
5571816339 enable udp by default 2013-07-16 08:05:46 -07:00
Eric House
403401745e network connection stuff must not be run on main/UI thread, so to
preserve socket connection completing before startup of read and write
threads, move it and start of write thread to beginning of read
thread.
2013-07-16 08:01:59 -07:00
Eric House
b7e00bfc0c log when unable open game based on rowid -- which may happen if
e.g. relay is sending packets to wrong device.
2013-07-16 07:56:56 -07:00
Eric House
cd728853b9 check for case where rowid doesn't exist (rather than NPE) 2013-07-15 07:51:15 -07:00
Eric House
a522266ce4 add message checksumming for android too by making it part of util
(compiled out by default)
2013-07-10 08:05:47 -07:00
Eric House
d50c808f96 Merge branch 'android_branch' into gtk_multigame
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
	xwords4/common/comms.c
	xwords4/linux/cursesmain.c
	xwords4/linux/cursesmain.h
	xwords4/linux/gtkmain.c
	xwords4/linux/gtkmain.h
	xwords4/linux/linuxmain.c
	xwords4/linux/main.h
	xwords4/linux/scripts/discon_ok2.sh
	xwords4/relay/xwrelay.cpp

(Note: The curses app crashes on exit with mempool assertions, but that's a problem before the merge.)
2013-07-09 07:18:00 -07:00
Eric House
db26c32c3e revert accidental part of commit 2013-07-08 07:14:42 -07:00
Eric House
7d968f8502 target is now hard-coded since I reliably can't derive it from the
manifest file.
2013-07-08 07:13:48 -07:00
Eric House
7e36171046 add comment 2013-07-08 07:13:04 -07:00
Eric House
11994d06f8 quote variable to make shell happy 2013-07-08 07:09:03 -07:00
Eric House
e7d20fd2a3 change API version configured by build script to be what I'm using now 2013-07-08 07:03:57 -07:00
Eric House
008cce8f37 Revert "pass additional param into java world so don't show toast every time connect to relay"
This reverts commit e9615cb154.
2013-07-08 06:30:26 -07:00
Eric House
bb68b25429 remove suggestion I don't have permission to use icons! 2013-07-07 19:53:12 -07:00
Eric House
e9615cb154 pass additional param into java world so don't show toast every time connect to relay 2013-07-07 13:31:49 -07:00
Eric House
0f104db88c list another change 2013-07-07 13:07:12 -07:00
Eric House
2c5ac1c293 remove excess logging 2013-07-07 13:07:02 -07:00
Eric House
fb32c847ae more changes from translator 2013-07-05 21:37:38 -07:00
Eric House
7419e3506a add missing string to translation 2013-07-05 06:19:28 -07:00
Eric House
cd1886a751 changes from translator 2013-07-04 20:46:59 -07:00
Eric House
3f2548dcce Merge branch 'fix_tablets' into android_branch
Conflicts:
	xwords4/android/XWords4/res/raw/changes
2013-06-27 08:04:03 -07:00
Eric House
4a49c49e87 changes for second tablet fix release. This time I've confirmed they
work on the google store.
2013-06-27 07:58:02 -07:00
Eric House
79293503fd Merge branch 'from_beta_60' into android_branch
Conflicts:
	xwords4/android/XWords4/AndroidManifest.xml
	xwords4/android/XWords4/project.properties
	xwords4/android/XWords4/res/raw/changes
2013-06-25 21:25:03 -07:00
Eric House
8cb89976cb new quickie release to fix Play Store filtering out devices without
phones -- or so I think.  Make SMS optional, and up version strings.
2013-06-25 21:14:14 -07:00
Eric House
ed1e2a0812 fix formatting -- no code change 2013-06-05 21:14:51 -07:00
Eric House
00be532c96 fix formatting -- no code change 2013-06-05 21:11:37 -07:00
Eric House
6a9c0bf5d4 up version strings for next beta 2013-06-05 20:56:59 -07:00
Eric House
6b2ec193c2 cleanup 2013-06-05 08:04:00 -07:00
Eric House
280154a12c fix bad message when dict deleted by using the right rowid variable -- duh. 2013-06-05 08:03:13 -07:00
Eric House
f9676f5ffd set focusableInTouchMode on wordlist browser's layout. This is the
only way I can find to prevent the soft keyboard from coming up on
launch.
2013-06-05 07:34:31 -07:00
Eric House
ca8a37d822 move less-used buttons to right where they may be off-screen 2013-06-05 07:33:31 -07:00
Eric House
c6d06e5fa4 bring up new popup on tap rather than long-tap of browser button to
make it easier to discover.  Long-tap now opens the wordlist directly.
2013-06-05 06:59:08 -07:00
Eric House
bb130a9b9f new feature: long-click on wordlist button in BoardActivity brings up
a popup of all wordlists so you can browse one that's not in use,
e.g. to see if a word's legal in a larger wordlist.  Uses PopupMenu
class that was introduced in API 11, so 11's the target now and the
interface trick is used to prevent crashing on older devices (which
get a "needs newer Android" alert.)
2013-06-04 07:29:40 -07:00
Eric House
c32df1a487 use alpha to dim pending score rather than mucking with the rgb values 2013-06-01 08:10:03 -07:00
Eric House
9d40930fff pass new param into java, and when it's not the player's turn draw
pending points with his color at half-intensity.
2013-05-31 07:40:42 -07:00
Eric House
d41c1a4ca8 add new param so pending text can be drawn differently when it's not
the player's turn.
2013-05-30 07:17:13 -07:00
Eric House
a1b6641067 catch and ignore exception from malformed user-provided url 2013-05-24 21:17:22 -07:00
Eric House
f4c18a78ac clear game-launched flag in onNewIntent so that one game can replace
another via a Notification- or other-sourced Intent
2013-05-23 07:51:03 -07:00
Eric House
6c7cf1fa97 fix bug where two quick taps on a game will launch two copies (or
crash a slower device) by tracking whether an open's in progress
2013-05-23 06:48:40 -07:00
Eric House
cc2ecdc5b2 two post-conflicted-merge changes git didn't pick up for some reason (emacs?) 2013-05-22 07:03:08 -07:00
Eric House
31c443e4b1 Merge branch 'android_branch' into gtk_multigame
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GCMIntentService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
2013-05-22 07:01:08 -07:00
Eric House
2e30ccd4c6 expect array of message bodies rather than just one 2013-05-22 06:45:34 -07:00
Eric House
120748416b handle GCM messages containing data, changing clientVers so server
knows we can.  And send to relay in AsyncTask rather than UI thread.
2013-05-22 06:44:01 -07:00
Eric House
076b1b7543 remove logging 2013-05-22 06:44:01 -07:00
Eric House
4470a9e66c clean up a couple of debug-only strings 2013-05-09 22:15:38 -07:00
Eric House
7d8cddb31f Merge branch 'android_branch' into gtk_multigame
Conflicts:
	xwords4/linux/gtkmain.c
	xwords4/linux/linuxmain.c
	xwords4/relay/xwrelay.cpp
2013-05-08 07:37:55 -07:00
Eric House
407a82322c modify to server the latest beta for non-debug users 2013-05-02 06:58:36 -07:00
Eric House
9cfc6be82c fix for when wordlist not found 2013-05-02 06:52:12 -07:00
Eric House
5a026ffda3 merge android_wordlists (local branch) 2013-05-01 06:39:31 -07:00
Eric House
c31a1d98df update changes list 2013-05-01 06:33:22 -07:00
Eric House
4e2f5b3b14 add (commented-out) debug function to print list of extras in an intent 2013-05-01 06:26:02 -07:00
Eric House
a62f9d4097 Fix but with missing-dict SMS invites: add missing intent extra. 2013-04-30 21:20:59 -07:00
Eric House
c8f447171a Stop SMS service if play via SMS is disabled by user 2013-04-29 07:40:42 -07:00
Eric House
e4eb867717 add new flag bit to built-in wordlists 2013-04-20 19:46:52 -07:00
Eric House
541fc546ab remove that bit from flags -- since we already do the right thing for it. 2013-04-20 19:46:35 -07:00
Eric House
87e21cd204 fix type in English string 2013-04-18 19:46:12 -07:00
Eric House
81ce47fe5e Add Brazilian Portuguese translation. 2013-04-18 19:44:52 -07:00
Eric House
75d11d7d95 Revert "First cut at Brazilian Portuguese localization, unmodified from what"
This reverts commit 6b43d29ff1.

Belongs on the main branch as it won't be part of the next beta.
2013-04-18 19:24:19 -07:00
Eric House
dbc8605d1d remove removed change from changelist 2013-04-18 19:19:41 -07:00
Eric House
0d260155ee Revert "On some devices a downloaded wordlist shows up twice, once in Internal"
This reverts commit 685971532a.

No way to test this right now....
2013-04-18 19:12:49 -07:00
Eric House
e4f52c5678 add assert and comment explaining why non-utf-8-aware hack is safe. 2013-04-18 07:15:14 -07:00
Eric House
cdcfef4e18 fix type in English string 2013-04-17 20:03:14 -07:00
Eric House
6b43d29ff1 First cut at Brazilian Portuguese localization, unmodified from what
the translator provided.
2013-04-17 19:59:41 -07:00
Eric House
7288e8c6dc up version/changes for next release 2013-04-16 07:14:03 -07:00
Eric House
685971532a On some devices a downloaded wordlist shows up twice, once in Internal
and again in Downloads.  I assume that's because the two directories
are the same, so fix by tracking directories that have been checked
and not checking the same twice.
2013-04-16 06:56:53 -07:00
Eric House
1614ebd551 new versions of builtin English wordlists with lowercase synonyms for all
letters ('a' for 'A', etc.)
2013-04-14 15:54:39 -07:00
Eric House
c8332a9665 load synonyms for specials correctly. So now Catalan works: wordlists
load, and search for "l-l" will find "L·L".
2013-04-14 15:45:23 -07:00
Eric House
cae631eeb0 handle synonyms in non-special tiles for Android: wordlists load and
display, and searching using lower case works.  Specials (e.g. Catalan
changes) not yet supported.
2013-04-14 11:58:11 -07:00
Eric House
a9d94e2977 list changes for b59 2013-04-06 08:24:30 -07:00
Eric House
43f4e802b6 up copyright year -- it's 2013 now 2013-04-06 08:18:27 -07:00
Eric House
388d37e4ee deal with more than one connected device/emulator 2013-04-06 08:16:57 -07:00
Eric House
51d72447c6 fix crash when wordlist winds up in downloads dir (for reasons I don't
understand: I can't reproduce the crash but for at least one
correspondent it happens every time.)
2013-04-06 08:05:39 -07:00
Eric House
86b39b8340 up version strings and number 2013-04-06 08:04:05 -07:00
Eric House
a18fb62b0f fix dialog not having custom OK button by not ignoring the param passed in. 2013-01-31 06:59:42 -08:00
Eric House
bf479c4334 Merge branch 'android_branch' into gtk_multigame 2013-01-30 08:03:48 -08:00
Eric House
660efa6380 rename script to be easier to type 2013-01-30 08:03:13 -08:00
Eric House
66a00bd76e make DlgState Parcelable rather than Serializable to work around what
seems to be a bug in the Blaze's OS.  (Requires that it be a
standalone class.)
2013-01-30 07:58:37 -08:00
Eric House
5e7fd39d66 always remove dialog state so we don't get confused 2013-01-29 21:59:42 -08:00
Eric House
0dc3856250 set initial rowID based on clock to avoid duplicates after an
uninstall/reinstall.
2013-01-29 19:02:53 -08:00
Eric House
d154efa441 rowid needs to be autoincrement to be useful as a token with new relay
protocol.  And you can't make it autoincrement except when creating a
table.  So add new column set equal to current rowid, then create a
new table and copy the old data into it.
2013-01-29 19:01:00 -08:00
Eric House
d88f66a890 record experiment with serialization -- no code change. 2013-01-29 18:57:03 -08:00
Eric House
d5842e79c2 use the new ANON devid type 2013-01-29 18:36:19 -08:00
Eric House
f3a063698c set initial rowID based on clock to avoid duplicates after an
uninstall/reinstall.
2013-01-29 08:01:14 -08:00
Eric House
1546b15997 rowid needs to be autoincrement to be useful as a token with new relay
protocol.  And you can't make it autoincrement except when creating a
table.  So add new column set equal to current rowid, then create a
new table and copy the old data into it.
2013-01-28 06:51:39 -08:00
Eric House
d1621c8d4b track and log all packetIDs and acks, including number (but not type)
of unacked packets.
2013-01-27 21:29:36 -08:00
Eric House
4417591b06 debug pref to disable GCM so new stuff can be tested on-device 2013-01-25 07:17:00 -08:00
Eric House
83441c65ef debug pref to disable GCM so new stuff can be tested on-device 2013-01-25 07:16:38 -08:00
Eric House
f91af77438 always try starting UDP threads in case Service has been stopped;
implement transportSend in RelayMsgSink since relay-connection packets
need it.
2013-01-25 06:22:37 -08:00
Eric House
c8b3050c8d fix duplicate key that was getting lots of extra games created 2013-01-25 06:20:32 -08:00
Eric House
da4d841220 use per-device UDP rather than per-board TCP to communicate with
relay, including latest UDP protocol and acking changes.  Basically
works (in emulator at least) but there are problems especially with
initial game creation.
2013-01-23 07:46:13 -08:00
Eric House
a3e4e31205 remove logging 2013-01-23 07:28:25 -08:00
Eric House
a6b3cb8cbe add new param JNIThread requires 2013-01-20 21:34:28 -08:00
Eric House
de7c29dcc7 add comms_stop() to jni and use it 2013-01-20 21:33:35 -08:00
Eric House
132a495c4f add explanatory comment 2013-01-20 21:32:19 -08:00
Eric House
3df0484e6a get maintenance mode message into an alert -- and create a new common
superclass for Service subclasses to reuse some code.
2013-01-20 16:07:38 -08:00
Eric House
fd2f4309f4 beginning of android changes to talk udp to the relay: sufficient to
get back (and log, not display) a message when the relay is in
maintenance mode.
2013-01-20 15:29:51 -08:00
Eric House
3bcf5d504b add a debug pref for turning on UDP-based networking (ignored so far) 2013-01-19 16:03:29 -08:00
Eric House
360602b3a0 fix compile failure: never meant to check this change in. 2013-01-19 16:02:58 -08:00
Eric House
6797e069bc Merge branch 'android_branch' into gtk_multigame 2013-01-19 15:56:16 -08:00
Eric House
4af30c534c snapshot. New game button works and game gets saved in DB. Next: display and open from DB. 2013-01-05 16:08:19 -08:00
Eric House
f5b8bb7aae fix text to match there being multiple buttons 2013-01-01 23:26:31 -08:00
Eric House
2202c6c6bf up version strings and number 2013-01-01 22:33:31 -08:00
Eric House
c97ec6b1e9 up copyright year -- it's 2013 now 2013-01-01 22:33:19 -08:00
Eric House
05cee5ce09 further work supporting simultaneous dialogs: use
bundle.get/putSerializable() to save/restore dialog state
2013-01-01 22:27:14 -08:00
Eric House
af406d92dc Handle multiple dialogs at once: save dialog state by dialog ID (ok
since the OS won't track more than one at a time with the same ID) and
look it up that way when needed.  Get rid of onPrepareDialog() (and in
all my Activity subclasses) since it's now a requirement that all
DlgDelegate-managed dialogs remove themselves from the Activity on
dismissal so that onCreateDialog will always get called and
onPrepareDialog not be needed.
2013-01-01 21:45:37 -08:00
Eric House
8b2712bd9e always remove dialog on dismissal since each must have its on-dismiss
handler called with its own state.  Fixes assertion failure that was
happening the second time a dialog was used.  Next: find a
reproducible case where two dialogs want to be created at the same
time.
2012-12-31 07:08:41 -08:00
Eric House
d1941090c5 Merge branch 'android_branch' into fix_dlgdelegate 2012-12-31 06:25:49 -08:00
Eric House
049b3389a6 turn DEBUG back on 2012-12-29 18:49:13 -08:00
Eric House
bbf9e8e0df tweaks suggested by code review 2012-12-29 13:22:00 -08:00
Eric House
1faf60f667 move updateRow back where it was (prior to some merge); no code change 2012-12-29 12:50:02 -08:00
Eric House
90adcde164 move side padding around 2012-12-29 12:42:48 -08:00
Eric House
04a7f9c999 tweak text; fix misspelling 2012-12-29 12:30:01 -08:00
Eric House
05566b1833 add space before ) to protect against buggy email url parsers. 2012-12-29 12:24:13 -08:00
Eric House
e58e520f70 fix name/rename group dialog title 2012-12-29 11:53:18 -08:00
Eric House
498ca99020 deal with added groups too, and better with removed groups. 2012-12-29 11:36:51 -08:00
Eric House
8c4b878e21 preserve order of groups when removing one by removing it from list
rather than allowing list to be regenerated.
2012-12-29 09:35:44 -08:00
Eric House
674b6d3e8e don't let new group dialog present the last name chosen as default name 2012-12-29 09:18:17 -08:00
Eric House
ff3af7f095 add xml-non-strippable space between sentences 2012-12-29 07:47:12 -08:00
Eric House
c994b27c04 try grey background and italic text for list group views 2012-12-28 20:01:13 -08:00
Eric House
4d07046a99 make static GamesListItem method responsible for providing new instances. 2012-12-28 20:00:46 -08:00
Eric House
21e572acfc Revert "use WeakReference to cache GameListItems and to inval them"
(Reusing Views this way seems to cause the occasional failure to recognize a tap-on-item bug.)

This reverts commit edd712ac16.
2012-12-28 10:06:16 -08:00
Eric House
edd712ac16 use WeakReference to cache GameListItems and to inval them 2012-12-28 09:50:33 -08:00
Eric House
fb575949ac order games within group the same way all games used to be ordered,
and get rid of the old all-games-listing code since it's no longer
used.
2012-12-27 20:50:37 -08:00
Eric House
a6586b6131 docs say not to call cursor.close -- so don't. 2012-12-27 20:38:31 -08:00
Eric House
8bba5d6106 Revert "add POSITION column to groups table, unused as yet"
This reverts commit 7be6a182f0.
2012-12-26 19:35:21 -08:00
Eric House
68026fef3e disable (but don't hide) group context menus that can't do anything. 2012-12-26 19:31:24 -08:00
Eric House
0d9f1a3ba7 add move-up and move-down menuitems so group order can be controlled
by user.  Store position as array of rowids in preferences, and make
game info hashed by rowid rather than name.
2012-12-26 18:55:15 -08:00
Eric House
0a7fcb2de4 remove deleteAll menuitem 2012-12-22 23:21:01 -08:00
Eric House
7be6a182f0 add POSITION column to groups table, unused as yet 2012-12-22 22:59:08 -08:00
Eric House
3ce379588b indent game list items to make them easier to tell from group items 2012-12-22 22:54:10 -08:00
Eric House
110df3c1ba Merge branch 'android_branch' into fix_dlgdelegate 2012-12-21 23:03:22 -08:00
Eric House
a594a77673 Merge branch 'android_branch' into android_groups 2012-12-21 18:06:48 -08:00
Eric House
2461b526a5 move check for updates into async task 2012-12-21 18:06:27 -08:00
Eric House
e8c3c304ab Fix so when child is invalidated its group/parent also is. Now when
an invisible child gets a network game message that changes its expiry
rendering and it's the one the group is showing, the group will follow.
2012-12-21 17:31:37 -08:00
Eric House
3436a71d65 new string for dialog title (forgot this last checkin) 2012-12-21 17:29:44 -08:00
Eric House
d33f44ea24 Merge branch 'android_branch' into android_groups 2012-12-21 17:15:30 -08:00
Eric House
1998da45de don't save game when it hasn't changed -- when saved bytes are
identical with those we started with.
2012-12-21 17:14:55 -08:00
Eric House
2375f86f61 improve move-to-group dialog: add title and disabled Move button when
radio is current group.
2012-12-21 17:06:04 -08:00
Eric House
a3b24be661 clear background drawable when no longer a local turn 2012-12-21 06:20:58 -08:00
Eric House
1743382e1f cleanup: combine files that belong together 2012-12-20 21:55:57 -08:00
Eric House
db829337f5 up version strings etc. 2012-12-20 21:51:38 -08:00
Eric House
7f9898f317 don't include expiry in group header when expanded 2012-12-19 20:49:02 -08:00
Eric House
ed0bb5b31e minimum to get game list group headers reflecting the most urgent move
expiry info of a contained game: local if there is one, otherwise
remote.  Still need to hide it when expanded, update, etc.
2012-12-19 20:45:58 -08:00
Eric House
7e302aae69 always show game count 2012-12-18 07:57:14 -08:00
Eric House
6690fdf122 derive from XWExpandableListActivity since it exists now 2012-12-18 07:56:48 -08:00
Eric House
9cbd76aae7 more cleanup; log info toward reuse of list items (looks unlikely) 2012-12-18 07:40:48 -08:00
Eric House
d583ec139d move all existing games into the curGames group 2012-12-18 07:08:57 -08:00
Eric House
24bddd1ff7 cleanup 2012-12-18 06:52:13 -08:00
Eric House
983a560294 expand groups in onCreate() 2012-12-18 06:51:43 -08:00
Eric House
3a1b39f827 more of the (conflicted) merge from android_branch. These may be
changes I need to make to get what git produced to compile and so not
what it included in the previous commit.
2012-12-18 06:36:30 -08:00
Eric House
8a58492389 Merge branch 'android_branch' into android_groups
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2012-12-18 06:35:07 -08:00
Eric House
8cb9d3d66b turn debug back on 2012-12-18 05:56:14 -08:00
Eric House
6988b14247 no need for redraw in onWindowFocusChanged 2012-12-18 05:40:25 -08:00
Eric House
9d7d0aca2b cleanup: logging and unused imports 2012-12-16 20:14:15 -08:00
Eric House
60adf36718 fix typo 2012-12-16 15:14:33 -08:00
Eric House
e38b99c0c8 set DEBUG to false for release 2012-12-16 15:14:04 -08:00
Eric House
51a5e80a26 mention attachment in invite email text 2012-12-16 15:13:36 -08:00
Eric House
3c4f266b8f work around problems locating GameListItems when it's time to
invalidate them by adding static list of those needing invalidating
and checking it in a new onDraw override.
2012-12-14 18:46:54 -08:00
Eric House
646ec65d66 wrap elapsed time logging in its own debug flag and turn off. 2012-12-14 18:23:33 -08:00
Eric House
8125c451cd in GamesList, save rowid of launched game and inval it afterwards so
scores etc. get updated.
2012-12-14 07:26:13 -08:00
Eric House
028899a9c4 no need to set action on local intent 2012-12-14 07:24:26 -08:00
Eric House
322a65ee41 in several places where lock() was being called without a timeout, add
one, and fail gracefully when a timeout occurs.
2012-12-13 20:22:11 -08:00
Eric House
7a1de73fb7 remove unused file 2012-12-13 20:18:36 -08:00
Eric House
85953c64dd move GameLock into its own file 2012-12-13 18:47:55 -08:00
Eric House
f989dad63c tweak changed descriptions 2012-12-13 07:11:51 -08:00
Eric House
6060d5e8bd Fix hangs when receiving relay messages in background for open game by
adding a static feedMessages method like the one used by SMS and BT
games.  For that to work, rowid and relayid need to be fetched and
tracked together -- so do that in RelayService.
2012-12-13 06:57:12 -08:00
Eric House
91ac04b896 remove logging 2012-12-13 06:32:57 -08:00
Eric House
b71046e5aa lock, rather than tryLock, game when feeding it messages. Otherwise
messages are dropped e.g. when UI's loading a summary in GameListItem.
2012-12-12 07:13:25 -08:00
Eric House
db8364c285 return empty array rather than null when query succeeds but produces
no result.
2012-12-12 06:43:18 -08:00
Eric House
69f868722f cancel any notification for game when resetting it 2012-12-12 06:41:56 -08:00
Eric House
eee954e705 list changes for next release 2012-12-11 19:15:15 -08:00
Eric House
575d5e9745 reduce time we'll wait for a summary to unlock when loading it for games list. 2012-12-11 19:11:23 -08:00
Eric House
01d17fe0c5 redraw full list after resetting a game in case position changes 2012-12-11 19:10:05 -08:00
Eric House
7246ae28c6 clear the cache after loading a new DB so will redraw correctly in list 2012-12-11 19:09:33 -08:00
Eric House
b2bd6ce662 add and use preference for square rack tiles, removing code that alternated for testing purposes. 2012-12-11 07:25:43 -08:00
Eric House
877225f59d rename interface; no code change 2012-12-10 18:20:44 -08:00
Eric House
f599ca8be4 make tiles square based on rowid so people can see both 2012-12-10 07:54:42 -08:00
Eric House
d820554ffb change game list item strategy since it turns out adapter's findView()
doesn't pass in the previous representation of a given item for
recycling: move async loading of summary into GameListItem class, and
use getChildAt() to invalidate a single list (rather than reloading
the whole list) whereever possible.  Still need to dump the list
whenever the number of items changes since we're depending on DBUtils
to determine the order and have no way to reshuffle existing items.
2012-12-10 07:48:15 -08:00
Eric House
1bc8070bb1 disable Rematch button (for now) 2012-12-10 07:11:13 -08:00
Eric House
3a45db66cf cache array of rowids, and clear cache appropriately, rather than
query DB for all games every time.
2012-12-08 20:28:11 -08:00
Eric House
ce803a928c pass summary rather than have callee refetch it 2012-12-08 08:55:45 -08:00
Eric House
7efbd2697d rewrite list item logic. Use a single custom LinearLayout subclass
for both the loading and loaded phases, toggling its state once the
data's available.  Reuse it: pay attention to what's passed into
getView and only allocate when there's no existing View to reuse.
Stop caching Views, as that defeats Android list logic that might
limit in-memory representation to the subset that's visible on-screen,
instead tracking a set of rowids whose data is known to be good as a
way of quickly drawing when there's a refresh.
2012-12-08 08:47:53 -08:00
Eric House
93bf2a1b3e hard-code tiles drawn nearly-square, just to see what it looks like.
Making them exactly square would probably take a new jni call.  And if
I ship this it needs to be optional, controlled by a preference.
2012-12-05 19:15:20 -08:00
Eric House
e719c6e61d don't crash if for some reason json file can't be written 2012-12-05 08:15:48 -08:00
Eric House
6789a64b68 reduce redundant code (hopefully without adding too much confusion) 2012-12-05 08:14:55 -08:00
Eric House
af853098f2 use preferred SDK-8 API to look for downloads directory, and wrap it
in an interface loaded only when SDK>=8 to avoid load-time crash on
older devices.
2012-12-05 07:32:11 -08:00
Eric House
a035ef5623 attachment can come in as file or content scheme 2012-12-05 06:52:10 -08:00
Eric House
ac8c229e75 Fix attachments, at least for the one phone I've tested on. Requires
K-9 mail (Gmail doesn't allow opening attachments).  Trick was to drop
the file extension, since if present that seems to come ahead of mime
type for filtering.
2012-12-03 23:10:31 -08:00
Eric House
922f4a22f4 remove unneeded variable 2012-12-03 23:07:14 -08:00
Eric House
2c71c8425f pass the rematch request off to GamesList where it can create new
games without interference from locked current game.  Handle
standalone case by cloning and launching: easy.  Networked games will
be harder.
2012-12-03 08:30:29 -08:00
Eric House
c041792f83 move methods toward better encapsualtion (no behavior change) 2012-12-03 08:03:00 -08:00
Eric House
ad606cdec0 trying to figure out why games list is occasionally redrawing itself
all the time: add logging that activated only when XWApp's DEBUG flag
is set, and turn that flag on.  The latter change should be reversed
before the next release.
2012-12-03 06:53:15 -08:00
Eric House
a640f9d97b up version number and string 2012-12-03 06:51:50 -08:00
Eric House
da9c7a1afd comment out unused column 2012-12-02 21:39:33 -08:00
Eric House
bda0d51c7f add Rematch button to game over dialog -- which only puts up notImpl
toast so far.
2012-12-02 18:45:35 -08:00
Eric House
7621b909c3 hide a couple of message-related menuitems for standalone games 2012-12-02 18:19:52 -08:00
Eric House
9eea15185c set m_gameOver when it's first known. 2012-12-02 18:09:15 -08:00
Eric House
e5bb360537 When a game is over, show "Game over" dialog containing score summary
every time it's opened.  This is a quick way to get around it being a
bit hard to tell a board's in that state.
2012-12-02 18:02:27 -08:00
Eric House
9007331fb0 cleanup, and suggest accepting Android's make-default offer 2012-12-01 21:13:04 -08:00
Eric House
0d0146cb17 additional changes required post-merge to compile 2012-12-01 10:53:55 -08:00
Eric House
c4e638bd84 Merge branch 'android_branch' into android_groups
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2012-12-01 10:52:42 -08:00
Eric House
38e6eac3a1 improve page users see when opening invite from new device on an old one. 2012-12-01 10:10:28 -08:00
Eric House
dd882ba9d4 first cut at script old clients will see responding to new-style invitations 2012-12-01 09:34:21 -08:00
Eric House
0394579b7c cleanup (and use factored-out updateRow a couple of additional places) 2012-11-30 19:58:23 -08:00
Eric House
795e05f544 update with changes and next steps 2012-11-30 19:57:46 -08:00
Eric House
13b7877a80 put name of file being downloaded in progress dialog 2012-11-30 08:08:45 -08:00
Eric House
74fec9d3d3 disable attachments as part of invitations -- for now. 2012-11-30 07:50:10 -08:00
Eric House
8b5ec28120 SMS play logs too much: remove non-error logging. 2012-11-30 07:22:16 -08:00
Eric House
32d7daf2b5 warn about duplicate games not just when there's exactly one, and
include the most recent create time in the warning.
2012-11-30 07:13:00 -08:00
Eric House
95062fb967 log missing dicts 2012-11-30 07:12:07 -08:00
Eric House
ab0fb918ee open json attachment and from it create a new game. Works, but there
are enough problems with attachements I may turn them off.
2012-11-30 06:21:18 -08:00
Eric House
f4dc8a6b41 snapshot of code and intent filter that gets an attachment into an
email and launches Crosswords when the attachment is opened.
Shouldn't, or at least shouldn't launch ONLY Crosswords, as the mime
type's not in the filter, but it does.
2012-11-29 08:19:07 -08:00
Eric House
9f5a64ee50 don't try to use null gamePtr. Happens when relay moves arrive for a
game whose dict has been deleted.
2012-11-29 06:20:45 -08:00
Eric House
bffb231d13 improve download-or-cancel messages 2012-11-28 21:07:03 -08:00
Eric House
8250447eca launch game after successfully downloading dict it's missing 2012-11-28 20:41:08 -08:00
Eric House
4bae56e631 use rowid as notification id for all types of games, and cancel when
games deleted.
2012-11-28 19:32:50 -08:00
Eric House
19333e33ac fix confirmation of duplicate game from invite. Along the way
dramatically simplify how new game intents are passed around.
2012-11-28 19:17:29 -08:00
Eric House
6f620ebc44 move prefix into resources two since it's repeated. 2012-11-28 06:30:35 -08:00
Eric House
baa790a8c3 remove debugging code; make Intent content details private to class. 2012-11-28 06:06:42 -08:00
Eric House
cd197e4530 use Class instance for synchronization of static methods rather than
creating an object only for that purpose.
2012-11-27 18:55:08 -08:00
Eric House
3cc92e99ca fix uri format error that was causing install to fail 2012-11-27 18:48:05 -08:00
Eric House
7c5a59beb3 remind self of Blaze's download directory 2012-11-27 18:31:14 -08:00
Eric House
bf970b6dd9 remove some logging 2012-11-27 07:53:48 -08:00
Eric House
c39d434ffa add logging giving size and md5sum of downloaded .apk. 2012-11-27 07:22:03 -08:00
Eric House
441cc53740 Remove debug preference for setting host in invite emails, replacing
it with a string resource.  The value passed in invites must match the
string hard-coded in the AndroidManifest so there's no point in making
it runtime-configurable.
2012-11-27 07:04:47 -08:00
Eric House
f3ecfa569a get rid of the second URL in invites that's meant for those without
the app installed.  It's confusing, especially in SMS case, and the
page they see when they don't have the app installed can explain how
to install it.
2012-11-27 07:02:44 -08:00
Eric House
30377908df Use the downloader with an infinite progress indicator instead of the
status-bar notifier (which is removed) for dict downloads.
2012-11-26 20:19:25 -08:00
Eric House
b1f54a67ed end path prefix with a /; otherwise Crosswords gets launched to browse
the wordlist directory.
2012-11-26 20:14:32 -08:00
Eric House
b433438022 add message via GCM to check for wordlist/app upgrades 2012-11-26 18:47:35 -08:00
Eric House
e590db5f3f merge in the db part of 82c39489f0
(android_groups branch, local only right now), but not the UI part
since it won't make the next release.
2012-11-26 08:05:05 -08:00
Eric House
a39cc44d56 Merge branch 'android_branch' into android_groups 2012-11-26 07:41:20 -08:00
Eric House
9130c8da50 download and install upgrade .apk files where possible. Download is
via the existing DictImportActivity, which should also be used for
dict upgrade downloads to keep the UI consistent.
2012-11-26 07:40:45 -08:00
Eric House
302ad04ef9 use recommended intent filtering to allow Crosswords to launch in
response to http URLs, removing need for custom scheme and one step
from the invitation process.
2012-11-26 05:41:42 -08:00
Eric House
6f3881d53d don't crash on malformed invite URL 2012-11-26 03:08:54 -08:00
Eric House
ac435b7857 Merge branch 'android_branch' into android_groups
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
2012-11-25 14:11:04 -08:00
Eric House
63b29a2cb2 Revert "add read-only debug prefs giving GCM and relay device IDs."
This reverts commit 5019d3960b.
2012-11-25 13:55:02 -08:00
Eric House
f82e5bd0e9 add code to deal with Amazon, which I falsely identified as having
broken custom schemes.  I'm leaving it in, unreachable, to have a record.
2012-11-25 12:30:25 -08:00
Eric House
d7bb869a5b rewrite to present a link rather than redirect, to attempt to present
the link only on Android devices, and to encourage users to email me
if I'm wrong about their not being on a device.
2012-11-25 10:39:46 -08:00
Eric House
5019d3960b add read-only debug prefs giving GCM and relay device IDs. 2012-11-25 09:58:46 -08:00
Eric House
7d6e393007 use a different missing-dict explanation string when the name of the
inviter isn't known (relay case)
2012-11-25 09:58:14 -08:00
Eric House
2a1c028268 deal with case where relay invite arrives for a language that device
doesn't have support for.  Dictionary name is now included in the
invite, and if that's present offer to download it then launch game.
For previous versions that don't include the dict name, offer to
download from the language (though that isn't tested yet.)
2012-11-25 08:54:46 -08:00
Eric House
b2e329f670 pass along wl (dict) param if present 2012-11-25 08:53:15 -08:00
Eric House
a3e0d0ca1e recover from situation where game is created in response to an
invitation for a lang for which it has no dicts installed.  Shouldn't
happen, but on relay still can.
2012-11-22 13:03:32 -08:00
Eric House
9659f810dc work even if ENV variable unset 2012-11-22 08:20:08 -08:00
Eric House
0bea58b128 make it possible to build without knowing the GCM sender ID. 2012-11-22 08:13:06 -08:00
Eric House
daf5a89a0e remove unused imports (no code change) 2012-11-21 21:49:42 -08:00
Eric House
dcf239ca48 add newGroup menu for when button's hidden; add deleteAll menuitem to
set of debug-features (but this should probably not ship until
deleting is changed.)
2012-11-21 06:17:09 -08:00
Eric House
cf88b60c4b make the two buttons fill the screen, and use newly created style
for new_games layout too.
2012-11-20 19:11:39 -08:00
Eric House
a199dd2b92 when deleting a group's games do as when they're deleted individually:
get the lock, tell the relay, and THEN remove from DB.
2012-11-20 19:03:39 -08:00
Eric House
3bff555bfd For move, make current group the default and warn whether there's only
one.
2012-11-20 18:34:26 -08:00
Eric House
19e7e27f1e fix so remembered expanded/contracted state is displayed 2012-11-20 07:40:33 -08:00
Eric House
fbfeae379d cache DB info on groups for better performance 2012-11-20 07:15:56 -08:00
Eric House
48dd3bb72e Merge branch 'android_branch' into android_groups 2012-11-20 07:02:27 -08:00
Eric House
04d839868d on launch to handle an invite for a game that seems to already exist,
instead launch that game -- for better feedback.
2012-11-20 06:24:23 -08:00
Eric House
b244adae1b fix transposed words 2012-11-20 06:22:29 -08:00
Eric House
f149391838 cleanup 2012-11-20 06:13:29 -08:00
Eric House
face24e915 make invite email text a bit easier to read 2012-11-20 06:10:57 -08:00
Eric House
cb70858583 up strings for next release (still a while out!) 2012-11-20 04:14:25 -08:00
Eric House
b827c82291 force refresh after delete 2012-11-19 21:23:19 -08:00
Eric House
be3cad96d7 tweak strings 2012-11-19 21:23:07 -08:00
Eric House
1994ea788e don't allow deleting default group. Wording needs fixing, or better
yet, replace the menuitem with greyed-out "is default group".  But
this works for now.
2012-11-19 19:28:26 -08:00
Eric House
82c39489f0 lots of changes toward grouping games in user-definable groups.
Creation and movement between work.  Deletion crashes.  Expansion
doesn't stick.  All's rough.
2012-11-19 07:41:15 -08:00
Eric House
2779139e75 add columns using data as well. Like pref commit, this does not change behavior. 2012-11-17 10:20:14 -08:00
Eric House
9ad41d5a3a use String[] data to build table-creation queries rather than huge
inline string concatenations.
2012-11-17 10:14:55 -08:00
Eric House
416db91312 experimental: always post notification on new moves received rather
than giving GamesList a chance to launch game directly.
2012-11-16 07:31:52 -08:00
Eric House
cefc13a2cd Docs say should allow GCM to reregister on app upgrade. And that the
registrar takes care of storing devid.  So app version when
registration arrives, and get from registrar except after an upgrade.
2012-11-15 21:44:56 -08:00
Eric House
9a4a8c7b26 use static to avoid querying OS for version over and over. 2012-11-15 21:41:51 -08:00
Eric House
f70a5bc6ee add getAppVersion() 2012-11-15 21:24:54 -08:00
Eric House
e1bc9876dd add to-do 2012-11-15 21:23:31 -08:00
Eric House
bda193029e add constructor in order to pass SENDER_ID to parent constructor,
as docs say to do
2012-11-15 21:14:45 -08:00
Eric House
f64de16ce3 catch and discard all exceptions that come when initing GCM. Fringe
devices may do anthing at that point.
2012-11-15 07:03:32 -08:00
Eric House
5afd93c5f5 fix NPE on Kindle 2012-11-15 06:42:27 -08:00
Eric House
c4df31892e Fix occasional infinite loop of devices sending and receiving the same
message over and over when getting updated by GCM.  The problem
occurred when one device had an un-ACKable initial message still in
its queue.  I call resendAll a lot, which caused that message to get
resent to the other game which then replied without being able to ACK
it so it remained to be sent again.  This would continue until users
moved forward in the game.  The fix is to add a backoff timer to
resendAll() so that it can't loop.  The timer is reset when an ackable
and new message is received, meaning there's been a change in what's
available to resend.  And since users calling resendAll manually
expect it to do something, add a force param that ignores the backoff.
seems to fix the problem (but needs a lot of testing.)
2012-11-13 21:25:03 -08:00
Eric House
ba11fcf8df don't bother checking for stream size of 0 in jni since comms does
that now.
2012-11-13 21:01:25 -08:00
Eric House
082e6a61f7 comment out unused command 2012-11-12 20:57:39 -08:00
Eric House
60814264e7 compile with XWFEATURE_COMMSACK turned off 2012-11-12 20:56:50 -08:00
Eric House
76c938cc67 fix to compile with API change; to drop relayid when it's rejected and
to use register with the GCM id on next [re]connect; and to not leave
variable unintialized when unable to call into java world due to being
called without context.
2012-11-12 08:03:25 -08:00
Eric House
4f3c81417d go back to logging devids for now 2012-11-12 08:01:24 -08:00
Eric House
ba733634cb NPE: don't crash on first install 2012-11-09 06:57:37 -08:00
Eric House
ff16db5c10 remove logging 2012-11-08 20:09:16 -08:00
Eric House
0f21f849d9 fix crash attempting to download dict when there's no network, e.g. in
airplane mode.
2012-11-08 20:08:20 -08:00
Eric House
0ef7c8bf46 return TYPE_NONE on devices like Kindle that don't do GCM instead of
an empty string claiming to be a GCM ID.
2012-11-08 19:58:03 -08:00
Eric House
07123ac823 cleanup: remove logging and only check for messages when the json data
holds that command.
2012-11-08 19:54:09 -08:00
Eric House
5cbafb9f56 up version strings and code 2012-11-08 19:49:45 -08:00
Eric House
283045c649 revert previous trivial change 2012-11-08 19:23:52 -08:00
Eric House
49117927db start process of allowing DlgDelegate to handle more than one dialog
at a time.  Step one is to move all the data into a singleton.  Once
that seems to work (excepting in the cases that fire assertions or lead
to dropped dialogs now) move to using a queue of them.  Right now it crashes
with an assertion on dismissing the second dialog.
2012-11-08 19:05:23 -08:00
Eric House
3b1f6a695f don't show "can't do GCM" Toast on Kindle Fire 2012-11-08 06:38:35 -08:00
Eric House
aafcd5144a Better Kindle fix: don't even post message if SMS not supported. 2012-11-07 19:46:33 -08:00
Eric House
949b804f35 fix NPE on Kindle Fire, which has no SMS DB. Duh. 2012-11-07 19:43:08 -08:00
Eric House
1e13d6ac6c look for values in msg sent from server, including one that puts up a
message via a notification.
2012-11-06 19:09:15 -08:00
Eric House
39dbed2004 add missing util method (fixing crash) and with it wire up new devID
scheme: now relay-assigned shorter id will be saved and used for
future games.
2012-11-06 07:08:06 -08:00
Eric House
9981360c67 put back minsdk stuff accidentally removed in merge. 2012-11-05 06:55:54 -08:00
Eric House
41cfacfee4 don't crash on emulator (which doesn't have library required by GCM) 2012-11-05 06:20:55 -08:00
Eric House
03108f311a Merge branch 'android_branch' into android_gcm 2012-11-05 06:14:21 -08:00
Eric House
0376e25c26 Merge branch 'fix_beta_53' into android_branch 2012-11-05 05:43:33 -08:00
Eric House
bb2e3ffdb1 fix (by dropping second message) assert that there is no first
message.  This is a TEMPORARY fix.
2012-11-04 21:36:20 -08:00
Eric House
e8720ec419 add link to changelog 2012-11-04 17:53:42 -08:00
Eric House
3942a49cac Add a debug preference allowing to provide, or override, the download
dir.  This will let users work around bugs on devices like my Blaze 4G
where the OS gives the wrong path, and also allows testing.  Inval
DictUtil's dict cache eash time this is changed, so in effect adding a
wrong path pref hides all dicts in the Downloads dir.
2012-11-04 17:47:30 -08:00
Eric House
69108fd8a1 cleanup: import class to make declarations shorter. 2012-11-04 17:33:07 -08:00
Eric House
30675cfd3e remove logging 2012-11-04 17:21:37 -08:00
Eric House
90480aca4c don't put up toast when checking SMS DB 2012-11-04 07:40:24 -08:00
Eric House
68d6e10ab7 up version strings for quick bugfix release. 2012-11-03 17:27:46 -07:00
Eric House
4dd094b2b3 if the download dir doesn't exist (and on my "Blaze 4G" the function
getDownloadCacheDirectory() returns a path that doesn't) then don't
offer to move things there.
2012-11-03 17:26:43 -07:00
Eric House
773f04e95b remove .gitignores from directory that's going away 2012-11-02 05:36:48 -07:00
Eric House
47f9eb03b9 merge in changes from the -gcm directory: GCM will be a feature of the
non-variant build now.
2012-11-02 05:35:31 -07:00
Eric House
ecd6d81228 Merge branch 'android_branch' into android_gcm 2012-11-01 19:50:07 -07:00
Eric House
a73a5e8077 there seems to be no way to fix the warning so add comment 2012-11-01 19:46:38 -07:00
Eric House
257a15917b script to run with lint checks enabled -- since I always have to look up how. 2012-11-01 19:46:08 -07:00
Eric House
a4787d5614 remove unused strings 2012-11-01 19:45:13 -07:00
Eric House
364acb6dcd cleanup: remove some logging and unused string resources 2012-11-01 19:32:29 -07:00
Eric House
935e3b9673 fix to work from main build directory 2012-11-01 19:32:08 -07:00
Eric House
1c33c8cc31 scripts that help find unneeded string resources 2012-11-01 19:17:46 -07:00
Eric House
27935752a8 check cursor still open in attempt to fix crash seen on Galaxy Nexus 2012-11-01 18:39:26 -07:00
Eric House
057a41e4a9 check cursor still open in attempt to fix crash seen on Galaxy Nexus 2012-11-01 07:59:42 -07:00
Eric House
3e289adc18 move related methods together 2012-11-01 07:58:27 -07:00
Eric House
b552a1fad0 check for moves on receiving message from GCM. Round-trip now works! 2012-10-31 07:09:23 -07:00
Eric House
1b7a618454 send the right dev id 2012-10-31 06:03:31 -07:00
Eric House
fe47266b1f don't ignore output when compiling jni: hides errors! 2012-10-30 08:05:25 -07:00
Eric House
6014e3d76f turn on devid code and implement support in java. Untested, but should work. 2012-10-30 07:57:17 -07:00
Eric House
6cf5d7e04e Android.mk needs to be checked in 2012-10-30 07:48:16 -07:00
Eric House
c93dfd6605 Merge branch 'android_branch' into android_gcm
Conflicts:
	xwords4/android/XWords4/res/values/common_rsrc.xml
2012-10-30 07:10:42 -07:00
Eric House
80a79b6991 Make it less likely that a message received while I'm not intercepting
them will be opened more than once: track whether I've searched the
SMS db, and only clear that setting when SMS play is *disabled*.
2012-10-29 21:20:32 -07:00
Eric House
ba0f91c438 cleanup: use constant 2012-10-29 20:43:02 -07:00
Eric House
e90621ec1d use existing string rather than invent a new one 2012-10-29 07:30:09 -07:00
Eric House
e39b776d80 Add button to alert warning that SMS isn't on that takes you to
Preferences.
2012-10-29 07:20:11 -07:00
Eric House
2375a6730a tweak text 2012-10-27 15:31:49 -07:00
Eric House
b83e587d91 changelog and version strings for beta 53 2012-10-27 15:21:33 -07:00
Eric House
5aef1afec3 point URL at android part of sf.net site, not home. 2012-10-27 13:18:08 -07:00
Eric House
f0a46eacfa script reached by URL in SMS messages sent to devices without
Crosswords installed.
2012-10-27 13:15:34 -07:00
Eric House
fb747304eb put sms at bottom of new-game dialog 2012-10-26 07:00:23 -07:00
Eric House
d7d666e4f9 Merge branch 'android_branch' into android_gcm 2012-10-25 08:12:02 -07:00
Eric House
6e39466b09 somehow new dict-download code is storing some in info DB with
langcode of 0.  Work around that by rebuilding cache entry when that's
seen.
2012-10-25 08:03:56 -07:00
Eric House
6180834ada log case where game has no dicts 2012-10-25 08:02:30 -07:00
Eric House
4ed1446e06 Fix new bug: don't null out default dict just because we don't have one. 2012-10-25 07:58:39 -07:00
Eric House
b40e9b7928 assert non-0 lang code 2012-10-25 07:10:54 -07:00
Eric House
f2684e5652 log device ID even when it's not newly assigned 2012-10-25 06:24:19 -07:00
Eric House
fcc4a0a5f9 add new file 2012-10-25 06:23:49 -07:00
Eric House
4c1c0ddaaa Merge branch 'android_branch' into android_gcm
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
2012-10-24 08:05:50 -07:00
Eric House
9bb8c9cddf don't allow change of dict in in-play networked game 2012-10-24 08:01:52 -07:00
Eric House
3d14ed96e7 cleanup and rename method 2012-10-24 07:40:14 -07:00
Eric House
643a301214 cleanup: add additional param to downloadFinished() iface method 2012-10-24 07:22:26 -07:00
Eric House
aec03fc572 When a game's consumated and guest discovers it isn't using the same
dict, give chance to switch, and to download if required.  Because of
the way the JNI thread works, and JNI's requirement in general that
env instances match up (e.g. dicts must be destroyed in the same
thread that creates them), substituting into a live game is too hard.
So the game's saved with its new dict and then reloaded.
2012-10-24 07:17:21 -07:00
Eric House
521d7042be remove redundant class name (no code change) 2012-10-23 06:50:49 -07:00
Eric House
1ce7b36b59 add pref to replace querying on each download where to store dict.
And use new background-download for update-triggered downloads.
2012-10-22 19:35:47 -07:00
Eric House
80e2b8955e comments to remind not to remove code not called from java; no code change 2012-10-22 19:29:05 -07:00
Eric House
8e911fef05 use import to shorten type -- no code change 2012-10-22 07:30:44 -07:00
Eric House
ca561f225c make dict storage location a default set in preference rather than
something queried each time.
2012-10-22 07:06:12 -07:00
Eric House
6ba5d4f7c8 use new internal download code for download to get dict required for
SMS invite as well.  Still to do: put back the query for where the
thing should be stored.  Hard-coded to go in INTERNAL for now.
2012-10-20 18:28:14 -07:00
Eric House
13557b6e25 use Utils.showToast() everywhere 2012-10-19 18:03:00 -07:00
Eric House
04f56ccf74 download dicts without the browser. This is a partial implementation
that will need to be generalized and used in other places, basically
whenever the full URL can be known.
2012-10-19 17:57:17 -07:00
Eric House
6c34f43df7 show toast when update requested manually and nothing found 2012-10-18 19:51:40 -07:00
Eric House
cb1a0093c3 Merge branch 'android_branch' into android_gcm 2012-10-17 21:23:09 -07:00
Eric House
e5feded0b1 When receiving an invite for a dict we don't have, post a notification
to DictsActivity that offers to download, and on download completion
arranges for notification of SMSService so the game can be created.
2012-10-17 21:20:08 -07:00
Eric House
3e83af3b97 pass dict name (in addition to language) with SMS invite, and
currently on recipient device refuse to create a game if dict not
installed.  Next step is to give a choice to download the thing or
decline.
2012-10-17 07:11:39 -07:00
Eric House
04f51bd392 add haveDict() 2012-10-17 07:10:08 -07:00
Eric House
a8c77bca88 fix NPE 2012-10-17 07:01:01 -07:00
Eric House
6d7d8d5c64 ignore dir not on this branch 2012-10-16 08:20:53 -07:00
Eric House
50238bea3e generate sender_id const from ENV so doesn't need to be checked in.
Now works to register as I'm using the right id.
2012-10-16 08:16:43 -07:00
Eric House
be79ce77ee fix name of service so reply received from GCM 2012-10-16 07:56:10 -07:00
Eric House
85f81a700c missing gitignores 2012-10-16 07:42:35 -07:00
Eric House
de5dcdc5f9 starting new variant for GCM 2012-10-16 07:41:04 -07:00
Eric House
077270f1cd merge in SMS-version UI -- there will not be a separate version for
SMS any more.
2012-10-15 08:29:46 -07:00
Eric House
eb47e75c50 put up more user-friendly message when dicts don't match. 2012-10-15 08:07:17 -07:00
Eric House
5f247db29c use the same missing-players message for all three connection types
(even though the way they're reported is, though shouldn't be,
different.)
2012-10-15 07:31:02 -07:00
Eric House
96ea4f3963 ignore new files 2012-10-15 06:21:50 -07:00
Eric House
c811282591 UI change: networked games are no longer allowed to have per-player
dicts.  Now you select a single dict for such games in a new spinner
just below the lang spinner, and player's dicts are no longer
displayed.  For standalone games, the single dict choice isn't there,
the individual dicts are displayed, and you must open a player config
to change the dict as before.  The idea is that this will be less
confusing, particularly when I need to tell the guest that the host is
using a different dict.
2012-10-14 19:21:27 -07:00
Eric House
e90c5ee94f pass index of resigning player into util_notifyGameOver. Not yet
passed into java.
2012-10-09 05:31:12 -07:00
Eric House
ce58750b92 change "resign" menu text once game is over 2012-10-08 07:09:44 -07:00
Eric House
e64ecfb78d implement resign on top of existing endGame logic, adding "quitter" as
new param passed to remote and changing final score formatting and
menu items to match.  Still need to show old menu on android in case
where game has already ended.
2012-10-07 12:47:06 -07:00
Eric House
fd9b9f85e2 make util_hiliteCell conditional, and remove from android where it
wasn't used anyway.
2012-10-05 18:51:32 -07:00
Eric House
b11da9d8eb use GamesList's Handler to set timers to redraw turn expiry indicators
when the percent left changes.  This may be done -- except for
deciding what to do when the time actually runs out.
2012-10-02 07:30:31 -07:00
Eric House
0a60419802 make ExpiringDelegate responsible for figuring percentage of time left
given start time and having a constant for how long a turn lasts.  Eventually
the constant will be replaced by a second number passed in.
2012-10-01 19:07:23 -07:00
Eric House
cd776a34dd Revert "Display turn start time in game summary. This is definitely not its"
This reverts commit ebaa22594d.
2012-10-01 17:53:35 -07:00
Eric House
bec596c744 remove no-longer-needed drawable 2012-10-01 17:52:56 -07:00
Eric House
0579253b8d Also override TextView to show turn left there. Works, requiring only
that actual percentage of turn remainning be calculated.
2012-10-01 07:24:45 -07:00
Eric House
50b10cd365 new classes overriding LinearLayout to allow framing is-turn rect to
be drawn in two colors showing how much time left for turn.  Required
because there's no (reasonably-easy) way to create nine-parts
dynamically.
2012-10-01 06:57:40 -07:00
Eric House
8281bd7f10 call back into java for util_getCurSeconds implementation so java and
C world are sure to be using the same clock.
2012-09-29 19:27:02 -07:00
Eric House
ebaa22594d Display turn start time in game summary. This is definitely not its
final form!
2012-09-27 07:48:30 -07:00
Eric House
2c89f13383 add turn as param to util_turnChanged, and call from server rather
than board.
2012-09-27 07:04:57 -07:00
Eric House
94103a4212 track time of most recent turn start, and include it in summary table. 2012-09-27 06:55:46 -07:00
Eric House
65598cdb7b replace DeleteLocalRef calls 2012-09-24 07:44:43 -07:00
Eric House
140c982d41 merge from android_branch 2012-09-24 07:39:44 -07:00
Eric House
4909dde622 call a script rather than an html file so file doesn't have to be
updated with every release.
2012-09-24 07:35:14 -07:00
Eric House
d24f9a28f6 up release number 2012-09-24 07:00:18 -07:00
Eric House
c76c5f5868 don't create obits for apps that don't have relayIDs (and presumably
never connected.)
2012-09-20 07:45:04 -07:00
Eric House
96e277c7ba don't offer to copy DB from sdcard when there is none. 2012-09-20 07:29:00 -07:00