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

8306 commits

Author SHA1 Message Date
Eric House
5c4242ac62 Fix (by inspection) NPE reported to google: test for null lock before 
trying to save its game. Also remove empty overridden method.
 2014-10-14 06:31:57 -07:00
Eric House
c73eec567b fix some const confusion the stricter android gcc found 2014-10-14 06:24:41 -07:00
Eric House
f14c3216a5 commit changes that have been running for a while 2014-10-13 19:10:56 -07:00
Eric House
bf1f0485df include git hash in name of .apk file 2014-10-13 19:06:40 -07:00
Eric House
2643c655f8 Merge branch 'android_branch' into android_multi2 2014-10-13 07:25:28 -07:00
Eric House
858187b9d7 include git rev hash in update info -- for later use detecting when a 
tagged build has changed
 2014-10-13 07:20:17 -07:00
Eric House
0362bf5cc9 Merge branch 'android_branch' into android_multi2 
Conflicts:
	xwords4/common/board.c
	xwords4/common/comtypes.h
	xwords4/common/model.c
	xwords4/common/strutils.c
 2014-10-13 07:03:20 -07:00
Eric House
518a6a903d list one more change 2014-10-13 06:48:00 -07:00
Eric House
fd7a03dfc4 remove logging 2014-10-13 06:47:49 -07:00
Eric House
4914e5b564 up strings and change log for new release 2014-10-12 21:12:25 -07:00
Eric House
501f9ad3d9 don't assume group will be found among visible views 2014-10-12 20:51:54 -07:00
Eric House
509df4cad5 add comment 2014-10-12 08:55:07 -07:00
Eric House
0770062559 when it becomes the turn of a game in a non-expanded group, update 
that group to show it now contains an in-turn game.
 2014-10-12 08:13:02 -07:00
Eric House
e87457cfbe cleanup: a view can always call getContext() 2014-10-10 08:01:08 -07:00
Eric House
9d038d13e4 add "new group" button to move game alert, and logic to relaunch the 
move game alert after new group alert exits.
 2014-10-10 07:29:36 -07:00
Eric House
b12d12590a don't memcpy 0 bytes 2014-10-09 21:21:41 -07:00
Eric House
4eb836ab2b fix to compile -- graft missed a constant defined earlier 2014-10-09 21:21:27 -07:00
Eric House
badc40f90b move dividerLoc into model and use to limit sorting to tiles to its 
right
 2014-10-09 20:09:24 -07:00
Eric House
195371ea2e as proof of concept, skip the first 3 tiles when sorting newly 
assigned.  Later '3' will be replaced by the location of the tray
divider, but that has to be moved from board to model first.
 2014-10-09 20:08:41 -07:00
Eric House
019daa6b84 Fix robot and human default dicts being able to be of different 
languages: add new languages pref above the two, filter their choices
to be limited to that language, and change them to the first dict of
the new language when it's changed.
 2014-10-09 08:03:25 -07:00
Eric House
4f22caafe9 don't assume there was only one missing after downloading first 
missing dict
 2014-10-09 06:31:43 -07:00
Eric House
d308baca8c add blank line so easier to read 2014-10-09 06:30:00 -07:00
Eric House
74eb6890b9 when user while configuring game chooses to download a new wordlist, 
make it the new selection in the spinner from which "Download more"
was chosen.
 2014-10-08 19:12:00 -07:00
Eric House
e4e5d599cd Fix new game process to not leave unconfigured new game behind when 
user chooses to configure then cancels.
 2014-10-07 06:52:55 -07:00
Eric House
095011020d cleanup 2014-10-07 06:07:30 -07:00
Eric House
6d5a556c78 break up chained method calls so stack crawls can more accurately show 
source of a crash.
 2014-10-07 06:02:00 -07:00
Eric House
a28dc8c182 catch up with comments added 2014-10-01 22:11:58 -07:00
Eric House
618d180aab fix broken about dialog 2014-10-01 22:10:42 -07:00
Eric House
731e2c49e0 call server_do even if not a client, fixing weeks-old breakage of 
local-only games.  git bisect rocks!!
 2014-10-01 21:54:23 -07:00
