Commit graph

4708 commits

Author SHA1 Message Date
Andy2
785a64123f Merge branch 'android_branch' into android_invite
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
2011-07-19 18:34:39 -07:00
Andy2
30b9df399c Address crash that happened when runnable ran too late by nulling out
m_handler in onPause() and adding new methods that check if it's null
before calling post(), postDelayed() or removeCallbacks() on it.
2011-07-19 18:31:20 -07:00
Andy2
ea853e2e51 replace hard-coded list of preferences whose summaries are their
values and code to enforce that with custom subclasses that do the
right thing automatically.
2011-07-19 18:21:52 -07:00
Andy2
e4ba5fb5fd log svn rev 2011-07-19 18:14:32 -07:00
Andy2
39e752cbc9 add comment explaining change 2011-07-19 06:24:15 -07:00
Andy2
1d2c63d50f Duh. Make it f*cking compile 2011-07-19 06:21:04 -07:00
Andy2
5dd181398d test theory about dropped moves 2011-07-19 06:20:51 -07:00
Andy2
ecaca66a96 move turn-in-range assert to where it won't fail 2011-07-19 06:17:50 -07:00
Andy2
c6be3aca22 Duh. Make it f*cking compile 2011-07-19 06:11:27 -07:00
Andy2
4ffd37d216 test theory about dropped moves 2011-07-18 19:01:34 -07:00
Andy2
d286e7011f FOR DEBUGGING ONLY: test theory about dropped dialogs. 2011-07-18 19:01:02 -07:00
Andy2
863bdac008 fix format specifier to not crash (use %h); remove redundant logging. 2011-07-18 18:30:36 -07:00
Andy2
cd8202f39a move turn-in-range assert to where it won't fail 2011-07-18 18:30:04 -07:00
eehouse@eehouse.org
584d387195 Merge branch 'android_branch' into android_invite 2011-07-18 18:11:18 -07:00
eehouse@eehouse.org
6477147854 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-07-18 18:11:08 -07:00
Eric House
0548f6be66 get rid of some logging 2011-07-18 18:08:56 -07:00
Eric House
47da43a581 use new param to turn on mmap 2011-07-18 18:08:31 -07:00
Eric House
4093e1c947 add option to switch between mmap and malloc for dict runtime access. 2011-07-18 18:07:15 -07:00
Andy2
33188b441d FOR DEBUGGING ONLY: %p segfaults! 2011-07-18 06:55:10 -07:00
Andy2
5deb68486c add a ton of asserts (no code change otherwise) 2011-07-18 06:44:17 -07:00
Andy2
b2d5336fbb FOR DEBUGGING ONLY: add remaining Activity lifecycle methods so
they'll get logged, and log this ptr as well.
2011-07-18 06:43:40 -07:00
Andy2
aa304772c6 FOR DEBUGGING ONLY: always launch GamesList in response to
notification or invite scheme -- just to see how it behaves.
2011-07-18 06:42:59 -07:00
Andy2
9b8126f060 add a ton of asserts (no code change otherwise) 2011-07-18 06:41:31 -07:00
Andy2
cc9f3f9079 FOR DEBUGGING ONLY: Turn off finishing. It's making it behave like
singleTask: go home with board showing and on relaunch we're back to
GamesList.
2011-07-15 21:53:53 -07:00
Andy2
e250fb003b FOR DEBUGGING ONLY: Got some asserts, I think because a new instance
can be coming up before another goes away.  Now we'll actually try
finish()ing a duplicate activity.
2011-07-15 21:24:28 -07:00
Andy2
808eb41d95 FOR DEBUGGING ONLY: register GamesList instance with XWApp and assert
that there's never a second.  I expect that those times I find
multiple instances on the device will catch these asserts after which
I'll figure out what to do (e.g. finish() the older instance...)  This
should not be merged to the shipping branch.
2011-07-15 18:58:39 -07:00
Andy2
655a892e07 FOR DEBUGGING ONLY: reduce shortest poll interval to 2 minutes (though
UI still says five)
2011-07-15 18:57:11 -07:00
Andy2
c482df300b better value for RESIGN_RATIO 2011-07-15 18:24:26 -07:00
Andy2
d81458c34c use nmap -- as test case for doing same in jni 2011-07-15 18:24:08 -07:00
Eric House
febb640049 add name of remote player to notification that remote player moved.
And remove a few dead strings.
2011-07-15 18:13:55 -07:00
Eric House
aec3400677 trivial cleanup 2011-07-15 18:09:40 -07:00
Eric House
8ba7861a7c fix to actually do something 2011-07-15 18:09:13 -07:00
Andy2
9bed15179d version update -- getting ready for next beta! 2011-07-14 18:53:45 -07:00
Andy2
b1f14972e0 remove commented-out foo 2011-07-14 18:53:22 -07:00
Andy2
f1a23a13a8 use a market URL to go directly to the download page 2011-07-14 18:52:59 -07:00
Andy2
4a03867369 add icon; center everything 2011-07-14 18:47:45 -07:00
Andy2
86d17dc615 for now, point at downloadable local rather than market. 2011-07-14 06:42:37 -07:00
Andy2
a4420e130a fix NPEs: not all intents contain all possible elements 2011-07-14 06:18:26 -07:00
Andy2
1dbef02ef6 trim some logging 2011-07-13 21:48:06 -07:00
Andy2
806745683c removed unused param. 2011-07-13 18:42:16 -07:00
Andy2
cd15a9e6e3 fix, I think, problems with launch mode and non-main activities.
singleTop is necessary, as with singleTask we get the whole actvity
stack nuked on every launch.  Open a game into BoardActivity then
background Crosswords; when you re-launch from the launcher or hold
the home key you're back to GamesList.  But with singleTop incoming
invite schemes would launch a second instance because though there was
one running it wasn't in the same task as the browser firing the url
to redir.php.  The solution there is to move the scheme intent from
GamesList to DispatchNotify, which is already handling notifications.
There the addition of a second launch flag means that an existing
instance will always see the launch through its onNewIntent -- under
tests I've come up with so far, anyway.
2011-07-13 18:42:03 -07:00
Andy2
ea205ebf97 when blocking dialogs want to stack, rather than assert, just drop the
second one.  I'm not sure this is the right thing to do, but it won't
matter except when the assert was firing.
2011-07-13 06:13:38 -07:00
Andy2
1686f3d9a8 make --skip-confirm do what it says, and include it in test script. 2011-07-12 07:13:58 -07:00
Andy2
f4a11d2be5 ignore commit turn request when player has 0 tiles. This catches,
awkwardly, the case in a networked game where a player runs out of
tiles in his turn but the server hasn't responded yet to kill the
game.  It remains the player's turn and he can make lots of 0-point
moves while waiting.  (Making it the next player's turn would be the
right thing to do if that player were always on a different device.)
2011-07-12 07:13:21 -07:00
Andy2
42e7a113b9 tweak logging 2011-07-12 07:09:40 -07:00
Andy2
b28a818a1d start games via invite in onNewIntent -- required now that singleTask
is the mode and working.
2011-07-11 20:06:28 -07:00
Andy2
29c2e0bfd6 fold intent filters together 2011-07-11 20:05:45 -07:00
Andy2
f7a0255dc4 needs to be singleTask, not singleTop, to avoid having a new GamesList
activity launched when launch-by-scheme happens when responding to an
invite.
2011-07-11 19:54:41 -07:00
Andy2
7022dbf8d5 set default user name before summoning dialog to change it. For some
reason the GamesList activity is being stopped then recreated
occasionally.  This prevents the dialog from coming up a second time
when that happens.
2011-07-11 18:37:37 -07:00
Andy2
bd7d608c64 combine the two GamesList Activity elements. For some reason it
didn't work before to have the custom URL launch stuff in the existing
one but it does now.
2011-07-10 10:36:14 -07:00