Commit graph

11885 commits

Author SHA1 Message Date
Eric House
b6a74b7d15 update change log 2020-08-09 12:18:34 -07:00
Eric House
0e3651131e get rid of two unnecessary classes 2020-08-09 12:17:34 -07:00
Allan Nordhøy
5f4362c266
Translated using Weblate (Norwegian Bokmål)
Currently translated at 77.8% (657 of 844 strings)
2020-08-09 15:32:47 +02:00
Allan Nordhøy
db09379118
Translated using Weblate (Japanese)
Currently translated at 99.4% (839 of 844 strings)
2020-08-09 15:32:46 +02:00
Allan Nordhøy
7933a70399
Translated using Weblate (English)
Currently translated at 100.0% (844 of 844 strings)
2020-08-09 15:32:46 +02:00
Eric House
0b9f628115 fix string 2020-08-07 18:42:39 -07:00
Eric House
d0145779ce fix string 2020-08-07 18:41:46 -07:00
Eric House
e8175d69aa fix problems iterating backwards with start-with pattern 2020-08-07 11:05:58 -07:00
Eric House
e5dd43ee1b Merge branch 'android_translate' into android_branch 2020-08-06 11:44:16 -07:00
Eric House
798f8421da show delimiter when language requires it 2020-08-06 11:41:50 -07:00
Eric House
0f9bcd9898 let user choose between tile-spellings 2020-08-06 11:37:05 -07:00
Eric House
87337ba789 add a show-faq menu 2020-08-05 14:01:34 -07:00
Eric House
92c1180411 add button taking you to the (new) FAQ 2020-08-05 13:46:44 -07:00
Eric House
b8f359c3e5 add filtering to wordlist browser
Add a basic regular expression engine to the dictiter, and to the UI add
the ability to filter for "starts with", "contains" and "ends with",
which translate into ANDed RE_*, _*RE_* and _*RE, respectively (with
_ standing for blank/wildcard). The engine's tightly integrated with the
next/prevWord() functions for greatest possible speed, but unless
there's no pattern does slow things down a bit (especially when "ENDS
WITH" is used.) The full engine is not exposed (users can't provide raw
REs), and while the parser will accept nesting (e.g. ([AB]_*[CD]){2,5}
to mean words from 2-5 tiles long starting with A or B and ending with C
or D) the engine can't handle it. Which is why filtering for word length
is handled separately from REs (but also tightly integrated.)

