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

3786 commits

Author SHA1 Message Date
Eric House
71839b1e85 add READ_PHONE_STATE permission so I can send my phone number in invitatiosn 2015-01-17 22:00:43 -08:00
Eric House
182b651d21 remove unused import 2015-01-17 14:54:37 -08:00
Eric House
1da2ba7220 move commas -- no code change 2015-01-17 08:52:24 -08:00
Eric House
5f657bdfc4 add new change-connect-via button to set disabled when game in play 2015-01-17 08:13:54 -08:00
Eric House
e5ac525087 provide default default language name (and rename string constant 
being used that way now too)
 2015-01-16 21:28:59 -08:00
Eric House
004cd350fc fix uri encoding/decoding so that invite-by-email works 2015-01-16 21:07:55 -08:00
Eric House
31b524e6c0 include forceChannel in emailed invitations 2015-01-15 07:03:35 -08:00
Eric House
306c9ef4b6 hide relay-related stuff when relay communication not enabled; remove 
sms status stuff altogether.
 2015-01-13 21:59:54 -08:00
Eric House
d035396371 string tweak 2015-01-13 21:51:36 -08:00
Eric House
d1c300d752 string tweak 2015-01-13 21:51:27 -08:00
Eric House
af7335c729 refactor 2015-01-13 21:38:27 -08:00
Eric House
7e28d2004b add button to game config activity for changing the connection types to be used in that game 2015-01-13 21:27:51 -08:00
Eric House
2073098a5e fix crash: adding wrong item to list 2015-01-13 19:53:02 -08:00
Eric House
1139b1d5d1 put some space before all but the first heading 2015-01-13 19:42:19 -08:00
Eric House
ea62b90f61 show conn status based on most recently successful connType 2015-01-12 08:00:20 -08:00
Eric House
fc9c262796 catch exception whose cause I'm not sure of but that make it 
impossible to launch the app when a game gets into a certain
state. Probably need to catch exceptions at a top level of game
listing process and offer to discard those in which non-recoverable
exceptions occur. Later...
 2015-01-12 07:27:24 -08:00
Eric House
5c00e31d95 BT sends fail all the time, e.g. when BT isn't enabled on 
remote. Until I figure out how to not try BT after some point, don't
log exceptions.
 2015-01-12 07:24:39 -08:00
Eric House
a49e732371 remove logging 2015-01-12 06:26:03 -08:00
Eric House
2fa0ea3375 fix new game alert titles to differ depending on type being created 2015-01-12 06:25:28 -08:00
Eric House
0caf30c4e7 fix forceChannel for NFC invite 2015-01-07 06:53:36 -08:00
Eric House
688b3944bb fixes to invite: don't allow non-servers to invite; have common code 
inform of number of missing even when it hasn't dropped to 0 (so
second invite can be sent for 3+ device games); take down older alerts
before posting new (again since number of missing may have changed)
 2015-01-05 07:43:45 -08:00
Eric House
50f29383f5 tweak invite message to not require all invitations to be sent at once 2015-01-05 07:41:31 -08:00
Eric House
e394bf01e8 add assertion 2015-01-05 07:40:01 -08:00
Eric House
6da1b54636 add preference controlling whether more than on player is invited per 
remote device
 2015-01-05 06:32:16 -08:00
Eric House
05aaffb933 cleanup 2015-01-05 06:31:46 -08:00
Eric House
af6f01fd9c tweak drawing and size of status icon background 2015-01-03 22:18:30 -08:00
Eric House
f39b5e8e82 separate heads in new game icon too 2015-01-03 17:22:57 -08:00
Eric House
327b20a9fe add white space between the heads 2015-01-03 17:20:31 -08:00
Eric House
ddd1efd8dd modify new game actionbar icons to derive from game status icons 2015-01-03 16:44:13 -08:00
Eric House
641d83ab48 use new game type icons 2015-01-03 15:17:12 -08:00
Eric House
d1d6a2669b snapshots of icons 2015-01-03 14:57:19 -08:00
Eric House
6f64ff062e one shot at new one-device game icon 2015-01-03 10:33:32 -08:00
Eric House
4701fe2b90 pass in number of devices already connected so forceChannel can be set 
more correctly; put up alert when device rejects an invitation as a
duplicate.
 2015-01-03 09:50:07 -08:00