Eric House
3534bc0e49 print usage prettier (with an apparent off-by-one error) 2014-10-01 19:52:07 -07:00
Eric House
b82383a5ad fix -- I hope -- array syntax that was getting lots of games launched 
without an app (until it got upgraded)
 2014-10-01 19:49:46 -07:00
Eric House
aade0a9aae cleanup 2014-10-01 08:08:45 -07:00
Eric House
76fb527b11 Handle NFC-invite case same as BT one: create a needs-download 
notification rather than a broken game when required wordlist is
missing
 2014-10-01 07:36:34 -07:00
Eric House
c1445f11b8 tweak text 2014-10-01 06:45:24 -07:00
Eric House
615d558fac revert 44e0f30520: no longer required 
and I'm afraid of changes elsewhere the function's used
 2014-10-01 06:32:09 -07:00
Eric House
8b15895380 forget about creating games when wordlists are missing. Instead adopt 
the SMS strategy and post a notification response to which opens a
download-or-decline dialog. On finishing the download open and connect
the game.
 2014-10-01 06:24:52 -07:00
Eric House
2be0db06ea revert list item change (but keep the padding) 2014-10-01 06:06:47 -07:00
Eric House
e5ae23bf67 try again on dict download to open game, but test first. 2014-09-30 22:02:17 -07:00
Eric House
3c79ea51c3 more helpful hint 2014-09-30 21:56:13 -07:00
Eric House
8b95cbb68a remove unnecessary level of layout nesting, and add padding. 2014-09-30 21:55:52 -07:00
Eric House
d8f93080bf force the language that's the point of opening the dicts downloader to 
be displayed expanded to make it a bit easier to figure out what to
do.
 2014-09-30 21:48:01 -07:00
Eric House
44e0f30520 modify anyMissing[dict] logic: having some null is ok, but all null is 
not.
 2014-09-30 21:26:34 -07:00
Eric House
8cc6f8b7cd don't open games created by BT invitation without checking that they 
have the dicts they need.
 2014-09-30 21:26:02 -07:00
Eric House
b62e4db8d2 better string 2014-09-30 21:21:03 -07:00
Eric House
fa3a2c1c5e don't crash if somehow a game gets opened without a dict 2014-09-30 21:20:47 -07:00
Eric House
6044503cc5 merge android_branch -> android_multi2 2014-09-30 05:57:53 -07:00
Eric House
c98a5cd5f0 move dividerLoc into model and use to limit sorting to tiles to its 
right
 2014-09-30 05:57:21 -07:00
Eric House
8e9ca8603d don't recalc menu and title too early 2014-09-29 20:12:56 -07:00
Eric House
1346aa6ee5 as proof of concept, skip the first 3 tiles when sorting newly 
assigned.  Later '3' will be replaced by the location of the tray
divider, but that has to be moved from board to model first.
 2014-09-29 20:04:54 -07:00
Eric House
69889c4382 don't set as selected a game inside a collapsed group 2014-09-29 08:16:24 -07:00
Eric House
55ea4d7a04 cleanup 2014-09-29 08:15:41 -07:00
Eric House
afedc8d9f5 fix prev optimization clearing board on load so it only happens when a 
different board is about to be drawn.  Fixes flash when btinvite
dialog goes away.
 2014-09-29 07:26:39 -07:00
Eric House
0f90538598 track whether invite progress is up and cancel only if it is 2014-09-29 06:19:52 -07:00
Eric House
321a6e7e73 add activity lifecycle logging, off by default 2014-09-29 06:18:48 -07:00
Eric House
9b845634e0 show progress when sending BT invitation -- since it might be a 
headset and take a while to time out.
 2014-09-27 07:16:36 -07:00
Eric House
93526d38d7 cleanup (version upgrade test works) 2014-09-25 22:24:09 -07:00
Eric House
92292ad1fe fix problems with undeclared variables that older bash didn't mind 2014-09-25 21:45:44 -07:00
Eric House
43bd3c018a make an addr's conType a bitfield rather than holding a single value. 
Works for large numbers of relay games in test, but will not yet
actually hold more than one value.  Should be safe to merge to main
branch once stream upgrade is verified.
 2014-09-25 20:05:37 -07:00
