Commit graph

11458 commits

Author SHA1 Message Date
Eric House
d6cf1d2f95 add comment about work needing doing 2020-01-11 20:44:12 -08:00
Eric House
9bb6f8c390 don't show NFC in network stats unless it's been used 2020-01-11 15:23:06 -08:00
Eric House
4fa1b3faf4 Don't join a game that's been idle for more than two weeks
The two weeks is configurable. But the idea is somebody creates a game
with a random name but it's never joined. Eventually the name is used
again and the first to connect joins the existing game that will never
progress. I could just prune from the DB, but this is less work ongoing.
2020-01-10 20:13:06 -08:00
Eric House
dfb33c01af remove some asserts from non-DEBUG builds
I don't want to be bitten by a default: Assert.fail() again.
2020-01-10 15:35:34 -08:00
Eric House
8291b70842 Merge branch 'android_branch' into android_translate 2020-01-10 14:03:12 -08:00
Eric House
a9a5cc14ca up strings for new release 2020-01-10 13:47:53 -08:00
Eric House
9b0d4cc88e Merge remote-tracking branch 'weblate/android_translate' into android_translate 2020-01-10 13:12:25 -08:00
Eric House
f7b312d3a5 up copyright: it's a new year! 2020-01-10 12:56:42 -08:00
Eric House
5874ccf5c2 up copyright: it's a new year! 2020-01-10 12:54:01 -08:00
Eric House
6417236505 add not-again checkbox to ask-phone-permission dialog
Otherwise if you're saying "no" you keep getting asked each time you
invite.
2020-01-10 12:43:25 -08:00
Eric House
e4bc2d99ed fix crash inviting via SMS/Text
Was asserting when NFC type came through. Bad.
2020-01-10 11:44:14 -08:00
Andrea Hernandiz Lopez
712b463ee9
Translated using Weblate (Spanish)
Currently translated at 20.4% (159 of 778 strings)
2020-01-10 20:21:25 +01:00
Eric House
2bfe91b6e8 Merge remote-tracking branch 'weblate/android_translate' into android_translate 2020-01-10 09:47:50 -08:00
Eric House
9406297c03 transmit sms phone in nli (and hard-code port=1)
This fixes on gtk version being able to invite to an SMS game using
relayID. I don't know why not transmitting port is ok; maybe android
doesn't use the port or gets it some other way, e.g. it's hard-coded for
each variant.
2020-01-09 21:24:38 -08:00
Andrea Hernandiz Lopez
6df6350061
Translated using Weblate (Catalan)
Currently translated at 94.9% (738 of 778 strings)
2020-01-09 16:33:03 +01:00
Eric House
cdbf574c0e add new files device{c,h}
I've long wanted common code and state that outlast a single game. The
smsproto stuff is a step in that direction, but this file will be a
place for anything new. Starting, perhaps, with a mapping of deviceID ->
addressInfo (e.g. BT name or SMS number of opponent device) that will
let me stop duplicating that stuff in every game's comms state. We'll
see. It's guarded by a compile-time flag so I can play with in on the
Linux version until ready.
2020-01-08 11:20:51 -08:00
Eric House
68890cdf86 don't pass relayDevID unless inviting using relay
And do some cleanup to make things more clear
2020-01-08 11:20:51 -08:00
Eric House
90903c24da Merge remote-tracking branch 'weblate/android_translate' into android_translate 2019-12-30 22:53:08 -08:00
Eric House
ef9a148eb4 Merge branch 'android_branch' into android_translate 2019-12-30 22:40:38 -08:00
Eric House
1eb3c7e2e0 Write relayID conditionally so we can drop it later 2019-12-30 22:26:07 -08:00
Eric House
864648c5b9 up changes for new release 2019-12-30 22:15:51 -08:00
Eric House
c663d33f88 fix string script to detect mismatch of format specifiers
Crash due to typo introduced by Weblate made me realize I wasn't running
the script that ensures translated strings have the same set of format
specifiers as the English -- which might not be strictly necessary, but
it's safer to enforce it for now. Moved a few remaining %s to %1$s style
while at it.
2019-12-30 22:09:23 -08:00
Eric House
278275a9cb get rid of pixelation using svg instead of png
There was only one size of png for the net status arrows. Now there are
svgs that generate the whole range. Also set color programatically to
avoid having to maintain four.
2019-12-30 13:50:24 -08:00
Eric House
2268d48fe2 remove dead code (old GCM stuff) 2019-12-30 10:53:27 -08:00
Eric House
15239d4a6c Control showing message count via a prefs checkbox
Off by default on non-DEBUG builds, but still available.
2019-12-29 08:33:38 -08:00
Eric House
381efc9ddb refactor to avoid ClassNotFound crash where SDK<19 2019-12-29 06:45:41 -08:00
Eric House
42da9b1ebf don't allow devid of 0 2019-12-28 09:43:01 -08:00
Eric House
d4d4693def makefile for new French wordlist 2019-12-28 09:01:10 -08:00
Eric House
8b06cde971 up strings for new release and cleanup 2019-12-28 08:35:49 -08:00
Bernard Massot
329428c791
Translated using Weblate (French)
Currently translated at 95.5% (743 of 778 strings)
2019-12-27 23:21:15 +01:00
Eric House
29480d2867 use the right variable for array access 2019-12-26 09:29:06 -08:00
Eric House
85fd353829 initialize variable flagged by valgrind 2019-12-26 09:28:58 -08:00
Andrea Hernandiz Lopez
170465077f
Translated using Weblate (Spanish)
Currently translated at 12.0% (93 of 778 strings)
2019-12-24 16:21:10 +01:00
Eric House
ae0d2facb4 remove debug option that no longer works
(NFC send-to-self would be very different now.)
2019-12-23 09:52:56 -08:00
Eric House
0153928bcd support sending invites and moves via NFC
Use low-level NFC, a combination of emulated card and reader mode, to
work around Google's removal of "beaming" support from Android 10. App
emulates a card by declaring support in its AndroidManifest. When a game
is open that has data to send, it goes periodically into read mode. If
two devices are touched while one is in read mode and the other isn't,
they handshake and open a connection that should last until they're
separated. The devices loop, sending messages back and forth with or
without data (as available.)
2019-12-23 08:45:55 -08:00
Eric House
ccaa3c67fc use enums for table names
Cleans up the code a bit, adding type-safety where it probably wasn't
needed but also letting me iterate over all tables. Not being able to do
the latter had allowed db-replacement code (useful only for debugging,
probably) to get out of date.
2019-12-23 08:25:43 -08:00
Eric House
97a80e7084 clean up email invite string
The tap-here link and attachment weren't working, so remove them.
2019-12-22 23:19:01 -08:00
Eric House
dae24f55d4 fix reported NPE: try 100ms to get lock then give up
I suspect it's really rare to fail to get the lock when the game's not
open, but hope that trying 100ms before giving up will make failure to
save rare enough to be ok.
2019-12-22 23:19:01 -08:00
Eric House
7b30921190 fix ClassCastException, and fix moving to new group
(Fixing the latter fixed the former.)
2019-12-22 23:19:01 -08:00
Eric House
47d4d51876 pull in stream changes from dup branch
No impact now, but I want to change the game stream format to add
deviceID somewhere and that won't merge with these other changes.
2019-12-22 23:19:01 -08:00
Andrea Hernandiz Lopez
7b53c48a7c Translated using Weblate (Spanish)
Currently translated at 11.4% (89 of 778 strings)
2019-12-22 23:19:01 -08:00
Andrea Hernandiz Lopez
cdd162b4c7 Translated using Weblate (Spanish)
Currently translated at 9.3% (72 of 778 strings)
2019-12-22 23:19:01 -08:00
Andrea Hernandiz Lopez
cfa8222762 Translated using Weblate (Spanish)
Currently translated at 3.2% (25 of 778 strings)
2019-12-22 23:19:01 -08:00
Hosted Weblate
4c60199fb0
Merge branch 'origin/android_translate' into Weblate. 2019-12-21 06:23:22 +01:00
Andrea Hernandiz Lopez
540e16b121
Translated using Weblate (Spanish)
Currently translated at 11.4% (89 of 778 strings)
2019-12-19 18:23:35 +01:00
Andrea Hernandiz Lopez
aac9597b2c
Translated using Weblate (Spanish)
Currently translated at 9.3% (72 of 778 strings)
2019-12-18 16:21:12 +01:00
Eric House
764cefcddd debug only: show pending msg count in game list item 2019-12-16 06:44:13 -08:00
Eric House
2a54f6f176 cleanup: make linux more like android
Wasn't using the game_receiveMessage() utility
2019-12-14 10:55:05 -08:00
Andrea Hernandiz Lopez
6d6750472f
Translated using Weblate (Spanish)
Currently translated at 3.2% (25 of 778 strings)
2019-12-14 13:21:20 +01:00
Eric House
f22868e5f4 Merge branch 'android_branch' into android_translate 2019-12-13 11:35:54 -08:00
Eric House
d3f8120ab5 Merge remote-tracking branch 'weblate/android_translate' into android_translate 2019-12-13 11:32:02 -08:00
Eric House
84b3c65373 always print comms_stats (if DEBUG) 2019-12-12 22:02:30 -08:00
Andrea Hernandiz Lopez
76b26be359
Added translation using Weblate (Spanish) 2019-12-11 12:24:16 +01:00
Eric House
0493ad2ef8 cleanup (changed to debug and want to keep changes) 2019-12-10 21:10:21 -08:00
Eric House
c7ebe6e80e add debug-only pending-msg count to connstatus display
I'm bringing this in from another branch because it'll be useful for
debugging bluetooth problems.
2019-12-10 14:42:54 -08:00
Eric House
b7ef8935d8 cleanup 2019-12-08 15:43:25 -08:00
Eric House
d2871c92ba move compile-time constant into gradle file 2019-12-03 10:52:56 -08:00
naofum
ecfd6bacb6 Translated using Weblate (Japanese)
Currently translated at 100.0% (778 of 778 strings)
2019-12-03 08:45:40 -08:00
Allan Nordhøy
41b376e4b0 Translated using Weblate (Norwegian Bokmål)
Currently translated at 83.2% (647 of 778 strings)
2019-12-03 08:45:40 -08:00
Allan Nordhøy
49e6e679ed Translated using Weblate (English)
Currently translated at 100.0% (778 of 778 strings)
2019-12-03 08:45:40 -08:00
Allan Nordhøy
576f2f6858 Translated using Weblate (Norwegian Bokmål)
Currently translated at 83.0% (646 of 778 strings)
2019-12-03 08:45:40 -08:00
WaldiS
4dccfae5b2 Translated using Weblate (Polish)
Currently translated at 94.7% (737 of 778 strings)
2019-12-03 08:45:40 -08:00
Andreas Kleinert
74688322f4 Translated using Weblate (German)
Currently translated at 100.0% (778 of 778 strings)
2019-12-03 08:45:40 -08:00
Joan Montané
5055af5a39 Translated using Weblate (Catalan)
Currently translated at 95.1% (740 of 778 strings)
2019-12-03 08:45:40 -08:00
Allan Nordhøy
9c1f02d001 Translated using Weblate (Norwegian Bokmål)
Currently translated at 83.0% (646 of 778 strings)
2019-12-03 08:45:40 -08:00
Joan Montané
2d9e137600 Translated using Weblate (Catalan)
Currently translated at 93.2% (725 of 778 strings)
2019-12-03 08:45:40 -08:00
Estébastien Robespi
d530f87c77 Translated using Weblate (French)
Currently translated at 92.8% (722 of 778 strings)
2019-12-03 08:45:40 -08:00
Allan Nordhøy
2e45e65b6c Translated using Weblate (Polish)
Currently translated at 94.5% (735 of 778 strings)
2019-12-03 08:45:40 -08:00
Allan Nordhøy
d5a10f0f8c Translated using Weblate (Catalan)
Currently translated at 92.4% (719 of 778 strings)
2019-12-03 08:45:40 -08:00
Allan Nordhøy
84dd6385d0 Translated using Weblate (Japanese)
Currently translated at 100.0% (778 of 778 strings)
2019-12-03 08:45:40 -08:00
naofum
92afb08b28 Translated using Weblate (Japanese)
Currently translated at 100.0% (778 of 778 strings)
2019-12-03 08:45:40 -08:00
naofum
b1277869c1 Translated using Weblate (Japanese)
Currently translated at 89.6% (697 of 778 strings)
2019-12-03 08:45:40 -08:00
naofum
a4b0527bcd Translated using Weblate (Japanese)
Currently translated at 73.3% (570 of 778 strings)
2019-12-03 08:45:40 -08:00
Wee
e42bc6f262 Translated using Weblate (German)
Currently translated at 99.7% (776 of 778 strings)
2019-12-03 08:45:40 -08:00
Allan Nordhøy
03f72c6d1c Translated using Weblate (Norwegian Bokmål)
Currently translated at 82.8% (644 of 778 strings)
2019-12-03 08:45:40 -08:00
Allan Nordhøy
443a0bd2bd Translated using Weblate (English)
Currently translated at 100.0% (778 of 778 strings)
2019-12-03 08:45:40 -08:00
Andreas Kleinert
07b24ea821 Translated using Weblate (German)
Currently translated at 100.0% (778 of 778 strings)
2019-12-03 08:45:40 -08:00
Eric House
f4845efc3f don't include NFC in network status 2019-12-03 08:26:51 -08:00
Eric House
5fb08cd35f update changelog 2019-12-03 08:10:40 -08:00
Eric House
5fe46f275c communicate FCM deviceID to relay immediately
Don't wait for second connection! This makes new installs able to get a
game going much more reliably.
2019-11-30 20:24:43 -08:00
Eric House
2d81135487 set dbname in build.gradle 2019-11-30 19:49:29 -08:00
Eric House
ee9f3c36f8 fix crash opening older games
I'd forgotten that merely adding a new type changed the game's binary format.
2019-11-30 18:43:28 -08:00
Eric House
496ef73da2 cleanup and remove one bad assertion 2019-11-27 11:47:46 -08:00
Eric House
9373dce0df fix fcm_msg.py test script (force to take devid) Works! 2019-11-27 11:47:46 -08:00
Eric House
20e9754966 don't print NFC stats 2019-11-27 09:35:07 -08:00
Eric House
ced26e8e37 remove release-build-only warning 2019-11-27 08:44:09 -08:00
Eric House
8d1065ea75 up strings for new release 2019-11-27 07:32:49 -08:00
Eric House
7eaa466f78 add ability to send moves via NFC
You can now play an entire game via NFC. There's no UI though: big
question is how to make the feature "discoverable."
2019-11-23 10:53:51 -08:00
Eric House
1e7ae2b2ec fix lower->upper translation: tr didn't like my strings
For whatever reason, though emacs thought the lower- and uppercase
strings I was passing to tr were the same but for case two letters were
getting dropped. This lets tr figure things out itself.
2019-11-19 22:27:41 -08:00
Eric House
8da3c5fc68 add comms_getPending(), and refactor to implement 2019-11-18 09:26:46 -08:00
naofum
5045356e6e
Translated using Weblate (Japanese)
Currently translated at 100.0% (778 of 778 strings)
2019-11-18 13:04:30 +01:00
Allan Nordhøy
e73664355f
Translated using Weblate (Norwegian Bokmål)
Currently translated at 83.2% (647 of 778 strings)
2019-11-16 16:04:24 +01:00
Allan Nordhøy
40454f4b24
Translated using Weblate (English)
Currently translated at 100.0% (778 of 778 strings)
2019-11-16 16:04:24 +01:00
Eric House
58c3ab4e4a first cut at python version of dawg2dict
Perl version doesn't work and I don't remember enough of the language to
fix it.
2019-11-13 13:22:30 -08:00
Eric House
c5a8319fa8 fix comment 2019-11-13 12:32:06 -08:00
Eric House
611e046987 check for undefined variable 2019-11-12 09:08:08 -08:00
Eric House
c69ec52502 add comms stats to conn status display (DEBUG only) 2019-11-05 08:30:38 -08:00
Eric House
a35f0f7339 fix stall when sending chat
Oops. Old code doesn't mark chat messages as successfully processed.
2019-11-05 08:30:15 -08:00
Eric House
f8a84cbe0a adding missing DB field
Can't upgrade a game if the field's missing so just add it. Adding a
notion of versioning and upgrading isn't worth the effort.
2019-11-03 18:14:47 -08:00
Eric House
56fc359f42 fix counts/values for 'D' (thanks Peter) 2019-11-03 18:12:24 -08:00