Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-03 23:04:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3916 commits 21 branches 243 tags 33 MiB
Commit graph

3889 commits

Author SHA1 Message Date
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
Andy2
b237277544 put back enum just removed; it's screwing up existing code having all 
the followers change.
 2010-10-25 18:06:48 -07:00
Andy2
39e502fe71 add not-again hints to all the buttons 2010-10-24 17:47:11 -07:00
Andy2
e909e4b343 remove redundant message; advance state to ALLCONNECTED on receipt of 
RECONN or CONN that lists the game as full.  This means we get the
all-green icon (or the A in the gtk case) when in a consummated game
rather than only when all devices are actually connected.
 2010-10-23 20:29:24 -07:00
eehouse@eehouse.org
24fae0f53b Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-10-23 19:50:11 -07:00
Eric House
8a038dc748 Merge branch 'relay_proxy' of ssh://xwords.git.sf.net/gitroot/xwords/xwords into relay_proxy 2010-10-23 19:45:03 -07:00
Andy2
2fa76a9e24 add second button to games list to add networked game, and remove 
ability from config dialog to make a game networked or not.  This
should confuse people less.  Better would be if the two buttons had
icons and those icons were associated with games in the list according
to which type of game they represent.
 2010-10-23 18:41:37 -07:00
Andy2
cff95ce3de go back to play being the onclick action (removing preference to make 
it that way); add more newbie hints; fix DIALOG id definitions to not
overlap superclass's.
 2010-10-23 14:08:57 -07:00
Andy2
038f6bd94c rename some private methods; add onPrepareDialog to fix problem where 
msg stuck from previous invocation
 2010-10-23 14:06:03 -07:00
Andy2
dd82fa02ad remove chat menuitem -- it's only a button now. 2010-10-23 14:00:24 -07:00
Andy2
314872d533 shrink needs-sync flag icon 2010-10-23 13:52:56 -07:00
Andy2
9383ef064d use sync icon instead of "M" to mark games with data. 2010-10-23 13:45:31 -07:00
Andy2
43ad43b604 change meetup server back to relay 2010-10-23 11:24:19 -07:00
Andy2
b6dfa0be8b disable background-checking code for now: make default be disabled and 
remove Preference that allows to change it.
 2010-10-23 11:19:55 -07:00
Andy2
5a5c73916e Don't allow copy of relay-connected game. 2010-10-23 11:08:33 -07:00
Andy2
7cf4535b4c new dbmgr API returns number of players in game; use that rather than 
currently connected devices to populate [RE]CONNECT message
 2010-10-22 22:34:43 -07:00
Andy2
593dac9d99 rotate 90 degrees 2010-10-22 22:04:09 -07:00
Eric House
85d29cf560 if can't send allcond to a device because it's not connected queue the 
message to be sent next time it does.  And since the cookieID will
change and should be there already anyway, remove it.  (Should remove
the hostID too for the same reason.)
 2010-10-22 19:02:52 -07:00
