Commit graph

2652 commits

Author SHA1 Message Date
Andy2
2c95179050 don't complain about empty room name for standalone game 2010-11-07 11:50:01 -08:00
Andy2
46a01ace56 work around occasional crash in on-device testing by checking for 0
before passing to getString.  Not sure of the circumstances but the
crash is coming from restoreManagedDialogs() -- might be related to
screen orientation changes.
2010-11-06 21:34:16 -07:00
Andy2
a6a7f1899d remove logging 2010-11-06 21:01:50 -07:00
Andy2
2fc48cbd97 nuke unused constant 2010-11-06 21:01:29 -07:00
Andy2
73d7c7a27b use new field to determine if simple relay config dialog can handle
the game or if user's already changed it enough that the full-on
dialog is required.
2010-11-06 18:26:09 -07:00
Andy2
f36b253ae7 add number of players to GameSummary. Changes DB but it's already
changed since last beta so I'm not upping the version.
2010-11-06 18:24:44 -07:00
Andy2
9fccbcc6b4 Problem with new minimal-config relay dialog: user can accidentally
tap "play game" and wind up connecting and creating an empty-room-name
game; or can dismiss the dialog and be confused because there's no way
back to it.  Solution: define empty-room-name as an illegal case.
Check for it when "play game" is tapped in either config dialog and
raise an alert.  And when user wants to open a game from the GamesList
activity go to the minimal config dialog if it's a relay game without
a room name.
2010-11-06 16:41:12 -07:00
Andy2
8213c9a5c1 add showOKOnlyDialog 2010-11-06 16:38:33 -07:00
Andy2
ceec9eda28 set m_invalPath so new network game will be drawn correctly first time
back in GamesList
2010-11-06 15:01:06 -07:00
Andy2
a72e029f40 add name field to and use a style for bulleted items in simplified
relay-connect dialog; remove not-again text and dialog attached to
new-relay-game button; tweak text.
2010-11-06 14:55:57 -07:00
Eric House
98716b755a get rid of menuitem that was there only for development testing 2010-11-06 08:30:45 -07:00
eehouse@eehouse.org
fc739e2c67 Merge branch 'android_branch' into relay_proxy 2010-11-05 05:19:16 -07:00
eehouse@eehouse.org
6d205011f5 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-11-05 05:12:59 -07:00
eehouse@eehouse.org
64cc199e1a Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-11-05 05:10:24 -07:00
Eric House
0d863d2d3f fix casting error caught by compiler 2010-11-05 05:06:24 -07:00
Andy2
2f38ce3d92 add button leading to the main config dialog plus an explanation of
what it's for.
2010-11-04 20:37:59 -07:00
Andy2
23924ff74e add new activity that's popped up on creation of a networked game to
ask only for the room name to make it as easy as possible to
get started.
2010-11-04 19:48:46 -07:00
Andy2
c9239fc921 make method public 2010-11-04 19:46:05 -07:00
Andy2
9c48c91156 init room name to current text -- duh! -- preventing close process
from thinking a change has been made (room name nulled) when none had
been.
2010-11-04 06:36:28 -07:00
Andy2
c630697c59 Fix crash on 2.2 emulator by turning of ipv6 on emulator. per
workarounds found online.  Suggested fix is to use io instead of nio.
2010-11-03 20:54:35 -07:00
Andy2
c039b92339 don't send 0-length message 2010-11-03 18:26:20 -07:00
Andy2
8bf8383d60 reread preferences in case of an upgrade. Fixes bug where default
port was 0 because the new key, meant to change the value, was not
being initialized.  It's a hack to use a side-effect to determine
whether this is an upgrade, but since I'm already calculating it
didn't see any point to doing it again.
2010-11-01 18:56:23 -07:00
Andy2
1e5a856287 log host/port connecting to. Too useful to omit. 2010-11-01 18:53:36 -07:00
Andy2
40e42b79c5 up version numbers and strings -- getting ready for release 2010-10-30 09:11:47 -07:00
Andy2
64a8b1e61a change confusing const name 2010-10-29 20:20:25 -07:00
Andy2
3d52698939 don't show all-here not-again dialog to host host -- already got the
first-in version.
2010-10-29 19:14:56 -07:00
Andy2
fd1ca2c9c5 confirm single game delete. 2010-10-29 19:02:21 -07:00
Andy2
5b6a5aafe8 add three not-again messages displayed after connection is first made
with the relay, for first-in-room, last-in-room, and the less common
middle case.  Add confirmation dialog for game reset.
2010-10-29 18:44:07 -07:00
Andy2
6de7fb28e3 add lock-setting checkbox to game config dialog and toggle
setEnabled() on most widgets as it's checked.  Add not-again dialog
explaining possibility of reset of started game.  Don't even show the
checkbox for non-started game.
2010-10-29 07:42:16 -07:00
Andy2
814dd89458 remove unused ivar; override setEnabled to dis/enable delete button 2010-10-29 07:40:41 -07:00
Andy2
a7c1319527 call super only in the default case 2010-10-29 06:48:18 -07:00
Andy2
d98525de95 make chat display dialog blocking. This fixes problem where multiple
chats received at once see all but the first dropped, and probably
fixes reported problem where only one message every got displayed.
2010-10-29 06:46:27 -07:00
Andy2
b115ce14ed add devOrder (= hostID) to params passed on connect. Fix to pass new
param from jni; use object to pass params into UI thread since there
are now too many for handler.
2010-10-29 06:34:39 -07:00
Andy2
4cd15a9c6a Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
Conflicts:
	xwords4/common/comms.c
