Eric House
efd47d731a
send the correctly calculated hash value, and up strings for another
...
release. This is the minimum required for a new release on top of the
previous one, but not enough if released on this branch!
2016-01-03 20:23:46 -08:00
Eric House
07dd7f2eed
use a different name for each variant's db when written to SD card so
...
they don't overwrite each other's.
2016-01-03 20:19:46 -08:00
Eric House
b8c597ab98
oops -- fix prematurely committed script.
2016-01-03 19:53:16 -08:00
Eric House
ba712046a2
add git version to file in assets/ so can tell .apk's version in
...
filesystem (before it's installed).
2016-01-03 19:27:33 -08:00
Eric House
22dde029c8
Merge tag 'android_beta_100' into android_branch
...
ready for release
2016-01-03 11:36:37 -08:00
Eric House
a51b01491d
up strings for new version, and copyright for new year
2016-01-02 09:21:59 -08:00
Eric House
929141f36d
fix compiler warning
2016-01-01 21:13:35 -08:00
Eric House
8dfddea508
up initial client vers id sent to relay
2016-01-01 21:09:10 -08:00
Eric House
ccb86f0358
0 len is ok
2016-01-01 21:05:28 -08:00
Eric House
6a0bcaee26
add missing parameter
2016-01-01 19:48:22 -08:00
Eric House
8c26cf726a
file for new French wordlist (not publicly available yet)
2016-01-01 19:32:32 -08:00
Eric House
a4a135b953
up CV version for testing
2016-01-01 19:30:35 -08:00
Eric House
ebcae1a523
move hashing into memstream impl, and reintroduce the old/broken
...
treatment of the final 8 bits. I'll need to release a version that
still produces the incorrect hash for compatibility with existing
clients that expect it, but that also looks for the correct hash. When
that's out there I can do a new release that sends the correct hash.
2016-01-01 17:57:14 -08:00
Eric House
4813c95976
cleanup: rename function and remove unused param
2015-12-31 15:47:48 -08:00
Eric House
02d5d26c60
when a move comes in whose hash doesn't match the top of the move
...
stack, go down the stack looking for a match. If it's found, pop down
to that point then apply the move. This fixes stalls in the test
engine when undo is enabled, and so I assume that undos and turns are
somehow coming in out-of-order. Should be rare that this happens.
2015-12-31 06:04:55 -08:00
Eric House
dd242c3ff5
make undo ratio operate on 1/1000 scale -- and even with this it's
...
overwhelming when more than 40 clients are running.
2015-12-30 21:23:29 -08:00
Eric House
9ddee9790d
Merge tag 'android_beta_99' into android_branch
...
ready for fix-marshmallow-bt release
2015-12-30 06:41:39 -08:00
Eric House
c9264eecac
add debug-only code to assert that the hash on the move stack remains
...
unchanged across a push and pop. Was used to verify memstream.c change
just committed.
2015-12-30 06:31:02 -08:00
Eric House
0a91f852cc
add commented-out flag
2015-12-30 05:59:52 -08:00
Eric House
a2ca381890
remove assert when hashes don't match. As currently implemented, this
...
can happen when somebody does an undo, since the ordering of undos and
moves is not assured. The result is a temporary (I think) stall, where
a move is rejected because the hash doesn't match, but that will be
accepted later when the undo's been processed and the hash will now
match.
2015-12-30 05:59:06 -08:00
Eric House
89138edae1
when dumping stream, preserve the subset of bits in the last word
...
that's real data. This fixes assertions that after popping a move off
the move stack the hash is the same as before it was pushed. It may or
may not be sufficient to fix reported stalls, but it's certainly
necessary.
2015-12-30 05:56:01 -08:00
Eric House
6ce1fbe465
add red Dbg to the middle of variant's icon
2015-12-30 05:53:37 -08:00
Eric House
4ed843a529
start UDP at 100% by default since all clients will be that way now
2015-12-29 19:01:15 -08:00
Eric House
c96861b329
wrap hash-related logging in ifdefs so can be easily turned on
2015-12-29 19:00:30 -08:00
Eric House
e3d6cb74fc
for some reason log files are now considered binary by grep, so -a option's needed
2015-12-29 18:59:52 -08:00
Eric House
5e3f7d0731
remove logging
2015-12-29 18:58:28 -08:00
Eric House
2f5ae51d3f
experimental change toward fixing networking stalls: when the cache
...
thinks the network isn't up, check anyway. Probably needs to be done
on a backoff timer so we aren't checking every few milliseconds....
2015-12-29 07:14:27 -08:00
Eric House
299b8ddc70
assert when hashes don't match. This may be legit, but I need to
...
understand when it can happen because I think it's the cause of games
failing to communicate in the field
2015-12-29 07:11:05 -08:00
Eric House
78d435c8cc
fix what are errors with new compiler
2015-12-29 07:09:50 -08:00
Eric House
ec9f233fdd
fix assertion, and up version code since I already uploaded a beta to
...
google
2015-12-27 20:48:41 -08:00
Eric House
b4d919b3a1
remove logging
2015-12-22 11:46:19 -08:00
Eric House
285dedb75f
fix NPE -- by inspection after a logged crash: can't reproduce
2015-12-21 22:31:27 -08:00
Eric House
49caf6505a
up strings and changelog for new release
2015-12-21 18:50:04 -08:00
Eric House
7878fd8fcc
fix test to hide menu when it'll otherwise cause an array
...
out-of-bounds exception. Thanks Aidan.
2015-12-21 18:23:41 -08:00
Eric House
3635abb17d
changes in players matter for local games too
2015-12-21 18:22:04 -08:00
Eric House
ea4e437e94
fix, by inspection, NPE reported through the Play Store.
2015-12-21 18:21:59 -08:00
Eric House
c48580b4ba
generated changes
2015-12-21 18:04:35 -08:00
Eric House
3da798f437
required by prev commit: follow api change to work around marshmallow
...
address change.
2015-12-21 18:00:41 -08:00
Eric House
f78cd0f656
fix another source of bad/marshmallow addresses, and add asserts to
...
catch any others.
2015-12-21 18:00:25 -08:00
Eric House
162ab11f12
fix, at least for most cases, Marshmallow change that doesn't let an
...
app know the BT/Mac addr of its own interface. The new bogus addr is
transmitted in common/ structs, and so sending code need to look up by
name when told to use that address.
2015-12-21 18:00:06 -08:00
Eric House
7cb1714568
fix compile -- new compiler, probably
2015-12-21 17:46:50 -08:00
Eric House
8e4867eccd
add some logging about network state
2015-12-21 17:04:40 -08:00
Eric House
6677a3e402
launch networked rematch games on creation, not just local ones
2015-12-21 16:42:54 -08:00
Eric House
f7df11b923
required by prev commit: follow api change to work around marshmallow
...
address change.
2015-12-21 16:27:11 -08:00
Eric House
7805900c07
fix another source of bad/marshmallow addresses, and add asserts to
...
catch any others.
2015-12-21 16:26:30 -08:00
Eric House
79e1473bf6
fix, at least for most cases, Marshmallow change that doesn't let an
...
app know the BT/Mac addr of its own interface. The new bogus addr is
transmitted in common/ structs, and so sending code need to look up by
name when told to use that address.
2015-12-21 15:56:52 -08:00
Eric House
536d220ba7
remove some logging
2015-12-21 15:42:57 -08:00
Eric House
57ba6ab693
remove org.apache.http (as SDK 23 prefers)
2015-12-13 12:17:33 -08:00
Eric House
87c6b3e0fe
use an enum for startActivityForResult requestCode to ensure they're
...
unique across the app.
2015-12-09 06:10:09 -08:00
Eric House
2a3bd60740
supply missing param
2015-12-08 07:15:26 -08:00
Eric House
db9c079356
fix to show files appearing in only one apk
2015-12-05 11:13:13 -08:00
Eric House
4e14477faf
script to compare .apk files, meant to aid in confirming that gradle
...
and ant are producing the same thing.
2015-12-04 21:51:10 -08:00
Eric House
9d42d76ae0
collapse a couple of list-specific classes into their superclasses.
2015-11-24 08:15:27 -08:00
Eric House
87edd09ab6
Cleanup: get rid of ListActivity. Eventually all Activities need to
...
inherit from FragmentActivity since there's no List-aware equivalent,
so XWListActivity now extends XWActivity and nearly all its methods go
away. getListView() and friends are all I needed to implement --
apparently.
2015-11-24 08:01:16 -08:00
Eric House
e3e4ebd7de
changes AS made
2015-11-23 07:51:54 -08:00
Eric House
97f24973e4
Rather than ask player for name on app install, ask every time he
...
creates a new game (but with a don't-ask-again check to avoid
annoying.) Make changes to DlgDelegate to support.
2015-11-23 07:51:31 -08:00
Eric House
0b0bd02e79
remove logging
2015-11-20 23:15:24 -08:00
Eric House
d468866a01
no more variables called socket; all are "sock" now.
2015-11-20 23:15:04 -08:00
Eric House
b7b664bee6
rename .apks to match the ant ones, including git revision info
2015-11-18 21:28:56 -08:00
Eric House
dc5b979e8a
including .apk signing, and turn on proguard, for release gradle builds
2015-11-18 06:27:11 -08:00
Eric House
e0cb84a332
AS changes -- should I be tracking these files?
2015-11-17 07:37:21 -08:00
Eric House
8626fdf027
refactor: move inline tests for being on emulator into a static method
2015-11-17 07:19:37 -08:00
Eric House
a2e00794fa
some stuff AS changed. I hope it stops doing this eventually
2015-11-12 07:30:09 -08:00
Eric House
6d948a33dd
name debug .apk using my convention, to include git rev
2015-11-12 07:29:49 -08:00
Eric House
58bf3ba07b
Merge remote-tracking branch 'maidu2/android_branch' into android_branch
...
Conflicts:
xwords4/android/XWords4/.gitignore
xwords4/android/XWords4/build.gradle
xwords4/android/scripts/common_targets.xml
2015-11-11 22:36:19 -08:00
Eric House
aa11bb50de
fix to work with modified script
2015-11-11 22:23:39 -08:00
Eric House
2f4fe1de72
some AS changes when run the first time. Source-level debugging of
...
java works!
2015-11-11 19:04:58 -08:00
Eric House
adbc3615c1
changes to run under gradle
2015-11-11 18:59:00 -08:00
Eric House
ca83f2ab8b
add exactly as came from modified sample app
2015-11-11 18:55:24 -08:00
Mario Frasca
0d688ab80e
Translated using Weblate (Slovak)
...
Currently translated at 69.0% (476 of 689 strings)
2015-11-09 21:45:04 +01:00
Eric House
46cb5404d0
fix so debug and release builds have the right setting passed to
...
ndk-build and keep their .o and .so files separate.
2015-11-06 21:10:45 -08:00
Eric House
9f28e5c350
more gradle improvements. Seems to build a usable .apk, but isn't
...
doing release/debug right yet.
2015-11-05 20:19:07 -08:00
Eric House
7aff11d7b0
files necessary for a gradle build (untested; need to commit and clone
...
elsewhere to be sure). I'm not moving things to the conventional
gradle locations yet -- want to keep the ant build working too for
now.
2015-11-04 06:28:57 -08:00
naofum
6a5462194e
Translated using Weblate (Japanese)
...
Currently translated at 100.0% (689 of 689 strings)
2015-11-04 09:44:43 +01:00
naofum
153f6a75c3
Translated using Weblate (Japanese)
...
Currently translated at 100.0% (689 of 689 strings)
2015-10-31 07:47:53 +01:00
Eric House
5d82636c26
allow using env variables in ant files
2015-10-30 05:42:27 -07:00
Eric House
6f1235492d
disable local-game reminders by default
2015-10-29 07:31:21 -07:00
Eric House
2f579832b4
trivial refactor
2015-10-29 07:02:18 -07:00
Eric House
77315b50ba
changes in players matter for local games too
2015-10-29 07:01:01 -07:00
Eric House
67fb55ccf2
Clear thumbnail when saving changes. Not sure this is the best place
...
to do it, but it fixes the problem I'm after.
2015-10-29 07:00:22 -07:00
Eric House
c581bb93ad
change default to checked so code doesn't have to set it
2015-10-29 06:32:18 -07:00
Eric House
83baa5a00c
don't allow removing players when game is locked
2015-10-29 06:31:32 -07:00
Eric House
3b6a0cda74
Don't keep game locked the whole time config activity is open: lock to
...
load, then again if needed to save.
2015-10-27 19:18:10 -07:00
Eric House
a2a073067c
fix assertion due to lock conflict between game config and context
...
menu updating by having updating not insist on getting the lock.
2015-10-27 07:32:18 -07:00
Eric House
59d01dc6a2
cleanup debug stack printing
2015-10-27 07:26:06 -07:00
Eric House
564b682e64
fix to correctly show stack of lock owner (in debug mode)
2015-10-27 07:25:42 -07:00
Eric House
4e7b2dc727
implement rematch menu: create a new game that will invite when opened
2015-10-27 06:22:52 -07:00
Luiz Wagner Tavares Nascimento
5737277444
Translated using Weblate (Portuguese)
...
Currently translated at 61.6% (425 of 689 strings)
2015-10-26 03:44:54 +01:00
Eric House
ddc9c5f920
beginning of rematch menu: enabled correctly, but not yet handled
2015-10-23 05:41:20 -07:00
Eric House
5886394fd7
move menus
2015-10-23 05:26:14 -07:00
Eric House
082b0e06ac
tweak <one> elements to not substitute in the digit
2015-10-22 06:31:58 -07:00
Eric House
2c558ab905
Turn off relay invite. I want to get a release out before I'm like to
...
resolve all issues.
2015-10-22 06:30:19 -07:00
Eric House
058be41265
change file name
2015-10-22 06:18:47 -07:00
naofum
aac42ef39a
Translated using Weblate (Japanese)
...
Currently translated at 32.3% (223 of 689 strings)
2015-10-22 12:44:42 +02:00
Eric House
f29d302f06
implement context menus for group items too, and add select/deselect
...
items for both -- for groups because there's no other way to select
now. Still not sure how to educate users about the change or to
provide a choice (if it's worth doing).
2015-10-21 06:31:09 -07:00
Eric House
6aa994e2c6
first cut at putting back context menus. For games only (not groups),
...
and done by duplicating the .xml file. TODO: support groups, unify
menu .xml files, and have a user preference controlling whether
context menus are available or at least a newbie info explaining the
change.
2015-10-20 06:21:43 -07:00
Michal Čihař
0e2f465173
Translated using Weblate (Czech)
...
Currently translated at 19.4% (134 of 689 strings)
2015-10-19 09:44:12 +02:00
Eric House
a02ca24ab4
remove buttons I'm not using, and put the final action button at the bottom
2015-10-15 06:46:53 -07:00
Eric House
1da2dd5330
snapshot of effort to add listing of previous opponent devices to be
...
invited. So far it creates the list of devices ok, and inviting from
it works, but they're not yet named, and the list isn't persisted.
2015-10-15 06:44:10 -07:00
Eric House
27312f7853
add comment
2015-10-15 06:32:47 -07:00
Eric House
5d81b3375b
add support for fetching devIDs for connnames, required to allow
...
inviting based on existing relay games.
2015-10-15 06:32:11 -07:00
Eric House
9d795ff01d
Makefile to build new "zinga" wordlist, and config changes to include
...
all letters, including those for which there are no tiles.
2015-10-12 21:42:22 -07:00
Eric House
590ae6bd8c
fix test to hide menu when it'll otherwise cause an array
...
out-of-bounds exception. Thanks Aidan.
2015-10-07 08:06:26 -07:00
naofum
6d88d56c40
Translated using Weblate (Japanese)
...
Currently translated at 100% (0 of 0 strings)
Created new translation.
2015-10-04 16:12:50 +02:00
Eric House
77c92ac4f3
improve a couple of plurals elements
2015-09-30 06:54:33 -07:00
Eric House
4c1786e65b
remove unused imports
2015-09-30 06:54:07 -07:00
Eric House
87517edd6f
fix counting of messages sent by "Resend messages" menuitem: actually
...
count them, and do so based on new msgNo passed from comms that's
concatenation of channelNo and msgID so that duplicates (over multiple
transports) aren't counted twice.
2015-09-30 06:50:04 -07:00
Eric House
d79ecfaf30
update URL for Catalan/DISC word lookup, from the maintainer.
2015-09-28 06:54:53 -07:00
Eric House
f363fadf39
fix, by inspection, NPE reported through the Play Store.
2015-09-28 06:46:37 -07:00
Eric House
e9059cba47
provide default rematch game name that makes sense on both devices
2015-09-24 20:26:43 -07:00
Weblate
d14a053e70
Merge remote-tracking branch 'origin/android_translate' into android_translate
2015-09-24 20:54:40 +02:00
Eric House
8a3bc943c8
give user a chance to name game during rematch of solo games too
2015-09-24 06:51:55 -07:00
Eric House
5e3ae54e2e
cleanup
2015-09-24 06:50:26 -07:00
Eric House
37094b72f3
fix crash, and clean up rematch game naming code. Deals with solo
...
games too though not used.
2015-09-23 19:11:43 -07:00
Eric House
873e0c7e92
make dbg variant "debuggable"
2015-09-23 19:01:21 -07:00
Eric House
7783021fd7
give player a chance to name rematch game, and provide default that
...
includes opponent's name
2015-09-23 07:53:49 -07:00
Eric House
b73b29fcca
log what's sent too -- for debugging update process
2015-09-22 20:39:37 -07:00
Eric House
8a2ca8195e
log bad json data
2015-09-22 20:23:08 -07:00
Eric House
a2fb6045a8
tweak move reminder strings
2015-09-22 20:21:58 -07:00
Eric House
bfce38c088
use a hash map instead of a bunch of str-compares.
2015-09-22 20:18:27 -07:00
Eric House
b3a93cc474
Make separate turn reminder disable prefs for solo and networked
...
games, as some folks playing against the robot don't need to be
reminded. From a feature request submitted via sourceforge.
2015-09-22 07:35:02 -07:00
Eric House
32cd08b1dc
oops: include new URL in note
2015-09-22 07:23:19 -07:00
Eric House
ccab839e66
change for new list, and also to use format better suited for keeping
...
wordlists in git.
2015-09-22 07:10:25 -07:00
Joan Montané
5f3a029ff7
Translated using Weblate (Catalan)
...
Currently translated at 100.0% (689 of 689 strings)
2015-09-22 00:09:57 +02:00
Sylvie
757add997b
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (689 of 689 strings)
2015-09-21 18:44:15 +02:00
Eric House
cb1d7dff71
Merge branch 'android_branch' into relay_noconn
...
# 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-09-21 07:14:01 -07:00
Eric House
b3a2e28647
copy over from android_translate branch
2015-09-17 19:38:00 -07:00
Eric House
311015103e
Merge remote-tracking branch 'weblate/android_translate' into android_translate
...
# 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-09-17 19:36:18 -07:00
Sylvie
b30822e488
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (689 of 689 strings)
2015-09-17 16:58:43 +02:00
Eric House
6f3b80cc68
catch up with recent changes
2015-09-17 07:11:39 -07:00
Eric House
81b8f9bcf6
Merge branch 'android_branch' into android_translate
...
# 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-09-17 07:09:44 -07:00
Eric House
3040d7f487
use new protocol for next release
2015-09-17 07:06:59 -07:00
Eric House
122335c53c
Merge branch 'android_branch' into relay_noconn
...
# 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-09-17 07:00:04 -07:00
Eric House
db1f569430
in chat window, don't show send menu item unless text is non-empty
2015-09-17 06:59:02 -07:00
Eric House
b8822f72bc
Change return types to match recent signature change. Apparently the
...
NDK's compiler is configured to be stricter than Ubuntu's.
2015-09-17 06:51:15 -07:00
Eric House
a9ddf98541
Merge branch 'android_branch' into android_translate
2015-09-16 07:08:53 -07:00
Eric House
34ecd92ff5
script to copy translation data from android_translate branch
2015-09-16 07:01:09 -07:00
Eric House
6eb2e8e174
pull in latest French translation
2015-09-16 06:49:52 -07:00
Eric House
0ce2d50504
merge latest French translation
2015-09-16 06:47:46 -07:00
Eric House
5d59bcd011
Revert to old proto since the version that's out there now won't work
...
with the new. Can switch once this version's distributed.
2015-09-16 06:42:01 -07:00
Eric House
f3d8f0b8ee
pass V=1 to ndk build script to make cc calls verbose
2015-09-15 20:57:39 -07:00
Eric House
cba1293bec
make return value void since it's never used
2015-09-15 20:54:01 -07:00
Eric House
05d0974823
Merge remote-tracking branch 'origin/android_branch' into android_branch
...
# 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-09-15 20:46:35 -07:00
Eric House
c8fcc32c2c
When two moves are identical (i.e. a one-letter word that forms two
...
words words) drop one when looking for hints
2015-09-14 08:49:52 -07:00
Eric House
759cd36162
Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch
...
Conflicts:
xwords4/android/XWords4-dbg/AndroidManifest.xml
xwords4/android/scripts/mkvariant.sh
2015-09-10 18:34:28 -07:00
Eric House
1a258be2f4
merge in latest from android_translate branch
2015-08-27 21:57:19 -07:00
Eric House
2d0dc6e192
Merge remote-tracking branch 'weblate/android_translate' into android_translate
...
Conflicts:
xwords4/android/XWords4/res_src/values-fr/strings.xml
2015-08-27 21:55:08 -07:00
Bernard Massot
a09e60d06e
Translated using Weblate (French)
...
Currently translated at 99.8% (689 of 690 strings)
2015-08-27 19:39:09 +02:00
Eric House
be44613773
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-08-27 07:53:14 -07:00
Eric House
75eb955050
Merge branch 'android_branch' into android_translate
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
2015-08-27 07:46:45 -07:00