Eric House
eca87d3755
don't crash on null set
2015-02-23 18:19:16 -08:00
Eric House
d4515c4930
Merge remote-tracking branch 'sf/android_branch' into android_multi2
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
2015-02-23 08:02:56 -08:00
Eric House
0cb549abcc
add another change summary item
2015-02-23 07:11:43 -08:00
Eric House
f9ddca8316
tweak explanation
2015-02-23 07:03:25 -08:00
Eric House
825577a762
manually bring in db71c4e4e2: force
...
resend_all() when opening game
2015-02-21 17:37:10 -08:00
Eric House
958ca38002
don't log normal case as error
2015-02-20 07:53:24 -08:00
Eric House
6fe0940187
don't log normal case as error
2015-02-20 07:52:19 -08:00
Eric House
6d8f13df9e
Merge remote-tracking branch 'sf/android_branch' into android_multi2
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-02-19 06:45:11 -08:00
Eric House
59bf77c871
fix occasional assert by increasing buffer size
2015-02-19 06:39:32 -08:00
Eric House
5940a7e860
Merge remote-tracking branch 'sf/android_branch' into android_multi2
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-02-18 19:56:48 -08:00
Eric House
9fd5e71e3d
up client version so we can tell when adoption's getting close to complete
2015-02-18 19:55:40 -08:00
Eric House
86d8a46da2
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/common/comms.c
2015-02-18 19:40:36 -08:00
Eric House
b89395ffb9
up strings for new release
2015-02-18 19:24:17 -08:00
Eric House
b23c4d0a73
change comms header format to add a version and flags, marking with an
...
almost unique 16-bit quantity. 1 in 2^16 new games will fail because
its connID will match, but that's ok in part because it can only
happen during the time between when this is released and follow-on
version that assumes all older versions are gone.
2015-02-18 19:19:36 -08:00
Eric House
3dd16b5883
alert on receiving phone when SMS sender is using older/incompatible protocol.
2015-02-18 06:49:43 -08:00
Eric House
159a1a8dd2
use TAGFMT stuff for comms_resendAll()
2015-02-17 20:45:39 -08:00
Eric House
7e8c30f2ab
add preference controlling whether radio-free short-circuiting is used
...
for SMS sends when sending and receiving number are the
same. Short-circuiting is faster and tests 99% of the code without
triggering Android's annoying OS-level too-many-sms-sends alerts, but
sometimes you need to test the radio too.
2015-02-17 20:16:44 -08:00
Eric House
1592ac3ede
cleanup -- no meaningful code change
2015-02-17 19:49:32 -08:00
Eric House
db71c4e4e2
force resend_all() when opening game. This unsticks some new games
...
that for some reason connected to having several ways of sending some
of which aren't working wind up running a backoff timer by the time
they want to connect. This fixes the cases I'm seeing. I don't know if
it's at the price of generating too much traffic, but at least it's
limited to when the user actually opens the game.
2015-02-17 19:46:54 -08:00
Eric House
1a87812f2b
don't check for updates on DEBUG builds as the server doesn't handle
...
that case (yet)
2015-02-17 06:59:40 -08:00
Eric House
749b9a5c19
changes in generated IDs: apparently different dev machines generate
...
different IDs, perhaps because they're running different SDK versions.
2015-02-17 06:52:36 -08:00
Eric House
d97dd6aff1
if fake-radio pref has changed to make something (SMS) unsupported,
...
try to recover from that (otherwise impossible) change in phone
capability by checking when fetching pref if it's all still possible.
2015-02-17 06:52:00 -08:00
Eric House
4d9465a3e2
fix crash on initial install, when pref won't be set yet
2015-02-17 06:49:34 -08:00
Eric House
eb1ad5cdc3
use fake radio preference in setting phone info, and rely on that for
...
isgsm test
2015-02-17 06:15:34 -08:00
Eric House
55714d81bf
remove unused method
2015-02-14 22:42:26 -08:00
Eric House
385220cf92
add debug preference, unused so far, for faking the type of radio I
...
have. Goal's to debug non-GSM devices correctly hiding all references
to play-via-SMS.
2015-02-13 18:52:13 -08:00
Eric House
98fe7eb343
if BT's off, offer to turn it on programatically rather than telling
...
user to do it himself
2015-02-13 18:38:24 -08:00
Eric House
49024ae070
offer to turn SMS on when setting the global pref too
2015-02-13 18:16:30 -08:00
Eric House
9399ddd0ab
add a bit of space to the custom view
2015-02-12 21:12:28 -08:00
Eric House
6cfedf7fb5
fix button being missing at the wrong time
2015-02-12 19:24:32 -08:00
Eric House
270f2922b1
include game name in invitation
2015-02-12 07:48:15 -08:00
Eric House
f4a691da6b
add name, mostly as a way of passing it around in the java world since
...
the C version doesn't know about it.
2015-02-12 07:44:37 -08:00
Eric House
1a94bab9e8
add naming of game to game creation, including adding custom view to alert
2015-02-12 07:41:28 -08:00
Eric House
e5957866b4
cleanup by adding an import -- no code change
2015-02-12 07:38:17 -08:00
Eric House
2142c752bf
factor confirm-unlimited-SMS stuff out into utility dialog so I can
...
turn on SMS from outside preferences -- which is a much better
experience than sending somebody into the prefs labyrinth
2015-02-11 07:51:19 -08:00
Eric House
615ec72ea7
fix channelNo equality test so it doesn't break relay games, which
...
connect a bit differently.
2015-02-10 07:26:23 -08:00
Eric House
72a1d8b7d4
clear any server bits that happen to have been set in older games.
2015-02-10 07:05:34 -08:00
Eric House
cf4431402b
additional check for misdelivered messages that fixes
...
three-participant SMS games on a single device: if message arrived on
a different channel from what its header says it was meant for, drop
it.
2015-02-10 06:55:08 -08:00
Eric House
ad6be1bb7e
add debug-only "tag" to open games so logging can more easily track
...
what's going on when multiple participants in a single game are on the
same device. But for a couple of strings passed into the jni the
changes are only in DEBUG code.
2015-02-09 19:15:43 -08:00
Eric House
a34f4e4954
don't save unset channelSeed
2015-02-09 07:28:11 -08:00
Eric House
bdc298b222
remove logging
2015-02-09 07:27:18 -08:00
Eric House
9e403ac6b2
add assert around the new bit that's -- bitten -- me once already
2015-02-09 06:46:34 -08:00
Eric House
5a28f8dedf
fix recent message header hack to not break addressing of messages
2015-02-08 18:42:38 -08:00
Eric House
534bb37224
only show every 5th toast
2015-02-08 18:36:55 -08:00
Eric House
aa77413116
remove logging
2015-02-08 18:35:34 -08:00
Eric House
88dd25fb21
fix channel comparison so messages actually get deleted after they're
...
ack'd.
2015-02-08 13:39:35 -08:00
Eric House
acf5a01374
Fix assertion failure: comms_msgProcessed() must be called whenever
...
comms_checkIncomingStream() is
2015-02-08 11:29:27 -08:00
Eric House
0620bc0443
remove extra carriage return
2015-02-08 11:03:55 -08:00
Eric House
9ab0113e85
tweak debug toast strings
2015-02-08 10:48:17 -08:00
Eric House
994bd4fc5c
format status time to seconds rather than minutes
2015-02-08 10:48:05 -08:00
