Andy2
aeafb9cefa
Tweak language for moving wordlists to more clearly refer to storage
...
locations.
2011-08-21 15:03:41 -07:00
Andy2
bbb73bb2e9
somehow dict deletion got broken (because wasn't adding file
...
extention); fix.
2011-08-21 15:02:42 -07:00
Andy2
6b8fd222ef
Merge branch 'android_branch' into french_xlation
...
Conflicts:
xwords4/android/XWords4/res/values/strings.xml
2011-08-21 14:35:53 -07:00
Andy2
d1b6bc16cf
add the standalone/network icons from GamesList display to the new
...
games dialog so users get some association going.
2011-08-21 14:30:00 -07:00
Andy2
04834c910b
more dictionary->wordlist terminology change: debug-only preference
...
and download URL.
2011-08-21 14:27:50 -07:00
Andy2
9612b28b1f
use goto to avoid having multiple returns. No behavior change.
2011-08-21 14:20:59 -07:00
Andy2
a17ff20db7
clean up background check pref wording to Chris's suggestions
2011-08-21 13:52:51 -07:00
Andy2
a72883ae9a
Merge branch 'android_branch' into french_xlation
...
Conflicts:
xwords4/android/XWords4/res/values/strings.xml
2011-08-21 12:29:32 -07:00
eehouse@eehouse.org
d7d5d85ec2
Merge branch 'android_branch' into send_in_background
2011-08-21 12:20:25 -07:00
Andy2
c0dae019d5
use same context menu header, including wordlist name, as for game
...
list items.
2011-08-21 12:19:58 -07:00
Andy2
5c8afa06ce
version string and changelog for beta 33
2011-08-21 12:07:45 -07:00
Andy2
56fd01a05b
oops -- missing semicolon.
2011-08-21 12:07:21 -07:00
Andy2
c38e3593fb
replace hard-coded placeholder names for optional top-line of games
...
list item display with real "aa vs. bb vs..." consed up in
GameSummary, and set field to singleline so doesn't wrap when names
get too long.
2011-08-21 11:39:38 -07:00
Andy2
c41af221b7
fix non-debug compile warning
2011-08-21 11:33:23 -07:00
Andy2
47bdec4eda
pass context into GameSummary constructor rather than into methods
...
that need it. No behavior change.
2011-08-20 21:51:57 -07:00
Andy2
28c78a0a6a
dictionary->wordlist
2011-08-20 14:16:38 -07:00
Andy2
eb00984563
Merge branch 'android_branch' into send_in_background
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
2011-08-20 12:44:17 -07:00
Andy2
659c054696
add new class that listens for SDCard mounted event (could be
...
generalized for multiple events and map them to multiple notification
callbacks), and use it from DictsActivity to redraw the list when the
SD card comes back online. While the default android behavior works
for the unmount case (relaunches DictsActivity which correctly draws
only those dicts still available) it needs this change to redraw after
the available set grows.
2011-08-20 11:59:32 -07:00
Andy2
6ca60438a1
no need for onClick listener when onDismiss listener does the same thing
2011-08-19 18:54:21 -07:00
Andy2
8f60ca5af3
Need to show dict-gone-missing dialog when umount from GameConfig too,
...
so: change loadMakeGame() to return gamePtr rather than take one in,
and to return 0 when any dict no available. Move dict-gone-missing
dialog into DlgDelegate. Remove DlgDelegate always adding onDismiss
listener that removes the dialog, and instead add one to the
dict-gone-missing dialog that, like the onClick handler, calls
finish() on the activity.
2011-08-19 18:52:55 -07:00
Andy2
fd4e627628
when sd card is umounted, android sends a message to apps. I can't
...
figure out how to get that so I ignore it and am killed then
relaunched if I have a dict file open on the SD. On relauch, don't
crash. Instead, check if any dicts used by the game is unreachable
and put up an alert with only one choice: Close game. Thought about
using the missing-dicts stuff from GamesList, but this is a special
case that should be seen only when user umounts while a BoardActivity
instance is frontmost.
2011-08-18 07:54:00 -07:00
Andy2
7a1346e530
add assert to catch bad dict earlier
2011-08-18 07:49:40 -07:00
Andy2
455cb9a4c4
Include possibility of umounted sd card in missing dict
...
explanation. Name of game too. Use single-selectable list and
Substitute button instead of expecting user to tap once to select
(which confused me.)
2011-08-18 06:26:43 -07:00
Andy2
0c29a4c1ca
fix NPE when sd card unmounted
2011-08-17 20:11:30 -07:00
Andy2
58be931558
remove messages after sending them if they appear to have been sent
...
successfully.
2011-08-17 19:52:55 -07:00
Andy2
8e6812780d
call feedMessages even if there are no messages, and call
...
comms_resendAll() from feedMessages. The combination means that all
networked games get a chance to resend dropped packets periodically
which should help prevent stalls.
2011-08-17 19:51:20 -07:00
Andy2
08789c4097
call server_do() up to five times to allow some extra work to get
...
done. Required if a host is also a robot.
2011-08-17 19:48:55 -07:00
Andy2
b9be2b45f4
sendMsg needs to report success if no-conn send works.
2011-08-17 18:41:45 -07:00
Andy2
2c26fc03e3
Track messages sent via proxy and credit nsent (accumulator) if
...
successful. Previously messages sent via proxy were not counted.
2011-08-17 18:09:10 -07:00
Andy2
b511b4c455
add new RecordSent to take list of msg ids -- and use stringstream
...
instead of static buffer and snprintf in one case. May make sense
elsewhere too.
2011-08-17 18:07:21 -07:00
Andy2
8148c7699a
don't loop forever on server_do(). It's broken w.r.t. guaranteeing
...
that it can always change state.
2011-08-17 06:52:04 -07:00
Eric House
c2c673e932
improve testing of proxy delete by saving up a number of relayIDs and
...
sending with multiple -d flags to rq.
2011-08-16 19:44:37 -07:00
Eric House
5c68f375fd
reorder more strings and add a bunch more context comments.
2011-08-16 19:42:54 -07:00
Andy2
30145deba7
add new proxy message handler for no-conn message, and feed into
...
existing store-and-forward system. With this checkin a robot-vs-robot
game plays for quite a few moves without either game every loaded into
the foreground (via a BoardActivity instance on Android), with all
moves transmitted as a result of relay checks. One of the games
refuses to open later, however, and there are certainly other bugs.
And I'm not sure what happens when a message sent no-conn (without a
cookie ID) is received in the foreground. But this is progress.
2011-08-16 19:41:33 -07:00
Andy2
7ab8c6eca4
re-factor sending code so essentially same message (without cookieID
...
that implies a connection) is sent and received by no-conn code. Use
flags to determine if comms can support no-conn sending without making
up the message only to have it fail to send.
2011-08-16 19:36:23 -07:00
Andy2
2dcfb2193c
complete the process of sending messages generated in response to
...
messages passed in in background: send them. Requires new method
implementing new protocol against proxy.
2011-08-16 19:33:24 -07:00
Andy2
066cef0306
using new send-noconn proc is too expensive if it's only going to fail
...
(return false) so add new iface comms can call once to get flags to
tell it whether to use that proc. One implementation of
TransportProcs returns one flag; the other, the other.
2011-08-16 19:31:08 -07:00
Andy2
dfab747504
make server_do() take a new param to allow caller to call it until
...
there's nothing more to do (without the assumption it's driven from an
event queue.)
2011-08-16 19:28:59 -07:00
Andy2
11f6d96be9
get 'svn' out of the version string variable
2011-08-16 19:26:53 -07:00
Andy2
dc693e4d6a
too much logging
2011-08-16 19:20:39 -07:00
Andy2
f61748369a
fix non-debug compile warning
2011-08-16 19:17:47 -07:00
Eric House
9f84468297
beginning process of adding contextual comments to all translatable strings.
2011-08-15 21:49:30 -07:00
eehouse@eehouse.org
be4ec00e55
Merge branch 'android_branch' into send_in_background
2011-08-15 18:28:35 -07:00
Andy2
dc273c7162
fix proxy msg handling to process more than one relayID per message.
...
Formerly all but the first were dropped.
2011-08-15 18:27:00 -07:00
Andy2
6f22cbd8c9
rename class and pass in from higher so send can be done in the right
...
place.
2011-08-11 06:49:44 -07:00
Andy2
985f254660
more refactoring -- limit NetUtils method to network stuff as much as
...
possible.
2011-08-11 06:40:13 -07:00
Andy2
008c70957a
refactor -- no behavior change
2011-08-11 06:29:21 -07:00
Andy2
c2ae80cf37
pass the stubbed-out procs into the jni. Now background-generated
...
packets are getting into the java world. Next: get 'em to the relay.
2011-08-10 21:28:12 -07:00
Andy2
ea05c34d8f
add the alternative send proc to the java transportprocs interface,
...
and call through to it from the jni. Add another implemenation of the
interface and pass that when opening games in the background.
2011-08-10 21:06:05 -07:00
Andy2
f6bf91de36
make overridden methods have params in same order (though some are
...
missing).
2011-08-10 20:49:41 -07:00