Eric House
6e843dec6c make 10997 default relay port 2010-10-22 18:30:19 -07:00
Andy2
7765bd0a1a move decision how to display connection info from CommsTransport to 
BoardActivity (where it'll be easier to include optional not-again dialog)
 2010-10-21 20:13:41 -07:00
Andy2
8fac0945b9 chat not-again message without obscenities 2010-10-21 19:22:17 -07:00
Andy2
99dbbb443c add comms_canChat, which knows better than java code what state a 
connected game is in, and call it to determine whether to show the
chat icon.
 2010-10-21 19:14:10 -07:00
Andy2
198f39b606 don't use yes button for simple ok dialog 2010-10-21 19:12:04 -07:00
Andy2
ae97d7d0f4 shouldn't have commented that out... 2010-10-21 06:51:26 -07:00
Andy2
aa0be5e2f2 remove unused imports 2010-10-21 06:50:29 -07:00
Andy2
ea617f39fa to deal with not being implement a common superclass for Activity and 
ListActivity create a delegate they use for dialog-related stuff.
Move code from them into it -- and delegate.
 2010-10-21 06:33:04 -07:00
Andy2
5599f91232 new prefs key and string for not-again help dlg for chat 2010-10-21 06:31:28 -07:00
Andy2
848c1493fd chat button enabled only for multi-device games. Needs to be disabled 
for unconnected games as well....
 2010-10-21 06:30:48 -07:00
Andy2
8a891816b4 add chat button 2010-10-21 06:28:01 -07:00
Andy2
5c9cf0ebc8 add first helptext dialog, with do-not-show-again button, attached to 
the sync menuitem.  The plan's that a bunch of these will make the
game easier for newbies to use.
 2010-10-20 20:48:18 -07:00
Andy2
0d4f77fb0a add sync icon to games list menu 2010-10-20 20:00:40 -07:00
Andy2
8788f9d4d5 move OK dialog to new scheme. Using a static global Bundle instead of 
the newer form of showDialog because that requires version 8 of the
SDK.
 2010-10-20 19:52:13 -07:00
Andy2
c1dc34e25d move common dialog code from Utils to XWActivity and XWListActivity 
(which delegates to XWActivity.)
 2010-10-20 18:34:41 -07:00
Andy2
8db6c7ad7f add setPrefsBoolean 2010-10-20 18:09:24 -07:00
Andy2
95f5c2e023 cleanup: add missing string; remove unused strings and array. 2010-10-19 18:43:26 -07:00
Andy2
01e926e8b3 up sdk version to silence warning 2010-10-19 18:42:32 -07:00
Andy2
17f1790d52 remove unused layout files (since they take up space in the .apk even 
if never referenced)
 2010-10-19 18:42:07 -07:00
Andy2
85e32907f0 remove '\r's 2010-10-19 18:39:27 -07:00
Andy2
1fecf9dbb4 implement new check-relay menu, and use new task to check for messages 
if there are any connected games.
 2010-10-19 07:54:52 -07:00
Andy2
4a5c0832d4 use new generalized code to check for messages. 2010-10-19 07:54:10 -07:00
Andy2
94b8aedda7 generalize relay-msg-check code so can be used from two places. 2010-10-19 07:53:26 -07:00
Andy2
d1b1e6db14 refactor into common subroutine -- no behavior change 2010-10-19 07:50:23 -07:00
Andy2
994a73e28b return null, not empty list, when nothing found 2010-10-19 07:49:54 -07:00
Andy2
f31e28dbd7 menu and strings for check-server menu added to GamesList 2010-10-19 07:49:23 -07:00
Andy2
ab8c3f985e add generic info dialog that, with luck, can be reused. 2010-10-19 07:48:34 -07:00
Andy2
b718804a4b new AsyncTask for pinging server on demand 2010-10-19 07:47:05 -07:00
Andy2
b9e3ca212b turn off glib-dependant checksuming for non-linux builds 2010-10-18 22:08:04 -07:00
eehouse@eehouse.org
6e56fb3544 Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-10-18 20:56:31 -07:00
Eric House
7b5d88cbba Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-10-18 20:20:14 -07:00
Eric House
9ba2d2f177 default msgs entry timestamps to 'now' 2010-10-18 20:19:09 -07:00
Eric House
211e9ded7f TIMEOUT needs to be bigger for small NGAMES values 2010-10-18 20:18:24 -07:00
Eric House
3648c22bd4 fix long-standing bug where initial messages were not getting deleted 
and multiplying; log md5 sums of messages in debug build.
 2010-10-18 20:17:44 -07:00
Andy2
9cfb302a2f don't populate room name; better that people see the hint 2010-10-18 06:48:26 -07:00
Andy2
db3c4da01f set a default value that actually exists 2010-10-18 06:47:31 -07:00
Andy2
b4c1710c66 remove strings dropped with prev change 2010-10-18 06:31:19 -07:00
Andy2
62d054cd46 default show-robot-scores to true; move background-check-frequency 
within existing PreferenceScreen
 2010-10-18 06:30:56 -07:00
Andy2
a2f0ec232a put back RestartTimer call inadvertently removed 2010-10-18 06:23:24 -07:00
Andy2
dda6e056a0 set summary from the array of use-visible values 2010-10-18 06:18:37 -07:00
Andy2
2d66913323 populate public rooms list as soon as checkbox set -- and mention 
language and number of players in failure message
 2010-10-17 21:13:14 -07:00
Andy2
56e83bfc1c trim leading and trailing whitespace from roomnames. If somebody has 
two spaces between words those will still matter.
 2010-10-17 20:45:48 -07:00
Andy2
6b7a92534a make default relay port 10997 (and change key so it'll apply for everybody) 2010-10-17 20:37:51 -07:00
Andy2
332ff27d8a use same string for both 2010-10-17 20:30:43 -07:00
Andy2
a58e74b70a add play game button at bottom of game config dialog. 2010-10-17 20:27:21 -07:00
Andy2
5c958eaadb deal with null socket (e.g. if in airplane mode); deal with new public 
rooms format.
 2010-10-17 20:18:24 -07:00
Andy2
1621e5932a give label different text from dialog title 2010-10-17 20:00:41 -07:00
Andy2
8972df7b88 add explanatory title to phonies spinner 2010-10-17 18:55:09 -07:00
Andy2
885bfe4779 remove values button. Seven buttons is too much. Add back when have 
means of assigning priority so it only shows up when there's space.
 2010-10-17 18:42:44 -07:00
Andy2
2cd0bf8c24 add singleline and selectonfocus for roomname edit 2010-10-17 12:45:34 -07:00
Andy2
2bfb26cded sleep (in thread) before closing proxy socket. This works around 
problem where, on PRX_HAS_MSGS path only, device reading socket gets
EOF early though logging here confirms additional bytes have been
written.  Gross but effective.
 2010-10-17 06:38:28 -07:00
Andy2
b63d730b53 compare languages rather than actual dict names so can switch dicts 
mid-game.
 2010-10-16 15:05:46 -07:00
Andy2
60e4c624e4 implement reply button; clear message edit field each time 2010-10-16 15:05:16 -07:00
Andy2
21afd79751 make send message first rather than last menuitem 2010-10-16 15:04:12 -07:00
Andy2
26b777acf8 don't post notification when results list returns empty 2010-10-16 11:01:12 -07:00
eehouse@eehouse.org
5d9989eb1b Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-10-16 10:50:23 -07:00
Andy2
a82051739b move interface; add some logging. 2010-10-16 10:49:25 -07:00
Andy2
91e95eb48b fix string (which should not be hard-coded!) and use new class. 2010-10-16 10:48:59 -07:00
Andy2
02ea8b13e0 move this functionality into RelayReceiver 2010-10-16 08:08:12 -07:00
Andy2
737b146093 Receiver replaces Activity as target of alarms. This seems to prevent 
flasing to the front when alarms fire which was causing all kinds of
grief.  But: not yet tested on device.
 2010-10-16 08:07:48 -07:00
Andy2
cd1ce339ed fix off-by-one error in reading from cursor 2010-10-16 07:57:47 -07:00
Eric House
38ae2faacc don't nuke bad files along with good 2010-10-14 22:17:34 -07:00
Eric House
34df149046 include age of room with info returned for open public rooms 2010-10-14 22:16:21 -07:00
Eric House
e5c7f476ba get rid of microseconds in timestamps 2010-10-14 22:15:41 -07:00
Eric House
c92d59fa53 games can be started with multiple dicts; saving of successful games/logs optional 2010-10-14 05:59:45 -07:00
Eric House
f246178b8f Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-10-12 19:18:21 -07:00
Eric House
40a7a1b5a3 cleanup; track checked rooms rather than checking each time seen 2010-10-12 19:17:42 -07:00
Eric House
0cf94dda8b fix frequent assertion failure that dates from when no messages passed 
outside of ALLCOND state.  With this fix the test script is running
all games to completion if given enough time.
 2010-10-12 19:16:46 -07:00
Andy2
a52c18522c use HashSet rather than relying on nesting (which I can't) to track 
whether I'm running
 2010-10-12 18:53:19 -07:00
Andy2
34428b3460 new Activity class 2010-10-12 18:28:05 -07:00
Andy2
82d5f21d54 extend subclass of Activity or ListActivity 2010-10-12 18:27:50 -07:00
Andy2
c37ad2d650 register self with RelayService to be called directly if running when 
there's something to update.  Use handler to do this from non-UI thread.
 2010-10-12 18:27:13 -07:00
Andy2
8e8c4f4d31 if GamesList is frontmost when we have relayIDs to update then just 
call the interface it's registered.  Otherwise post notification.
 2010-10-12 18:25:29 -07:00
Andy2
ad9a249042 new files. Subclass Activity and ListActivity to track whether we're 
running (yeah, WTF, but that's what Android dev support says you have
to do!).  Special-purpose Activity to be the target of notifications
so I have more control on how to handle them.
 2010-10-12 18:21:18 -07:00
Andy2
673c9858cb fire every 30 for testing 2010-10-12 05:24:23 -07:00
eehouse@eehouse.org
ddb8f508f9 Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-10-12 05:23:04 -07:00
Eric House
0d1542ca9d tweaks to logging 2010-10-12 05:18:44 -07:00
Eric House
8011eeec2c cleanup; fix off-by-one bug with NAMES that was breaking runs with 
four-device games; check before run that there aren't already waiting
games in db.
 2010-10-12 05:17:32 -07:00
Andy2
b124a3f438 add every-five-minutes option; change 10-seconds debug option to 60 2010-10-11 06:54:02 -07:00
Andy2
392aeff7ad replace FLAG_ONE_SHOT with FLAG_UPDATE_CURRENT; seems to fix failure 
of notification to fire.
 2010-10-11 06:52:26 -07:00
Andy2
86b57526df show game name in title if not hidden 2010-10-11 06:47:33 -07:00
Andy2
e637a64d96 Change param signage to fix compiler warning 2010-10-11 06:20:30 -07:00
Andy2
56cd161d8b Pass list of relayIDs through activity to onNewActivity() added to 
GamesList, and inval those list elements that now have messages
pending so they redraw.  And add static method to be called from there
to cancel the status-bar notification now that it's been acted on.
 2010-10-09 21:44:42 -07:00
Andy2
6ad074182f make GamesList singleTop so notifications go to existing activity 2010-10-08 17:33:44 -07:00
Andy2
7d9c143d15 string doesn't need localizing 2010-10-08 17:32:51 -07:00
Andy2
76258f609a make sure game is still over before calculating final scores. Fixes 
assertion failure in server.c.
 2010-10-08 17:30:26 -07:00
Andy2
97d96add5e add stubbed-out strings 2010-10-08 06:53:41 -07:00
Andy2
e855b51491 use new DB api to build list of relayIDs to send; set summary DB field 
and post notification on response.
 2010-10-08 06:52:43 -07:00
Andy2
3bbbd65077 use same 1.5-safe layout on all devices; add elem (a text field for 
now) to be shown when messages are pending; show it.
 2010-10-08 06:47:46 -07:00
Andy2
6ce5f36133 add msgsPending field set from new DB column; add methods to set 
column and to fetch relayIDs for games where it's not set, and to get
path for game based on relayID.
 2010-10-08 06:46:10 -07:00
Andy2
d5eff5af21 new column to track whether game has pending msgs 2010-10-08 06:42:51 -07:00
relay
680b2f31b3 use pid to avoid permission problems for logfile in /tmp 2010-10-07 19:48:38 -07:00
Eric House
f2ad6d92b4 use full paths so pidof doesn't pick up instances of xwrelay launched elsewhere 2010-10-07 19:41:02 -07:00
Eric House
86d73392d5 track bytes sent in db; use defaults to init ctime 2010-10-06 21:45:05 -07:00
eehouse@eehouse.org
46ff3c3b68 Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-10-06 05:22:10 -07:00
Andy2
cb4092bb39 make relayID a String rather than a byte[]; log result of pending 
messages query to confirm working.
 2010-10-06 05:21:19 -07:00
Eric House
6c5b279946 respect TIMEOUT, and kill all remaining processes before exiting 2010-10-05 20:58:29 -07:00
Eric House
a444786a28 reduce logging 2010-10-05 20:57:19 -07:00
Eric House
f0b05da131 reduce logging 2010-10-05 20:57:07 -07:00
Andy2
a78c4b304e custom class for pref 2010-10-05 18:39:00 -07:00
Andy2
df939249e4 fix caps and add too-long string 2010-10-05 18:38:46 -07:00
Andy2
861de8d592 call new method to start polling timer 2010-10-05 18:38:06 -07:00
Andy2
81fb934e4a new custom class for resetting polling timer on prefs change 2010-10-05 18:36:56 -07:00
Andy2
cd0d14b1bb new class will own setting summary for relay-polling frequency so don't do it here 2010-10-05 18:36:15 -07:00
Andy2
ae6edf4ace add static methods for starting timer. 2010-10-05 18:35:35 -07:00
Andy2
ed95d2e794 add proxy port to list whose values are displayed 2010-10-05 06:17:35 -07:00
Andy2
31f3cbc6c8 complete rewrite: use bash's new associative arrays to track games and 
pids etc. so that a single process can manage starting and stopping
all games.  Fixes race conditions where a game would be killed after
finishing but before it'd sent out the message that would allow other
games to finish.
 2010-10-04 22:16:58 -07:00
Andy2
a13bb34419 plug memory leak 2010-10-04 22:14:44 -07:00
Eric House
2e844d798f replace single db connection protected by a mutex with one connection per thread kept in thread-local storage. 2010-10-04 20:04:14 -07:00
Eric House
d9ca6f5e11 block TERM and INT from all but the main thread. (Pretty much untested; doesn't fix hang-on-SIGINT.) 2010-10-04 20:03:19 -07:00
Eric House
1ff4d67bc0 block TERM and INT from all but the main thread. (Pretty much untested; doesn't fix hang-on-SIGINT.) 2010-10-04 20:03:00 -07:00
Eric House
43bf3cd50f improve log statement 2010-10-04 20:01:00 -07:00
Andy2
fae8faa0be add stubbed-out Reply button to msg received dialog. 2010-10-04 18:59:44 -07:00
Andy2
1ed8e7a66c fix crash: can't call dialog from non-UI thread 2010-10-04 18:53:33 -07:00
Andy2
89f967a016 pass remaining reconnect params in case connName's missing from db. 
Should only matter if the relay's db's been deleted.
 2010-10-04 18:39:26 -07:00
Eric House
b3c7cb3711 start on sending chat messages. Doesn't even compile -- committing to get onto another machine. 2010-10-04 05:38:05 -07:00
Eric House
1e13e92deb support for receiving and displaying chat messages. Compiles but not tested. 2010-10-03 18:32:39 -07:00
Eric House
d35bc7d748 refuse to store more than four messages at a time for a single 
connName/hid pair.  This works around a problem where a device,
continuing to connect and send all pending messages for another device
that is not connecting, winds up with hundreds of identical messages
stored.
 2010-10-03 18:18:15 -07:00
Eric House
14fd1f9023 add test code for chat feature: display incoming chat and send via 
menu.  Sent message is hard-coded for now; should fix that.
 2010-10-03 18:13:48 -07:00
Eric House
61b228f189 implement simple chat on top of current server-level protocol -- 
meaning it'll work on any tranport but relay doesn't know about it.
(If relay knew about it I could send a "shutting down for a minute"
message to every connected device, which would be cool.  But this is
easier.)  Written, BTW, enroute from Seattle with help from beer from
Chris in first class. :-)
 2010-10-03 18:11:51 -07:00
Eric House
4a5de0a24c cleanup 2010-10-03 18:09:15 -07:00
Eric House
1f87379cd0 change default port 2010-09-29 07:37:26 -07:00
Eric House
1b93654f7e use stored procedure sum_array instead of C macro 2010-09-29 06:21:08 -07:00
eehouse@eehouse.org
d0797af6e5 Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-09-28 21:11:17 -07:00
Andy2
f78b1747dd put up an alert when unable to find any public rooms 2010-09-28 18:58:05 -07:00
Andy2
0bfad7cd05 up timeout to 15 seconds. 2010-09-28 18:42:23 -07:00
Andy2
2610ef34ac move dict above connection settings since it provides a parameter 2010-09-28 18:38:47 -07:00
Andy2
978fa010f1 commented-out sleep positioned to give download progress time to come up. 2010-09-28 18:35:33 -07:00