Eric House
9e67106adc fix crash by always initializing 2015-01-03 09:49:10 -08:00
Eric House
a7cc96c697 add ability to invite more than one player per device. This is mostly 
for testing and needs to be hidden by an "advanced" pref so folks
don't stumble onto it. Works for BT (SMS will crash), but needs
cleaning up.
 2014-12-31 06:54:31 -08:00
Eric House
d46c7a39f1 pass forceChannel as part of invitation 2014-12-30 07:25:26 -08:00
Eric House
28bfa3c904 make forceChannel part of CurGameInfo rather than comms, since Android 
needs to save it there on receipt of an invitation (doesn't create
full game with comms until later.)  Passes discon2 tests and seems to
work on a single Android device. (Haven't tested inviting on Android
yet.)
 2014-12-29 07:39:28 -08:00
Eric House
e8bb624b0b add preference checkbox for hiding newgame buttons (which are 
duplicated by menu items)
 2014-12-29 07:02:56 -08:00
Eric House
e961756f12 give up on hard-coding size of thread->env map: expand it as needed. 2014-12-08 20:43:24 -08:00
Eric House
c8e55a85a3 use a constant; log a bit more for now 2014-12-02 06:08:58 -08:00
Eric House
a1b967033f summarize role based on relay if in use, bt or sms otherwise 2014-12-02 06:08:18 -08:00
Eric House
73851b285e fix a couple of NPEs 2014-12-01 07:01:10 -08:00
Eric House
fe76cfa1a1 remove logging 2014-11-26 07:21:27 -08:00
Eric House
9bdf9b2f5e pass conType into java world from jni send proc, eliminating loops 
e.g. sending relay setup traffic over BT.
 2014-11-26 07:18:29 -08:00
Eric House
eac026a1a1 remove unused string 2014-11-25 07:18:16 -08:00
Eric House
0250f42b36 remove dead invite code 2014-11-25 07:17:52 -08:00
Eric House
8974407a67 setTitle: it's either networked or not 2014-11-25 07:17:03 -08:00
Eric House
2df8c68e60 remove commented-out logging 2014-11-25 07:16:43 -08:00
Eric House
938756a34f switch for loop to using C99-style variable declarations; no other change 2014-11-25 06:09:18 -08:00
Eric House
363215841d add assert 2014-11-24 07:50:54 -08:00
Eric House
963b0e23cf don't send bt pings on non-bt addresses 2014-11-21 23:00:16 -08:00
Eric House
80229376e9 include connection types string in header text 2014-11-21 08:02:55 -08:00
Eric House
38e37bfbb9 use gameID as inviteID when it's not provided. Originally it was a 
relay-only thing, but it's associated with being not-standalone in
places and this seems like the easiest fix.
 2014-11-21 08:02:18 -08:00
Eric House
67d41f34a3 remove loggin 2014-11-21 07:58:17 -08:00
Eric House
6c917f34ba fix race-condition assert by dropping message. This needs a better fix. 2014-11-21 07:57:58 -08:00
Eric House
c3ca257a10 oops: new style 2014-11-20 19:13:15 -08:00
Eric House
d08a7f8d24 use a style for new game buttons 2014-11-20 19:12:56 -08:00
Eric House
8d021aa11e trying to hide the buttons when they take too much space. Leaving 
commented out for now
 2014-11-20 19:11:22 -08:00
Eric House
fbea67e479 don't kill relay when bluetooth turned off: pass comms type into 
comms_transportFailed()
 2014-11-20 07:12:25 -08:00
Eric House
d3d83b3557 cleanup 2014-11-20 06:21:22 -08:00
Eric House
a35527ae88 need to copy in BT address too 2014-11-20 06:21:14 -08:00
Eric House
e236a32c20 forgot a mutex 2014-11-20 06:04:11 -08:00
Eric House
56121fdcd4 stop (or at least greatly reduce) leakage of thread->env mappings in 
jni, mostly by having jnithread explicitly announce that it's closing.
Yuck. This stuff *should* obey a stacking protocol but the callback
stuff I'm doing makes me unsure that can work.
 2014-11-19 21:42:21 -08:00
