Commit graph

2831 commits

Author SHA1 Message Date
Andy2
9879f96729 cleanup -- no code change 2011-12-21 18:50:55 -08:00
eehouse@eehouse.org
abd6727b10 Merge branch 'android_branch' into send_in_background 2011-12-20 17:34:26 -08:00
Andy2
0e487a4a42 When creating game in response to new-from menuitem, juggle players if
the juggle newgame preference is set.
2011-12-20 17:31:13 -08:00
Andy2
3e42c68091 add randomly-generated inviteID to set of params transmitted with an
invitation and stored in a summary.  On receipe of an invitation, if
the room/inviteID exists just drop it -- don't even bring app to the
foreground.  This is meant to stop people from getting lots of
games/warnings about dupes if they happen to trigger a refresh of the
negame.php page in their browsers.
2011-12-20 17:29:05 -08:00
Andy2
9023806b5f cleanup: move instanceof/cast from use of vector elements to addition
of elements to save memory and time.
2011-12-20 17:24:38 -08:00
Andy2
6cc1a2d672 Add new column and up db version number. 2011-12-20 17:12:23 -08:00
Andy2
431a01ef0a remove logging I didn't mean to check in 2011-12-18 15:55:54 -08:00
Andy2
c2c2c7e766 NEW_TASK plus CLEAR_TOP is the magic combination -- says one set of
docs.  Looks good so far.
2011-12-18 12:23:00 -08:00
Andy2
0d6b5914b9 revert to standard launchMode to get proper from-Launcher behavior and
specify a pair of flags when background-launching GamesList that
strips any stack it has and doesn't launch a new instance.  Seems to
fix the problems with launching from notifications and invite emails.
But then I've thought this fixed before.
2011-12-16 19:02:20 -08:00
eehouse@eehouse.org
14bddb0e45 Merge branch 'android_branch' into send_in_background 2011-12-15 18:46:24 -08:00
Andy2
494652518a comment out dead code (entire class) 2011-12-15 07:44:16 -08:00
Andy2
f504c3688c reverse sense of test done on receiving invitation whether game
already exists.  Unless I'm missing something I have it wrong.
2011-12-14 20:09:57 -08:00
Andy2
0dfc1312ff set up intents to limit choices in sending invites to SMS and email,
and recast choices offered users from text vs. html to SMS vs. email.
Revert recent change (88986b49d5) adding
visible URL to email as it doesn't seem to be needed now.  Will want
to keep an eye on that.
2011-12-13 17:24:21 -08:00
Andy2
e5294f2393 add to commented out code 2011-12-12 19:09:50 -08:00
Andy2
fa39db7fc6 comment out file not being used now 2011-12-12 19:01:04 -08:00
Andy2
f07e1c5ea1 use same email address for both ways you can send to me, and rfc822
instead of text type to prevent giving handler options that aren't
email clients.
2011-12-12 19:00:30 -08:00
Andy2
2992c33396 Merge branch 'android_branch' into send_in_background
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
(conflicts were for formatting changes only)
2011-12-07 18:46:59 -08:00
Andy2
2d7ac8e7b0 use SystemClock.elapsedRealtime() rather than 0 as initial fire time
when setting background update timer.
2011-12-07 18:33:26 -08:00
Andy2
c12f64cc03 save pendingMsgLevel flag as part of summary. This fixes reset games
being displayed with the sync icon if they had it before the reset.
I'm not sure if not saving was an omission or if I've forgotten the
reason.  There *is* separate API for clearing the flags stored in that
variable but it requires a second DB write.
2011-12-07 18:24:22 -08:00
Andy2
7b985fcbae fix formatting -- no code change 2011-12-07 06:16:11 -08:00
Andy2
17edc79aaf Merge branch 'android_branch' into send_in_background
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2011-12-06 19:56:10 -08:00
Andy2
ded7ffc6fe Attempting to fix occasional stalls of background proxy checker. It
could be caused by the timer not running after an install, so always
launch it when the app is launched.  (There's no notification
available on [re]install.)  So that the check doesn't happen
immediately, which would be silly, make the initial wait same as
interval when not called in response to check-relay menu.
2011-12-06 19:52:01 -08:00
Andy2
20446bcf32 for style points, don't return from middle of function. No behavior
change.
2011-12-06 19:49:41 -08:00
Andy2
5d09c7bbed add git describe for version to email body 2011-12-06 19:19:50 -08:00
Andy2
7884246d7a add menu to main screen for sending me email. TODO: find a darker
menu icon; add git revision to outgoing text.
2011-12-06 18:49:48 -08:00
Andy2
3b48c3ca60 use title rather than a field in custom view for title of lookup
dialog.
2011-12-06 18:25:55 -08:00
Andy2
7c76af30b2 remove excessing logging 2011-12-06 18:21:48 -08:00
Andy2
0474984b82 export new preference from jni and add a checkbox setting for it 2011-12-06 18:18:50 -08:00
eehouse@eehouse.org
e1e8516e1b Merge branch 'android_branch' into send_in_background 2011-12-02 19:04:12 -08:00
Andy2
52d02f04dd pass tile value into drawCell(). Java code doesn't use it yet, but I
want to play with drawing cells tray-tile-style when they're big
enough.
2011-12-02 18:58:52 -08:00
Andy2
ae2e27e651 Put the values button back (and remove the corresponding menuitem). 2011-12-02 18:14:26 -08:00
Andy2
08063d9444 Merge branch 'android_branch' into send_in_background
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2011-12-01 21:18:37 -08:00
Andy2
4c320a52e7 allow scrolling to go a bit deeper 2011-12-01 21:10:04 -08:00
Eric House
7da7dbc731 shoulda tried compiling before committing a large merge.... 2011-12-01 19:54:56 -08:00
Eric House
9d42e3f4d0 move logf and showf into their own DbgUtils class 2011-12-01 19:51:02 -08:00
Andy2
577c2c8538 move MultiHandler implementation inside BoardView. 2011-12-01 19:44:22 -08:00
Andy2
15503522f2 implement pinch-to-zoom on board -- and do it in such a way that class
loader doesn't barf on older versions of the OS that don't provide the
necessary APIs.  Tested only on original Motorola Droid so far (and
emulator running 1.6, which is too old.)
2011-12-01 18:56:44 -08:00
Eric House
c1e420f726 Merge branch 'android_branch' into send_in_background
Conflicts:
	xwords4/relay/rq.c