Eric House
75981f52ca up strings for new release, including changelog 2014-09-25 18:36:50 -07:00
Eric House
f3acdfc78a remove bt error count toast 2014-09-25 18:36:22 -07:00
Eric House
a0881b1041 add titles to SMS and BT invite alerts 2014-09-25 07:49:22 -07:00
Eric House
47591fb8c6 For SMS and BT, text contains the text of a button. Substitute in 
button text rather than have to keep the two in sync.
 2014-09-25 07:34:58 -07:00
Eric House
e0eb22854f save changes to address list 2014-09-25 07:06:33 -07:00
Eric House
2beb897b2c replace scan that tries to connect to all paired devices, taking 20 
seconds to discover that some 20-miles-away device isn't here and
resisting use of concurrency, with simple listing of paired
devices. If user tries to invite a headset, try and fail with an error
message.  Fix up re-invite and detection of whether players are
missing to support this.
 2014-09-25 06:40:44 -07:00
Eric House
aa566ad1f0 call util_informMissing when the pendingPlayers count drops to 0 2014-09-25 06:36:07 -07:00
Eric House
abf12e90da save a bit of work setting up game manually by assuming two players -- 
but ths must be happening too late because not all takes effect.
 2014-09-25 06:35:10 -07:00
Eric House
3668b7d8a7 merge android_branch -> android_shipbt 2014-09-24 20:51:23 -07:00
Eric House
1e80109c3e add assert, and don't pass pendingRegistrations to clients -- it confuses them 2014-09-24 19:33:59 -07:00
Eric House
743d532fc7 putting back recent change: this works for automated test and gtk 
manual app.  I'm not sure what's up with pendingRegistrations but it
needs more studying before I can change it.
 2014-09-24 19:16:06 -07:00
Eric House
9ad8ad601c add cur dir to empty dict search path 2014-09-24 07:29:57 -07:00
Eric House
64b30b68d2 merge android_branch -> android_shipbt 2014-09-23 21:33:57 -07:00
Eric House
b4ef9ced87 merge android_branch changes 2014-09-23 21:33:02 -07:00
Eric House
3d6f972e9e fix number of missing players not being calculated correctly 2014-09-23 21:30:31 -07:00
Eric House
113c7a13d2 print number of devices left 2014-09-23 21:26:46 -07:00
Eric House
49689ab04c always log error message 2014-09-23 07:30:34 -07:00
Eric House
ab64197ac4 fix recent booboo: it's not an error for server_initClientConnection() 
to fail here.
 2014-09-23 07:30:23 -07:00
Eric House
4c2c6e5814 improve bad-protocol messaging: suggestion to upgrade is displayed on 
both sides.
 2014-09-22 08:09:58 -07:00
Eric House
59f5c17e78 remove debugging toast 2014-09-22 08:00:37 -07:00
Eric House
a485480496 make divider wider 2014-09-22 07:05:45 -07:00
Eric House
46907ec03d tweak string 2014-09-22 06:59:23 -07:00
Eric House
45317678b7 a better way of cleaning up 2014-09-21 21:59:21 -07:00
Eric House
73e5f946b2 cleanup: private method to reduce number of params required 2014-09-21 21:54:00 -07:00
Eric House
c5b948b464 offer to launch Setting app when there are no paired devices 2014-09-21 18:03:31 -07:00
Eric House
7964f96b28 include gameID in bt ping, and in reply a boolean indicating if it's 
been deleted. Means you open a game and if you have a connection know
immediately that it's no longer there.
 2014-09-21 17:32:35 -07:00
Eric House
dbb09241ec save known bt addresses only; names can be looked up 2014-09-21 17:03:25 -07:00
Eric House
e69f0179cc fix script 2014-09-21 16:59:00 -07:00
Eric House
0073cba698 cleanup: get rid of btName wherever possible 2014-09-21 14:59:28 -07:00
Eric House
653ad7c62a cleanup how bt names and addresses are handled, working with addresses 
except when something has to be shown in the UI.  Because names can be
duplicated but never addresses....
 2014-09-21 14:40:44 -07:00
Eric House
0d04fd138d ping remote BT hosts on game open and on radio on in order to update 
the status of the connection arrows.
 2014-09-21 13:06:12 -07:00
Eric House
4695619c63 refactor: add methods to be called from elsewhere 2014-09-21 11:35:32 -07:00
Eric House
e52422afcc reflect bt radio state in in-game net status handler 2014-09-21 10:55:13 -07:00
Eric House
049cf284c5 toward getting direct-ip addressing working again: add a tab to the 
connections dialog
 2014-09-20 18:08:33 -07:00