Eric House
a1bbbe3371 separate the new-game icons into two (as stubs) 2014-11-19 19:26:08 -08:00
Eric House
ae81404215 remove assert that was firing 2014-11-19 19:25:42 -08:00
Eric House
7977c8f799 cleanup 2014-11-19 19:19:12 -08:00
Eric House
1962371fe2 flesh out MultiMsgSink so that subclasses invoked e.g. in response to 
BT traffic can send messages via other means as well.  Relay games
with both participants on one device work again.
 2014-11-19 18:46:35 -08:00
Eric House
f14a1c095f print all conn types, not just the first 2014-11-17 07:06:56 -08:00
Eric House
11f7083eb6 remove dead classes and layouts; add menu to create networked games. 2014-11-15 20:42:09 -08:00
Eric House
2465017e46 add buttons that create new games, bypassing the NewGame activity for 
a simpler experience.
 2014-11-15 17:59:59 -08:00
Eric House
d848c17d03 use real strings rather than enum's toString() result in prefs UI 2014-11-14 07:53:12 -08:00
Eric House
e750811836 add relay and bt as default address types when there's no preference set 2014-11-14 07:32:27 -08:00
Eric House
76fe26a057 include the list of currently selected conn types as pref summary 2014-11-14 07:24:24 -08:00
Eric House
2e8f4097d9 remove unused widget 2014-11-14 07:23:54 -08:00
Eric House
15e380291b snapshot: invite by BT now works well enough that moves can be 
exchanged. Haven't checked whether the relay's also seeing traffic.
 2014-11-14 07:12:03 -08:00
Eric House
f625332782 add preference (dialog) to set default address types. Not used yet, 
and still ugly.
 2014-11-13 07:27:29 -08:00
Eric House
3024bcbd50 get rid of bt and sms new game options 2014-10-27 19:12:38 -07:00
Eric House
93f0b626af snapshot: invite sent by NFC connects two devices using relay with BT 
ability passed too (though not yet used.)
 2014-10-27 07:51:25 -07:00
Eric House
7a1cd06486 fix crash in dict iteration: add to thread map the env that creates globals 2014-10-23 07:44:41 -07:00
Eric House
c3e7b12103 merge android_branch 2014-10-23 06:33:28 -07:00
Eric House
51a1ddfe39 include robot name in report of his score 2014-10-23 06:32:24 -07:00
Eric House
8486bad44b add default robot name to prefs 2014-10-23 06:21:16 -07:00
Eric House
3fe3b1724a replace stacked tracking of env with explicit mapping from pthread to 
env for that thread to fix occasional assertion failure that indicated
I was using the wrong env occasionally.  I'm not super confident in
this because I've seen the env for a thread change, but that could be
due to reuse of the thread id.
 2014-10-22 06:58:42 -07:00
Eric House
452729fb9d merge android_branch 2014-10-17 18:36:08 -07:00
Eric House
53d2c2f0f2 rename method 2014-10-17 18:35:14 -07:00
Eric House
f1e6e2f8f5 can't assert yet -- breaks upgrade 2014-10-17 07:58:26 -07:00
Eric House
df093e1c10 preexisting db field now a set, so treat it that way in the other place it's read 2014-10-17 07:55:04 -07:00
Eric House
4e37947d94 assert, for now at least, no unexpected types being added from jni world 2014-10-17 07:54:34 -07:00
Eric House
7cef0c8c06 un-stub-out summary info 2014-10-17 07:47:48 -07:00
Eric House
2e74b97b4a oops: set typeset field in java struct 2014-10-17 07:46:32 -07:00
Eric House
ed1b6af246 turn on -std=c99 2014-10-16 20:21:32 -07:00
Eric House
ebfe8ceb28 use Collections.toArray() rather than roll my own 2014-10-16 20:16:50 -07:00
Eric House
878a16b3bc snapshot: android compiles, and works well enough to exchange moves 
via relay!  Lots of changes, mostly around treating connTypes as a Set
inside the java world.  Jni to translate to that is a pain.
 2014-10-16 06:45:24 -07:00
Eric House
215cbe94ba turn on -std=c99 2014-10-15 21:43:34 -07:00
Eric House
76db94effc move git rev pref to bottom 2014-10-14 06:35:12 -07:00
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
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
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
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
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
8e9ca8603d don't recalc menu and title too early 2014-09-29 20:12:56 -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
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
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
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