Eric House
9fb8671ef0
Merge branch 'android_branch' into android_translate
2018-08-04 11:14:54 -07:00
Markus Enzenberger
5d729094c3
Translated using Weblate (German)
...
Currently translated at 99.0% (743 of 750 strings)
2018-08-03 09:38:07 +02:00
Eric House
d23307f0ef
up strings for new release
2018-08-02 06:28:09 -07:00
Eric House
3d7d1b8ffd
don't call tile picker more than once
...
Some devices, including my Moto, are apparently calling server_do() more
than most. When the game's supposed to be asking the user to pick tiles
that resulted in stacked TilePickAlerts. The stack of these
sending (taken together) too many picked tiles to the game made it
crash. So modify server to have only one pending tile-pick request going
at a time. Because the server can't know when the user dismisses the
alert in Android and so won't post again, respond to the dismissal by
closing the game. Reopening will put it in a state where the tile picker
can get called again.
2018-08-01 20:30:51 -07:00
Eric House
0cc7d21ecb
fix race-condition NPE by inspection
2018-08-01 08:08:36 -07:00
Eric House
6a58a08bca
remove redundant specifier
2018-08-01 07:50:34 -07:00
Eric House
8286c9c116
new script for when release builds required
2018-08-01 07:48:02 -07:00
Eric House
f1c2eb79d4
remove x86 from jni; that chip's dead on Android
2018-08-01 07:37:33 -07:00
Eric House
e0c6621bfe
remove assert: messages not for me are common
2018-07-31 00:26:11 -07:00
Hosted Weblate
a44db6c942
Merge branch 'origin/android_translate' into Weblate
2018-07-31 08:56:08 +02:00
Eric House
803b4ff0f3
cleanup: load/initialize only when first needed
2018-07-30 08:00:00 -07:00
Eric House
bf06d4b4c2
fix not sending ACK_INVITE
...
Logic error meant it was never sent. Now always send on receipt of a
well-formed invitation, even if e.g. the recipient's missing a wordlist
and the game can't be started immediately.
2018-07-30 07:37:20 -07:00
Eric House
a23777bade
move byte[]<->NetLaunchInfo convert into the class
2018-07-27 07:44:02 -07:00
Eric House
2f10712379
revert to old invite data format
...
Had inadventently changed how NetLaunchInfo was transmitted, and crashed
on receiving from older builds. Fix to not crash, and then fix to send
and recieve in the old format.
2018-07-27 07:24:27 -07:00
Joan Montané
2c9d619f71
Translated using Weblate (Catalan)
...
Currently translated at 96.6% (723 of 748 strings)
2018-07-27 10:35:25 +02:00
Eric House
e637f49b95
include port and proto
...
Pretty sure couldn't have played against an older build without this.
2018-07-26 21:13:09 -07:00
Eric House
9ddc6e4b89
Move transision of cmd and gameid and port (pending) into smsproto
...
common code, simplifying and unifying what the platform-specific code
has to do. Seems to work.
2018-07-26 07:50:16 -07:00
Eric House
a65498c132
add missing Overrides -- in one file
2018-07-26 07:24:23 -07:00
Eric House
70b22f7d11
revert to sdk-23
...
Too much breaks with the upgrade and I don't have time to deal.
2018-07-21 21:36:51 -07:00
Eric House
affb13207e
up sdk version in the second place
2018-07-20 08:24:48 -07:00
Eric House
e1ba676a8e
Merge branch 'quick-bt-fix' into android_branch
2018-07-19 07:17:15 -07:00
Eric House
723e7d7953
update changes to include translations included
2018-07-19 06:57:21 -07:00
Allan Nordhøy
6abff25946
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 55.2% (413 of 748 strings)
2018-07-19 06:54:32 -07:00
Joan Montané
5ced000c8c
Translated using Weblate (Catalan)
...
Currently translated at 94.3% (706 of 748 strings)
2018-07-19 06:54:14 -07:00
Eric House
a9701525b7
up version string for new release
2018-07-19 06:47:18 -07:00
Eric House
fcefa9ca97
dismiss the BT invite progress thing on success
...
Not sure how this broke in the reorg of XWService stuff, but let's be
agressive about dismissing that thing.
2018-07-19 06:33:05 -07:00
Eric House
4450a8d56c
fix NPE by inspection
...
I'm not sure how it happened -- race condition -- but it's harmless to
drop the action when it does.
2018-07-19 06:33:00 -07:00
Eric House
7cb00b6266
fix assertion: return a f*ing sink
...
Messed this up in February apparently.
2018-07-19 06:32:48 -07:00
Eric House
b0cf3a795c
fix NPE by inspection
...
fix crash reported by user. Looks like a race on the way out so check
for null first.
2018-07-19 06:32:36 -07:00
Eric House
d40b8b7cad
dismiss the BT invite progress thing on success
...
Not sure how this broke in the reorg of XWService stuff, but let's be
agressive about dismissing that thing.
2018-07-19 06:29:59 -07:00
Eric House
e1fec99860
fix NPE by inspection
...
I'm not sure how it happened -- race condition -- but it's harmless to
drop the action when it does.
2018-07-19 06:29:03 -07:00
Eric House
67d09a79b5
fix assertion: return a f*ing sink
...
Messed this up in February apparently.
2018-07-19 06:07:26 -07:00
Eric House
a3fb82ebc4
Merge branch 'android_branch' into android_translate
2018-07-18 22:30:58 -07:00
Eric House
a3ac3c4c8a
fix NPE by inspection
...
fix crash reported by user. Looks like a race on the way out so check
for null first.
2018-07-18 22:26:26 -07:00
Eric House
807fe8633f
add forgotten file
2018-07-17 08:46:39 -07:00
Eric House
84f636cbd5
always resend via SMS when opening game
...
It's done for other comm types too, and is necessary to get linux test
script to pass once I make SMS delivery unreliable. But it may duplicate
the tickle that Android's doing and result in duplicate messages: test.
2018-07-17 07:05:33 -07:00
Eric House
8f9c9e0623
fix crash around uri permissions for new OS version
...
Use a FileProvider with all the necessary xml changes to pass apk to
installer without crashing it or myself.
2018-07-17 07:02:36 -07:00
Eric House
1abc6e39fd
trying something else to fix travis
2018-07-15 21:38:24 -07:00
Eric House
cee53842cc
add licenses to travis. which might fix breakage.
2018-07-15 20:36:43 -07:00
Eric House
276ef38108
use sdk26 -- will be required soon anyway
2018-07-15 10:33:09 -07:00
Eric House
2d8ac995b7
add test case where (fake) sms messages never arrive
2018-07-14 15:43:42 -07:00
Joan Montané
cc714a96cb
Translated using Weblate (Catalan)
...
Currently translated at 94.3% (706 of 748 strings)
2018-07-14 12:35:09 +02:00
Eric House
352d87a327
use stream to take apart untrusted message safely
...
add new stream getters that return false if reach EOS and use them to
exit early and safely if incoming SMS msg is misformatted. I'm getting
random garbage meant for other apps perhaps.
2018-07-13 22:41:52 -07:00
Eric House
019cc628e4
fix crash figuring md5sum of null bytes
...
Just return null String
2018-07-13 22:35:44 -07:00
Eric House
89ec7987e6
move test to after db's inited to avoid crash
2018-07-13 18:20:56 -07:00
Eric House
5d6c743087
fix (I hope) null jni array dereference
2018-07-13 18:20:05 -07:00
WaldiS
cf24b1e4a0
Translated using Weblate (Polish)
...
Currently translated at 0.2% (2 of 748 strings)
2018-07-13 21:41:10 +02:00
Eric House
669acdcd19
log checksum of messages into smsproto
2018-07-13 07:39:11 -07:00
Eric House
c45c9cd809
read format spec outside assert
...
since the read inside goes away in release builds!
2018-07-13 06:59:57 -07:00
Eric House
b8c2cd1dd5
don't assert when a stray message wanders in
2018-07-12 20:20:04 -07:00