Eric House
ff82ff1e7c add connType param to resendAllIf(): no point resending relay messages 
when it's the BT radio that just turned on.
 2014-09-19 05:53:49 -07:00
Eric House
645da39e51 use new convenience method 2014-09-18 06:10:55 -07:00
Eric House
2e6993cce0 show bt status red when bt radio turned off 2014-09-18 06:08:43 -07:00
Eric House
36bed8a2c8 call super 2014-09-17 08:03:43 -07:00
Eric House
e6203182ec resend pending messages when BT radio comes back on 2014-09-17 08:03:12 -07:00
Eric House
b97a9518f7 better newbie hint title 2014-09-17 08:02:33 -07:00
Eric House
2321b36bec better newbie hint title 2014-09-17 08:01:58 -07:00
Eric House
e018d136e1 don't disable general beaming, since that prevents default behavior of 
launching the store to install on a device that doesn't have the app
yet.
 2014-09-17 07:10:41 -07:00
Eric House
810ccb5555 add padding 2014-09-17 07:05:32 -07:00
Eric House
e3667dde2f remove do-you-want-to-invite dialog when NFC used for relay case too 2014-09-17 06:52:57 -07:00
Eric House
e7e04fc2bb don't offer to nfc-invite a SMS game since that doesn't work, and DO a 
relay game since that does.
 2014-09-16 07:41:09 -07:00
Eric House
9df2d0c1dc keep track of BT IOExceptions, and report the number back to callers. 
At least one app I've seen tells the user to restart BT if that number
gets too high; this makes that easy.
 2014-09-16 07:25:31 -07:00
Eric House
cfba0411fe hide the expandable headers completely when BT or SMS isn't available 2014-09-16 06:42:53 -07:00
Eric House
3e72da8e3f when sms pref changes, clear cached value 2014-09-16 06:39:46 -07:00
Eric House
82b25d1956 add utility method 2014-09-16 06:39:06 -07:00
Eric House
567f6a2ac0 turn off beaming except where I provide an explicit message 
(callback), since it's confusing to have the game offer to beam where
all that's being sent is the install URL.  Hmmm -- maybe we do want
that.  Consider....
 2014-09-15 08:03:14 -07:00
Eric House
aeeb3dc3bc fix so when BT invite is tapped for game requiring a missing wordlist, 
an offer's made to download and only then is game created.
 2014-09-15 07:41:26 -07:00
Eric House
77192bf3bd clear/erase board bitmap before reusing for new game 2014-09-14 15:18:36 -07:00
Eric House
2c8d356ac0 changes to generated files that should have gone with prev commit 2014-09-14 14:50:19 -07:00
Eric House
808e01b428 cleanup: there's no progress to be shown now when inviting 2014-09-14 14:42:58 -07:00
Eric House
45a1dcd5f9 This comment meant for this fix, not prev! : 
Fix board sometimes coming up half-height by indicating that it should
never have a soft keyboard associated with it.  It's otherwise getting
told its height is half what it should be, and I can't find any way to
get the layout redone when the keyboard goes away.  (The keyboard in
this case is leftover from the previous activity.)
 2014-09-14 14:37:01 -07:00
Eric House
134f7dbe2b fix board sometimes coming up half-height by indicating that it should 
never have a soft keyboard associated with it.  It's otherwise getting
told its height is half what it should be, and I can't find any way to
get the layout redone when the keyboard goes away.  (The keyboard in
this case is leftover from the previous activity.)
 2014-09-14 14:36:13 -07:00
Eric House
434bbf74cb when inviting to a new BT game, make it so the games come up on both 
sides already connected and ready to play.  That requires creating the
game on the sending side before the send so it's ready to receive
messages, and on the receiving side giving the new game a message sink
via which to send its initial registration message.
 2014-09-14 13:43:41 -07:00
Eric House
6f07098cf3 return succes from server_initClientConnection() 2014-09-14 13:42:11 -07:00
Eric House
7d8b9b4270 return succes from server_initClientConnection() 2014-09-14 13:41:33 -07:00
Eric House
4d2f49d33f when sending and don't have an address for channel yet, send the one 
comms was created with, which is what client will have to do anyway.
 2014-09-14 13:41:12 -07:00
