Commit graph

4117 commits

Author SHA1 Message Date
Eric House
add93c83de add methods for getting and putting strings as part of summary and
testing if any of them constitute rematch info
2015-02-26 05:56:08 -08:00
Eric House
187e55e4ad add column for arbitrary & extensible data in GameSummary 2015-02-26 05:52:40 -08:00
Eric House
e2f3963667 wrap static Boolean to avoid NPE when uninitialized 2015-02-25 07:35:14 -08:00
Eric House
da3452f3fa 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-24 06:46:16 -08:00
Eric House
7229d110a0 go ahead an up the beta version number too 2015-02-23 21:51:25 -08:00
Eric House
64cf060c4e up version code and add to changelist 2015-02-23 21:35:42 -08:00
Eric House
4d0a825e43 fix NPE downloading .xwd files 2015-02-23 21:16:53 -08:00
Eric House
f2f5fb22e6 use new comms header to transmit isServer bit 2015-02-23 18:28:31 -08:00
Eric House
dc1f08a7ac up protocol number so old clients know to upgrade 2015-02-23 18:25:34 -08:00
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
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
3dd16b5883 alert on receiving phone when SMS sender is using older/incompatible protocol. 2015-02-18 06:49:43 -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
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
bdc298b222 remove logging 2015-02-09 07:27:18 -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
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
Eric House
b7dfc169bf add commented-out mutex protecting comms. I don't think I need it, but
this makes it easier to put back if comms->processingMsg assertions
start failing.
2015-02-08 10:37:06 -08:00
Eric House
9a0da56158 fix NPE: onActivityResult gets called before onResume, so reload game
there instead.
2015-02-08 10:35:52 -08:00
Eric House
c6b42c539c add assert to ensure there are no thread issues: mutex may be required
if the assert winds up getting hit.
2015-02-08 07:51:08 -08:00
Eric House
01c4fa620e when nbs send is to my own phone number, just put the packet in the
incoming queue. T-mobile will deliver the message, but it's much
faster this way and while I'm still sending too many messages avoids
triggering the undismissable "this app is sending too many SMS
messages" Android warning alert.
2015-02-07 22:37:06 -08:00
Eric House
fa856e1db0 don't send sms messages in queue if sms support has been turned off 2015-02-07 13:37:14 -08:00