Users can enter strings that don't map to tiles. They now get an
error. It made sense for the error alert to have a "Show tiles"
button, so there's now a dialog listing all the tiles in a wordlist,
something the browser has needed all along.
2020-08-05 09:47:44 -07:00
Eric House
d71cf6cac6 remove assert
It's firing on a device whose screen happens to be the wrong size. Seems
nothing bad happens in spite of proceeding, so let's....
2020-08-01 20:16:41 -07:00
Eric House
1d587caf85 remove dead symlink
(part of reverting f-droid mqtt removal I missed)
2020-07-27 20:50:54 -07:00
Eric House
915b47d612 use mavenCentral instead of eclipse's repo 2020-07-27 20:36:42 -07:00
Eric House
965ecc51e2 user newer ndk version (required by f-droid) 2020-07-27 20:36:42 -07:00
Eric House
f59b51268d Revert "Remove mqtt from f-droid build"
This reverts commit 7583c26e41.
2020-07-27 09:32:27 -07:00
Allan Nordhøy
1445e29d4b
Translated using Weblate (Norwegian Bokmål)
Currently translated at 75.4% (637 of 844 strings)
2020-07-26 23:41:52 +02:00
Eric House
f4104a318a modify version strings for new release 2020-07-25 14:03:49 -07:00
Eric House
f32b894843 Remove mqtt from f-droid build
The Maven repo that includes the (FOSS) client library for MQTT isn't
approved by the f-droid build system, so for now rip MQTT out of that
variant. Long-term I'll have to fix this, either by persuading the
f-droid folk to permit the library or by building the C client from
source in my jni library -- or when the relay goes away the f-droid
build will cease to offer internet play.
2020-07-25 13:59:29 -07:00
Eric House
197897c95e remove obsolete credit 2020-07-25 13:58:29 -07:00
Eric House
6905b0cfcf cleanup and update version strings
commented out more of variable line-thickness since the ability to set
has been removed.
2020-07-25 13:58:29 -07:00
Eric House
3cbc707b1d add change notes
Version upgrade to follow
2020-07-25 13:58:29 -07:00
Eric House
df8a9f5108 quarantine: tolerate one crash but not two
I was really after the situation where a game could never be
opened. There are lots of reasons a single failure can occur, not least
of which is installing via adb while game's open. :-)
2020-07-25 13:58:29 -07:00
Eric House
5d1bba2faf remove the under-construction icon
It looks bad, especially to a new user we suspect. Also add retries,
hoping that whatever caused the thumbnail to fail to load once will not
happen again.
2020-07-25 13:58:29 -07:00
Eric House
fcc2beb857 add preference to set cell line thickness 2020-07-25 13:58:29 -07:00
Eric House
725bec1a7a add pref to set color of board lines 2020-07-25 13:58:29 -07:00
Eric House
7daf3313e0 fix to include optional info.txt info 2020-07-25 13:58:29 -07:00
Eric House
d98430aa0d improving prep of byod files 2020-07-25 13:58:29 -07:00
Eric House
6f6e5516c9 add LANGFILTER so byod can build Hungarian 2020-07-25 13:58:29 -07:00
Eric House
d2a997d0ee don't exit badly when piped 2020-07-25 13:58:29 -07:00
Eric House
67d91111df more tweaks for byod 2020-07-25 13:58:29 -07:00
Eric House
a75264c8eb tweaks for byod 2020-07-25 13:58:29 -07:00
Eric House
666d2db62a add Makefile as symlink 2020-07-25 13:58:29 -07:00
Eric House
83b775a52c convert two more perl scripts to python 2020-07-25 13:58:29 -07:00
Eric House
042e5e6eab remove files I'll never need again 2020-07-25 13:58:29 -07:00
Eric House
f30bc77a5f rewrite some dawg perl scripts in python 2020-07-25 13:58:29 -07:00
Eric House
68343858d0 remove unneeded code 2020-07-25 13:58:29 -07:00
Eric House
6b2fceb468 more dialog cleanup
get rid of subclasses that are no longer separate, since features like
providing a not-again checkbox are available everywhere now.
2020-07-25 13:58:29 -07:00
Eric House
ba9fe85611 provide default Action to avoid NPE 2020-07-25 13:58:29 -07:00
Eric House
c8b587c29b simplify dialogs
Get rid of subclasses, since there's not the clear inheritance structure
I imagined. Any dialog type might want a not-again checkbox, or to have a
third button offer an unexpected option. This is a big change that needs
some bake time.
2020-07-25 13:58:29 -07:00
Eric House
37d774b9da on load, remove records missing a device
Can't test because changing the class meant the thing couldn't be
deserialized. Oh well. It was likely a fluke that caused the null dev
entry anyway.
2020-07-25 13:58:29 -07:00
Eric House
2b0dcbbd17 work around NPE
Not sure if the name being null is ok, but this is likely better code.
2020-07-25 13:58:29 -07:00
Eric House
fe7e85c93d fix to store mqtt id using properly-named key
And throw in temporary code so those of us testing the stuff don't have
all our existing games stop working.
2020-07-25 13:58:29 -07:00
Eric House
cfd988d998 changelog change 2020-07-25 13:58:29 -07:00
Eric House
ba342c891d Merge branch 'android_branch' into android_translate 2020-07-25 12:50:48 -07:00
Eric House
7583c26e41 Remove mqtt from f-droid build
The Maven repo that includes the (FOSS) client library for MQTT isn't
approved by the f-droid build system, so for now rip MQTT out of that
variant. Long-term I'll have to fix this, either by persuading the
f-droid folk to permit the library or by building the C client from
source in my jni library -- or when the relay goes away the f-droid
build will cease to offer internet play.
2020-07-25 11:59:00 -07:00
Eric House
18be14c760 remove obsolete credit 2020-07-20 18:16:02 -07:00
Eric House
e8127a22fb cleanup and update version strings
commented out more of variable line-thickness since the ability to set
has been removed.
2020-07-20 11:15:34 -07:00
ssantos
41b0060b1e
Translated using Weblate (Portuguese)
Currently translated at 46.6% (393 of 842 strings)
2020-07-20 17:41:51 +02:00
Eric House
4629f878a3 add change notes
Version upgrade to follow
2020-07-19 21:50:24 -07:00
Eric House
dbe48644c2 quarantine: tolerate one crash but not two
I was really after the situation where a game could never be
opened. There are lots of reasons a single failure can occur, not least
of which is installing via adb while game's open. :-)
2020-07-19 21:30:22 -07:00
Eric House
e8c18b74d0 remove the under-construction icon
It looks bad, especially to a new user we suspect. Also add retries,
hoping that whatever caused the thumbnail to fail to load once will not
happen again.
2020-07-19 21:15:15 -07:00
Eric House
982200cb3b add preference to set cell line thickness 2020-07-19 18:04:00 -07:00
Eric House
ad4542b4ac add pref to set color of board lines 2020-07-19 17:31:50 -07:00
naofum
9724daa562
Translated using Weblate (Japanese)
Currently translated at 100.0% (842 of 842 strings)
2020-07-16 12:41:49 +02:00
Eric House
729fb5d6b7 fix to include optional info.txt info 2020-07-07 11:54:45 -07:00
Eric House
45e7e716b9 improving prep of byod files 2020-07-07 10:37:23 -07:00
Eric House
a2335064da add LANGFILTER so byod can build Hungarian 2020-07-03 20:58:47 -07:00
Eric House
8a35b61808 don't exit badly when piped 2020-07-03 20:56:45 -07:00
Eric House
52aeb6991d more tweaks for byod 2020-07-03 19:06:16 -07:00
Eric House
cc2b61af7d tweaks for byod 2020-07-01 20:55:56 -07:00
Eric House
41a600d2f1 add Makefile as symlink 2020-07-01 11:03:55 -07:00
Eric House
a7343f6a1d convert two more perl scripts to python 2020-07-01 10:44:26 -07:00
Eric House
10ae99fb5e remove files I'll never need again 2020-06-30 20:06:20 -07:00
Eric House
98d134b491 rewrite some dawg perl scripts in python 2020-06-30 09:48:08 -07:00
BrunaKimura
f22d90595f
Translated using Weblate (Portuguese)
Currently translated at 46.6% (393 of 842 strings)
2020-06-26 22:41:44 +02:00
Eric House
6f049c0b27 remove unneeded code 2020-06-25 12:01:44 -07:00
Eric House
e72532c999 more dialog cleanup
get rid of subclasses that are no longer separate, since features like
providing a not-again checkbox are available everywhere now.
2020-06-25 10:20:19 -07:00
Eric House
4d960c2115 provide default Action to avoid NPE 2020-06-23 09:41:40 -07:00
Eric House
04534d729e simplify dialogs
Get rid of subclasses, since there's not the clear inheritance structure
I imagined. Any dialog type might want a not-again checkbox, or to have a
third button offer an unexpected option. This is a big change that needs
some bake time.
2020-06-23 08:51:29 -07:00
Eric House
4a3f5d5a44 on load, remove records missing a device
Can't test because changing the class meant the thing couldn't be
deserialized. Oh well. It was likely a fluke that caused the null dev
entry anyway.
2020-06-21 11:32:19 -07:00
Eric House
1398e1ed55 work around NPE
Not sure if the name being null is ok, but this is likely better code.
2020-06-20 14:43:21 -07:00
Eric House
927f9a8f83 fix to store mqtt id using properly-named key
And throw in temporary code so those of us testing the stuff don't have
all our existing games stop working.
2020-06-19 11:50:44 -07:00
Oğuz Ersen
965e3dca3d
Translated using Weblate (Turkish)
Currently translated at 2.1% (18 of 842 strings)
2020-06-18 13:41:46 +02:00
Allan Nordhøy
becaca6670
Translated using Weblate (Norwegian Bokmål)
Currently translated at 75.5% (636 of 842 strings)
2020-06-18 13:41:45 +02:00
Allan Nordhøy
ba6580e990
Translated using Weblate (Polish)
Currently translated at 86.2% (726 of 842 strings)
2020-06-18 13:41:44 +02:00
Hosted Weblate
7002d36ac1
Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: Crosswords/Android
Translate-URL: https://hosted.weblate.org/projects/xwords/android/
2020-06-16 06:29:46 +02:00
Hosted Weblate
5c70ad23bf
Merge branch 'origin/android_translate' into Weblate. 2020-06-16 06:29:45 +02:00
Oğuz Ersen
4679542fec
Translated using Weblate (Turkish)
Currently translated at 2.1% (18 of 841 strings)
2020-06-16 06:29:45 +02:00
Eric House
51862140c6 Merge branch 'android_translate' into android_branch
This is from weblate's automated pruning of strings no longer in the
English base file
2020-06-15 17:54:48 -07:00
Eric House
92c7162878 Merge remote-tracking branch 'weblate/android_translate' into android_translate 2020-06-15 17:51:26 -07:00
Eric House
07bc2a08aa changelog change 2020-06-15 17:38:09 -07:00
WaldiS
6536628607 Translated using Weblate (Polish)
Currently translated at 88.4% (741 of 838 strings)
2020-06-15 17:32:19 -07:00
Michal Biesiada
1417bda08c Translated using Weblate (Polish)
Currently translated at 88.4% (741 of 838 strings)
2020-06-15 17:32:19 -07:00
ssantos
4b06a7d637 Translated using Weblate (Portuguese)
Currently translated at 46.4% (389 of 838 strings)
2020-06-15 17:32:19 -07:00
Eric House
6416428f7a convert to python3 2020-06-15 17:20:26 -07:00
Eric House
2f339450f3 fix to allow plurals items not in English
Change copy-strings.py to insist that no language provide a format
string not also found in English (since parameters to match all English
format string are sure to exist, but other languages are free NOT to
match them.) It's ok for other languages to provide "few", for example,
when English doesn't.
2020-06-15 13:02:18 -07:00
Eric House
9c4854e91f convert to python3 2020-06-15 13:02:18 -07:00
Hosted Weblate
399d342214
Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: Crosswords/Android
Translate-URL: https://hosted.weblate.org/projects/xwords/android/
2020-06-15 18:19:49 +02:00
Hosted Weblate
6b2b3a4645
Merge branch 'origin/android_translate' into Weblate. 2020-06-15 18:02:54 +02:00
Eric House
14f414d85f up strings for new release 2020-06-15 08:58:38 -07:00
Eric House
e44f19f04e include in register whether build is DEBUG 2020-06-13 18:10:05 -07:00
Eric House
af46660d6c make url for mqtt-relay apis a preference 2020-06-13 18:10:01 -07:00
Eric House
c4dfae13ee always disconnect inside clearInstance()
For some reason I wasn't unless it was the current instance, meaning
that some would leak and forever be connecting and disconnecting as
failures were in effect ignored.
2020-06-13 10:46:28 -07:00
Eric House
e4f213470c add a basic password for mqtt 2020-06-11 13:11:56 -07:00
Eric House
c3c041864d add under-construction icon as thumbnail fallback 2020-06-10 21:45:05 -07:00
Eric House
51a00cd829 allow everybody the new phonies option 2020-06-10 12:54:22 -07:00
Eric House
4508192a3a hide mqtt but couple it to relay
Idea is that if you have relay you have MQTT too. Eventually relay
should go away.
2020-06-10 09:53:26 -07:00
Eric House
28ff1022c3 fix typo in user-vis string 2020-06-10 09:50:25 -07:00
Eric House
9c890032c0 implement relay backoff timer
Moving logic into the timer itself. There's always meant to be one
running, set from between 10 seconds and 23 hours from now. Code
receiving messages (mqtt or relay) resets the backoff when a message is
received, so when there's activity the timer should stay short. Somebody
with no games at all will have attempts made to connect to the relay and
mosquitto once/day, which is when invitations via that method would be
received. Devices with FCM should see lower latency of course.
2020-06-10 08:31:55 -07:00
Eric House
63835105e4 remove relay-check-interval option and fix relay disable 2020-06-09 17:31:44 -07:00
Eric House
1560bf01ed move pref into newgame defaults -- since it is one 2020-06-09 16:13:08 -07:00
Eric House
699eef79cb change file name (nothing else) 2020-06-09 16:04:29 -07:00
Eric House
436d3c2ad0 fix crashes rematching from linux a games started on android
Didn't handle the case where a game included NFC or BT. I should
probably be stripping those on receipt as I think the android side does
when the devices doesn't support 'em. And that in turn should be common/
code. So just fix it for now so testing can continue.
2020-06-04 11:37:07 -07:00
Eric House
72e813038f fix mqtt problems
There were ways of leaving multiple instances running, I think fighting
for resources and keeping each other from connecting. Now I think there
can only be one. And lots of logging will help find future problems.
2020-06-04 11:36:04 -07:00
Eric House
5f31fedf70 handle new mqtt fcm message
Not sure yet how to restart, but this is a try
2020-06-03 18:53:10 -07:00
Eric House
7f6db851c8 move gameID into header to relay2 can snoop 2020-06-03 09:21:12 -07:00
Eric House
8f9bf100e5 register FCM id (and other stats) with new relay API 2020-06-02 11:56:05 -07:00
WaldiS
fdfdafa2c7
Translated using Weblate (Polish)
Currently translated at 88.4% (741 of 838 strings)
2020-06-01 17:41:39 +02:00
Michal Biesiada
d188c8b5bd
Translated using Weblate (Polish)
Currently translated at 88.4% (741 of 838 strings)
2020-06-01 17:41:39 +02:00
ssantos
85c8544e1e
Translated using Weblate (Portuguese)
Currently translated at 46.4% (389 of 838 strings)
2020-06-01 17:41:38 +02:00
Eric House
43ce9f390a force 16-letter devids 2020-05-31 23:42:44 -07:00
Eric House
27e784e784 change mqtt proto
Making return address part of a header of all messages so server-side
listener can snoop.
2020-05-31 13:13:31 -07:00
Eric House
bb9e0559dc change method name 2020-05-21 19:38:01 -07:00
Eric House
4d60205d12 Merge tag 'android_beta_159' into android_translate
fixes for Hungarian
2020-05-20 20:58:21 -07:00
Eric House
c48ff355de Merge branch 'android_translate' into android_branch 2020-05-20 20:55:32 -07:00
Eric House
2a98ab121a Merge remote-tracking branch 'weblate/android_translate' into android_translate 2020-05-20 20:51:59 -07:00
Eric House
7e62be0662 remove unused variable and incorrect --help param 2020-05-20 20:49:54 -07:00
Eric House
f6d7eed84d add mqtt as a new transport
This is meant to replace the relay eventually, but for now it's a new
option, like BT or SMS, to be chosen. Protocol is handled in common/
code for the first time, meaning that linux and android interact without
the need to keep two platforms in sync. Linux uses lib-mosquitto, and
Android uses eclipse's Paho client (the generic java version, not the
one that uses four-year-old Service patterns and so crashes for SDK >=
26.)
2020-05-20 13:58:53 -07:00
Eric House
996e0d62c7 show alert icon in place of chat when quarantined
It'll be helpful (non-release only) to see an alert icon for all games
that can't be opened.
2020-05-20 13:04:52 -07:00
Eric House
fe2d8712d4 log stash when exception caught 2020-05-19 11:58:42 -07:00
Eric House
a1719f14b2 prune quarantine data on launch
I had hundreds of val==zero entries
2020-05-19 08:00:17 -07:00
Eric House
e0b39bb9f4 fix getsigs to work with current build layout 2020-05-18 20:26:32 -07:00
Eric House
db30cea947 update to work with uncompressed Portuguese source 2020-05-18 20:24:36 -07:00
Eric House
4c28013439 fix per informant's instructions to build from git src 2020-05-15 08:33:23 -07:00
naofum
0de6415e49
Translated using Weblate (Japanese)
Currently translated at 100.0% (838 of 838 strings)
2020-05-12 13:41:31 +02:00
Eric House
90a175e509 string/version code changes for new release 2020-05-05 08:23:11 -07:00
Eric House
0e9661aa19 fix search of wordlists containing duplicates
Hungarian is unique (so far) in having two-letter tiles that can be
spelled with one-letter tiles AND in allowing words to be spelled both
ways. This crashed search based on strings because there were
duplicates. So now search is done by tile arrays. Strings are first
converted, and then IFF there is more than one tile array result AND the
wordlist has the new flag indicating that duplicates are possible, THEN
the user is asked to choose among the possible tile spellings of the
search string.
2020-05-04 08:33:15 -07:00
Eric House
98ce0e416f api cleanup: dict_iter -> di
(JNI changed too, so it's not just compiler-checked, but tests ok)
2020-05-03 21:45:08 -07:00
Eric House
851fa1a76e let's not change the Spanish wordlist name rashly 2020-05-03 21:28:33 -07:00
Eric House
d4bf908055 Merge branch 'android_translate' into android_branch 2020-05-03 16:48:44 -07:00
Eric House
02e40ddd92 fix build error: specifier sets must match
Strictly speaking I think a subset is ok. I need to fix my build scripts
OR figure out how to enable the checking Weblate claims to have. The
string I modified is isn't used AFAIK so it's not urgent.
2020-05-03 16:38:48 -07:00
Eric House
353e9cf795 remove assertions from dictiter code on Android
Makes wordlist scrolling really slow, and since it's common code keeping
the assertions in Linux is probably good enough.
2020-05-03 10:18:37 -07:00
Eric House
aea47e0184 fix to use new param 2020-05-02 19:10:04 -07:00
Eric House
c4b4c9a0c8 handle 'len' param for dict info if provided 2020-05-02 18:38:42 -07:00
Eric House
2b8e6e192a include len in info for upgradeable wordlists
Server should offer to upgrade if size has changed: checksum doesn't
cover everything.
2020-05-02 13:04:32 -07:00
Eric House
67f74b3808 cleanup hungarian Makefile 2020-05-01 09:26:08 -07:00
Eric House
07f4774a7c refactor so common dictnry does more work
Linux and Android duplicated all the code to parse a wordlist file --
and shared a bug that needed fixing. So now most of that is in a common/
function both call, and the bug -- failing to mask out flag bits I don't
care about -- is fixed.
2020-05-01 09:18:27 -07:00
Eric House
f1f6d5b642 change name of Spanish wordlist
"Spanish" is redundant
2020-05-01 08:59:58 -07:00
Eric House
dfbbf2d480 don't assert wordlist length wrong
For some reason the header and dawg data in Spanish wordlist don't
agree. Until I fix this, remove the assertion from the (dev-use-only)
script that dumps wordlist since it breaks it for other uses.
2020-05-01 08:59:58 -07:00
Eric House
71575934b8 mark-bad menuitm (DEBUG) for standalone games too 2020-04-30 13:25:25 -07:00
Eric House
f7374f54c5 fix Spanish support for lowercase
"special" casing is specified in two places, and I forgot to modify the
second one when I added allowing lowercase alternative spellings
2020-04-30 13:06:01 -07:00
Eric House
2d6aa1d019 final change list change? 2020-04-30 09:21:30 -07:00
Eric House
5eef348a6c remove mistaken code (replacing with assert for now) 2020-04-29 12:31:31 -07:00
Eric House
fb2fcf15cc tmp fix for Hungarian: remove duplicate words
Find-prefix feature in current code crashes on Hungarian because it
allows duplicates (words that occur spelled with the same letters but
different tile combinations.) Modify Makefile to exclude those (as it
does for all other multi-letter-tile languages). And to pull the git
source of the wordlist on demand.
2020-04-29 12:29:26 -07:00
Jeannette L
ca9e4e741e
Translated using Weblate (French)
Currently translated at 90.4% (758 of 838 strings)
2020-04-29 21:11:18 +02:00
Jeannette L
8fc143d919
Translated using Weblate (German)
Currently translated at 91.1% (764 of 838 strings)
2020-04-29 21:11:18 +02:00