2010-10-29 05:27:07 -07:00
Andy2
c087b4b031 add room name to callback used when device connects: pass the new
parameter through and format into messages posted via Toast.
2010-10-28 18:48:07 -07:00
Eric House
670f7982ea add comms_isConnected 2010-10-27 21:58:36 -07:00
Andy2
7ad4a43468 use new confirm-delete-all dialog to confirm deletion of dictionary 2010-10-27 06:33:13 -07:00
Andy2
4c17ea8802 generalize confirm-delete-all dialog into confirm-then-do 2010-10-27 06:25:29 -07:00
Andy2
11c68797bf unique title for not-again dialogs 2010-10-26 19:28:22 -07:00
Andy2
eb41e24c4e show language of dict that can't be found 2010-10-26 18:48:28 -07:00
Andy2
84e6d94919 add languages to dict names in set-default spinner 2010-10-26 18:35:54 -07:00
Andy2
c8a6f453c9 dismiss underlying activity when no-dict dialog is cancelled too. 2010-10-26 18:28:54 -07:00
Andy2
1ceea2cde2 check that default dict exists and if it doesn't use same as if hadn't
been specified.  Catches case where dict is downloaded, made new-game
default, and then deleted.
2010-10-26 18:20:49 -07:00
Andy2
26210e1cf2 new function for reporting missing dict called from two places 2010-10-26 18:08:53 -07:00
Andy2
f9b2eb4a3e attach not-again dialog to turn done menuitem 2010-10-25 21:32:07 -07:00
Andy2
d7b6cb0691 use resetGame() to populate a newly created game. With this change a
new network game will connect without first having been opened in the
GameConfig dialog.
2010-10-25 18:56:51 -07:00
Andy2
e1b7a0f44d when resetting game, if it's multi-device but doesn't have a default
address (as will be the case if it was just created), get and give it
one.
2010-10-25 18:55:53 -07:00
Andy2
3cbda7471c init public room vars to false 2010-10-25 18:55:15 -07:00
Andy2
54d312e523 saveSummary(0 needs to be passed context in case must init dbhelper. 2010-10-25 18:51:07 -07:00
Andy2
2e122fe9f3 default for new networked game is no robots, second player remote. 2010-10-25 18:08:09 -07:00