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
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
3278b55819
return whether NFC *can* be enabled as well as whether it is
2013-11-17 21:21:06 -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
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
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
53748e352a
fix games created after reset of prefs from disappearing: they were
...
being saved with groupid of -1, so now when the default's not been sit
choose and pass in the first group.
2013-11-14 21:47:01 -08:00
Eric House
5826f080be
don't hide titlebar for board if there's no menu key, since on such
...
devices there's no other way to get to the menu.
2013-11-14 08:07:00 -08:00
Eric House
85a533c74f
use interface trick to avoid NFC code crashing on 2.1
2013-11-14 08:03:28 -08:00
Eric House
bdf5a43686
always update nMissing so invite menuitem can go away
2013-11-14 06:19:04 -08:00
Eric House
e20a72e527
remove and turn off active rect stuff
2013-11-14 05:59:51 -08:00
Eric House
4d6a37b048
don't force NFC messages to ascii -- it breaks special chars and isn't
...
required, even with special chars.
2013-11-14 05:46:47 -08:00
Eric House
e9bdf3c4f8
don't show trade buttons when have actionbar since they're redundant
...
and the AB icons are visible; hide resign menuitem when in trade mode.
2013-11-13 19:00:34 -08:00
Eric House
3b5bc3a786
fix OOB per http://stackoverflow.com/questions/12133404/indexoutofboundsexception-in-a-baseexpandablelistadapter-implementing-sectionind
2013-11-13 18:39:03 -08:00
Eric House
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
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
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
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
f27e798966
need to requestLayout(), not just invalidate(), after common code
...
layout is finished.
2013-11-10 08:37:28 -08:00
Eric House
7457ce9b80
fix so board draws correctly when loaded in trade mode
2013-11-10 06:55:01 -08:00
Eric House
82a82b5ae1
set trade mode in canvas where it'll do some good
2013-11-10 06:41:43 -08:00
Eric House
d598dde86e
inval view even if board_draw says there's more drawing to do -- as
...
there's probably still a lot that got drawn.
2013-11-10 06:41:12 -08:00
Eric House
f6e0febd6d
fix NPE
2013-11-09 08:20:32 -08:00
Eric House
397b03b074
save thumbnail along with summary to fix reset game keeping its old
...
(and populated) thumbnail until opened
2013-11-09 07:27:05 -08:00
Eric House
3142069adb
save bitmap after generating it
2013-11-09 07:19:54 -08:00
Eric House
26a464aae4
set a minimum width for rem tiles display based on screen width rather
...
than pixels
2013-11-09 07:15:28 -08:00
Eric House
3e6a7418b1
move snapshoting code into GameUtils, and use it whenever loading a
...
GameListItem that should have a snapshot but doesn't. This lets games
have snapshots immediately rather than only after they've been opened
once.
2013-11-09 06:59:33 -08:00
Eric House
e0dd481393
restore missing ivar init so remaining tiles square comes back
2013-11-09 06:48:09 -08:00
Eric House
049b8247ff
clear all thumbnails whenever a thumb-related pref changes
2013-11-09 06:40:31 -08:00
Eric House
82f61b43f2
add utility to erase all thumbnails
2013-11-09 06:36:47 -08:00
Eric House
dfdbd9a8a2
pass scoreWidth separately into formatting code so space can be left
...
for network status icon.
2013-11-09 05:34:23 -08:00
Eric House
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
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
e780b536f9
obey thumb size preference. Currently "1/3" means 1/3 the size of the
...
smaller screen dimension. There may be a better scale.
2013-11-07 19:28:00 -08:00
Eric House
41df94af31
new separate set of three prefs for thumbnails, and make the first,
...
enable/disable, work.
2013-11-07 19:07:19 -08:00
Eric House
fba7aee83a
take thumb setting into account (though not in the rigth way yet, and
...
changes are still reflected only after the list item's been forced to
reload)
2013-11-07 07:51:57 -08:00
Eric House
a26dced506
drawing tray tiles can fail, e.g. when font info not yet available, so
...
only clear bits when successful. Fixes problem where tray didn't get
drawn until tiles were somehow invalidated.
2013-11-07 07:29:54 -08:00
Eric House
56f9f5f88e
remove unused method
2013-11-07 05:48:39 -08:00
Eric House
16923eb27e
save thumbnail in separate step, creating new square board-only
...
drawctxt to render it without scaling. Draw whole board rather than
just the active rect.
2013-11-07 05:44:16 -08:00
Eric House
baba78535f
fixes to the merge
2013-11-07 05:30:02 -08:00
Eric House
bb80cdfb08
Merge branch 'android_branch' into android_thumbnail
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
2013-11-07 05:25:51 -08:00
Eric House
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
499e07d84b
follow convention: width usually comes before height
2013-11-05 06:38:48 -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
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
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
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
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
0960e5510c
add board_getActiveRect to jni, and use it to capture a thumbnail
...
that's smaller. Scaling is still a problem, though: some but not all
grid lines show up.
2013-10-29 07:51:35 -07:00
Eric House
d72526ff84
enable turning thumbnail featuren on/off via a line in build.xml
2013-10-29 06:49:06 -07:00
Eric House
8bdde9765d
Merge branch 'android_branch' into android_thumbnail
2013-10-29 06:30:03 -07:00
Eric House
1d7a443c8d
cleanup
2013-10-28 21:25:44 -07:00
Eric House
969d0d0a71
cleanup
2013-10-28 07:50:43 -07:00
Eric House
8ab202dd27
cleanup menu config code
2013-10-28 06:21:24 -07:00
Eric House
e197e7499f
add new thumbnail/blob column to DB
2013-10-27 21:56:00 -07:00
Eric House
2c9cd311a5
add thumbnail: save scaled-down image when closing board, store it in
...
summaries db, and display as part of game list item. Preference
governs whether saved/displayed and the scale.
2013-10-25 21:08:37 -07:00
Eric House
e3c99595b1
add new thumbnail/blob column to DB
2013-10-25 21:02:34 -07:00
Eric House
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
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
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
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
1bb0c49c71
assert that we don't use an unprepared menu.
2013-10-21 20:44:47 -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
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
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
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
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
9217eb71dd
move config into actionbar from context menu, deprecating it there.
2013-10-15 22:06:29 -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
8816e590f2
copy gmail app's selection color
2013-10-14 19:01:51 -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
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
5f177ac62f
remove logging
2013-10-11 22:30:13 -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
9a8ed72ea1
when new GCM ID is received, force re-register.
2013-10-11 07:51:10 -07:00
Eric House
253073efc5
cleanup and rename variable
2013-10-09 07:35:21 -07:00
Eric House
ec77be8a2a
put the pass/turn done menuitem in the action bar as a first cut
2013-10-01 07:50:01 -07:00
Eric House
c294ad45cf
don't recomment tapping the pts area of tray when it's not visible
2013-10-01 07:50:01 -07:00
Eric House
4abc9623f9
add invalidateOptionsMenuIf(), for working with action bar in a
...
safe-before-sdk-11 way
2013-10-01 07:50:01 -07:00
Eric House
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
c9daf91b06
remove excess logging
2013-09-23 07:19:53 -07:00
Eric House
74546d183f
better log message
2013-09-23 07:00:20 -07:00
Eric House
8ab832a136
wrap a bunch of tcp-connection code in !XWApp.UDP_ENABLED so compiler
...
can make it go away.
2013-09-23 07:00:05 -07:00
Eric House
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
3499af3ac4
fix reported NPE (by inspection, as I can't repro)
2013-09-14 21:22:06 -07:00
Eric House
91a0dc5ecd
turn chat back on -- and make it configurable via a single property in
...
build.xml that's turned into both a -D option to the jni compiler and
a constant in the java world.
2013-09-11 22:18:00 -07:00
Eric House
91e78eccf9
make download progress determinate
2013-09-11 08:37:12 -07:00
Eric House
ae79da9842
Merge branch 'from_android_beta_65' into android_branch
2013-09-10 08:00:57 -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
cf71479931
cleanup formatting
2013-09-09 07:42:27 -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
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
de2c938f41
stop menu button (or "action bar overflow") from being invisible on
...
tablet devices.
2013-09-07 08:10:00 -07:00
Eric House
fdbdfa5911
add OS release number to reg data
2013-09-04 21:05:39 -07:00
Eric House
810dfac8b8
postpone packet creation and id assignment until send time so id can
...
be logged along with send.
2013-09-04 08:11:42 -07:00
Eric House
42a517b246
support UPGRADE message; don't queue KEEPALIVE packets when network is
...
down (as it is on Kindle when screen off)
2013-09-03 06:57:21 -07:00
Eric House
70fc4c448c
print the exception's stack trace
2013-09-03 06:54:13 -07:00
Eric House
40215337c9
cleanup
2013-09-03 06:53:25 -07:00
Eric House
23bdec0ea1
Remove debug prefs checkboxes for ignoring gcm and using the udp relay
...
mechanism. Replace with static finals with shipping settings.
2013-09-01 09:40:08 -07:00
Eric House
0003065571
handle dev (not game) messages arriving via gcm
2013-08-31 08:58:12 -07:00
Eric House
f6a91464ac
don't update db unless value's changed
2013-08-31 07:59:58 -07:00
Eric House
593bb91ee6
saving last packet timestamp in onDestroy then reading in in onCreate
...
wasn't working because they're not always called in that order. So
for now save every time we get a message. Should be every time it
changes...
2013-08-31 07:59:58 -07:00
Eric House
7b9f6adf6d
preserve most recent maxInterval rather than counting on getting it
...
from relay.
2013-08-31 07:59:58 -07:00
Eric House
3592c2a1ab
add logging
2013-08-29 21:54:36 -07:00
Eric House
99ec44809a
use random number rather than incrementing static int (which can be
...
reset) to keep Intents from being reused
2013-08-29 21:54:17 -07:00
Eric House
b6fd850d04
improve logging
2013-08-29 21:53:22 -07:00
Eric House
ad9615709e
test whether gcm being ignored not when receiving messages but when
...
deciding whether to stay connected to relay.
2013-08-28 08:02:48 -07:00
Eric House
668cc27f35
lots of logging; handle GCM messages for device as well as for a
...
single game; tweak for more reliable connection or messages to help
diagnose.
2013-08-27 07:57:36 -07:00
Eric House
a7d5d261d3
replace static final ints with enum
2013-08-27 07:03:25 -07:00
Eric House
063b01d3d8
change most len-as-short+bytes strings to vli+bytes; add device model
...
to what's passed for device registration, and store it in a new column
in devices table.
2013-08-25 21:20:26 -07:00
Eric House
d10e9f6235
use vlis for acks in both directions
2013-08-25 16:59:07 -07:00
Eric House
47414beeb2
catch up with changes in udp proto: use vli for packet num in header.
2013-08-25 16:15:37 -07:00
Eric House
4be1653ab7
remove logging
2013-08-23 07:41:10 -07:00
Eric House
f728f7459b
pass INITIAL_CLIENT_VERS and git version to relay
2013-08-20 08:42:41 -07:00
Eric House
a8d67830d8
add missing enum
2013-08-19 20:51:03 -07:00
Eric House
7bce97f78a
post notification, not alert, on receipt of relay alert message
2013-08-19 07:02:03 -07:00
Eric House
31a3a593a4
handle alert command by posting message (if app's in foreground;
...
should otherwise post an intent...); remove some of excessive logging
2013-08-18 20:13:08 -07:00
Eric House
5412119a6f
add hexDump (commented out)
2013-08-18 15:49:13 -07:00
Eric House
e776f7b230
comment out toast that's showing on every connection -- too annoying
2013-08-15 22:32:00 -07:00
Eric House
8c56f55445
track time since last game-related packet, not any packet from relay.
2013-08-15 22:32:00 -07:00
Eric House
10ef75113f
factor common code
2013-08-15 22:32:00 -07:00
Eric House
652a8ec905
toward staying reachable as-if GCM were there: note whether GCM
...
working, and if so skip keeping the connection up. But otherwise stay
reachable by relay for a week after last udp packet was received.
2013-08-12 08:24:52 -07:00
Eric House
09494dcf09
remove unused param
2013-08-12 08:15:55 -07:00
Eric House
0ba0530bf3
set global before informing of change so if there's a query result
...
will match what was sent
2013-08-12 08:13:58 -07:00
Eric House
a96c0c548f
switch from static final ints to an enum; no other change.
2013-08-11 10:47:01 -07:00
Eric House
1d52a9afea
add reset button to ConnStatusHandler on-click dialog that calls to
...
stubbed-out function in RelayService
2013-08-10 23:24:46 -07:00
Eric House
de1803c9dd
cleanup: reduce number of params required
2013-08-10 17:36:37 -07:00
Eric House
758c6a6c5c
add interface to ConnStatusHandler as part of moving UI-based response
...
into Activity.
2013-08-10 14:25:28 -07:00
Eric House
dbc1bb1cd5
use getHandler()
2013-08-10 08:54:51 -07:00
Eric House
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
ed0c0fe3a5
add methods that don't require handler but use any set
2013-08-02 08:03:35 -07:00
Eric House
1e94e217b8
collapse catch statements since all do the same thing
2013-08-02 08:02:46 -07:00
Eric House
64b89536b0
Test whether game is on device before starting process of opening it.
...
Fixes problem caused by relay sending messages for games that have
been deleted.
2013-07-30 07:43:52 -07:00
Eric House
4ce2368e90
remove unused variable and functions that set it
2013-07-30 07:35:13 -07:00
Eric House
b40533230a
fix OS warning by unregistering SMS receivers in onDestroy
2013-07-29 07:50:01 -07:00
Eric House
d8a4b5ce29
include udp maxInterval, the number of seconds the relay's configured
...
to assume an address is still good when it hasn't heard from it, in
reg response reply, send that reply always, and read and log the new
field on clients. It will eventually be used to implement a
keepalive.
2013-07-29 07:27:30 -07:00
Eric House
27d9f3de45
Don't enable chat when more than 128 messages are in queue to prevent
...
an extremely unlikely cause of stalls -- and make tests trip over full
queues less often.
2013-07-18 07:37:45 -07:00
Eric House
bf39f9194c
kill service after 3 minutes of no socket activity
2013-07-17 06:42:54 -07:00
Eric House
3d9539b42b
don't stop comms before every save, but only when stopping
2013-07-16 08:06:23 -07:00
Eric House
403401745e
network connection stuff must not be run on main/UI thread, so to
...
preserve socket connection completing before startup of read and write
threads, move it and start of write thread to beginning of read
thread.
2013-07-16 08:01:59 -07:00
Eric House
b7e00bfc0c
log when unable open game based on rowid -- which may happen if
...
e.g. relay is sending packets to wrong device.
2013-07-16 07:56:56 -07:00
Eric House
cd728853b9
check for case where rowid doesn't exist (rather than NPE)
2013-07-15 07:51:15 -07:00
Eric House
a522266ce4
add message checksumming for android too by making it part of util
...
(compiled out by default)
2013-07-10 08:05:47 -07:00
Eric House
d50c808f96
Merge branch 'android_branch' into gtk_multigame
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
xwords4/common/comms.c
xwords4/linux/cursesmain.c
xwords4/linux/cursesmain.h
xwords4/linux/gtkmain.c
xwords4/linux/gtkmain.h
xwords4/linux/linuxmain.c
xwords4/linux/main.h
xwords4/linux/scripts/discon_ok2.sh
xwords4/relay/xwrelay.cpp
(Note: The curses app crashes on exit with mempool assertions, but that's a problem before the merge.)
2013-07-09 07:18:00 -07:00
Eric House
008cce8f37
Revert "pass additional param into java world so don't show toast every time connect to relay"
...
This reverts commit e9615cb154
.
2013-07-08 06:30:26 -07:00
Eric House
e9615cb154
pass additional param into java world so don't show toast every time connect to relay
2013-07-07 13:31:49 -07:00
Eric House
2c5ac1c293
remove excess logging
2013-07-07 13:07:02 -07:00
Eric House
ed1e2a0812
fix formatting -- no code change
2013-06-05 21:14:51 -07:00
Eric House
00be532c96
fix formatting -- no code change
2013-06-05 21:11:37 -07:00
Eric House
6a9c0bf5d4
up version strings for next beta
2013-06-05 20:56:59 -07:00
Eric House
6b2ec193c2
cleanup
2013-06-05 08:04:00 -07:00
Eric House
280154a12c
fix bad message when dict deleted by using the right rowid variable -- duh.
2013-06-05 08:03:13 -07:00
Eric House
c6d06e5fa4
bring up new popup on tap rather than long-tap of browser button to
...
make it easier to discover. Long-tap now opens the wordlist directly.
2013-06-05 06:59:08 -07:00
Eric House
bb130a9b9f
new feature: long-click on wordlist button in BoardActivity brings up
...
a popup of all wordlists so you can browse one that's not in use,
e.g. to see if a word's legal in a larger wordlist. Uses PopupMenu
class that was introduced in API 11, so 11's the target now and the
interface trick is used to prevent crashing on older devices (which
get a "needs newer Android" alert.)
2013-06-04 07:29:40 -07:00
Eric House
c32df1a487
use alpha to dim pending score rather than mucking with the rgb values
2013-06-01 08:10:03 -07:00
Eric House
9d40930fff
pass new param into java, and when it's not the player's turn draw
...
pending points with his color at half-intensity.
2013-05-31 07:40:42 -07:00
Eric House
a1b6641067
catch and ignore exception from malformed user-provided url
2013-05-24 21:17:22 -07:00
Eric House
f4c18a78ac
clear game-launched flag in onNewIntent so that one game can replace
...
another via a Notification- or other-sourced Intent
2013-05-23 07:51:03 -07:00
Eric House
6c7cf1fa97
fix bug where two quick taps on a game will launch two copies (or
...
crash a slower device) by tracking whether an open's in progress
2013-05-23 06:48:40 -07:00
Eric House
cc2ecdc5b2
two post-conflicted-merge changes git didn't pick up for some reason (emacs?)
2013-05-22 07:03:08 -07:00
Eric House
31c443e4b1
Merge branch 'android_branch' into gtk_multigame
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/GCMIntentService.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
2013-05-22 07:01:08 -07:00
Eric House
2e30ccd4c6
expect array of message bodies rather than just one
2013-05-22 06:45:34 -07:00
Eric House
120748416b
handle GCM messages containing data, changing clientVers so server
...
knows we can. And send to relay in AsyncTask rather than UI thread.
2013-05-22 06:44:01 -07:00
Eric House
076b1b7543
remove logging
2013-05-22 06:44:01 -07:00
Eric House
7d8cddb31f
Merge branch 'android_branch' into gtk_multigame
...
Conflicts:
xwords4/linux/gtkmain.c
xwords4/linux/linuxmain.c
xwords4/relay/xwrelay.cpp
2013-05-08 07:37:55 -07:00
Eric House
5a026ffda3
merge android_wordlists (local branch)
2013-05-01 06:39:31 -07:00
Eric House
4e2f5b3b14
add (commented-out) debug function to print list of extras in an intent
2013-05-01 06:26:02 -07:00
Eric House
a62f9d4097
Fix but with missing-dict SMS invites: add missing intent extra.
2013-04-30 21:20:59 -07:00
Eric House
c8f447171a
Stop SMS service if play via SMS is disabled by user
2013-04-29 07:40:42 -07:00
Eric House
0d260155ee
Revert "On some devices a downloaded wordlist shows up twice, once in Internal"
...
This reverts commit 685971532a
.
No way to test this right now....
2013-04-18 19:12:49 -07:00
Eric House
685971532a
On some devices a downloaded wordlist shows up twice, once in Internal
...
and again in Downloads. I assume that's because the two directories
are the same, so fix by tracking directories that have been checked
and not checking the same twice.
2013-04-16 06:56:53 -07:00
Eric House
cae631eeb0
handle synonyms in non-special tiles for Android: wordlists load and
...
display, and searching using lower case works. Specials (e.g. Catalan
changes) not yet supported.
2013-04-14 11:58:11 -07:00
Eric House
51d72447c6
fix crash when wordlist winds up in downloads dir (for reasons I don't
...
understand: I can't reproduce the crash but for at least one
correspondent it happens every time.)
2013-04-06 08:05:39 -07:00
Eric House
a18fb62b0f
fix dialog not having custom OK button by not ignoring the param passed in.
2013-01-31 06:59:42 -08:00
Eric House
bf479c4334
Merge branch 'android_branch' into gtk_multigame
2013-01-30 08:03:48 -08:00
Eric House
66a00bd76e
make DlgState Parcelable rather than Serializable to work around what
...
seems to be a bug in the Blaze's OS. (Requires that it be a
standalone class.)
2013-01-30 07:58:37 -08:00
Eric House
5e7fd39d66
always remove dialog state so we don't get confused
2013-01-29 21:59:42 -08:00
Eric House
0dc3856250
set initial rowID based on clock to avoid duplicates after an
...
uninstall/reinstall.
2013-01-29 19:02:53 -08:00
Eric House
d154efa441
rowid needs to be autoincrement to be useful as a token with new relay
...
protocol. And you can't make it autoincrement except when creating a
table. So add new column set equal to current rowid, then create a
new table and copy the old data into it.
2013-01-29 19:01:00 -08:00
Eric House
d88f66a890
record experiment with serialization -- no code change.
2013-01-29 18:57:03 -08:00
Eric House
d5842e79c2
use the new ANON devid type
2013-01-29 18:36:19 -08:00
Eric House
f3a063698c
set initial rowID based on clock to avoid duplicates after an
...
uninstall/reinstall.
2013-01-29 08:01:14 -08:00
Eric House
1546b15997
rowid needs to be autoincrement to be useful as a token with new relay
...
protocol. And you can't make it autoincrement except when creating a
table. So add new column set equal to current rowid, then create a
new table and copy the old data into it.
2013-01-28 06:51:39 -08:00
Eric House
d1621c8d4b
track and log all packetIDs and acks, including number (but not type)
...
of unacked packets.
2013-01-27 21:29:36 -08:00
Eric House
4417591b06
debug pref to disable GCM so new stuff can be tested on-device
2013-01-25 07:17:00 -08:00
Eric House
83441c65ef
debug pref to disable GCM so new stuff can be tested on-device
2013-01-25 07:16:38 -08:00
Eric House
f91af77438
always try starting UDP threads in case Service has been stopped;
...
implement transportSend in RelayMsgSink since relay-connection packets
need it.
2013-01-25 06:22:37 -08:00
Eric House
c8b3050c8d
fix duplicate key that was getting lots of extra games created
2013-01-25 06:20:32 -08:00
Eric House
da4d841220
use per-device UDP rather than per-board TCP to communicate with
...
relay, including latest UDP protocol and acking changes. Basically
works (in emulator at least) but there are problems especially with
initial game creation.
2013-01-23 07:46:13 -08:00
Eric House
a3e4e31205
remove logging
2013-01-23 07:28:25 -08:00
Eric House
a6b3cb8cbe
add new param JNIThread requires
2013-01-20 21:34:28 -08:00
Eric House
de7c29dcc7
add comms_stop() to jni and use it
2013-01-20 21:33:35 -08:00
Eric House
132a495c4f
add explanatory comment
2013-01-20 21:32:19 -08:00
Eric House
3df0484e6a
get maintenance mode message into an alert -- and create a new common
...
superclass for Service subclasses to reuse some code.
2013-01-20 16:07:38 -08:00
Eric House
fd2f4309f4
beginning of android changes to talk udp to the relay: sufficient to
...
get back (and log, not display) a message when the relay is in
maintenance mode.
2013-01-20 15:29:51 -08:00
Eric House
360602b3a0
fix compile failure: never meant to check this change in.
2013-01-19 16:02:58 -08:00
Eric House
4af30c534c
snapshot. New game button works and game gets saved in DB. Next: display and open from DB.
2013-01-05 16:08:19 -08:00
Eric House
05cee5ce09
further work supporting simultaneous dialogs: use
...
bundle.get/putSerializable() to save/restore dialog state
2013-01-01 22:27:14 -08:00
Eric House
af406d92dc
Handle multiple dialogs at once: save dialog state by dialog ID (ok
...
since the OS won't track more than one at a time with the same ID) and
look it up that way when needed. Get rid of onPrepareDialog() (and in
all my Activity subclasses) since it's now a requirement that all
DlgDelegate-managed dialogs remove themselves from the Activity on
dismissal so that onCreateDialog will always get called and
onPrepareDialog not be needed.
2013-01-01 21:45:37 -08:00
Eric House
8b2712bd9e
always remove dialog on dismissal since each must have its on-dismiss
...
handler called with its own state. Fixes assertion failure that was
happening the second time a dialog was used. Next: find a
reproducible case where two dialogs want to be created at the same
time.
2012-12-31 07:08:41 -08:00
Eric House
d1941090c5
Merge branch 'android_branch' into fix_dlgdelegate
2012-12-31 06:25:49 -08:00
Eric House
049b3389a6
turn DEBUG back on
2012-12-29 18:49:13 -08:00
Eric House
bbf9e8e0df
tweaks suggested by code review
2012-12-29 13:22:00 -08:00
Eric House
1faf60f667
move updateRow back where it was (prior to some merge); no code change
2012-12-29 12:50:02 -08:00
Eric House
e58e520f70
fix name/rename group dialog title
2012-12-29 11:53:18 -08:00
Eric House
498ca99020
deal with added groups too, and better with removed groups.
2012-12-29 11:36:51 -08:00
Eric House
8c4b878e21
preserve order of groups when removing one by removing it from list
...
rather than allowing list to be regenerated.
2012-12-29 09:35:44 -08:00
Eric House
674b6d3e8e
don't let new group dialog present the last name chosen as default name
2012-12-29 09:18:17 -08:00
Eric House
4d07046a99
make static GamesListItem method responsible for providing new instances.
2012-12-28 20:00:46 -08:00
Eric House
21e572acfc
Revert "use WeakReference to cache GameListItems and to inval them"
...
(Reusing Views this way seems to cause the occasional failure to recognize a tap-on-item bug.)
This reverts commit edd712ac16
.
2012-12-28 10:06:16 -08:00
Eric House
edd712ac16
use WeakReference to cache GameListItems and to inval them
2012-12-28 09:50:33 -08:00
Eric House
fb575949ac
order games within group the same way all games used to be ordered,
...
and get rid of the old all-games-listing code since it's no longer
used.
2012-12-27 20:50:37 -08:00
Eric House
a6586b6131
docs say not to call cursor.close -- so don't.
2012-12-27 20:38:31 -08:00
Eric House
8bba5d6106
Revert "add POSITION column to groups table, unused as yet"
...
This reverts commit 7be6a182f0
.
2012-12-26 19:35:21 -08:00
Eric House
68026fef3e
disable (but don't hide) group context menus that can't do anything.
2012-12-26 19:31:24 -08:00
Eric House
0d9f1a3ba7
add move-up and move-down menuitems so group order can be controlled
...
by user. Store position as array of rowids in preferences, and make
game info hashed by rowid rather than name.
2012-12-26 18:55:15 -08:00
Eric House
0a7fcb2de4
remove deleteAll menuitem
2012-12-22 23:21:01 -08:00
Eric House
7be6a182f0
add POSITION column to groups table, unused as yet
2012-12-22 22:59:08 -08:00
Eric House
110df3c1ba
Merge branch 'android_branch' into fix_dlgdelegate
2012-12-21 23:03:22 -08:00
Eric House
a594a77673
Merge branch 'android_branch' into android_groups
2012-12-21 18:06:48 -08:00
Eric House
2461b526a5
move check for updates into async task
2012-12-21 18:06:27 -08:00
Eric House
e8c3c304ab
Fix so when child is invalidated its group/parent also is. Now when
...
an invisible child gets a network game message that changes its expiry
rendering and it's the one the group is showing, the group will follow.
2012-12-21 17:31:37 -08:00
Eric House
d33f44ea24
Merge branch 'android_branch' into android_groups
2012-12-21 17:15:30 -08:00
Eric House
1998da45de
don't save game when it hasn't changed -- when saved bytes are
...
identical with those we started with.
2012-12-21 17:14:55 -08:00
Eric House
2375f86f61
improve move-to-group dialog: add title and disabled Move button when
...
radio is current group.
2012-12-21 17:06:04 -08:00
Eric House
a3b24be661
clear background drawable when no longer a local turn
2012-12-21 06:20:58 -08:00
Eric House
1743382e1f
cleanup: combine files that belong together
2012-12-20 21:55:57 -08:00
Eric House
7f9898f317
don't include expiry in group header when expanded
2012-12-19 20:49:02 -08:00
Eric House
ed0bb5b31e
minimum to get game list group headers reflecting the most urgent move
...
expiry info of a contained game: local if there is one, otherwise
remote. Still need to hide it when expanded, update, etc.
2012-12-19 20:45:58 -08:00
Eric House
7e302aae69
always show game count
2012-12-18 07:57:14 -08:00
Eric House
6690fdf122
derive from XWExpandableListActivity since it exists now
2012-12-18 07:56:48 -08:00
Eric House
9cbd76aae7
more cleanup; log info toward reuse of list items (looks unlikely)
2012-12-18 07:40:48 -08:00
Eric House
d583ec139d
move all existing games into the curGames group
2012-12-18 07:08:57 -08:00
Eric House
24bddd1ff7
cleanup
2012-12-18 06:52:13 -08:00
Eric House
983a560294
expand groups in onCreate()
2012-12-18 06:51:43 -08:00
Eric House
3a1b39f827
more of the (conflicted) merge from android_branch. These may be
...
changes I need to make to get what git produced to compile and so not
what it included in the previous commit.
2012-12-18 06:36:30 -08:00
Eric House
8a58492389
Merge branch 'android_branch' into android_groups
...
Conflicts:
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2012-12-18 06:35:07 -08:00
Eric House
8cb9d3d66b
turn debug back on
2012-12-18 05:56:14 -08:00
Eric House
6988b14247
no need for redraw in onWindowFocusChanged
2012-12-18 05:40:25 -08:00
Eric House
9d7d0aca2b
cleanup: logging and unused imports
2012-12-16 20:14:15 -08:00
Eric House
e38b99c0c8
set DEBUG to false for release
2012-12-16 15:14:04 -08:00
Eric House
3c4f266b8f
work around problems locating GameListItems when it's time to
...
invalidate them by adding static list of those needing invalidating
and checking it in a new onDraw override.
2012-12-14 18:46:54 -08:00
Eric House
646ec65d66
wrap elapsed time logging in its own debug flag and turn off.
2012-12-14 18:23:33 -08:00
Eric House
8125c451cd
in GamesList, save rowid of launched game and inval it afterwards so
...
scores etc. get updated.
2012-12-14 07:26:13 -08:00
Eric House
028899a9c4
no need to set action on local intent
2012-12-14 07:24:26 -08:00
Eric House
322a65ee41
in several places where lock() was being called without a timeout, add
...
one, and fail gracefully when a timeout occurs.
2012-12-13 20:22:11 -08:00
Eric House
85953c64dd
move GameLock into its own file
2012-12-13 18:47:55 -08:00
Eric House
6060d5e8bd
Fix hangs when receiving relay messages in background for open game by
...
adding a static feedMessages method like the one used by SMS and BT
games. For that to work, rowid and relayid need to be fetched and
tracked together -- so do that in RelayService.
2012-12-13 06:57:12 -08:00
Eric House
91ac04b896
remove logging
2012-12-13 06:32:57 -08:00
Eric House
b71046e5aa
lock, rather than tryLock, game when feeding it messages. Otherwise
...
messages are dropped e.g. when UI's loading a summary in GameListItem.
2012-12-12 07:13:25 -08:00
Eric House
db8364c285
return empty array rather than null when query succeeds but produces
...
no result.
2012-12-12 06:43:18 -08:00
Eric House
69f868722f
cancel any notification for game when resetting it
2012-12-12 06:41:56 -08:00
Eric House
575d5e9745
reduce time we'll wait for a summary to unlock when loading it for games list.
2012-12-11 19:11:23 -08:00
Eric House
01d17fe0c5
redraw full list after resetting a game in case position changes
2012-12-11 19:10:05 -08:00
Eric House
7246ae28c6
clear the cache after loading a new DB so will redraw correctly in list
2012-12-11 19:09:33 -08:00
Eric House
b2bd6ce662
add and use preference for square rack tiles, removing code that alternated for testing purposes.
2012-12-11 07:25:43 -08:00
Eric House
877225f59d
rename interface; no code change
2012-12-10 18:20:44 -08:00
Eric House
f599ca8be4
make tiles square based on rowid so people can see both
2012-12-10 07:54:42 -08:00
Eric House
d820554ffb
change game list item strategy since it turns out adapter's findView()
...
doesn't pass in the previous representation of a given item for
recycling: move async loading of summary into GameListItem class, and
use getChildAt() to invalidate a single list (rather than reloading
the whole list) whereever possible. Still need to dump the list
whenever the number of items changes since we're depending on DBUtils
to determine the order and have no way to reshuffle existing items.
2012-12-10 07:48:15 -08:00
Eric House
1bc8070bb1
disable Rematch button (for now)
2012-12-10 07:11:13 -08:00
Eric House
3a45db66cf
cache array of rowids, and clear cache appropriately, rather than
...
query DB for all games every time.
2012-12-08 20:28:11 -08:00
Eric House
ce803a928c
pass summary rather than have callee refetch it
2012-12-08 08:55:45 -08:00
Eric House
7efbd2697d
rewrite list item logic. Use a single custom LinearLayout subclass
...
for both the loading and loaded phases, toggling its state once the
data's available. Reuse it: pay attention to what's passed into
getView and only allocate when there's no existing View to reuse.
Stop caching Views, as that defeats Android list logic that might
limit in-memory representation to the subset that's visible on-screen,
instead tracking a set of rowids whose data is known to be good as a
way of quickly drawing when there's a refresh.
2012-12-08 08:47:53 -08:00
Eric House
93bf2a1b3e
hard-code tiles drawn nearly-square, just to see what it looks like.
...
Making them exactly square would probably take a new jni call. And if
I ship this it needs to be optional, controlled by a preference.
2012-12-05 19:15:20 -08:00
Eric House
e719c6e61d
don't crash if for some reason json file can't be written
2012-12-05 08:15:48 -08:00
Eric House
6789a64b68
reduce redundant code (hopefully without adding too much confusion)
2012-12-05 08:14:55 -08:00
Eric House
af853098f2
use preferred SDK-8 API to look for downloads directory, and wrap it
...
in an interface loaded only when SDK>=8 to avoid load-time crash on
older devices.
2012-12-05 07:32:11 -08:00
Eric House
a035ef5623
attachment can come in as file or content scheme
2012-12-05 06:52:10 -08:00
Eric House
ac8c229e75
Fix attachments, at least for the one phone I've tested on. Requires
...
K-9 mail (Gmail doesn't allow opening attachments). Trick was to drop
the file extension, since if present that seems to come ahead of mime
type for filtering.
2012-12-03 23:10:31 -08:00
Eric House
922f4a22f4
remove unneeded variable
2012-12-03 23:07:14 -08:00
Eric House
2c71c8425f
pass the rematch request off to GamesList where it can create new
...
games without interference from locked current game. Handle
standalone case by cloning and launching: easy. Networked games will
be harder.
2012-12-03 08:30:29 -08:00
Eric House
c041792f83
move methods toward better encapsualtion (no behavior change)
2012-12-03 08:03:00 -08:00
Eric House
ad606cdec0
trying to figure out why games list is occasionally redrawing itself
...
all the time: add logging that activated only when XWApp's DEBUG flag
is set, and turn that flag on. The latter change should be reversed
before the next release.
2012-12-03 06:53:15 -08:00
Eric House
da9c7a1afd
comment out unused column
2012-12-02 21:39:33 -08:00
Eric House
bda0d51c7f
add Rematch button to game over dialog -- which only puts up notImpl
...
toast so far.
2012-12-02 18:45:35 -08:00
Eric House
7621b909c3
hide a couple of message-related menuitems for standalone games
2012-12-02 18:19:52 -08:00
Eric House
9eea15185c
set m_gameOver when it's first known.
2012-12-02 18:09:15 -08:00
Eric House
e5bb360537
When a game is over, show "Game over" dialog containing score summary
...
every time it's opened. This is a quick way to get around it being a
bit hard to tell a board's in that state.
2012-12-02 18:02:27 -08:00
Eric House
0d0146cb17
additional changes required post-merge to compile
2012-12-01 10:53:55 -08:00
Eric House
c4e638bd84
Merge branch 'android_branch' into android_groups
...
Conflicts:
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2012-12-01 10:52:42 -08:00
Eric House
0394579b7c
cleanup (and use factored-out updateRow a couple of additional places)
2012-11-30 19:58:23 -08:00
Eric House
13b7877a80
put name of file being downloaded in progress dialog
2012-11-30 08:08:45 -08:00
Eric House
74fec9d3d3
disable attachments as part of invitations -- for now.
2012-11-30 07:50:10 -08:00
Eric House
8b5ec28120
SMS play logs too much: remove non-error logging.
2012-11-30 07:22:16 -08:00
Eric House
32d7daf2b5
warn about duplicate games not just when there's exactly one, and
...
include the most recent create time in the warning.
2012-11-30 07:13:00 -08:00
Eric House
95062fb967
log missing dicts
2012-11-30 07:12:07 -08:00
Eric House
ab0fb918ee
open json attachment and from it create a new game. Works, but there
...
are enough problems with attachements I may turn them off.
2012-11-30 06:21:18 -08:00
Eric House
f4dc8a6b41
snapshot of code and intent filter that gets an attachment into an
...
email and launches Crosswords when the attachment is opened.
Shouldn't, or at least shouldn't launch ONLY Crosswords, as the mime
type's not in the filter, but it does.
2012-11-29 08:19:07 -08:00
Eric House
9f5a64ee50
don't try to use null gamePtr. Happens when relay moves arrive for a
...
game whose dict has been deleted.
2012-11-29 06:20:45 -08:00
Eric House
bffb231d13
improve download-or-cancel messages
2012-11-28 21:07:03 -08:00
Eric House
8250447eca
launch game after successfully downloading dict it's missing
2012-11-28 20:41:08 -08:00
Eric House
4bae56e631
use rowid as notification id for all types of games, and cancel when
...
games deleted.
2012-11-28 19:32:50 -08:00
Eric House
19333e33ac
fix confirmation of duplicate game from invite. Along the way
...
dramatically simplify how new game intents are passed around.
2012-11-28 19:17:29 -08:00
Eric House
6f620ebc44
move prefix into resources two since it's repeated.
2012-11-28 06:30:35 -08:00
Eric House
baa790a8c3
remove debugging code; make Intent content details private to class.
2012-11-28 06:06:42 -08:00
Eric House
cd197e4530
use Class instance for synchronization of static methods rather than
...
creating an object only for that purpose.
2012-11-27 18:55:08 -08:00
Eric House
3cc92e99ca
fix uri format error that was causing install to fail
2012-11-27 18:48:05 -08:00
Eric House
bf970b6dd9
remove some logging
2012-11-27 07:53:48 -08:00
Eric House
c39d434ffa
add logging giving size and md5sum of downloaded .apk.
2012-11-27 07:22:03 -08:00
Eric House
441cc53740
Remove debug preference for setting host in invite emails, replacing
...
it with a string resource. The value passed in invites must match the
string hard-coded in the AndroidManifest so there's no point in making
it runtime-configurable.
2012-11-27 07:04:47 -08:00
Eric House
30377908df
Use the downloader with an infinite progress indicator instead of the
...
status-bar notifier (which is removed) for dict downloads.
2012-11-26 20:19:25 -08:00
Eric House
b433438022
add message via GCM to check for wordlist/app upgrades
2012-11-26 18:47:35 -08:00
Eric House
e590db5f3f
merge in the db part of 82c39489f0
...
(android_groups branch, local only right now), but not the UI part
since it won't make the next release.
2012-11-26 08:05:05 -08:00
Eric House
a39cc44d56
Merge branch 'android_branch' into android_groups
2012-11-26 07:41:20 -08:00
Eric House
9130c8da50
download and install upgrade .apk files where possible. Download is
...
via the existing DictImportActivity, which should also be used for
dict upgrade downloads to keep the UI consistent.
2012-11-26 07:40:45 -08:00
Eric House
6f3881d53d
don't crash on malformed invite URL
2012-11-26 03:08:54 -08:00
Eric House
ac435b7857
Merge branch 'android_branch' into android_groups
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
2012-11-25 14:11:04 -08:00
Eric House
7d6e393007
use a different missing-dict explanation string when the name of the
...
inviter isn't known (relay case)
2012-11-25 09:58:14 -08:00
Eric House
2a1c028268
deal with case where relay invite arrives for a language that device
...
doesn't have support for. Dictionary name is now included in the
invite, and if that's present offer to download it then launch game.
For previous versions that don't include the dict name, offer to
download from the language (though that isn't tested yet.)
2012-11-25 08:54:46 -08:00
Eric House
a3e0d0ca1e
recover from situation where game is created in response to an
...
invitation for a lang for which it has no dicts installed. Shouldn't
happen, but on relay still can.
2012-11-22 13:03:32 -08:00
Eric House
0bea58b128
make it possible to build without knowing the GCM sender ID.
2012-11-22 08:13:06 -08:00
Eric House
daf5a89a0e
remove unused imports (no code change)
2012-11-21 21:49:42 -08:00
Eric House
dcf239ca48
add newGroup menu for when button's hidden; add deleteAll menuitem to
...
set of debug-features (but this should probably not ship until
deleting is changed.)
2012-11-21 06:17:09 -08:00
Eric House
a199dd2b92
when deleting a group's games do as when they're deleted individually:
...
get the lock, tell the relay, and THEN remove from DB.
2012-11-20 19:03:39 -08:00
Eric House
3bff555bfd
For move, make current group the default and warn whether there's only
...
one.
2012-11-20 18:34:26 -08:00
Eric House
19e7e27f1e
fix so remembered expanded/contracted state is displayed
2012-11-20 07:40:33 -08:00
Eric House
fbfeae379d
cache DB info on groups for better performance
2012-11-20 07:15:56 -08:00
Eric House
48dd3bb72e
Merge branch 'android_branch' into android_groups
2012-11-20 07:02:27 -08:00
Eric House
04d839868d
on launch to handle an invite for a game that seems to already exist,
...
instead launch that game -- for better feedback.
2012-11-20 06:24:23 -08:00
Eric House
f149391838
cleanup
2012-11-20 06:13:29 -08:00
Eric House
b827c82291
force refresh after delete
2012-11-19 21:23:19 -08:00
Eric House
1994ea788e
don't allow deleting default group. Wording needs fixing, or better
...
yet, replace the menuitem with greyed-out "is default group". But
this works for now.
2012-11-19 19:28:26 -08:00
Eric House
82c39489f0
lots of changes toward grouping games in user-definable groups.
...
Creation and movement between work. Deletion crashes. Expansion
doesn't stick. All's rough.
2012-11-19 07:41:15 -08:00
Eric House
2779139e75
add columns using data as well. Like pref commit, this does not change behavior.
2012-11-17 10:20:14 -08:00
Eric House
9ad41d5a3a
use String[] data to build table-creation queries rather than huge
...
inline string concatenations.
2012-11-17 10:14:55 -08:00
Eric House
416db91312
experimental: always post notification on new moves received rather
...
than giving GamesList a chance to launch game directly.
2012-11-16 07:31:52 -08:00
Eric House
cefc13a2cd
Docs say should allow GCM to reregister on app upgrade. And that the
...
registrar takes care of storing devid. So app version when
registration arrives, and get from registrar except after an upgrade.
2012-11-15 21:44:56 -08:00
Eric House
9a4a8c7b26
use static to avoid querying OS for version over and over.
2012-11-15 21:41:51 -08:00
Eric House
f70a5bc6ee
add getAppVersion()
2012-11-15 21:24:54 -08:00
Eric House
bda193029e
add constructor in order to pass SENDER_ID to parent constructor,
...
as docs say to do
2012-11-15 21:14:45 -08:00
Eric House
f64de16ce3
catch and discard all exceptions that come when initing GCM. Fringe
...
devices may do anthing at that point.
2012-11-15 07:03:32 -08:00
Eric House
5afd93c5f5
fix NPE on Kindle
2012-11-15 06:42:27 -08:00
Eric House
c4df31892e
Fix occasional infinite loop of devices sending and receiving the same
...
message over and over when getting updated by GCM. The problem
occurred when one device had an un-ACKable initial message still in
its queue. I call resendAll a lot, which caused that message to get
resent to the other game which then replied without being able to ACK
it so it remained to be sent again. This would continue until users
moved forward in the game. The fix is to add a backoff timer to
resendAll() so that it can't loop. The timer is reset when an ackable
and new message is received, meaning there's been a change in what's
available to resend. And since users calling resendAll manually
expect it to do something, add a force param that ignores the backoff.
seems to fix the problem (but needs a lot of testing.)
2012-11-13 21:25:03 -08:00
Eric House
082e6a61f7
comment out unused command
2012-11-12 20:57:39 -08:00
Eric House
76c938cc67
fix to compile with API change; to drop relayid when it's rejected and
...
to use register with the GCM id on next [re]connect; and to not leave
variable unintialized when unable to call into java world due to being
called without context.
2012-11-12 08:03:25 -08:00
Eric House
4f3c81417d
go back to logging devids for now
2012-11-12 08:01:24 -08:00
Eric House
ba733634cb
NPE: don't crash on first install
2012-11-09 06:57:37 -08:00
Eric House
ff16db5c10
remove logging
2012-11-08 20:09:16 -08:00
Eric House
0f21f849d9
fix crash attempting to download dict when there's no network, e.g. in
...
airplane mode.
2012-11-08 20:08:20 -08:00
Eric House
0ef7c8bf46
return TYPE_NONE on devices like Kindle that don't do GCM instead of
...
an empty string claiming to be a GCM ID.
2012-11-08 19:58:03 -08:00
Eric House
07123ac823
cleanup: remove logging and only check for messages when the json data
...
holds that command.
2012-11-08 19:54:09 -08:00
Eric House
283045c649
revert previous trivial change
2012-11-08 19:23:52 -08:00
Eric House
49117927db
start process of allowing DlgDelegate to handle more than one dialog
...
at a time. Step one is to move all the data into a singleton. Once
that seems to work (excepting in the cases that fire assertions or lead
to dropped dialogs now) move to using a queue of them. Right now it crashes
with an assertion on dismissing the second dialog.
2012-11-08 19:05:23 -08:00
Eric House
3b1f6a695f
don't show "can't do GCM" Toast on Kindle Fire
2012-11-08 06:38:35 -08:00
Eric House
aafcd5144a
Better Kindle fix: don't even post message if SMS not supported.
2012-11-07 19:46:33 -08:00
Eric House
949b804f35
fix NPE on Kindle Fire, which has no SMS DB. Duh.
2012-11-07 19:43:08 -08:00
Eric House
1e13d6ac6c
look for values in msg sent from server, including one that puts up a
...
message via a notification.
2012-11-06 19:09:15 -08:00
Eric House
39dbed2004
add missing util method (fixing crash) and with it wire up new devID
...
scheme: now relay-assigned shorter id will be saved and used for
future games.
2012-11-06 07:08:06 -08:00
Eric House
41cfacfee4
don't crash on emulator (which doesn't have library required by GCM)
2012-11-05 06:20:55 -08:00
Eric House
03108f311a
Merge branch 'android_branch' into android_gcm
2012-11-05 06:14:21 -08:00
Eric House
0376e25c26
Merge branch 'fix_beta_53' into android_branch
2012-11-05 05:43:33 -08:00
Eric House
bb2e3ffdb1
fix (by dropping second message) assert that there is no first
...
message. This is a TEMPORARY fix.
2012-11-04 21:36:20 -08:00
Eric House
3942a49cac
Add a debug preference allowing to provide, or override, the download
...
dir. This will let users work around bugs on devices like my Blaze 4G
where the OS gives the wrong path, and also allows testing. Inval
DictUtil's dict cache eash time this is changed, so in effect adding a
wrong path pref hides all dicts in the Downloads dir.
2012-11-04 17:47:30 -08:00
Eric House
69108fd8a1
cleanup: import class to make declarations shorter.
2012-11-04 17:33:07 -08:00
Eric House
30675cfd3e
remove logging
2012-11-04 17:21:37 -08:00
Eric House
90480aca4c
don't put up toast when checking SMS DB
2012-11-04 07:40:24 -08:00
Eric House
4dd094b2b3
if the download dir doesn't exist (and on my "Blaze 4G" the function
...
getDownloadCacheDirectory() returns a path that doesn't) then don't
offer to move things there.
2012-11-03 17:26:43 -07:00
Eric House
47f9eb03b9
merge in changes from the -gcm directory: GCM will be a feature of the
...
non-variant build now.
2012-11-02 05:35:31 -07:00
Eric House
ecd6d81228
Merge branch 'android_branch' into android_gcm
2012-11-01 19:50:07 -07:00
Eric House
a73a5e8077
there seems to be no way to fix the warning so add comment
2012-11-01 19:46:38 -07:00
Eric House
364acb6dcd
cleanup: remove some logging and unused string resources
2012-11-01 19:32:29 -07:00
Eric House
27935752a8
check cursor still open in attempt to fix crash seen on Galaxy Nexus
2012-11-01 18:39:26 -07:00
Eric House
057a41e4a9
check cursor still open in attempt to fix crash seen on Galaxy Nexus
2012-11-01 07:59:42 -07:00
Eric House
3e289adc18
move related methods together
2012-11-01 07:58:27 -07:00
Eric House
1b7a618454
send the right dev id
2012-10-31 06:03:31 -07:00
Eric House
6014e3d76f
turn on devid code and implement support in java. Untested, but should work.
2012-10-30 07:57:17 -07:00
Eric House
c93dfd6605
Merge branch 'android_branch' into android_gcm
...
Conflicts:
xwords4/android/XWords4/res/values/common_rsrc.xml
2012-10-30 07:10:42 -07:00
Eric House
80a79b6991
Make it less likely that a message received while I'm not intercepting
...
them will be opened more than once: track whether I've searched the
SMS db, and only clear that setting when SMS play is *disabled*.
2012-10-29 21:20:32 -07:00
Eric House
ba0f91c438
cleanup: use constant
2012-10-29 20:43:02 -07:00
Eric House
e90621ec1d
use existing string rather than invent a new one
2012-10-29 07:30:09 -07:00
Eric House
e39b776d80
Add button to alert warning that SMS isn't on that takes you to
...
Preferences.
2012-10-29 07:20:11 -07:00
Eric House
d7d666e4f9
Merge branch 'android_branch' into android_gcm
2012-10-25 08:12:02 -07:00
Eric House
6e39466b09
somehow new dict-download code is storing some in info DB with
...
langcode of 0. Work around that by rebuilding cache entry when that's
seen.
2012-10-25 08:03:56 -07:00
Eric House
6180834ada
log case where game has no dicts
2012-10-25 08:02:30 -07:00
Eric House
4ed1446e06
Fix new bug: don't null out default dict just because we don't have one.
2012-10-25 07:58:39 -07:00
Eric House
f2684e5652
log device ID even when it's not newly assigned
2012-10-25 06:24:19 -07:00
Eric House
4c1c0ddaaa
Merge branch 'android_branch' into android_gcm
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
2012-10-24 08:05:50 -07:00
Eric House
9bb8c9cddf
don't allow change of dict in in-play networked game
2012-10-24 08:01:52 -07:00
Eric House
3d14ed96e7
cleanup and rename method
2012-10-24 07:40:14 -07:00
Eric House
643a301214
cleanup: add additional param to downloadFinished() iface method
2012-10-24 07:22:26 -07:00
Eric House
aec03fc572
When a game's consumated and guest discovers it isn't using the same
...
dict, give chance to switch, and to download if required. Because of
the way the JNI thread works, and JNI's requirement in general that
env instances match up (e.g. dicts must be destroyed in the same
thread that creates them), substituting into a live game is too hard.
So the game's saved with its new dict and then reloaded.
2012-10-24 07:17:21 -07:00
Eric House
521d7042be
remove redundant class name (no code change)
2012-10-23 06:50:49 -07:00
Eric House
1ce7b36b59
add pref to replace querying on each download where to store dict.
...
And use new background-download for update-triggered downloads.
2012-10-22 19:35:47 -07:00
Eric House
80e2b8955e
comments to remind not to remove code not called from java; no code change
2012-10-22 19:29:05 -07:00
Eric House
8e911fef05
use import to shorten type -- no code change
2012-10-22 07:30:44 -07:00
Eric House
ca561f225c
make dict storage location a default set in preference rather than
...
something queried each time.
2012-10-22 07:06:12 -07:00
Eric House
6ba5d4f7c8
use new internal download code for download to get dict required for
...
SMS invite as well. Still to do: put back the query for where the
thing should be stored. Hard-coded to go in INTERNAL for now.
2012-10-20 18:28:14 -07:00
Eric House
13557b6e25
use Utils.showToast() everywhere
2012-10-19 18:03:00 -07:00
Eric House
04f56ccf74
download dicts without the browser. This is a partial implementation
...
that will need to be generalized and used in other places, basically
whenever the full URL can be known.
2012-10-19 17:57:17 -07:00
Eric House
6c34f43df7
show toast when update requested manually and nothing found
2012-10-18 19:51:40 -07:00
Eric House
cb1a0093c3
Merge branch 'android_branch' into android_gcm
2012-10-17 21:23:09 -07:00
Eric House
e5feded0b1
When receiving an invite for a dict we don't have, post a notification
...
to DictsActivity that offers to download, and on download completion
arranges for notification of SMSService so the game can be created.
2012-10-17 21:20:08 -07:00
Eric House
3e83af3b97
pass dict name (in addition to language) with SMS invite, and
...
currently on recipient device refuse to create a game if dict not
installed. Next step is to give a choice to download the thing or
decline.
2012-10-17 07:11:39 -07:00
Eric House
04f51bd392
add haveDict()
2012-10-17 07:10:08 -07:00
Eric House
a8c77bca88
fix NPE
2012-10-17 07:01:01 -07:00
Eric House
de5dcdc5f9
starting new variant for GCM
2012-10-16 07:41:04 -07:00
Eric House
077270f1cd
merge in SMS-version UI -- there will not be a separate version for
...
SMS any more.
2012-10-15 08:29:46 -07:00
Eric House
eb47e75c50
put up more user-friendly message when dicts don't match.
2012-10-15 08:07:17 -07:00
Eric House
5f247db29c
use the same missing-players message for all three connection types
...
(even though the way they're reported is, though shouldn't be,
different.)
2012-10-15 07:31:02 -07:00
Eric House
c811282591
UI change: networked games are no longer allowed to have per-player
...
dicts. Now you select a single dict for such games in a new spinner
just below the lang spinner, and player's dicts are no longer
displayed. For standalone games, the single dict choice isn't there,
the individual dicts are displayed, and you must open a player config
to change the dict as before. The idea is that this will be less
confusing, particularly when I need to tell the guest that the host is
using a different dict.
2012-10-14 19:21:27 -07:00
Eric House
ce58750b92
change "resign" menu text once game is over
2012-10-08 07:09:44 -07:00
Eric House
e64ecfb78d
implement resign on top of existing endGame logic, adding "quitter" as
...
new param passed to remote and changing final score formatting and
menu items to match. Still need to show old menu on android in case
where game has already ended.
2012-10-07 12:47:06 -07:00
Eric House
b11da9d8eb
use GamesList's Handler to set timers to redraw turn expiry indicators
...
when the percent left changes. This may be done -- except for
deciding what to do when the time actually runs out.
2012-10-02 07:30:31 -07:00
Eric House
0a60419802
make ExpiringDelegate responsible for figuring percentage of time left
...
given start time and having a constant for how long a turn lasts. Eventually
the constant will be replaced by a second number passed in.
2012-10-01 19:07:23 -07:00
Eric House
cd776a34dd
Revert "Display turn start time in game summary. This is definitely not its"
...
This reverts commit ebaa22594d
.
2012-10-01 17:53:35 -07:00
Eric House
0579253b8d
Also override TextView to show turn left there. Works, requiring only
...
that actual percentage of turn remainning be calculated.
2012-10-01 07:24:45 -07:00
Eric House
50b10cd365
new classes overriding LinearLayout to allow framing is-turn rect to
...
be drawn in two colors showing how much time left for turn. Required
because there's no (reasonably-easy) way to create nine-parts
dynamically.
2012-10-01 06:57:40 -07:00
Eric House
8281bd7f10
call back into java for util_getCurSeconds implementation so java and
...
C world are sure to be using the same clock.
2012-09-29 19:27:02 -07:00
Eric House
ebaa22594d
Display turn start time in game summary. This is definitely not its
...
final form!
2012-09-27 07:48:30 -07:00
Eric House
2c89f13383
add turn as param to util_turnChanged, and call from server rather
...
than board.
2012-09-27 07:04:57 -07:00
Eric House
94103a4212
track time of most recent turn start, and include it in summary table.
2012-09-27 06:55:46 -07:00
Eric House
140c982d41
merge from android_branch
2012-09-24 07:39:44 -07:00
Eric House
4909dde622
call a script rather than an html file so file doesn't have to be
...
updated with every release.
2012-09-24 07:35:14 -07:00
Eric House
c76c5f5868
don't create obits for apps that don't have relayIDs (and presumably
...
never connected.)
2012-09-20 07:45:04 -07:00
Eric House
96e277c7ba
don't offer to copy DB from sdcard when there is none.
2012-09-20 07:29:00 -07:00
Eric House
a601d0818e
save and restore search prefix even when find button not clicked, and
...
display last scroll position when different from what prefix finds.
2012-09-18 07:51:50 -07:00
Eric House
210913d4d4
track dictbrowse info for multiple copies of same dict if that's
...
what's installed.
2012-09-18 07:36:54 -07:00
Eric House
fcecd1db3c
don't ask for column no longer there
2012-09-18 06:38:22 -07:00
Eric House
33772ff0b9
remove redundant DB field and variable
2012-09-15 17:11:59 -07:00
Eric House
a939c9ec4b
cleanup
2012-09-15 17:11:45 -07:00
Eric House
937bde6378
combine two jniutils methods into one
2012-09-15 15:21:31 -07:00
Eric House
bcc8c0c249
remove code figuring md5sum on full dict file; the sum on data is all
...
we're using now.
2012-09-13 19:33:17 -07:00
Eric House
aa974be567
Before figuring md5sum (via java callback added recently), use new
...
callback to see if there's already one in the DB. Required passing
context into jniutils getter, and passing name into jni dict
constructors that previously didn't need it.
2012-09-13 07:38:08 -07:00
Eric House
edc6b9c270
Merge branch 'android_branch' into android_dictdb
2012-09-13 05:40:08 -07:00
Eric House
3e4384c2a8
when dict doesn't have built-in md5sum, or when in DEBUG code, call
...
back into java to get a sum. It's very slow for large dicts, but will
eventually be in a DB so only done once per dict that doesn't have it.
2012-09-13 05:39:44 -07:00
Eric House
13507e6fc2
break dict info table in two, one browse state and one for what's been
...
stored in static data in DictLangCache up to now -- and remove that
static data in favor of the new table.
2012-09-12 19:50:03 -07:00
Eric House
67b0d44f26
save search prefix too
2012-09-12 07:55:41 -07:00
Eric House
ce6356fb92
add new db table for tracking dict-releated stuff. Use it to save
...
state in wordlist browser so can return to same place as left for each
dict. Eventually the new table should replace DictLangCache.
2012-09-12 07:44:58 -07:00
Eric House
0ccc2331b5
address bug where message was getting ACK'd by a device that failed to
...
save what it had ACK'd leaving the game permanently broken. Do that
by adding a new method game_saveSucceeded() called after the client
claims to have committed bytes returned by game_writeToStream() to
disk. In that method comms updates the value it'll use in subseqent
ACKs.
2012-09-10 07:31:45 -07:00
Eric House
95a7b14a3a
transmit dict's md5sum along with name in initial message from host to
...
guest. On guest, pass that sum into client code along with names so
the appropriate tests can be done and corrections taken.
2012-09-08 20:23:48 -07:00
Eric House
f90e6343c7
don't crash if no dict info
2012-09-08 20:22:22 -07:00
Eric House
9a72f252ed
Merge branch 'android_branch' into android_dictname
2012-09-08 13:20:59 -07:00
Eric House
5a81484cf1
add md5Sum to DictInfo and add a getter
2012-09-08 10:11:18 -07:00
Eric House
4f180e9e14
pass rejecting dict name into java layer and display as part of turn
...
lost message.
2012-09-06 19:04:40 -07:00
Eric House
fa90150055
Revert "As an experiment, lower case words being looked up. Apparently one of"
...
This reverts commit 5bdebd445f
.
2012-09-05 19:20:05 -07:00
Eric House
5bdebd445f
As an experiment, lower case words being looked up. Apparently one of
...
the Catalan sites doesn't like upper case. At least in theory no site
should care so the rest of the world should be ok with lower case too.
2012-09-04 19:03:53 -07:00
Eric House
270a19f3aa
Revert "first of a set of changes to communicate to clients dictionary being"
...
This reverts commit b7a0f1489b
, which I didn't mean to check in on this branch.
2012-09-03 21:34:51 -07:00
Eric House
ea4d805d5f
first of a set of changes to communicate to clients dictionary being
...
used by server. Clients need to care if e.g. the server's disallowing
phonies based on its dict. Can only be sent if client is of latest
version. In that case, common code calls into new util function. In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it. Once it's available, will want to install it.
2012-09-03 21:33:46 -07:00
Eric House
b7a0f1489b
first of a set of changes to communicate to clients dictionary being
...
used by server. Clients need to care if e.g. the server's disallowing
phonies based on its dict. Can only be sent if client is of latest
version. In that case, common code calls into new util function. In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it. Once it's available, will want to install it.
2012-09-03 21:29:21 -07:00
Eric House
adab1b5cea
replace getString() calls that fetch format strings then apply them
...
with calls to the formatting (varargs) version of getString(). Should
be no behavior change.
2012-08-30 19:18:08 -07:00
Eric House
da4ec16ba4
remove one-release logging confirming getInstallerPackageName result.
2012-08-27 06:15:11 -07:00
Eric House
c5f21a3517
new field to be populated if dict desc header is found.
2012-08-26 21:00:21 -07:00
Eric House
08aa9b66e8
also load new desc field in android client, and add jni call to retrieve it
2012-08-26 20:59:17 -07:00
Eric House
efb7a9b5c5
call loge rather than logf from within catch statements
2012-08-23 07:08:17 -07:00
Eric House
47822e94e3
remove comment
2012-08-23 06:38:57 -07:00
Eric House
8f6486b381
add psuedo-unique device id to update messages; log installer once
...
(which will only matter once it's on the market)
2012-08-22 19:10:38 -07:00
Eric House
1423968098
check every day, not every seven, for users who've said they want the
...
intermediate builds.
2012-08-21 18:55:44 -07:00
Eric House
31ef5026be
use constants for json params so easier to paste into python code
2012-08-21 07:43:49 -07:00
Eric House
cc4549e7d3
add debug pref controlling whether non-release updates are installed.
...
(passed to info.py, but is ignored there so far)
2012-08-20 07:23:13 -07:00
Eric House
fca1621ad0
use json to do app and all dict queries in one transaction
2012-08-18 07:42:42 -07:00
Eric House
07c6d57233
pass git version and installer name (usually empty) as part of update
...
for more granularity
2012-08-16 21:49:52 -07:00
Eric House
75d8820b98
make check-for-updates a debug-only menuitem
2012-08-16 07:48:34 -07:00
Eric House
5584a66043
run update checks off a timer that adds a random element to its
...
interval; move update check URL into a debug pref.
2012-08-16 07:43:57 -07:00
Eric House
6bdec885b1
add nextRandomInt() to Utils and use it
2012-08-16 07:26:51 -07:00
Eric House
6226efe8d6
move remaining non-jni prefs stuff from CommonPrefs to XWPrefs. No
...
other changes.
2012-08-16 06:31:23 -07:00
Eric House
81d7903aa3
move new version checking stuff into new file
2012-08-15 19:24:57 -07:00
Eric House
e749aedd34
return url inside a json rather than just a url for more flexibility
...
and so python's error messages don't trigger Notifications that then
fail.
2012-08-15 18:55:54 -07:00
Eric House
4b318070ca
remove unused imports
2012-08-15 18:52:56 -07:00
Eric House
910bb2a5a0
add new function loge that takes an Exception and logs a stack trace
...
for it
2012-08-15 18:52:31 -07:00
Eric House
6947c50238
pass lang instead of lang code; include app name in notification text
2012-08-15 07:22:10 -07:00
Eric House
cd340aba0c
post notification on receipt of url for new app that'll result it it's
...
being downloaded.
2012-08-15 06:53:13 -07:00
Eric House
7cb68f1c85
post notification when new dict is available and download it in
...
when notification selected.
2012-08-15 06:10:39 -07:00
Eric House
8b6af3fdb9
add md5sum calculator for dicts and use to send POST that checks if
...
they're current.
2012-08-14 07:13:03 -07:00
Eric House
3ef81f248b
start on checking for updates/latest version: a menu item that
...
triggers new code that sends an HTTP POST to a python script on the
server that returns whether the current version is correct.
2012-08-13 21:10:22 -07:00
Eric House
9128c2d60c
factor code into new method copyFileStream
2012-08-13 07:45:14 -07:00
Eric House
8562503cd9
show status icon as red when SMS game and airplane mode on. (Better
...
would be to track radio state in NetStateCache.)
2012-07-31 06:47:52 -07:00
Eric House
4414943f90
implement loading saved DB from /sdcard
2012-07-30 18:36:41 -07:00
Eric House
af2c361225
add debug menu option to enable debug features, and first such
...
feature, to copy xwdb file to /sdcard. Option to do opposite is
stubbed out.
2012-07-30 07:23:52 -07:00
Eric House
e70fbda502
don't send packets if SMS play disabled
2012-07-26 07:21:16 -07:00
Eric House
1abba7e560
fix crash on first install: context !always= PrefsActivity
2012-07-26 07:20:39 -07:00
Eric House
9c670804f2
draw status icon background red when SMS turned off.
2012-07-25 23:26:24 -07:00
Eric House
bc91956e20
put up an alert when SMS game opened but SMS is disabled. (Does not
...
have a button taking you to settings.)
2012-07-25 07:15:57 -07:00
Eric House
cd1eb2e4da
add pref enabling SMS games, and a scary confirmation dialog meant to
...
force user to realize the potential costs (by requiring interaction).
Until that's enabled, show in New Game activity an explanation and
button that goes to Preferences.
2012-07-24 07:15:27 -07:00
Eric House
4f437f0d55
don't start SMS receivers on device without a phone
2012-07-24 07:09:37 -07:00
Eric House
8e961fcb4c
remove logging
2012-07-24 06:56:55 -07:00
Eric House
b7247d259c
add superclass for CommonPrefs that can hold stuff not related to
...
jni/common code.
2012-07-23 22:42:38 -07:00
Eric House
9df8086476
no SMS game option if device has no phone
2012-07-21 19:02:23 -07:00
Eric House
549c826c9a
show SMS message send/receives from BoardActivity where a hander's
...
available.
2012-07-20 21:36:59 -07:00
Eric House
54b4478582
show orange arrows briefly when net traffic goes in or out
2012-07-20 18:11:02 -07:00
Eric House
2a25bae706
don't use cached bitmap if board's been resized
2012-07-19 06:54:56 -07:00
Eric House
a5c3c7e548
fix layout on wider screens (e.g. 768x1024): rather than draw the
...
board so wide that scrolling's required, reduce width enough that it's
not.
2012-07-18 07:07:53 -07:00
Eric House
516a1800a0
Add board-size to game config. It makes no sense for it to exist in
...
per-game defaults but not be settable in config. But it may make more
sense to remove both options/locations entirely, or hide them by
default.
2012-07-16 07:15:33 -07:00
Eric House
9b0436d1ee
Make rem string measure function return boolean to indicate rect will
...
be invisible rather than setting width and height to 0. No real
change beyond simplifying/speeding platform code.
2012-07-15 09:30:27 -07:00
Eric House
d602a0c22b
fix reported NPE by saving variable in bundle passed to onCreate
2012-07-14 14:53:57 -07:00
Eric House
479ed0dc58
update conn status on receipt or send of packets to/from relay, not
...
just when relay connect status changes. This means that a game will
show as connected when it's still waiting for another device to join
room, but also fixes exchanging moves over 10 minutes and having the
status icon say you haven't sent or received in that long. This could
be improved.
2012-07-12 21:15:35 -07:00
Eric House
a3de089e15
remove unused constant
2012-07-12 06:34:54 -07:00
Eric House
abcdafe56a
always invalidate board view to force layout/draw. Fixes crosshairs
...
not going away, and board being unresponsive, after lookup activity is
dismissed.
2012-07-12 06:34:01 -07:00
Eric House
d3b56f4167
don't show rem text when -1
2012-07-12 06:15:53 -07:00
Eric House
11bd4a73fe
oops: fix centered text drawing.
2012-07-11 06:17:36 -07:00
Eric House
bad6c599f8
more tweaks to tray tile drawing: make small screen letters 3/4 height
...
even though numbers are 1/3 and overlap is in theory possible; put 1/5
of extra space to left of letters so they don't hug the edge.
2012-07-10 21:04:54 -07:00
Eric House
c2956f4064
save net status state on a timer (when handler is available) waiting
...
five seconds.
2012-07-10 06:21:49 -07:00
Eric House
bd70a1dd7d
improve text in remaining tiles dialog, and always show the tiles for
...
all trays rather than excluding those in current player's tray.
2012-07-09 21:44:29 -07:00
Eric House
e6f02ee3c7
when drawing letter in tray tile, only shift origin left of edge when
...
letter width exceeds that of tile.
2012-07-09 07:03:39 -07:00
Eric House
5702c83f17
do string formatting properly, using resources and StringBuffer.
2012-07-09 06:56:08 -07:00
Eric House
e7b0727e0c
leave remaining-tiles in place when pool count drops to 0.
2012-07-09 06:07:26 -07:00
Eric House
9885d3bf61
draw letters in tray tiles as far to left as possible
2012-07-07 19:55:19 -07:00
Eric House
7f087181e5
Don't store current network connType in ConnStatusHandler; instead
...
pass the one for which we want icon displayed or status text
generated.
2012-07-07 19:45:18 -07:00
Eric House
0c02103d42
fix assertion failures due to failure to get game locks. The problem
...
is that getSummary() can be called at unpredictable times by
background tasks for the games list, and the current open game holds a
lock as long as it's open. So those getSummary() calls must be
allowed to fail. Before, letting them fail immediately meant
empty/unusable list elements; now I've added a time they'll wait
before failing. Now the ones that are called while a game is open can
fail without being noticed, but the ones that are called as a game is
closed to update its summary will succeed by being able to wait for
its lock to be given up.
2012-07-07 11:34:40 -07:00
Eric House
052725aabc
fix problems with serialization: use types that are serializable, and
...
init transients correctly.
2012-07-07 11:05:07 -07:00
Eric House
43fead368c
make Random class static rather than generate one over and over
2012-07-07 09:27:27 -07:00
Eric House
3c19a7ef44
tolerate failure to get lock for five seconds before asserting (up
...
from one.)
2012-07-06 07:14:01 -07:00
Eric House
75602c47d8
on Amazon-made devices only, sleep randomly during load of game
...
summary. This seems to work around a bug where only the last item in
the list is clickable but once it's clicked events are received for
every failed click up to that point.
2012-07-06 07:13:11 -07:00
Eric House
9a23473b2f
use a dummy TextArea instead of an empty custom view as a placeholder
...
for loading game summary view.
2012-07-06 06:49:09 -07:00
Eric House
d6fdd24637
move interface methods together -- no code change
2012-07-06 06:10:04 -07:00
Eric House
1ad0a899f0
don't return from getSummary without succeeding, even if must wait on
...
lock. Fixes problem with blank entries in game list after returning
from config screen.
2012-07-03 20:30:31 -07:00
Eric House
8ebe180eab
fix NPE
2012-07-02 06:59:35 -07:00
Eric House
2e6b64a4e4
complete implementation of java part of one-pass scoreboard draw. Now
...
looks pretty much identical to what the old code draws except that
rather than having width allocated in proportion to requested size all
get the same width except the one whose score it is which gets 2x.
2012-07-01 17:24:50 -07:00
Eric House
c41c877ae7
fix right edge of scaled text getting clipped by paying attention to
...
where getTextBounds() says its left edge is.
2012-07-01 17:05:39 -07:00
Eric House
5cd8ab2b33
remove uncalled method -- no change.
2012-07-01 15:57:20 -07:00
Eric House
2ae6bd8caf
override onMeasure to make BoardView only as large as it needs to be
...
so that on tall narrow screens (e.g. Kindle Fire) there's no white
space between the tray and the buttons.
2012-07-01 12:54:38 -07:00
Eric House
89ffd972bf
more work on single-pass scoreboard drawing. Now the jni stuff is
...
finished, but disabled via compile-time flag, and there's a
commented-out rudimentary implementation on the java side.
2012-07-01 10:04:10 -07:00
Eric House
69b0a0d4a3
load conn state for sms app too
2012-06-28 07:22:10 -07:00
Eric House
9b9aec45da
format status timestamps in terms of how long ago (using
...
getRelativeDateTimeString); save and restore serialized timestamps.
2012-06-28 07:20:28 -07:00
Eric House
52e70bff3d
rename method; make [g|s]etPrefsString public
2012-06-28 07:17:48 -07:00
Eric House
065446def4
paint status area background manually in red or green and use a single
...
transparent background icon for success and failure.
2012-06-27 06:44:24 -07:00
Eric House
13633186ff
don't reset variable unless changed
2012-06-26 06:50:54 -07:00
Eric House
8ff27cc075
include "sms" or "text" in chooser title
2012-06-24 14:46:02 -07:00
Eric House
5eb937dede
use deviceSupportsSMS() to skip asking user whether to invite vis SMS
...
or email when SMS isn't an option. Assumption: email *is* available,
which it isn't if it hasn't been configured yet.
2012-06-24 14:43:57 -07:00
Eric House
392f4239d7
add deviceSupportsSMS() -- which checks phonetype, i.e. that there's no phone.
2012-06-24 14:42:46 -07:00
Eric House
7dfe5ba8e1
inval status icon when there's a change so it gets updated.
2012-06-21 18:28:45 -07:00
Eric House
10b47257e9
flesh out new connection status icon: track times and give meaningful
...
message. Still to do: [de]serialize state, and separate global from
per-game somehow. Might also want to include game state (e.g. whether
in a game or still looking.)
2012-06-20 07:50:08 -07:00
Eric House
2b9fb13dbd
Merge branch 'android_smallscreen' into android_branch
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
2012-06-20 06:14:37 -07:00
Eric House
c2c1fe4f89
attempt to improve scoreboard drawing when names are long or numerous
...
enough to crowd by using same math to figure height when measuring as
when drawing, but it still needs work.
2012-06-19 07:44:26 -07:00
Eric House
964c4cecd8
add dict-browse menuitem to small-screen board menu and on same move
...
undo/redo up per user request
2012-06-19 06:19:03 -07:00
Eric House
bb5cd677ab
make turn color public so can be used from board too (though I'm not
...
doing that yet.)
2012-06-19 06:19:03 -07:00
Eric House
9d8e1ec261
cleanup: one-letter variables are bad.
2012-06-19 06:19:03 -07:00
Eric House
c34f70f9eb
fix bug where current player's scoreboard would disappear if other
...
players' names were too long by giving all a the same proportion of
what they request and passing in the percent given in case draw
implementation wants to use it as a cue to truncate.
2012-06-19 06:19:03 -07:00
Eric House
545cf9166f
show green border in contracted view too when appropriate, and not
...
only for net games.
2012-06-19 06:18:16 -07:00
Eric House
d46c827b4c
reduce min tray height to twice cell height, and tweak layout on
...
small-screen devices to make the value readable.
2012-06-19 06:16:36 -07:00
Eric House
2e2df3dc17
add hasSmallScreen()
2012-06-19 06:11:16 -07:00
Eric House
a65e1dfa79
add menus for small-screen devices to provide functionality others get
...
from toolbar.
2012-06-19 06:11:16 -07:00
Eric House
5d9381e1bc
change text of menu from hide rack to show rack depending on hidden state
2012-06-19 06:11:16 -07:00
Eric House
78dfd6267c
include trayVisState in GameStateInfo on the java side
2012-06-19 06:11:16 -07:00
Eric House
b78ea03ea6
add board layout for small case that doesn't include toolbar or
...
exchange-state buttons, and check for presence of Views that may now
be missing. With this checkin small screen devices don't have access
to toolbar functionality -- new and expanded menu will be required for
them.
2012-06-19 06:11:16 -07:00
Eric House
1e9928e7f3
add commented-out toString() for debugging
2012-06-19 06:11:16 -07:00
Eric House
d7f576d6b7
fix board dimensioning for small (needs-scrolling) screens. Since this
...
effects larger screens needs some testing.
2012-06-19 06:11:16 -07:00
Eric House
9ac5113c93
add dict-browse menuitem to small-screen board menu and on same move
...
undo/redo up per user request
2012-06-15 07:00:18 -07:00
Eric House
628c058c4c
make turn color public so can be used from board too (though I'm not
...
doing that yet.)
2012-06-15 06:44:39 -07:00
Eric House
6beb572180
cleanup: one-letter variables are bad.
2012-06-15 06:43:54 -07:00
Eric House
405cb23023
fix bug where current player's scoreboard would disappear if other
...
players' names were too long by giving all a the same proportion of
what they request and passing in the percent given in case draw
implementation wants to use it as a cue to truncate.
2012-06-15 06:26:40 -07:00
Eric House
46770ac0cb
show green border in contracted view too when appropriate, and not
...
only for net games.
2012-06-12 07:19:18 -07:00
Eric House
e3401724e1
new icons for network status and code to draw them, so far hard-coded
...
to show success.
2012-06-11 19:23:01 -07:00
Eric House
266e9ba91a
reduce min tray height to twice cell height, and tweak layout on
...
small-screen devices to make the value readable.
2012-06-11 07:01:36 -07:00
Eric House
ac74e2e832
add new class that will be responsible for drawing network status icon
...
at right end of scoreboard. It now shows the same icon as the games
list per connection type and gives a stubbed-out status message dialog
when tapped. Still need to add actual status: when was the last
successful send or receive; and need to add decorations to show
connection state.
2012-06-10 07:40:33 -07:00
Eric House
4fc33fe4e5
add hasSmallScreen()
2012-06-09 10:01:41 -07:00
Eric House
9827ea1b39
add menus for small-screen devices to provide functionality others get
...
from toolbar.
2012-06-06 06:48:55 -07:00
Eric House
b8bad58125
change text of menu from hide rack to show rack depending on hidden state
2012-06-05 22:19:44 -07:00
Eric House
6257c14436
include trayVisState in GameStateInfo on the java side
2012-06-05 22:13:58 -07:00
Eric House
e15c104eb4
add board layout for small case that doesn't include toolbar or
...
exchange-state buttons, and check for presence of Views that may now
be missing. With this checkin small screen devices don't have access
to toolbar functionality -- new and expanded menu will be required for
them.
2012-06-05 07:42:39 -07:00
Eric House
c5358dc9c3
add commented-out toString() for debugging
2012-06-05 07:41:00 -07:00
Eric House
b3cf9c65aa
fix board dimensioning for small (needs-scrolling) screens. Since this
...
effects larger screens needs some testing.
2012-06-05 07:38:58 -07:00
Eric House
27ddc355ed
don't bother cloning message when it'll be passed to multiple games.
...
Clone was too late, and there's no chance of modification of the
contents.
2012-05-30 06:54:30 -07:00
Eric House
a03dc80205
tweak method for clarity -- no behavior change
2012-05-30 06:52:08 -07:00
Eric House
2db02f9aa5
fix delegated dialogs to clear state before issuing dismiss callback
...
so that callback can set up another dialog without tripping an assert,
then move SMS invite dialog chaining from on-click callback to
on-dismiss.
2012-05-23 07:16:27 -07:00
Eric House
622afa4d98
track what games we've sent died notices for and don't repeat. Fixes
...
infinite message flood occurring when a packet was received after
games had been deleted on both devices.
2012-05-21 21:47:09 -07:00
Eric House
e80417e806
don't draw separate icon in games list elements for needs-sync relay
...
game -- since that state no longer really exists.
2012-05-21 21:23:13 -07:00
Eric House
adac3abcc6
fix bug where all notifications wound up launching the same game
...
because all their PendingIntents were the same by passing a unique
resultCode on creation.
2012-05-21 06:46:37 -07:00
Eric House
f56b09980c
include game name in notification text
2012-05-21 06:40:52 -07:00
Eric House
469f63f96f
log when more than one game found with a given ID.
2012-05-20 10:33:26 -07:00
Eric House
1ca36044a0
allow for possibility that there's more than one game on device with
...
one gameID. Currently this should only happen when a device is
playing via SMS against itself -- i.e. when I'm debugging or a user is
playing around. It hasn't been tested and may not work to the extent
that a game like that can actually work and so may want to be backed
out later.
2012-05-20 10:24:37 -07:00
Eric House
211318f2ef
remove logging
2012-05-18 21:23:09 -07:00
Eric House
47a5ab65df
use broadcast receiver for status PendingIntents from SendTextMessage,
...
and pass up new MultiService messages on success or failure. In
response to these, post SMS status icons on board. Still need to come
up with an initial status, notice radio ups/downs, etc. And design icons!
2012-05-18 07:55:10 -07:00
Eric House
9ba663ab98
implement util_phoneNumbersSame in java and call telephony's number
...
compare method. Skip the java call when the numbers are
strcmp-identical.
2012-05-18 07:41:46 -07:00
Eric House
60c3a5bf64
use green_border to frame remote players whose turn it is.
2012-05-18 06:54:05 -07:00
Eric House
3a54aa0ebc
add util_informUndo() that gets called, and puts up a dialog, after
...
remote device has performed an undo on a committed turn.
2012-05-14 07:01:02 -07:00
Eric House
10ad59247a
don't remove undo menuitem for networked games -- should be safe to
...
use now.
2012-05-11 07:26:49 -07:00
Eric House
013d9c689b
fix bug introduced with dictionary lookup of words played that meant
...
trades didn't get reported as remote moves -- it just became your turn
without notice.
2012-05-09 18:22:05 -07:00
Eric House
f6ba94735d
move BT and SMS listener installation behind if_supported tests
2012-05-09 07:09:15 -07:00
Eric House
75247e59df
fix confusing log message
2012-04-26 19:12:13 -07:00
Eric House
b68b8aa0d0
for extra safety, move message hash into header where it can be part
...
of test whether message should be deleteted from sms inbox.
2012-04-24 07:19:52 -07:00
Eric House
9035f901b1
fix NPE for non-SMS case
2012-04-23 21:46:27 -07:00
Eric House
6930da9686
add warning about unlimited SMS plans that's triggered whenever a new
...
number is added to the list of possible invitees.
2012-04-23 20:07:44 -07:00
Eric House
010fae495b
fix compile error
2012-04-23 07:37:02 -07:00
Eric House
2082b40d4a
look up names from phones rather than store them separately
2012-04-23 07:32:42 -07:00
Eric House
f7c9e0cc16
use name in summary where available
2012-04-23 07:31:33 -07:00
Eric House
b2a1fefd26
synchronize access to phone-to-name hash
2012-04-23 06:55:00 -07:00
Eric House
07c1d68321
syntax error!
2012-04-23 06:54:23 -07:00
Eric House
97cb3863a6
name constant -- no code change
2012-04-23 06:34:00 -07:00
Eric House
02443d26a9
catch oob exception when older version receives enum not in values() array
2012-04-23 06:30:20 -07:00
Eric House
b34e741e30
add param to phoneToContact controlling whether phone number is
...
returned when name can't be found.
2012-04-23 06:16:06 -07:00
Eric House
d5076e2167
make a couple of methods private
2012-04-23 06:14:02 -07:00
Eric House
a98f9ef12f
refactor; don't rely on otherwise unused i-var.
2012-04-23 06:13:05 -07:00
Eric House
a72dbdd8dd
add static to cache phone->name mapping
2012-04-21 22:16:47 -07:00
Eric House
3af20f1d5a
look up name for phone number in contacts and use in game config.
...
Will want to use elsewhere. May want to cache depending on speed.
2012-04-19 00:37:37 -07:00
Eric House
e5758766f7
test for null comment
2012-04-19 00:36:51 -07:00
Eric House
fd18d8c95a
add boolean param to jni version of comms_resendAll() to ack
...
afterwards. Saves some extra jni calls. Then make comms_ackAny()
separately-useable, and use from BoardActivity after receiving
SMS messages.
2012-04-19 00:03:22 -07:00
Eric House
033a69be8d
to make it easier to tell games apart, print the number[s] of the
...
remote device[s] as part of summary view and in game config screen
(read-only). Use same field in summaries table for remote phone
numbers and bt addresses.
2012-04-18 23:23:36 -07:00
Eric House
d6ad17ad58
don't crash if relayID null
2012-04-18 23:07:14 -07:00
Eric House
8713b9e148
don't crash when relayID is null
2012-04-18 23:05:28 -07:00
Eric House
b4416f3abe
add missing private keyword
2012-04-18 23:04:55 -07:00
Eric House
d67614cd69
send ack after creating game on receipt of SMS invitation. Thought
...
about starting up the game so it could connect, but that'd make it
impossible to change any settings, e.g. player name, on the accepting
end.
2012-04-17 21:46:57 -07:00
Eric House
019a053df0
give move-made notifications ids based on the games they belong to so
...
that there can be more than one, then use those ids to dismiss them if
the game's opened other than through the notifications.
2012-04-17 20:08:37 -07:00