Eric House
c55bba5aab
for game config replace onKeyDown() with onBackPressed() since only
...
one key was handled.
2015-02-03 21:49:33 -08:00
Eric House
5e6bb507b7
shift responsibility for deleting new game when config activity is
...
cancelled from games list to config activity. Fixes race condition
that on emulator, and less often on device, left a game highlighted
after config was cancelled that should have been deleted.
2015-02-03 21:43:28 -08:00
Eric House
35525d62a4
give newgame alert an icon to remind folks what's up.
2015-02-03 19:16:37 -08:00
Eric House
46c361028e
move config of ConnViaViewLayout to prepareDialog() so checkboxes get
...
reset each time, fixing problem of checks sticking across invocations.
2015-02-03 07:45:12 -08:00
Eric House
70545eb3f2
more fixing assuming a connection-means-less game is solo
2015-02-01 22:54:15 -08:00
Eric House
e383d9c7ad
show the multi-game icon for multi-games even if they have no conn
...
options set.
2015-02-01 22:31:03 -08:00
Eric House
8abe7720c8
don't allow saving/playing a multi-divice game that doesn't have at
...
least one way of connecting. Instead, give a choice between discarding
it and editing, and if the latter choice it taken open the alert for
picking ways to connect. Requires a new version of showConfirmThen()
that lets the negative button be other than "Cancel".
2015-02-01 22:15:06 -08:00
Eric House
02da56ce9c
add populate() that can be called to add defaults when new type is added
2015-02-01 19:55:06 -08:00
Eric House
4bd15c072b
add isFinishing() to base class
2015-02-01 19:51:32 -08:00
Eric House
46c4cc0669
warn when user disables all communication options in prefs
2015-01-31 23:17:13 -08:00
Eric House
5d58c09120
remove must-invite alert when game connects
2015-01-28 06:17:27 -08:00
Eric House
0972e07b4e
give download button a green background for greater visibility
2015-01-27 21:42:42 -08:00
Eric House
a4842bdaab
just hide the "hide title" pref on devices where it's a no-op --
...
rather than explain to a user why his action is being ignored
2015-01-27 21:40:22 -08:00
Eric House
1b6f0de8e6
inset checkbox for better visibility
2015-01-27 08:24:06 -08:00
Eric House
fb13c949e8
re-enable ActionPairs stuff now that an additional button works/fits.
2015-01-27 08:14:06 -08:00
Eric House
5cece9f3cc
Merge remote-tracking branch 'sf/android_branch' into android_multi2
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-01-27 07:53:42 -08:00
Eric House
828b620c44
make "do not show again" a checkbox instead of a button -- requires a
...
trivial custom view.
2015-01-27 07:46:18 -08:00
Eric House
41a2655248
move newbie hint about hiding newgame buttons to the buttons
...
themselves, and disable third button because it isn't shown on the
devices I'm testing on. Not sure why. Tweak text to make sense in that
context.
2015-01-27 07:11:49 -08:00
Eric House
8044fb0fc7
exit board when invite alert cancelled
2015-01-26 07:25:46 -08:00
Eric House
5f5e35e885
hide (the right way) play-via-sms preference on non-gsm phones
2015-01-26 07:06:43 -08:00
Eric House
74ce8116ea
don't allow to enable SMS or BT if the feature's off on the phone, and
...
warn via an alert (varies by whether in prefs or game config) in that case.
2015-01-25 17:40:23 -08:00
Eric House
2c5cf9da39
move conn-via set manipulation into a custom view prefs and game
...
config can both use.
2015-01-25 16:14:34 -08:00
Eric House
c506805235
show SMS and BT as connect-via options only when available on the
...
device -- which for SMS means it's a GSM phone.
2015-01-25 15:18:20 -08:00
Eric House
b3f1b6ae3e
hide SMS as invite option (for now)
2015-01-25 15:17:49 -08:00
Eric House
b851427fd9
tweak string
2015-01-25 15:17:28 -08:00
Eric House
2710ef7243
turn off invite via SMS (for now)
2015-01-25 14:00:03 -08:00
Eric House
f983e477a2
remove all code for sending and receiving non-data SMS. The plan is
...
that SMS will only be supported for GSM phones from here out (unless
Google figure out how to make the Data SMS APIs work on CDMA devices.)
2015-01-25 13:56:33 -08:00
Eric House
1ec5df0914
fix so button is correctly enabled from the start
2015-01-24 21:55:44 -08:00
Eric House
9806b01d6b
get rid of send-invitation menuitem, since it's never there unless
...
there's a dialog in front of the board forcing you to send an
invitation.
2015-01-24 16:32:11 -08:00
Eric House
b8ff064819
turn another set of constants into an enum: no code change
2015-01-24 16:20:13 -08:00
Eric House
bd55ed025e
fix handling bt invitations when the wordlist specified is missing
2015-01-24 15:59:36 -08:00
Eric House
9031885eb0
fix duplicate NFC invites being accepted (but not working to create
...
usable games) by fixing broken query used by getMostRecentCreate()
2015-01-24 14:59:15 -08:00
Eric House
56e61061be
add alert explaining "just tap" when user picks nfc for sending invite
2015-01-24 14:29:49 -08:00
Eric House
dd6aa95068
force invite alert to stay up as long as a host has players missing.
2015-01-24 14:18:30 -08:00
Eric House
445d44e773
import child class to cut a few characters from file -- no code change
2015-01-24 13:48:03 -08:00
Eric House
da374db1bc
fix progress alert thinging being left after BT invites accepted in
...
case where more than one device being invited. Really should
incorporate progress into the dialog showing missing players, but this
is better than before.
2015-01-24 13:22:51 -08:00
Eric House
f87dd30bd6
don't create new using-defaults game is if from a received invitation
2015-01-24 13:07:52 -08:00
Eric House
17f4e35bf4
tweak wording
2015-01-24 12:57:42 -08:00
Eric House
b2781afeb3
offer to hide newgame buttons via augmented showNotAgainDlgThen shown
...
when player has five or more games in list.
2015-01-24 12:47:22 -08:00
Eric House
3a1e091852
fix crash on receiving end: inviteID is optional
2015-01-24 11:26:48 -08:00
Eric House
95f761d664
cleanup for better logging, including replacing constants with an enum
2015-01-24 11:01:50 -08:00
Eric House
027cd319e6
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-01-24 10:10:10 -08:00
Eric House
7b2a6fddf8
add an assert toward figuring out google-reported assert
2015-01-24 09:48:11 -08:00
Eric House
6da910ea07
merge with remote head
2015-01-24 09:38:05 -08:00
Eric House
44624b20d9
up strings and changes list for release
2015-01-24 08:59:44 -08:00
Eric House
9b0eba8be6
up copyright for the new year
2015-01-24 08:54:06 -08:00
Eric House
f48d79d4c8
provide default default language name (and rename string constant
...
being used that way now too)
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-01-23 08:35:04 -08:00
Eric House
e0c9d626ae
rename script
2015-01-23 08:30:19 -08:00
Eric House
178156b7d7
Add UI to invite via SMS more than one player per device (if the
...
"Advanced" option is enabled).
2015-01-23 08:19:20 -08:00
Eric House
bfd6b2162d
swap two config positions
2015-01-22 07:39:07 -08:00
Eric House
aec70782f4
tweaks to get game initialization working, including not looking on
...
startup for incoming text messages if on KITKAT or above.
2015-01-22 07:37:06 -08:00
Eric House
c3482925b4
Send NLI data for invitation instead of field-by-field. Try to prevent
...
duplicate phone number entries when the same number is formatted
differently.
2015-01-20 07:57:08 -08:00
Eric House
4b345ff28e
new methods to store and retrieve byte arrays
2015-01-20 07:52:49 -08:00
Eric House
f8e530da9b
Snapshot toward making SMS work again: invites now work via
...
user-visible SMS, providing a URL same as email that launches the app
with a new game. Game works sending via NBS (data SMS) when both
devices are on GSM (T-mobile, anyway.) Plan is to use os version and
gsm info included in invite to warn user when the game can't
communicate, but that test isn't done yet. Also removed debug pref
allowing to force send by NBS.
2015-01-18 10:49:15 -08:00
Eric House
f05d8c774e
include class name in log
2015-01-17 22:11:20 -08:00
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
951f5462b3
remove assert. Can't always get forceChannel right on creation, and
...
it's mean to be advisory.
2015-01-12 07:23:50 -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
70e4d06e73
don't crash when ctrl-d hit in console
2015-01-07 07:23:40 -08:00
Eric House
861aeeb53a
don't crash when ctrl-d hit in console
2015-01-07 07:22:45 -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
3209fc1b74
log sqlite error codes as strings in attempt to track down the
...
occasional assertions failure.
2014-12-28 21:40:31 -08:00
Eric House
3b7afa4557
pass --server if not setting forceChannel
2014-12-28 21:39:11 -08:00
Eric House
897c4d5786
add param to force a client to connect to host requesting a particular
...
channel. Works well enough that relay test script works. Not yet
integrated for let alone tested on Android.
2014-12-21 17:40:00 -08:00
Eric House
d81f022c78
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/linux/scripts/discon_ok2.sh
2014-12-15 16:48:10 -08:00