2011-11-29 06:45:32 -08:00
Andy2
1575279cd8 replace restore menus in prefs activity with buttons at bottom of
screen.  The trick involves getting the OS to insert the prefs xml
layout as a ListView, and seems like a hack, but it works so far.
Ought to be tested on several OS versions before next release.
2011-11-22 19:00:03 -08:00
Andy2
cd23022cde Get rid of int m_msgID, storing all dialog messages as String m_msg.
The code was getting confused and sometimes set one then tried to
display the other.
2011-11-22 18:28:57 -08:00
Andy2
cdef8f42f6 add comment about NPEs received when device networking foobared. No
code change.
2011-11-22 18:12:21 -08:00
Andy2
d37424ad7f Merge branch 'android_branch' into send_in_background
Conflicts:
	xwords4/linux/linuxutl.h
2011-11-21 22:18:52 -08:00
Andy2
a8859599dd update emacs compile-command for new SDK. No code change. 2011-11-21 22:16:33 -08:00
Andy2
795b86e569 when asked to browse empty dict, put up explanatory dialog then exit
activity.  Required new DlgDelegate method to send event after posting
alert.  Note that eventually when the dict browser shows tile info as
well as words this will change.
2011-11-21 18:08:51 -08:00
Andy2
c7906c3bd4 prevent min from exceed max by not including values below min as
possible max settings and vice-versa.  Since spinner values no longer
have a consistent base, parse them rather than relying on position --
requires assumptions such as that View is a TextView, but that is
probably not changing.
2011-11-21 08:19:25 -08:00
Andy2
aba4e02cac use a standard list item for words rather than consing up a TextView
and having to worry about text size.
2011-11-21 07:20:12 -08:00
Andy2
c781bfc29e remove hard-coded 2-15 array for word-len limit spinners and instead
create at runtime arrays that represent the words actually in the dict
-- e.g. showing a max of 8 when there are no words longer than that.
2011-11-18 21:24:59 -08:00
Andy2
b86330c71f add dict_iter_getCounts() 2011-11-18 21:10:17 -08:00
Andy2
4760ceda5a Merge branch 'android_branch' into android_browsedict
Conflicts:
	xwords4/android/XWords4/jni/anddict.c
2011-11-17 20:55:02 -08:00
Andy2
1889fbd78b relaunch activity, with pararms in intent, every time min or max
changed.  Can't figure any other way to change the list of section
heads, as setListAdapter() is ignored when called a second time.
Note: I got an assertion failure in the jni indexing code so there
may be a bug here.
2011-11-17 19:52:10 -08:00