Eric House
b6f708ee75 add text to missing player alert suggesting tap-to-invite, and dismiss 
it if user does so while it's still up (via a bit of a hack).
 2014-09-12 07:10:18 -07:00
Eric House
94b51cf53b cleanup; log non-hex gameid too for easier searching 2014-09-12 06:07:32 -07:00
Eric House
b1ea1185f1 tweak invite-received strings. Alas, the inviting player's name isn't 
there yet.
 2014-09-12 05:56:30 -07:00
Eric House
ebb9684cc9 remove bt variant files too, at least on this branch 2014-09-12 05:47:03 -07:00
Eric House
172d01137a copy stuff required to make main app support BT 2014-09-11 20:42:15 -07:00
Eric House
0924a20a66 sometimes a null addr comes in; check 2014-09-11 19:55:12 -07:00
Eric House
640283263a remove XWords4-sms files; that ship has sailed 2014-09-11 19:40:31 -07:00
Eric House
2a0489889c when the number of available BT devices matches the number of players 
sought, check them all initially.  Speeds inviting for most common
case.
 2014-09-11 08:05:43 -07:00
Eric House
588e5245d5 log dropped result 2014-09-11 07:20:59 -07:00
Eric House
c47c8928ec open BT game after creating it on invite/nfc reception; remove game 
from games list selection when it's deleted by board when open so
action bar is in correct state.
 2014-09-11 07:06:12 -07:00
Eric House
a08292a918 Handle invite to BT game via NFC. 2014-09-10 07:24:12 -07:00
Eric House
3b2a537e93 fix crash trying to create new game immediately after allowing board 
to delete one.
 2014-09-10 07:01:56 -07:00
Eric House
b333e3959f remove assert: it's fine to close without saving 2014-09-10 06:37:32 -07:00
Eric House
39b9c32fd7 don't track and refuse to connect to deleted games: the tracking was 
incomplete (didn't persist) and gameIDs couldn't be reused.  Fix later
when it's not blocking development if the feature still makes sense.
 2014-09-09 07:27:04 -07:00
Eric House
95eb140461 cleanup 2014-09-09 07:24:27 -07:00
Eric House
4029af955d inval cache twice, fixing a race condition around creating new BT games 2014-09-09 07:24:17 -07:00
Eric House
46e648933a Log, but don't assert, when an event isn't handled. 2014-09-09 07:23:52 -07:00
Eric House
df6a117c5c cleanup 2014-09-09 07:21:33 -07:00
Eric House
4f6fb61d4b put BT ahead of SMS, and use a style to reduce repeated layout code 2014-09-08 20:42:18 -07:00
Eric House
2400029b8b force all comms-type icons to have same width 2014-09-08 08:02:12 -07:00
Eric House
03c6db78db add new class that's a header-styled label with an expander, and use 
that as separator in NewGame activity.  Save expanded state so people
who don't play networked games don't have to see all that text
forever.
 2014-09-08 07:30:07 -07:00
Eric House
473bea77d6 get rid of -i param; instead install to all devices instead of passing 
'install' to ant.
 2014-09-08 07:25:05 -07:00
Eric House
fdde7b67bc ignore dirs for another branch (local only so far) 2014-09-08 07:06:45 -07:00
Eric House
5fbe98e4e2 remove unused string 2014-09-06 06:56:06 -07:00
Eric House
9c0fc39478 add move summary to SMS notifications too 2014-09-06 06:54:43 -07:00
Eric House
c6a9f303f0 include last move summary in BT notifications 2014-09-06 06:47:24 -07:00
Eric House
c1ee254c4f echo what's going on 2014-09-05 21:19:32 -07:00
Eric House
ddc4ab9844 oops: MultiEventListener installation got dropped with the move to 
activity delegates; fix
 2014-09-05 21:12:35 -07:00
Eric House
1d4d3a7a32 don't use same title for all progress dialogs 2014-09-05 07:49:37 -07:00
Eric House
d949028006 set names as properties; param doesn't seem to work 2014-09-05 07:41:06 -07:00
Eric House
a2853046d4 set names as properties; param doesn't seem to work 2014-09-05 07:40:54 -07:00
Eric House
b9aa335027 log dropped event 2014-09-05 07:40:37 -07:00