Eric House
fa6c043433
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-03-04 07:32:43 -08:00
Eric House
b967c39c20
up strings for release
2015-03-04 06:56:12 -08:00
Eric House
e9ccf5a305
fix crash copying game (by replacing assertion with a stricter one)
2015-03-04 06:49:52 -08:00
Eric House
4ab846ee60
remove assertion that fired on creation of every standalone game
2015-03-04 06:35:53 -08:00
Eric House
736e5f1ea0
prevent keyboard from coming up on launch of game config activity;
...
instead wait until room name is tapped. (I did this in two places
though one might have been enough. On some devices anyway that
AndroidManifest change is needed to close a keyboard if it's open
prior to opening the activity.)
2015-03-04 06:17:18 -08:00
Eric House
1e051e835c
Merge remote-tracking branch 'sf/android_branch' into android_multi2
2015-03-03 21:23:30 -08:00
Eric House
7e7305c1be
I want to be able to switch dev machines without having to uninstall
...
the latest debug build from my phones, and that requires using the
same debug.keystore everywhere. So check one in, and add a script that
symlinks to it from the machine's global location if necessary.
2015-03-03 21:19:07 -08:00
Eric House
2371111edf
add warning to rename game alert that the name won't sync, but only
...
for networked games in progress.
2015-03-03 07:55:43 -08:00
Eric House
4e7dbbfa30
update build/install instructions
2015-03-03 07:14:03 -08:00
Eric House
22dada5a1a
update build/install instructions
2015-03-03 07:12:44 -08:00
Eric House
e3b5848d5d
don't post notification if there's no explanation to be offered. I've
...
been seeing ghost notifications where there should be none; this will
fix that, but I need to observe that it doesn't remove notifications
that are needed.
2015-03-03 07:05:20 -08:00
Eric House
4cd75abaa9
Don't unbundle an invalid NLI: use a static factory method rather than
...
a constructor since the factory is allowed to fail.
2015-03-03 07:03:42 -08:00
Eric House
797cb23de2
rewrite to track by BT address rather than position since the latter
...
can change. Fixes occasional assertion failure.
2015-03-02 19:09:56 -08:00
Eric House
2b2b9982d0
remove unused method
2015-03-02 19:07:24 -08:00
Eric House
863d83bf44
reorder prefs
2015-03-02 07:11:34 -08:00
Eric House
61649aab2d
when game opens and SMS is off, offer to turn it not rather than just
...
to open the Android settings app (as done in game config already)
2015-03-02 06:45:46 -08:00
Eric House
0233ad6b79
turn off rematch
2015-03-02 06:41:11 -08:00
Eric House
a003cf686f
offer to rematch via relay too, but leave the server communication
...
part stubbed out. I'm disabling rematch for now because there are
several issues to be worked out, chief among them how to handle
simultaneous receipt of identical invitations (via different
channels.)
2015-03-02 06:28:42 -08:00
Eric House
cdf7a88302
change method signature to be more clear what it's doing
2015-03-02 06:22:57 -08:00
Eric House
6964458c84
fix string
2015-03-02 06:20:17 -08:00
Eric House
e03be955a6
make ivar private
2015-03-02 06:19:47 -08:00
Eric House
25beb1b8d4
cleanup: remove unnecessary Context params
2015-02-28 19:36:07 -08:00
Eric House
13b3905458
fix so emailed invitations from current shipping version can be
...
received. I think NFC works too. Bluetooth doesn't, and isn't worth
the time to fix since users get a very clear "upgrade already"
message.
2015-02-26 21:39:21 -08:00
Eric House
3e27721ca4
cleanup
2015-02-26 21:35:45 -08:00
Eric House
6e7c1cb73f
include set of addresses in rematch so that even though invite by
...
relay doesn't work yet games can communicate that way.
2015-02-26 06:54:56 -08:00
Eric House
3cccb0cb11
move (effective) [de]serialization logic into class
2015-02-26 06:18:19 -08:00
Eric House
ed212801c8
first pass at enabling Rematch, which seems to work for SMS and
...
Bluetooth. Relay will take a bit more work, and there are rough edges
still.
2015-02-26 06:01:17 -08:00
Eric House
8538b1b293
remove assert. Not sure why I wanted it before.
2015-02-26 06:00:03 -08:00
Eric House
a3a88463a5
get and put new game summary extras in DB
2015-02-26 05:56:46 -08:00
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
e9cab298d9
makefile for new Czech wordlist
2015-02-24 06:45:32 -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
24de5cc486
change order, showing newest first
2015-02-23 18:24:01 -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
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
