Eric House
327b20a9fe
add white space between the heads
2015-01-03 17:20:31 -08:00
Eric House
ddd1efd8dd
modify new game actionbar icons to derive from game status icons
2015-01-03 16:44:13 -08:00
Eric House
641d83ab48
use new game type icons
2015-01-03 15:17:12 -08:00
Eric House
d1d6a2669b
snapshots of icons
2015-01-03 14:57:19 -08:00
Eric House
6f64ff062e
one shot at new one-device game icon
2015-01-03 10:33:32 -08:00
Eric House
4701fe2b90
pass in number of devices already connected so forceChannel can be set
...
more correctly; put up alert when device rejects an invitation as a
duplicate.
2015-01-03 09:50:07 -08:00
Eric House
9e67106adc
fix crash by always initializing
2015-01-03 09:49:10 -08:00
Eric House
a7cc96c697
add ability to invite more than one player per device. This is mostly
...
for testing and needs to be hidden by an "advanced" pref so folks
don't stumble onto it. Works for BT (SMS will crash), but needs
cleaning up.
2014-12-31 06:54:31 -08:00
Eric House
d46c7a39f1
pass forceChannel as part of invitation
2014-12-30 07:25:26 -08:00
Eric House
28bfa3c904
make forceChannel part of CurGameInfo rather than comms, since Android
...
needs to save it there on receipt of an invitation (doesn't create
full game with comms until later.) Passes discon2 tests and seems to
work on a single Android device. (Haven't tested inviting on Android
yet.)
2014-12-29 07:39:28 -08:00
Eric House
e8bb624b0b
add preference checkbox for hiding newgame buttons (which are
...
duplicated by menu items)
2014-12-29 07:02:56 -08:00
Eric House
3209fc1b74
log sqlite error codes as strings in attempt to track down the
...
occasional assertions failure.
2014-12-28 21:40:31 -08:00
Eric House
3b7afa4557
pass --server if not setting forceChannel
2014-12-28 21:39:11 -08:00
Eric House
897c4d5786
add param to force a client to connect to host requesting a particular
...
channel. Works well enough that relay test script works. Not yet
integrated for let alone tested on Android.
2014-12-21 17:40:00 -08:00
Eric House
d81f022c78
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/linux/scripts/discon_ok2.sh
2014-12-15 16:48:10 -08:00
Eric House
4123de3560
merge android branch heads
2014-12-15 16:44:32 -08:00
Eric House
30d2c84dcc
so tests can continue, comment out an assertion that indicates a relay
...
bug that neverless doesn't prevent games from running to completion.
2014-12-15 16:43:24 -08:00
Eric House
26b01acf23
fix crash on duplicate connect packet: drop it, but keep the
...
connection alive if the duplicated packet set up addressing correctly.
2014-12-15 16:42:34 -08:00
Eric House
eb5ae9edd3
declare as little-a array so key will be listed in numeric order
2014-12-15 16:41:15 -08:00
Eric House
45ef4fcb65
add --dup-packets calling through to linux client
2014-12-15 16:14:59 -08:00
Eric House
92fd048eef
signature change: return void instead of always returning true
2014-12-15 15:33:12 -08:00
Eric House
4835afbe4a
simplify and print in order
2014-12-15 15:29:37 -08:00
Eric House
7560156351
summarize the number of tiles left every 20 passes to give better view
...
into games' progress
2014-12-15 15:11:29 -08:00
Eric House
1eb7d01be5
add option to turn on duplicate packets -- which fires an assert on
...
the relay instantly.
2014-12-11 20:23:51 -08:00
Eric House
ddc9f7994c
Merge remote-tracking branch 'sf/android_branch' into android_multi2
...
Conflicts:
xwords4/relay/crefmgr.h
2014-12-11 06:22:17 -08:00
Eric House
bf53481aad
log unexpected condition rather than asserting
2014-12-11 06:18:30 -08:00
Eric House
16c4e74e04
ignore client index of 0, since it means the device needs a slot
...
assigned.
2014-12-10 08:04:56 -08:00
Eric House
2e9c033a29
If client provides its index, honor that when placing it in game. This
...
allows a game where indices have already been established over some
transport other than relay to start using the relay mid-game.
2014-12-10 08:03:39 -08:00
Eric House
39b0d40e41
add local variable to prevent some dereferencing
2014-12-10 08:02:20 -08:00
Eric House
f0cf77d7d6
fix overwriting of addresses that happened for most (relay-only) games
...
run by my test script: match records based on channel number only.
This has yet to be tested on multi-addressing Android builds.
2014-12-10 07:54:50 -08:00
Eric House
00d19eada6
log a few more message checksums
2014-12-10 07:48:51 -08:00
Eric House
68441c60f6
add local variable to prevent some dereferencing
2014-12-10 07:48:38 -08:00
Eric House
9ff7cd1ff9
comment out dead code so I stop trying to debug it
2014-12-10 07:47:36 -08:00
Eric House
e961756f12
give up on hard-coding size of thread->env map: expand it as needed.
2014-12-08 20:43:24 -08:00
Eric House
97092e361c
update grepped string to match changes in logging
2014-12-08 06:23:18 -08:00
Eric House
c70fcf64a7
ignore client index of 0, since it means the device needs a slot
...
assigned.
2014-12-08 06:22:30 -08:00
Eric House
f84f9aa85f
include timestamp of switch to UDP -- in case it needs to be
...
correlated with logs
2014-12-08 06:20:47 -08:00
Eric House
a80293ba82
include timestamp in "new day" post-crash line
2014-12-05 06:39:10 -08:00
Eric House
b8660470f7
include timestamp in "new day" post-crash line
2014-12-05 06:35:31 -08:00
Eric House
5935681b82
in getDestID, deal with possibility game was consumated via a
...
non-relay channel, and allow client to use HOST_ID_SERVER.
2014-12-05 06:19:02 -08:00
Eric House
9ba9d258f3
If client provides its index, honor that when placing it in game. This
...
allows a game where indices have already been established over some
transport other than relay to start using the relay mid-game.
2014-12-04 06:03:42 -08:00
Eric House
a6f9f6608a
drop relay connect meta-messages (as well as game messages) when relay
...
send is disabled.
2014-12-02 06:52:48 -08:00
Eric House
b2b60d6c48
add commandline params that disable comms types on game creation so
...
relay not connecting initally can be tested.
2014-12-02 06:49:35 -08:00
Eric House
c8e55a85a3
use a constant; log a bit more for now
2014-12-02 06:08:58 -08:00
Eric House
a1b967033f
summarize role based on relay if in use, bt or sms otherwise
2014-12-02 06:08:18 -08:00
Eric House
73851b285e
fix a couple of NPEs
2014-12-01 07:01:10 -08:00
Eric House
fe76cfa1a1
remove logging
2014-11-26 07:21:27 -08:00
Eric House
9bdf9b2f5e
pass conType into java world from jni send proc, eliminating loops
...
e.g. sending relay setup traffic over BT.
2014-11-26 07:18:29 -08:00
Eric House
eac026a1a1
remove unused string
2014-11-25 07:18:16 -08:00
Eric House
0250f42b36
remove dead invite code
2014-11-25 07:17:52 -08:00
Eric House
8974407a67
setTitle: it's either networked or not
2014-11-25 07:17:03 -08:00
Eric House
2df8c68e60
remove commented-out logging
2014-11-25 07:16:43 -08:00
Eric House
938756a34f
switch for loop to using C99-style variable declarations; no other change
2014-11-25 06:09:18 -08:00
Eric House
53bfe9812d
add const
2014-11-24 07:52:03 -08:00
Eric House
363215841d
add assert
2014-11-24 07:50:54 -08:00
Eric House
a1cdef6ad8
fix log format
2014-11-24 06:30:58 -08:00
Eric House
f3828ab7c9
merge android_branch -> android_multi2
2014-11-22 17:15:22 -08:00
Eric House
83a79963d4
Merge remote branch 'origin/android_branch' into android_branch
2014-11-22 17:11:40 -08:00
Eric House
4b635791d7
crash fix: provide missing param to format string
2014-11-22 17:08:17 -08:00
Eric House
963b0e23cf
don't send bt pings on non-bt addresses
2014-11-21 23:00:16 -08:00
Eric House
142861656e
don't send when channel address doesn't have the right type yet
2014-11-21 22:53:48 -08:00
Eric House
80229376e9
include connection types string in header text
2014-11-21 08:02:55 -08:00
Eric House
38e37bfbb9
use gameID as inviteID when it's not provided. Originally it was a
...
relay-only thing, but it's associated with being not-standalone in
places and this seems like the easiest fix.
2014-11-21 08:02:18 -08:00
Eric House
67d41f34a3
remove loggin
2014-11-21 07:58:17 -08:00
Eric House
6c917f34ba
fix race-condition assert by dropping message. This needs a better fix.
2014-11-21 07:57:58 -08:00
Eric House
c3ca257a10
oops: new style
2014-11-20 19:13:15 -08:00
Eric House
d08a7f8d24
use a style for new game buttons
2014-11-20 19:12:56 -08:00
Eric House
8d021aa11e
trying to hide the buttons when they take too much space. Leaving
...
commented out for now
2014-11-20 19:11:22 -08:00
Eric House
301ce8bc3c
spelling error in comment :-)
2014-11-20 18:57:57 -08:00
Eric House
4b30d98bd0
fix to compile with DEBUG off
2014-11-20 07:16:37 -08:00
Eric House
fbea67e479
don't kill relay when bluetooth turned off: pass comms type into
...
comms_transportFailed()
2014-11-20 07:12:25 -08:00
Eric House
d3d83b3557
cleanup
2014-11-20 06:21:22 -08:00
Eric House
a35527ae88
need to copy in BT address too
2014-11-20 06:21:14 -08:00
Eric House
e236a32c20
forgot a mutex
2014-11-20 06:04:11 -08:00
Eric House
56121fdcd4
stop (or at least greatly reduce) leakage of thread->env mappings in
...
jni, mostly by having jnithread explicitly announce that it's closing.
Yuck. This stuff *should* obey a stacking protocol but the callback
stuff I'm doing makes me unsure that can work.
2014-11-19 21:42:21 -08:00
Eric House
a1bbbe3371
separate the new-game icons into two (as stubs)
2014-11-19 19:26:08 -08:00
Eric House
ae81404215
remove assert that was firing
2014-11-19 19:25:42 -08:00
Eric House
7977c8f799
cleanup
2014-11-19 19:19:12 -08:00
Eric House
1962371fe2
flesh out MultiMsgSink so that subclasses invoked e.g. in response to
...
BT traffic can send messages via other means as well. Relay games
with both participants on one device work again.
2014-11-19 18:46:35 -08:00
Eric House
f14a1c095f
print all conn types, not just the first
2014-11-17 07:06:56 -08:00
Eric House
11f7083eb6
remove dead classes and layouts; add menu to create networked games.
2014-11-15 20:42:09 -08:00
Eric House
64276b041e
echo so I know it's doing something
2014-11-15 20:37:22 -08:00
Eric House
2465017e46
add buttons that create new games, bypassing the NewGame activity for
...
a simpler experience.
2014-11-15 17:59:59 -08:00
Eric House
d848c17d03
use real strings rather than enum's toString() result in prefs UI
2014-11-14 07:53:12 -08:00
Eric House
e750811836
add relay and bt as default address types when there's no preference set
2014-11-14 07:32:27 -08:00
Eric House
76fe26a057
include the list of currently selected conn types as pref summary
2014-11-14 07:24:24 -08:00
Eric House
2e8f4097d9
remove unused widget
2014-11-14 07:23:54 -08:00
Eric House
15e380291b
snapshot: invite by BT now works well enough that moves can be
...
exchanged. Haven't checked whether the relay's also seeing traffic.
2014-11-14 07:12:03 -08:00
Eric House
1d1af9ffb3
fix some asserts: we have BT working now
2014-11-14 07:06:02 -08:00
Eric House
f625332782
add preference (dialog) to set default address types. Not used yet,
...
and still ugly.
2014-11-13 07:27:29 -08:00
Eric House
f2ecefd573
copy bt address info too
2014-11-13 07:27:03 -08:00
Eric House
74afdbd8b6
add more asserts
2014-11-12 06:52:58 -08:00
Eric House
c008f55133
add invite button only if I'm a host and am missing players
2014-11-12 06:52:40 -08:00
Eric House
0e2bbfc1ad
augment addresses even when message received is a duplicate. Now games
...
using (fake) SMS and relay work whichever of the address modes is
disabled during the game, on either side. At least for two-device
games.
2014-11-11 07:46:01 -08:00
Eric House
552ab8fa48
fix assertion (leaving the confusion in the code about tracking the
...
open relay socket)
2014-11-11 07:36:55 -08:00
Eric House
ba44863381
add simple tell() as wrapper on ask()
2014-11-11 07:35:56 -08:00
Eric House
10a960930c
collect number to be invited. (Not tested: whether a number other than 1 works)
2014-11-11 07:35:14 -08:00
Eric House
ba6151c385
remove param that causes assert to fire
2014-11-10 07:31:51 -08:00
Eric House
c704b7ff4f
remove dead code
2014-11-10 07:31:33 -08:00
Eric House
e82589a526
replace overloaded method with diff-named one, avoiding call to wrong
...
one when compiled on old 32-bit Atom. 32-bit issue, or what? This is
quick and sure to fix it. Should be grafted back to main branch.
2014-11-10 06:43:42 -08:00
Eric House
94cfaecfb1
replace overloaded method with diff-named one, avoiding call to wrong
...
one when compiled on old 32-bit Atom. 32-bit issue, or what? This is
quick and sure to fix it. Should be grafted back to main branch.
2014-11-08 23:07:34 -08:00
Eric House
c087824b47
snapshot with a bit of debugging added, mostly to tranfer to another machine
2014-11-07 20:26:02 -08:00
Eric House
786d775878
don't pass null address
2014-11-07 20:25:13 -08:00
Eric House
8e616095ad
add a bit more logging of channelNos
2014-11-06 20:28:51 -08:00
Eric House
70f4541bbe
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/common/comms.c
2014-11-06 20:09:20 -08:00
Eric House
a34a859d18
log channelNo more consistently
2014-11-06 18:44:19 -08:00
Eric House
540d3e9622
wire disabling checkboxes into comms. They work -- and show that
...
multi-addressing needs debugging still.
2014-11-06 06:35:28 -08:00
Eric House
b1de8663d6
fix to compile with DEBUG undefined
2014-11-06 06:32:00 -08:00
Eric House
2426e04a70
fix overwriting of address info so that, AFAICT, both address types
...
are successfully being used through much of a test game.
2014-11-05 21:57:25 -08:00
Eric House
3d9ee4b9f9
use app define, not relay's
2014-11-05 21:45:14 -08:00
Eric House
68e7f303b0
oops -- here's the relay md5sum logging. app side went in prior.
2014-11-05 21:42:45 -08:00
Eric House
c516e1f77c
add code to log md5 sums of udp packets sent and received. These match
...
relaycon logging to be added shortly.
2014-11-05 21:42:03 -08:00
Eric House
405b3eef93
remove dead/commented out code
2014-11-05 21:33:54 -08:00
Eric House
564e671b47
quick hack to add checkboxes for turning off transport sends and
...
receives to be used for testing after it's actually hooked up. This
is just the UI.
2014-11-05 18:48:53 -08:00
Eric House
8aae7ae10a
fix crash: don't use comms before initialized
2014-11-05 07:49:17 -08:00
Eric House
17bc0ab47c
snapshot of work toward communicating when two addresses are in use.
...
An invitation works with relay and (fake) SMS on, and the invited
client connects successfully using both (the second to arrive being
correctly identified as a dupe.) While the game can be played after,
only SMS messages are being received. And opening a saved game
crashes.
2014-11-05 07:41:20 -08:00
Eric House
fc6ccf217f
fix formatting of types: don't crash on too-small buffer, and add
...
separator only when needed.
2014-11-02 17:25:56 -08:00
Eric House
e1a10508e1
when preprocessing a message, limit search to the address type of the
...
channel it came in on if known.
2014-11-02 17:24:37 -08:00
Eric House
f853aad904
add checkbox to tab label when selected
2014-11-02 11:55:46 -08:00
Eric House
71fbae622a
clean up code a bit
2014-10-28 20:13:48 -07:00
Eric House
1ca5515b07
Add checkbox to each type tab indicating whther the game will use that
...
addressing type to communicate.
2014-10-28 08:08:11 -07:00
Eric House
9b336bde49
fix crash: must iterate when multiple types are possible
2014-10-28 08:04:05 -07:00
Eric House
b624867cb4
add addr_rmType()
2014-10-28 08:03:19 -07:00
Eric House
1789d442ba
let me look at another player's tiles, regardless of pref setting,
...
when game is over
2014-10-27 19:24:22 -07:00
Eric House
2163d25a27
let me look at another player's tiles, regardless of pref setting,
...
when game is over
2014-10-27 19:23:52 -07:00
Eric House
3024bcbd50
get rid of bt and sms new game options
2014-10-27 19:12:38 -07:00
Eric House
93f0b626af
snapshot: invite sent by NFC connects two devices using relay with BT
...
ability passed too (though not yet used.)
2014-10-27 07:51:25 -07:00
Eric House
7a1cd06486
fix crash in dict iteration: add to thread map the env that creates globals
2014-10-23 07:44:41 -07:00
Eric House
c3e7b12103
merge android_branch
2014-10-23 06:33:28 -07:00
Eric House
51a1ddfe39
include robot name in report of his score
2014-10-23 06:32:24 -07:00
Eric House
8486bad44b
add default robot name to prefs
2014-10-23 06:21:16 -07:00
Eric House
9886d5a6e6
merge over changes to run with new bash
2014-10-22 18:57:33 -07:00
Eric House
3fe3b1724a
replace stacked tracking of env with explicit mapping from pthread to
...
env for that thread to fix occasional assertion failure that indicated
I was using the wrong env occasionally. I'm not super confident in
this because I've seen the env for a thread change, but that could be
due to reuse of the thread id.
2014-10-22 06:58:42 -07:00
Eric House
452729fb9d
merge android_branch
2014-10-17 18:36:08 -07:00
Eric House
53d2c2f0f2
rename method
2014-10-17 18:35:14 -07:00
Eric House
f1e6e2f8f5
can't assert yet -- breaks upgrade
2014-10-17 07:58:26 -07:00
Eric House
df093e1c10
preexisting db field now a set, so treat it that way in the other place it's read
2014-10-17 07:55:04 -07:00
Eric House
4e37947d94
assert, for now at least, no unexpected types being added from jni world
2014-10-17 07:54:34 -07:00
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
14a0ca95fe
don't crash with, and correctly save, multiple addresses
2014-10-15 07:52:35 -07:00
Eric House
fe4c7b52f2
snapshot: relay test script works with a second address type set
...
(though with its actual transport stubbed out). Android doesn't even
compile.
2014-10-15 07:26:18 -07:00
Eric House
737af802b0
don't abort if core file count goes down -- I probably removed some
...
old thing
2014-10-15 06:38:43 -07:00
Eric House
52465b3e1e
merge android_branch
2014-10-14 06:57:52 -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
c73eec567b
fix some const confusion the stricter android gcc found
2014-10-14 06:24:41 -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
2643c655f8
Merge branch 'android_branch' into android_multi2
2014-10-13 07:25:28 -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
0362bf5cc9
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/common/board.c
xwords4/common/comtypes.h
xwords4/common/model.c
xwords4/common/strutils.c
2014-10-13 07:03:20 -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
b12d12590a
don't memcpy 0 bytes
2014-10-09 21:21:41 -07:00
Eric House
4eb836ab2b
fix to compile -- graft missed a constant defined earlier
2014-10-09 21:21:27 -07:00
Eric House
badc40f90b
move dividerLoc into model and use to limit sorting to tiles to its
...
right
2014-10-09 20:09:24 -07:00
Eric House
195371ea2e
as proof of concept, skip the first 3 tiles when sorting newly
...
assigned. Later '3' will be replaced by the location of the tray
divider, but that has to be moved from board to model first.
2014-10-09 20:08:41 -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
3534bc0e49
print usage prettier (with an apparent off-by-one error)
2014-10-01 19:52:07 -07:00
Eric House
b82383a5ad
fix -- I hope -- array syntax that was getting lots of games launched
...
without an app (until it got upgraded)
2014-10-01 19:49:46 -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
6044503cc5
merge android_branch -> android_multi2
2014-09-30 05:57:53 -07:00
Eric House
c98a5cd5f0
move dividerLoc into model and use to limit sorting to tiles to its
...
right
2014-09-30 05:57:21 -07:00
Eric House
8e9ca8603d
don't recalc menu and title too early
2014-09-29 20:12:56 -07:00
Eric House
1346aa6ee5
as proof of concept, skip the first 3 tiles when sorting newly
...
assigned. Later '3' will be replaced by the location of the tray
divider, but that has to be moved from board to model first.
2014-09-29 20:04:54 -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
93526d38d7
cleanup (version upgrade test works)
2014-09-25 22:24:09 -07:00
Eric House
92292ad1fe
fix problems with undeclared variables that older bash didn't mind
2014-09-25 21:45:44 -07:00
Eric House
43bd3c018a
make an addr's conType a bitfield rather than holding a single value.
...
Works for large numbers of relay games in test, but will not yet
actually hold more than one value. Should be safe to merge to main
branch once stream upgrade is verified.
2014-09-25 20:05:37 -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
aa566ad1f0
call util_informMissing when the pendingPlayers count drops to 0
2014-09-25 06:36:07 -07:00
Eric House
abf12e90da
save a bit of work setting up game manually by assuming two players --
...
but ths must be happening too late because not all takes effect.
2014-09-25 06:35:10 -07:00
Eric House
3668b7d8a7
merge android_branch -> android_shipbt
2014-09-24 20:51:23 -07:00
Eric House
1e80109c3e
add assert, and don't pass pendingRegistrations to clients -- it confuses them
2014-09-24 19:33:59 -07:00
Eric House
743d532fc7
putting back recent change: this works for automated test and gtk
...
manual app. I'm not sure what's up with pendingRegistrations but it
needs more studying before I can change it.
2014-09-24 19:16:06 -07:00
Eric House
9ad8ad601c
add cur dir to empty dict search path
2014-09-24 07:29:57 -07:00
Eric House
64b30b68d2
merge android_branch -> android_shipbt
2014-09-23 21:33:57 -07:00
Eric House
b4ef9ced87
merge android_branch changes
2014-09-23 21:33:02 -07:00
Eric House
3d6f972e9e
fix number of missing players not being calculated correctly
2014-09-23 21:30:31 -07:00
Eric House
113c7a13d2
print number of devices left
2014-09-23 21:26:46 -07:00
Eric House
49689ab04c
always log error message
2014-09-23 07:30:34 -07:00
Eric House
ab64197ac4
fix recent booboo: it's not an error for server_initClientConnection()
...
to fail here.
2014-09-23 07:30:23 -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
a485480496
make divider wider
2014-09-22 07:05:45 -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
049cf284c5
toward getting direct-ip addressing working again: add a tab to the
...
connections dialog
2014-09-20 18:08:33 -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
7d8b9b4270
return succes from server_initClientConnection()
2014-09-14 13:41:33 -07:00
Eric House
4d2f49d33f
when sending and don't have an address for channel yet, send the one
...
comms was created with, which is what client will have to do anyway.
2014-09-14 13:41:12 -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
b333e3959f
remove assert: it's fine to close without saving
2014-09-10 06:37:32 -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
622760b71a
post response to long-tap on player as a gtk dialog rather than just logging it.
2014-08-25 07:52:18 -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
e42dd971cb
Hide crosshairs once drag leaves the initial cell UNLESS a tile is
...
being dragged
2014-08-21 07:51:06 -07:00
Eric House
b77d529099
fix linux-side compile errors
2014-08-21 07:15:20 -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
d921a386d5
remove logging
2014-08-19 07:21:02 -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
e998fbfcba
log less
2014-08-09 17:11:35 -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
56336f7178
double the max size of a tile, fixing board not using full screen in
...
portrait mode on Nexus 10.
2014-07-24 20:36:37 -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
d902c35d33
add note
2014-06-24 08:19:20 -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
40d63be58b
too much logging
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
b34f701b1e
use comm instead of huge grep loop to filter wordlist
2014-06-23 07:29:05 -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
f954b09391
merge android_branch->
2014-04-25 18:47:24 -07:00
Eric House
19573af533
a more elegant way of building up params to pass to PQexecParams
2014-04-25 18:45:51 -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
6eaf7a57b5
fix crash when there's a "'" in model name
2014-04-25 07:41:58 -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
33175e271c
Merge remote-tracking branch 'sf/android_branch' into android_branch
2014-04-18 06:13:53 -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
4de894627a
fix infinite loop -- duh
2014-04-18 06:01:03 -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
0e4f24dfe9
use fixed string for model rather than clearing it
2014-04-17 08:24:09 -07:00
Eric House
6f0b5c1bea
empty the model string if the client version's lower than what I'm
...
about to release and there's non-ascii stuff in it.
2014-04-17 08:13:01 -07:00
Eric House
f05b1e0525
log model -- can remove later
2014-04-17 07:44:32 -07:00
Eric House
0897ae2ba9
log the bad query
2014-04-17 07:43:58 -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
c2c81dbbf1
use tmp model to find words crossing a point to avoid undoing pending turns
2014-03-20 18:52:57 -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
ad0f882335
change port to live server's so recovery can be faster
2014-03-12 19:47:14 -07:00
Eric House
5f34fe3317
first cut at script to fetch messages for a game
2014-03-12 19:45:07 -07:00
Eric House
ed41fdd924
Fix to work with newest format. (This should fix updating of wordlists.)
2014-03-12 19:26:08 -07:00
Eric House
b869940997
fix another 64-bit bug, this one prevening opening new SOWPODS.
2014-03-12 19:24:00 -07:00
Eric House
2bb9a12b63
add missing (for android build) header
2014-03-11 22:04:30 -07:00
Eric House
1ee16ca09d
remove unnecessary import
2014-03-11 22:01:30 -07:00
Eric House
d1a9b716bb
protect refcount operations with mutex
2014-03-11 22:01:11 -07:00
Eric House
4231ed1108
fix refcount leak
2014-03-11 21:59:53 -07:00
Eric House
fbcd953a3e
define as void instead of <empty>
2014-03-11 19:38:51 -07:00
Eric House
7d8f5844bd
fix to compile without DEBUG defined
2014-03-11 19:38:08 -07:00
Eric House
640837f318
up strings for new release
2014-03-11 19:16:41 -07:00
Eric House
a3e9562654
put related fields together -- no code change
2014-03-11 07:02:10 -07:00
Eric House
dee75f5a0a
don't ref dicts from dmgr_get()
2014-03-10 21:50:06 -07:00
Eric House
a4302897e2
enlarge dictmgr to track a compile-time defined number of dicts
2014-03-10 21:01:24 -07:00
Eric House
55267f2e42
add memmove
2014-03-10 20:25:38 -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
3c32ca6402
add option to log callsites of dictmgr put and get for easier ref leak tracking
2014-03-10 18:59:10 -07:00
Eric House
6203a23c62
don't crash in networked games
2014-03-10 18:58:16 -07:00
Eric House
fec1ce3bed
use pthreads mutex to protect with will become critical sections in dict mgr, as will be accessed from several threads on android
2014-03-10 18:56:39 -07:00
Eric House
5500d36cde
add and use dict manager that caches, using refcount, dicts across games. Allows multiple games to be opened, and open at the same time, with only one instance of a dict ever created. Works on linux; not used or tested yet on Android.
2014-03-09 19:12:21 -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
8a6adfec34
cleanup -- no logic change
2014-03-08 20:51:49 -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
23b72467bb
don't assert unset cookieID, as that's normal (I think) for unconnected case
2014-03-08 12:47:58 -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
7002ff11c7
fix so non-DEBUG build compiles
2014-03-04 07:07:01 -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
d122b7d2ff
include all .xml and .java files, but only if they're not named in a .gitignore file in the same directory
2014-03-01 11:44:20 -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
242f722f2e
remove logging
2014-02-28 18:56:39 -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
b45fcf2aa6
force output in UTF-8 -- fixes German BYOD display and still works for English
2014-02-28 06:27:54 -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
cc4982b833
add debug-only code to assert that movestack is never disposed when dirty (via macros easy to use elsewhere)
2014-02-28 05:43:47 -08:00
Eric House
efbb676cce
better formatting for hexdump offsets
2014-02-28 05:42:22 -08:00
Eric House
3ecd0a4b03
fix to compile without DEBUG
2014-02-28 04:58:25 -08:00
Eric House
2f7839f7e0
cleanup
2014-02-28 04:35:39 -08:00
Eric House
39983f65b6
remove logging
2014-02-27 21:44:25 -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
4e2c93fd3c
more work on script
2014-02-26 07:52:18 -08:00
Eric House
33d6f212b2
beginning of a script to parse relay logs
2014-02-25 07:56:48 -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
27a5990283
log out-of-date token
2014-02-24 08:00:52 -08:00
Eric House
cd31cd432a
tweak column display
2014-02-24 08:00:43 -08:00
Eric House
b840f7d708
add filter for rooms
2014-02-24 08:00:21 -08:00
Eric House
565a466164
capitalize note
2014-02-23 12:10:19 -08:00
Eric House
fe2a623a5a
use sowpods list from freescrabbledictionary.com
2014-02-23 11:28:49 -08:00
Eric House
f50c1191b5
fix to compile and produce correct output on 64-bit system
2014-02-23 11:26:10 -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
025bcb885b
don't move state forward when should be moving back
2014-02-09 19:35:17 -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
0b132661ca
change struct name from r to rr for easier searching; no code change
2014-02-07 21:12:45 -08:00
Eric House
a4e65f667d
add ok button to about dialog
2014-02-07 07:59:34 -08:00
Eric House
ca8a901bbb
add assertion aimed at confirming theory about race-condition based Android crash
2014-02-07 07:41:50 -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
1f698eae6d
use ccache for relay build too
2014-01-25 19:03:50 -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
e6564c679c
use ccache if present
2014-01-21 07:10:13 -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
0fb4c19ca7
fix syntax error in table creation sql
2014-01-07 07:17:48 -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
459c12d91f
copy string's null terminator too
2014-01-06 07:05:34 -08:00
Eric House
19c70ccdcb
fix mistaken scoreboard size calc
2014-01-06 06:54:56 -08:00
Eric House
3702a9f326
don't constrain screen size
2014-01-06 06:40:59 -08:00
Eric House
ac969793ea
remove assert preventing large screen
2014-01-06 06:38:08 -08:00
Eric House
83692fd2e8
format rem text as two lines
2014-01-05 13:30:27 -08:00
Eric House
123141e0df
draw scoreboard entries centered
2014-01-05 13:15:09 -08:00
Eric House
b43855a313
fix curses build for 64bit compile and to use common layout (meaning
...
tray is now under the board unstead of to the right). Works on 64-bit
system at least for non-networked games.
2014-01-05 13:04:59 -08:00
Eric House
3f67afaefb
replace tabs with spaces; no code change
2014-01-05 12:57:46 -08:00
Eric House
093a260f1d
fix memory corruption on 64-bit systems
2014-01-02 07:48:12 -08:00
Eric House
abb8da44ba
open game on double-click of row
2014-01-02 07:10:00 -08:00
Eric House
40c04be47b
call sqlite3_initialize() as recommended by docs
2014-01-02 07:09:23 -08:00
Eric House
e15fb02d8a
add ability in ask dialog to display buttons with arbitrary text
...
returning custom results. Use to add "Rematch" option (which so far
only fires an assert when chosen.)
2013-12-30 07:16:52 -08:00
Eric House
35c12eb7bb
add --ask-timeout param
2013-12-30 07:08:43 -08:00
Eric House
6d84dfea7e
cleanup: remove '2' from function and struct names
2013-12-30 07:08:42 -08:00
Eric House
bba0b79763
add logging
2013-12-30 07:08:42 -08:00
Eric House
f46f8ed560
cleanup
2013-12-30 07:08:42 -08:00
Eric House
12932bf788
fix crash on 64-bit system
2013-12-30 06:46:57 -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
b2b4c2a1f5
fix android compile errors
2013-12-27 19:32:56 -08:00
Eric House
ebdf5ed492
fix to compile on 64-bit system (untested on 32-bit :-)
2013-12-27 19:13:54 -08:00
Eric House
d29840434f
pass, save and restore port; read several messages at once
2013-12-19 08:00:04 -08:00
Eric House
762945857e
fix to work for standalone games too
2013-12-19 07:59:00 -08:00
Eric House
a1d5553266
fix invite button disabling logic
2013-12-19 07:58:32 -08:00
Eric House
75b6ecc325
add missing util function
2013-12-19 07:57:59 -08:00
Eric House
79fae43100
enable invite and commit buttons based on game state
2013-12-19 06:59:34 -08:00
Eric House
0ad18efcff
fix memory leaks
2013-12-17 22:16:52 -08:00
Eric House
bece99bb98
load dict named in invite
2013-12-17 22:11:21 -08:00
Eric House
f45f3bacbf
fix so invitation results in a playable game (though dictionary is not
...
yet available to invitation recipient)
2013-12-17 21:57:10 -08:00
Eric House
2a47c91a91
add gi_setNPlayers()
2013-12-17 21:54:02 -08:00
Eric House
de41802f54
rename variable so I don't trip up again
2013-12-17 21:08:27 -08:00
Eric House
6bdd939531
rename field
2013-12-17 20:02:31 -08:00
Eric House
8d20c33b76
snapshot: still not correctly recording return address
2013-12-16 08:06:29 -08:00
Eric House
f1f13c65a2
don't overwrite gameID
2013-12-16 08:05:56 -08:00
Eric House
4420049bd0
remove duplicate lines (added by merge?)
2013-12-16 08:05:35 -08:00
Eric House
3c6ecb7ffa
ignore app
2013-12-12 21:10:44 -08:00
Eric House
2a56a0ba98
snapshot: more linux-sms stuff
2013-12-12 21:08:25 -08:00
Eric House
78d8c0398f
another snapshot: invites are received but don't create game correctly yet
2013-12-12 07:58:02 -08:00
Eric House
5f97f8197c
progress on inviting via SMS
2013-12-12 06:08:56 -08:00
Eric House
1b5bda5da8
don't turn on SMS if no phone
2013-12-11 08:04:47 -08:00
Eric House
cad6cb8075
log when inotify kicks off
2013-12-11 08:02:44 -08:00
Eric House
833a3384b3
remove assert; add empty invite button
2013-12-11 08:02:29 -08:00
Eric House
7cffa27a88
snapshot toward implementing fake-sms as per-device rather than per-game
2013-12-11 07:54:26 -08:00
Eric House
a4f274a1f4
preserve and use sms settings
2013-12-11 07:02:44 -08:00
Eric House
f0c5d1f865
toward improving bt support in gtk client: add scan button that only
...
picks up devices currently open for discovery
2013-12-07 10:12:20 -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
49e0bf639a
include only non-cloned java files in etags
2013-12-05 06:48:22 -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
9fa9ba643f
fix linux crash when timers enabled: clear timer while taking down board
2013-12-01 18:50:18 -08:00
Eric House
fc6d6ec707
use local variable
2013-12-01 18:37:21 -08:00
Eric House
6875eaa10a
don't draw timer if it has an empty rect
2013-12-01 18:32:51 -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
9f22386bf6
another assert
2013-11-29 10:15:22 -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
69e050c8de
remove linefeeds; add synonyms
2013-11-27 17:14:38 -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
85a49885fb
sum percentages as sanity check
2013-11-22 18:51:17 -08:00
Eric House
14fa77cf2d
remove blank lines
2013-11-22 18:51:04 -08:00
Eric House
9a5408f5db
first cut at script to build new, larger wordlist from sourceforge
...
scrabble wordlist project
2013-11-21 19:20:56 -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
14c7b7370a
fix layout bug where board overlapped tray
2013-11-16 18:31:14 -08:00
Eric House
46a5f83bb1
shrink "netstat rect" to reasonable size
2013-11-16 18:25:09 -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
b5bec1e2cd
ignore valgrind core files
2013-11-14 21:48:06 -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
7d1a1228f0
fix bug where scrolling used when shrinking would suffice
2013-11-14 06:56:11 -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
c9ba7b2fe1
When timer fires for pen held on board, don't do anything if we're in
...
trade mode.
2013-11-10 07:08:49 -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
38613a85d3
make active rect for empty board 3x3 for a bit more context
2013-11-08 06:34:41 -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
b61e580b40
ignore .db files
2013-11-07 07:32:15 -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
f0b554213b
assert rect isn't too small to inset
2013-11-04 05:59:18 -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
184ac28ebc
fix to compile, and in gtk case to work, when COMMON_LAYOUT defined
2013-11-03 12:15:53 -08:00
Eric House
5a65bca12a
add board functions to figure layout (position and size of board,
...
tray, etc.), removing need for each client to do it itself.
2013-11-03 12:12:25 -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
b9d0469cfe
fix OFFSET_OF ptr size to quiet compiler
2013-11-01 19:09:05 -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
182ea7f862
make it possible to set DrawCtxt after opening/creating game
2013-10-31 08:06:44 -07:00
Eric House
3858893ab2
don't crash on null dctxt
2013-10-31 06:35:23 -07:00
Eric House
88af10552e
don't try to draw with null dctx
2013-10-31 06:35:00 -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
26f5a0b269
add two out params giving number of cols and rows
2013-10-29 07:50:12 -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
90e5d12ff6
Merge remote-tracking branch 'origin/android_branch' into android_branch
2013-10-27 21:55:06 -07:00
Eric House
6776490c40
Merge remote-tracking branch 'origin/android_branch' into android_thumbnail
2013-10-27 21:54:34 -07:00
Eric House
88b380503e
add function, not compiled by default, to return bounding rect of all
...
non-empty tiles. As a test, add menu that uses it to grey out that
region.
2013-10-27 21:51:30 -07:00
Eric House
53e6db5683
remove return from middle of function
2013-10-27 21:47:49 -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
91b54dd66a
use delete to free what's allocated using new
2013-10-25 06:16:17 -07:00
Eric House
a33f04e077
fix shutdown to work (by sending signal)
2013-10-25 06:16:17 -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
bd902bfc12
ignore dawg exporting files
2013-10-21 20:39:21 -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
e8616735b6
move .o files into an obj directory
2013-10-21 18:52:12 -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
9efb044c4f
simplify construction of one query
2013-10-09 21:13:22 -07:00
Eric House
becbf7aea6
include dict2dawg in exported files
2013-10-09 21:12:52 -07:00
Eric House
c0598aa06b
fix to compile without DEBUG defined
2013-10-09 21:02:15 -07:00
Eric House
ad2916b186
add Makefile so byod export will pick it up
2013-10-09 20:54:31 -07:00
Eric House
fe8bb0932c
delete messages whose games have been deleted
2013-10-09 20:41:14 -07:00
Eric House
ec468ef3ba
printf -> catf missed because in ifdef
2013-10-09 20:40:21 -07:00
Eric House
bb246fd7e7
rename printf -> catf; no other changes
2013-10-09 20:20:45 -07:00
Eric House
6cbfc03228
Merge remote branch 'origin/android_branch' into android_branch
2013-10-09 20:09:31 -07:00
Eric House
c34fb48a2c
oops -- init mutex. This may be why the relay's hanging after a
...
crash.
2013-10-09 20:08:29 -07:00
Eric House
24509662e8
fix so standalone games don't crash!
2013-10-09 07:36:21 -07:00
Eric House
303f919b5e
fix pattern for synonyms
2013-10-09 07:36:04 -07:00
Eric House
253073efc5
cleanup and rename variable
2013-10-09 07:35:21 -07:00
Eric House
0431f1a7ea
fix capitalization
2013-10-07 07:01:03 -07:00
Eric House
5e92de6ff8
skip Hëx files when exporting for byod
2013-10-07 07:00:27 -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
3b87c9562c
formatting
2013-10-01 07:50:00 -07:00
Eric House
7290a41913
tweak; add limit
2013-10-01 00:01:39 -07:00
Eric House
b3723897d5
to prevent duplicate UDP packets (I hope), bind the UDP socket to a
...
single ip address rather than INADDR_ANY. Get that address at runtime
for an interface provided in the config file.
2013-09-30 23:40:12 -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
945c41c615
Merge remote branch 'origin/android_branch' into android_branch
2013-09-27 05:46:43 -07:00
Eric House
9f38ded122
new script
2013-09-27 05:46:06 -07:00
Eric House
4d4f76c8ae
assert not registering with RELAY_ID
2013-09-26 08:37:39 -07:00
Eric House
4202f24091
don't allow reregister with a RELAY_ID (a client bug)
2013-09-26 08:37:21 -07:00
Eric House
c1f94681bb
when a message sent via udp from cref isn't acked, add it to stored
...
messages so gcm loop can pick it up.
2013-09-26 07:14:24 -07:00
Eric House
9640d0c5f9
fail build when jni compile fails
2013-09-26 06:39:32 -07:00
Eric House
63067dc374
oops: the test is equality with 'epoch'
2013-09-25 07:33:41 -07:00
Eric House
31fa2ea442
turn on feature where sent messages are marked rather than deleted.
...
Make default 'epoch' rather than NULL so constraint will work to
prevent duplicates, and fix insertion SQL to not violate constraint.
2013-09-25 06:38:10 -07:00
Eric House
fb59aa4907
use epoch rather than null as default so constraint will work
2013-09-24 08:37:18 -07:00
Eric House
8862c5f750
move include file up
2013-09-24 08:37:18 -07:00
Eric House
a4de87cfeb
fix constraint, and add stime to it
2013-09-24 08:37:18 -07:00
Eric House
c9daf91b06
remove excess logging
2013-09-23 07:19:53 -07:00
Eric House
f59a7db85d
update to work with either udp or tcp-sourced stored messages
2013-09-23 07:18:00 -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
4de9df4c97
Merge remote branch 'origin/android_branch' into android_branch
2013-09-22 20:36:38 -07:00
Eric House
e1a5a2d53a
remove excess logging
2013-09-22 20:35:32 -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
2e6d49303b
remove logging around hasNoMessages stuff -- too much
2013-09-20 04:54:05 -07:00
Eric House
e12069b45d
fix to work with devids and devtypes being arrays
2013-09-19 06:38:37 -07:00
Eric House
9169659c80
cleanup: let conversion to including devid and change in devid happen at different rates
2013-09-18 08:05:19 -07:00
Eric House
5d49b9b5d6
oops: don't default to clearing relayid
2013-09-18 08:04:12 -07:00
Eric House
9650000fce
add filter option -- sometimes want to see devices not in a current game.
2013-09-18 07:03:25 -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
af44c6d190
only append to mtimes when appending a new devid
2013-09-15 12:54:47 -07:00
Eric House
b67ea7293d
add mtimes, remove mtime, for devices to track each time the devid
...
changes. Eventually; now it's updated too often.
2013-09-15 12:46:40 -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
b0e2975994
show specific columns from devices table rather than *
2013-09-15 10:16:11 -07:00
Eric House
c212c0e367
add in-memory cacheing of messageless-connname/hid combos.
2013-09-15 10:04:46 -07:00
Eric House
657d0d2b1f
-l - means log to stderr
2013-09-15 10:04:45 -07:00
Eric House
de1f1cf681
in devices table, replace devid and devtype with array so can track
...
history if/as they change; remove rrcount as no longer needed.
2013-09-15 09:59:51 -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
2629c07256
Address problem with devids (e.g. GCM): until now when you got a new
...
devid you tossed your relayID and reregistered. Which meant any
existing messages meant for your relayID were orphaned, and any open
games didn't know who they belonged to until you reconnected to them
with your new relayID. So: modify the UDP protocol (though not on
Android yet) to include both relayID and devid with registration, with
one or the other an empty string if not present or not changed from
earlier. I can't fix existing clients that are dropping their
relayIDs, but when one does a re-connect without a relayID I can look
it up from the existing game record, then reuse it rather than issue a
new one. Better than nothing -- and that protocol will be obsolete
soon anyway.
2013-09-14 21:06:14 -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
2cad611ec4
get postgres port from config; send connname only if present
2013-09-11 07:42:14 -07:00
Eric House
8fa5e3e4bd
drop duplicate packet rather than asserting
2013-09-11 07:30: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 & 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
94b2eddda6
fix crash by adding byte protocol expects
2013-09-09 07:42:00 -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
c115752852
supply in linux client, and look for and store on relay, os version
2013-09-07 16:17:31 -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
5b7a039d78
cleanup
2013-09-05 07:53:47 -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
48e0afc589
add comment
2013-09-03 06:54:42 -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
032f8c1f99
add ctrl port command to post UPGRADE message to clients
2013-09-03 06:52:02 -07:00
Eric House
8da0b73744
replace string_printf() with new class derived from std::string with
...
printf() method.
2013-09-02 13:17:42 -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
a95d620b09
Make ack timeout settable from ctrl port; add ctrl facility to print
...
and nack outstanding acks.
2013-08-31 08:30:25 -07:00
Eric House
07c9722433
add ability to forget multiple devices
2013-08-31 08:26:44 -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
d9bfc01e35
change unsigned char to uint8_t (using sed)
2013-08-29 22:55:11 -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
0e6b211a76
fix treating game-targeted messages as if they were device-targeted.
...
Should probably have separate tables for the two types....
2013-08-29 06:37:22 -07:00
Eric House
b80051cc73
send dev-targeted messages pulled from db by rewriting their headers
...
with a new packetID.
2013-08-28 21:36:12 -07:00
Eric House
de125eb9a6
fix GetStoredMessages to also return messages without connnames,
...
i.e. messages to a device rather than to a game.
2013-08-28 21:29:39 -07:00
Eric House
cd2b83c9c5
type change: use vector<uint8_t> rather than string in struct for
...
retrieving data from db.
2013-08-28 20:33:42 -07:00
Eric House
e2f689765b
Merge remote-tracking branch 'origin/android_branch' into android_branch
2013-08-28 20:08:33 -07:00
Eric House
c4cf8b3c3c
make 'devs print' take multiple devid args; rename args to argv everywhere.
2013-08-28 19:23:40 -07:00
Eric House
831018ed9d
oops: remove extra format specifier
2013-08-28 19:20:37 -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
b5f35fab78
unescape things like '\n' in messages
2013-08-28 08:00:21 -07:00
Eric House
4207df8078
apply limit to all; list messages without connname too
2013-08-28 07:29:24 -07:00
Eric House
2e7433f2b2
change 'devs msg' command to send to a list, or to all
2013-08-28 07:29:23 -07:00
Eric House
b3342c6e8a
for --clean-start option, try not to remove games not created by this script.
2013-08-28 07:29:23 -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
084abb57e3
Merge remote-tracking branch 'origin/android_branch' into android_branch
2013-08-27 06:52:11 -07:00
Eric House
35a09512ce
add missing params
2013-08-26 08:41:42 -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
f6b34fcbbc
sleep time should depend on configured ACK expiry
2013-08-25 22:24:21 -07:00
Eric House
d3c15eb58b
remove logging
2013-08-25 22:23:52 -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
7e02db78db
change function name spelling
2013-08-25 16:14:42 -07:00
Eric House
91235f3be7
begin process of using variable-length-ints in udp protocol. Works
...
between linux client and relay, but unrelased features of Android
client will be broken until fixed.
2013-08-25 12:34:35 -07:00
Eric House
69f34f4ef8
make method private
2013-08-25 12:32:26 -07:00
Eric House
cf3437c686
fix argc checking to prevent crashes
2013-08-23 07:44:42 -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
38adea1612
fix infinite recursion
2013-08-22 08:23:32 -07:00
Eric House
1af12f1de2
refactor packet assembly/sending so posting message can post all,
...
including header.
2013-08-22 08:15:38 -07:00
Eric House
16aafccec6
to telnet interface add ability to forget device and to send to one
...
not known (which will make message available next time it connects or
via GCM); rename methods.
2013-08-22 06:29:20 -07:00
Eric House
23a59e8097
sometimes a device goes away and we don't notice, so when it comes
...
back just reuse its record rather than asserting there's no record
there.
2013-08-21 21:32:55 -07:00
Eric House
45998fd2c0
don't assert when packet size short is unexpectedly large. Not sure
...
why this happens, but it's not a reason to abort a test.
2013-08-21 21:28:47 -07:00
Eric House
3dee41e584
set new clntvers row in devices table at the same time as updating it
...
in games table. (The latter is now redundant and will go away.)
2013-08-21 06:49:37 -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
2157706dcd
add client version and a desc string to devices DB and to reg info sent to relay
2013-08-20 08:09:45 -07:00
Eric House
a8d67830d8
add missing enum
2013-08-19 20:51:03 -07:00
Eric House
84d06b9fed
use g_shell_parse_argv() to parse input buf (so messages can be in
...
quotes and contain whitespace)
2013-08-19 08:25:06 -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
0868a33c83
print out whether message is ACK'd or not
2013-08-18 20:52:09 -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
d0aca01289
clean up send message/alert code
2013-08-18 15:48:44 -07:00
Eric House
47203437cc
register devices more often; add ctrl command to send text message to
...
device if possible, otherwise to post it to the db (mostly for testing).
2013-08-17 14:55:19 -07:00
Eric House
8ad549d2bd
query on null db fails, doesn't assert
2013-08-16 19:15:28 -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
6a27bbba94
tweaks to new ctrl command
2013-08-15 19:22:23 -07:00
Eric House
d07bb5013d
oops: function need to return something
2013-08-15 19:22:01 -07:00
Eric House
62f0819a82
Toward resurrecting ctrl feature to give runtime info about stuff that
...
isn't in the DB. Step one: comment out the stuff that doesn't compile
and add ability to print all registered devices with their ages.
2013-08-15 08:44:33 -07:00
Eric House
06f0b7e411
treat KEEPALIVE same as RQSTMSGS (for now)
2013-08-15 07:25:20 -07:00
Eric House
61009cefc7
in advance of using memcache, keep track (in memory) of those devids
...
for which no messages are pending, since that's a query that can be
made by each device every minute.
2013-08-15 07:24:30 -07:00
Eric House
42bbc946ae
quote variable and echo when switching to udp
2013-08-15 07:20:22 -07:00
Eric House
f1b60dab62
Don't assert when can't find state transition. At least in some cases
...
these result from unexpected/out-of-order packets that slip through.
2013-08-14 08:11:21 -07:00
Eric House
fe51d19c2e
Device can't be 'alreadyHere' if has hostID of 0 since the only way a
...
device gets registered involves giving it a non-0 hostID. Fixes array
OOB access.
2013-08-14 08:10:09 -07:00
Eric House
80f66d1df7
remove test for duplicates now that it's impossible
2013-08-13 08:20:57 -07:00
Eric House
5be8779749
remove redundant member variable
2013-08-13 08:19:32 -07:00
Eric House
c9406c36ae
use a simple array rather than a vector to store currently connected
...
devices. It's simpler, searching for hid is faster, and it makes it
easier to detect when we try to add the same device twice.
2013-08-13 08:04:19 -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
fde50cce32
move timeout interval into config file; cleanup
2013-08-12 07:41:48 -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
787367071d
show only those devids in the visible games
2013-08-08 19:55:04 -07:00
Eric House
f96155f12b
merge changes for quick b65
2013-08-08 01:14:23 -07:00
Eric House
9528e61f84
Merge remote-tracking branch 'origin/android_branch' into android_branch
2013-08-08 01:07:02 -07:00
Eric House
635b948c41
don't drop messages from devices without a devID -- lots of older
...
devices are in that boat.
2013-08-08 00:40:32 -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
01c97c5716
null token is a possibility if message was stored by device connecting
...
via tcp and device is now connecting via udp
2013-08-07 21:59:21 -07:00
Eric House
cd9eea665b
oops: still need to register device connecting via tcp so gcm sends
...
can work.
2013-08-07 21:36:06 -07:00
Eric House
84b77d4456
log threadid as unsigned int
2013-08-07 21:32:58 -07:00
Eric House
b49486fc3f
cleanup: use constant and add/use isUDP()
2013-08-07 21:31:10 -07:00
Eric House
ae21b6f0d8
use new --use-udp flag and, by default, switch devices from tcp- to
...
udp-based connections over time at a configurable rate.
2013-08-07 21:12:08 -07:00
Eric House
71ea59e7fb
separate whether app is using udp from whether it stores games in a
...
sqlite3 db so that it can switch mid-game -- that being something that
needs testing.
2013-08-07 21:09:48 -07:00
Eric House
bac947d780
don't remember tcp-based addresses. Fixes problem when a device
...
switches from tcp- to udp-based connection.
2013-08-07 21:04:05 -07:00
Eric House
91c82d9874
tweak logging to match format gdb prints
2013-08-07 21:03:11 -07:00
Eric House
6dbabaa319
cleanup
2013-08-07 21:02:47 -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
a38fd0e96c
fix too-short tray on 10" tablet by making height a 16-bit value, not 8-.
2013-08-06 21:56:10 -07:00
Eric House
b9450589c8
add new commandline option --use-udp. Not yet used.
2013-08-06 21:10:42 -07:00
Eric House
470dbb5304
oops: still remove address from set tracked if it's not tcp
2013-08-05 07:50:11 -07:00
Eric House
4ad6696ecc
add delete-on-ack logic to another message sending site, and fix
...
assertion failure caused by not providing a client token on messages
being sent.
2013-08-02 22:33:06 -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
da54b1e5fb
add keepalive timers
2013-08-02 08:01:16 -07:00
Eric House
1e35d676bf
change constant name
2013-08-02 07:31:41 -07:00
Eric House
6e14a6d33a
fix leak; remove unused variable
2013-08-02 06:11:08 -07:00
Eric House
8b936ea0ea
iterator is invalid after erase() call, so advance first. Fixes problem valgrind found.
2013-08-02 06:08:41 -07:00
Eric House
a8cc920dcf
new method
2013-08-01 07:49:12 -07:00
Eric House
4ecb0f534d
For a subset of stored messages sent, don't remove from DB until
...
they're acked. (This is the goal for all messages sent via UDP, but
will be harder elsewhere in the code.)
2013-08-01 07:48:44 -07:00
Eric House
684effd170
cleanup
2013-08-01 06:12:58 -07:00
Eric House
17b8eae1f1
clean up fetching of stored messages, and excluse those from dead games
2013-07-31 07:24:58 -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
54c1e0c2ab
drop bogus assert
2013-07-29 17:39:43 -07:00
Eric House
b40533230a
fix OS warning by unregistering SMS receivers in onDestroy
2013-07-29 07:50:01 -07:00
Eric House
63ad3a196b
debug build asserts that packet is meant for this device, but
...
non-debug should drop those that aren't.
2013-07-29 07:30:46 -07:00
Eric House
1f877c7567
remove logging
2013-07-29 07:29: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
cdea106824
change param to simplify code a bit
2013-07-29 06:33:31 -07:00
Eric House
5f9b2e431f
optimization: test address before fetching messages for it
2013-07-28 07:28:32 -07:00
Eric House
9951064439
fetch all stored messages at once to reduce number of DB calls made.
2013-07-25 06:37:53 -07:00
Eric House
6bb2efbbd5
remove mistaken assert
2013-07-24 06:03:50 -07:00
Eric House
41160579ca
remove duplicate
2013-07-23 18:30:08 -07:00
Eric House
bfc617720e
add isCurrent() method on UDP addresses based on how long it's been
...
since we've received data from the same source, and use to drop
packets in response to reads that are older than when the test says
the endpoint of the address changed.
2013-07-23 06:21:57 -07:00
Eric House
572d3596ae
add heretofore undocumented config
2013-07-23 06:18:17 -07:00
Eric House
ceacbc2cbe
fix formatting error
2013-07-23 06:17:35 -07:00
Eric House
acca4d14d4
new files to track how long it's been since data's been received from
...
a UDP address. The idea's that when there's too long a gap the
address has likely been recycled and we shouldn't send replies to
packets received before the reset.
2013-07-22 07:26:14 -07:00
Eric House
6418513a6d
don't try to read from socket if == -1
2013-07-22 06:15:35 -07:00
Eric House
385243763a
Merge remote-tracking branch 'origin/android_branch' into android_branch
2013-07-22 06:13:01 -07:00
Eric House
a191c6fc2a
don't add chats to queue at len 64 rather than 128
2013-07-22 06:12:06 -07:00
Eric House
7b18da70db
logging tweak
2013-07-22 06:11:10 -07:00
Eric House
48a2567edf
log contents of incoming udp packets
2013-07-22 06:06:39 -07:00
Eric House
13550865ad
drop packets in queue if they've been there longer than 30 seconds --
...
which should be a configurable value.
2013-07-22 06:05:24 -07:00
Eric House
3a14b12cc5
exit when number of core files changes, not if it's non-zero
2013-07-20 12:52:32 -07:00
Eric House
13c234dfab
log when address replaced
2013-07-20 11:59:00 -07:00
Eric House
49a2d099f0
include packet num in every udp packet. They start over on app
...
reboot, but add a bit of help with debugging.
2013-07-20 11:57:10 -07:00
Eric House
5d8cd5a17f
recognize already-seen devices. This seems to occasionally fix
...
reconnect problems but needs to be studied/tested more -- check logs.
2013-07-20 11:44:00 -07:00
Eric House
464ef49018
add new send_via_udp that may be able to check for address validity
2013-07-20 10:37:38 -07:00
Eric House
792a51a404
change ivar name
2013-07-20 08:33:22 -07:00
Eric House
61992943dd
Add mapping from address to devid in order to catch when an address is
...
reused. That required making AddrUnion a class rather than a simple union.
2013-07-20 08:06:14 -07:00
Eric House
573a87993e
Don't propogate chat when queue too full. This *should* only impact
...
tests since users won't keep chatting at a non-responsive friend.
2013-07-20 08:01:56 -07:00
Eric House
32150049e2
assert that we aren't tracking two connected games with the same hid
2013-07-20 06:28:35 -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
3f59b31d51
Log received udp messages as b64-encoded strings. These match what the
...
relay's now logging
2013-07-18 07:07:25 -07:00
Eric House
1e6ff9b33c
include seed in chat messages to make sure they're unique
2013-07-18 07:06:20 -07:00
Eric House
2ce097629f
log contents of udp packets as b64-encoded strings for debugging; off
...
by default.
2013-07-18 06:52:07 -07:00
Eric House
06dd9a99a1
better logging
2013-07-17 21:34:52 -07:00
Eric House
3737f19548
better logging
2013-07-17 21:34:27 -07:00
Eric House
972dcfec81
cleanup
2013-07-17 21:33:59 -07:00
Eric House
1d5cf0bea7
don't remember devid unless it's valid
2013-07-17 21:33:36 -07:00
Eric House
93a7c7f817
fix to compile when DEBUG not defined
2013-07-17 06:52:35 -07:00
Eric House
bf39f9194c
kill service after 3 minutes of no socket activity
2013-07-17 06:42:54 -07:00
Eric House
d436232800
correctly log b64 dump of return address at record and use sites
2013-07-17 06:38:25 -07:00
Eric House
62dacb83d8
fix to compile when DEBUG not defined
2013-07-16 08:17:46 -07:00
Eric House
4d9d65b67e
Merge remote-tracking branch 'origin/android_branch' into android_branch
2013-07-16 08:07:41 -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
d6fd79be44
log, and be more aggressive about closing, sockets on which errors occur
2013-07-16 06:43:30 -07:00
Eric House
e6e7154c82
close socket rather than proceed with what looks like a bad packet/connection
2013-07-16 06:42:21 -07:00
Eric House
021d6370f3
drop, rather than asserting about, corrupt packets -- meaning where
...
the player counts don't make sense.
2013-07-16 06:40:00 -07:00
Eric House
1638d964fb
log socket address to try to track down apparent misaddressing
2013-07-16 06:38:26 -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
e80fe76652
assert we don't go out of bounds on array
2013-07-15 07:33:27 -07:00
Eric House
27e90c2d2c
exit as soon as there's a core file
2013-07-15 07:16:35 -07:00
Eric House
b5714e9d14
improve API: hide special numbers inside implementation
2013-07-12 08:24:44 -07:00
Eric House
ab1ae7c9ad
remove logging
2013-07-12 08:19:53 -07:00
Eric House
9e358ad413
don't insert a new message in queue if it's identical to the one
...
currently at the end. This mostly happens when devices are making
several initial client connection attempts before succeeding.
2013-07-12 07:34:12 -07:00
Eric House
8a4e766b32
make 50% of games communicate via UDP by default
2013-07-11 20:39:40 -07:00
Eric House
491b288631
assert that the seed's preserved for curses version too (where
...
clientToken is otherwise ignored since there's only one game per app
instance)
2013-07-11 20:39:10 -07:00
Eric House
9db54a5461
make linux version's gameToken combine game's seed with rowid so we
...
can test that the relay is keeping them straight
2013-07-11 20:01:17 -07:00
Eric House
f27d8d5d8f
list java files first so their methods, which tend to be more
...
numerous, will be found last.
2013-07-11 19:56:37 -07:00
Eric House
d6658c5c08
don't show other_disconnected error message
2013-07-10 23:14:48 -07:00
Eric House
7dfd19a7a2
name change
2013-07-10 23:14:24 -07:00
Eric House
5814febad5
better client token logging
2013-07-10 23:13:50 -07:00
Eric House
2060aa4577
don't match on empty devID
2013-07-10 23:12:57 -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
dbf156fca7
remove excess logging
2013-07-10 08:02:28 -07:00
Eric House
5462a05692
Merge branch 'gtk_multigame' into android_branch
2013-07-09 19:35:26 -07:00
Eric House
bf1cdf225c
print queue less frequently
2013-07-09 19:32:49 -07:00
Eric House
4bde445c48
fix so gtk mode works too by providing storage for CurGameInfo
2013-07-09 18:19:22 -07:00
Eric House
5a20cc282c
fix so curses app works well enough that discon_ok2.sh script runs
...
successfully. GTK mode is untested and certainly broken.
2013-07-09 18:10:41 -07:00
Eric House
48fbf15a69
needed to quote variable
2013-07-09 18:07:03 -07:00
Eric House
f5696334a9
changes to get the merged code to compile but not included by git in the commit
2013-07-09 07:25:23 -07:00
Eric House
79f07e8751
cleanup
2013-07-09 07:19:20 -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
