Commit graph

3135 commits

Author SHA1 Message Date
Eric House
a111cf8953 move static stuff from activity to delegate 2016-03-12 15:46:59 -08:00
Eric House
08da6e5472 use logdf instead 2016-03-11 18:23:59 -08:00
Eric House
e0cf48779d delete a game's entries in chats table when it's deleted 2016-03-11 18:21:25 -08:00
Eric House
054cf5bf52 drop mysterious exception that seems to happen only on one emulator
and that can be safely dropped then.
2016-03-11 18:20:53 -08:00
Eric House
7f4729ad73 send messages from within chat delegate, without closing it. Requires
leaving the board delegate's game and jnithread open and adding a
static to JNIThread to chat can get the current instance to use for
sending, all a bit of a hack that depends on onDestroy getting called
in a timely manner. TODO: display chats that arrive while the
receiving game's window is open.
2016-03-10 07:38:55 -08:00
Eric House
5dc7b66e89 use different background color for local player's chat lines 2016-03-08 07:20:02 -08:00
Eric House
cd93bdb03e move to sdk-22 breaks jni on x86, so revert to -19 for now. 2016-03-06 09:59:22 -08:00
Eric House
0b7dca2222 store and present chat sender's name instead of the lame "Me"/"Not me"
thing. Requires a new table, and includes code to convert from old
format. Still need to clean up the presentation (TableRow).
2016-03-06 07:03:54 -08:00
Eric House
f5bc9ca434 toward using chat senders' names in history: add chats table so we can
keep track of sender as a separate column rather than a prepended
string. I'm committing this separately for easier debugging of the
code that uses it and that converts from the old format.
2016-03-05 21:30:21 -08:00
Eric House
d536d05e24 remove unnecessary override (identical to parent's implemenation) 2016-03-04 19:49:59 -08:00
Eric House
4f3d620cd6 in search of why some game summaries never load: show a different
state string when the load has timed out.
2016-03-04 08:34:47 -08:00
Eric House
885b375a55 add a notification icon that looks better on lollipop. But: still needs polish. 2016-03-04 08:29:31 -08:00
Eric House
0f6615b25b formatting 2016-03-04 08:16:42 -08:00
Eric House
36bce5332d undo changes forcing there to be a single checked item, since that
made it impossible to do bulk deletes.
2016-02-29 07:38:08 -08:00
Eric House
eb4613c842 deal with case where invitation via relay requires a wordlist that
must be downloaded. (Does not solve the problem that if the download
fails the invitation must be resent.)
2016-02-26 07:13:12 -08:00
Eric House
6fe302eab1 first cut at fix to hundreds of games leading to attention-grabbing
battery usage: rather than have every single ExpiringDelegate set its
own timer, run a single time they can attach themselves to.
2016-02-24 22:16:40 -08:00
Eric House
8c3f1ee100 up sdk version to 22 in order to drop timestamp from marshmallow logs
(since they provide it natively)
2016-02-24 07:12:10 -08:00
Eric House
33916761fb include various options, e.g. whether hints are allowed, in data used
to clone a game prior to a rematch so they're not lost. Thanks A.B.!
2016-02-18 06:48:48 -08:00
Eric House
ee0caad464 make String private 2016-02-18 06:39:40 -08:00
Eric House
874b479a69 avoid NPE by dropping message after test 2016-02-02 20:54:35 -08:00
Eric House
6e30d77ada pull int (ptr) out of GamePtr inside jni code where it can be done
once instead of at every call site. There's probably a performance
penalty to making bunch of extra calls back into java, but the code's
much cleaner. Will pay attention to performance changes.
2016-02-02 07:50:02 -08:00
Eric House
5ddb4da466 when resending messages, be willing to do it more frequently, and
don't count toward quota unless a send actually happens.
2016-02-02 07:32:41 -08:00
Eric House
d3e521ca6e cleanup 2016-02-02 07:04:29 -08:00
Eric House
19713a40ad add param to comms_resendAll to limit type of message sent
(e.g. BT). Meant to be used when a single type has become available.
2016-02-02 07:01:48 -08:00
Eric House
9455c0ef26 wrap jni ptr so can detect leaks (failure to call
game_dispose()). There was one that had been undetected for years. The
int is still passed into the jni, and each call site has to pull it
from the wrapper. Better would be to pass the wrapper, but I'm worried
about the performance hit of making a call back into the java world
from every jni entrypoint. Will test....
2016-01-31 19:51:51 -08:00
Eric House
794bce1ceb cleanup from review of diff since last release. All whitespace or
removing logging except for one check for null.
2016-01-27 07:31:10 -08:00
Eric House
813d5c18b3 show explanatory text when there are no invitations 2016-01-25 07:29:26 -08:00
Eric House
e6fa514982 Merge branch 'android_branch' into android_translate 2016-01-23 22:03:40 -08:00
Eric House
805f160556 don't break r.{string,plurals}.id across lines: my script's too dumb
to recognize them then
2016-01-23 21:04:20 -08:00
Eric House
dcedbefd63 fix rematch info getting overwritten the first time a game is
opened. Some GameSummary fields are unknown to jni code and so
shouldn't be saved if they happen to be empty (as they will be when
the GameSummary is created by jni and never merged with what was read
from the DB when the game was loaded.
2016-01-21 07:14:57 -08:00
Eric House
7325377bcb remove comment 2016-01-21 07:13:46 -08:00
Eric House
16b558a566 fix BT and SMS game creation in response to invitations by passing a
UtilCtxt they can use to get the devices ID, allowing relay messages
to reach the games when they're not open. Move into superclass while
at it.
2016-01-21 06:27:51 -08:00
Eric House
eb08e8e78d give user a chance to turn on play-via-SMS when sending an SMS
invitation (which will otherwise fail silently). Required a hack
passing params from one dialog to another, but I like that better
(today) than creating new single-purpose iVars in BoardDelegate.
2016-01-20 07:58:01 -08:00
Eric House
f65d42732b offer invites-info menu on release builds too if debug features
enabled.
2016-01-19 07:17:29 -08:00
Eric House
7ba7879a55 cleanup: track only checked items, not all items. 2016-01-19 06:53:43 -08:00
Eric House
eee13bcdd6 fix assertion failure by dropping packet for which I can't get an
address. It was in a three-player game with two on the server device.
2016-01-19 06:41:44 -08:00
Eric House
177a591a23 During SMS and BT invitation, when a single target is sought uncheck
the old selection when a new one is made.
2016-01-18 08:36:25 -08:00
Eric House
38898776bd when re-inviting, pre-populate BT and SMS invite dialogs from the most
recent invitation of that "means" recorded for that game
2016-01-18 07:41:47 -08:00
Eric House
6c1394a3a5 separate explanatory dialogs for games sending invites based on
whether they were created for a rematch. If for a rematch, don't give
user ability to change invite target; just resend (if asked) and show
a toast. Also, send rematch invites only when there aren't already
some, i.e. the first time the game's opened.
2016-01-16 13:52:30 -08:00
Eric House
3ca47cdd82 add debug-only context menu giving conn-via config and invites for GamesList games. 2016-01-16 12:08:36 -08:00
Eric House
84fe06e029 in invite, record bt device name rather than (unreadable) addr 2016-01-15 20:52:39 -08:00
Eric House
e8ceb82d8d add debug-only menu to show game's sent invitations 2016-01-15 20:48:53 -08:00
Eric House
9d20aea6be record NFC invites 2016-01-15 06:01:35 -08:00
Eric House
fe0504a308 put a different title on notifications when it's now a player's
turn. Probably only matters in three-device games, but I like it.
2016-01-14 20:45:58 -08:00
Eric House
1e50181b12 fix handling of SMS invitations specifying a dictionary that's missing 2016-01-14 07:55:49 -08:00
Eric House
90f7438290 allow deleting dict that doesn't exist (don't assert) 2016-01-14 07:37:47 -08:00
Eric House
bdafcfa916 improve text around invitations 2016-01-13 19:51:24 -08:00
Eric House
e98ba8d84a make explicitly public 2016-01-13 08:00:28 -08:00
Eric House
42574550d0 move method next to others with same name 2016-01-13 07:59:46 -08:00
Eric House
a1f590642a don't write DB column that's never read, nor pass the value that was
being written.
2016-01-12 00:09:34 -08:00