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
Eric House
bb2ebe8128
code cleanup
2016-01-11 23:56:56 -08:00
Eric House
e94ec48613
don't encourage invited games to invite others; instead remind that
...
they've been invited and can only wait for the game to begin. (Unless
more than two devices are involved this should only happen briefly and
when connections aren't working perfectly.)
2016-01-11 23:53:16 -08:00
Eric House
e1f6bc3c8e
stop posting toast about net status fix working
2016-01-11 07:23:25 -08:00
Eric House
c13b637b46
record invites sent as part of rematch
2016-01-09 13:02:56 -08:00
Eric House
b6bebbb0c4
offer re-invite; track and display more than one invitation,
...
including those whose success isn't known (email and clipboard).
2016-01-09 10:14:43 -08:00
Eric House
73a7a8836f
show in game list item if invitations pending
2016-01-09 06:58:18 -08:00
Eric House
e60945733f
first step in showing a different alert for an unconnected game where
...
an invitation's already been sent. It's stored in a new DB table, and
user can display info about how and to what device it was sent.
2016-01-08 19:05:22 -08:00
Eric House
7e714ae547
fix crash posing Toast from non-looper Activities
2016-01-08 18:58:46 -08:00
Eric House
bbad4a316a
better fix for memory leak (because local to where the leak is): keep
...
a weak reference to the owning object in the runnable added to the
main Handler so that it can be gc'd if otherwise unreachable.
2016-01-06 19:33:30 -08:00
Eric House
14aab9ec36
Revert "fix massive memory leak by removing ExpiringDelegate's timers when"
...
This reverts commit 50ca74d259
.
2016-01-06 19:29:37 -08:00
Eric House
50ca74d259
fix massive memory leak by removing ExpiringDelegate's timers when
...
owning view is removed from parent window.
2016-01-06 07:03:03 -08:00
Eric House
b472d78ba0
remove unused variable
2016-01-06 06:52:32 -08:00
Eric House
eda1e89e3e
replace empty-list-explanation functionality that went away when I
...
stopped inheriting from ListActivity.
2016-01-04 20:40:47 -08:00
Eric House
52b53b9a9d
try not using executeOnExecutor on the theory that occasional OOM
...
errors are happening because too many threads are trying to create
thumbnails at once.
2016-01-04 07:23:48 -08:00
Eric House
2286f55e8f
only second-guess network available tracking every 20 seconds. And
...
show toast about it only on DEBUG builds.
2016-01-03 21:02:24 -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
22dde029c8
Merge tag 'android_beta_100' into android_branch
...
ready for release
2016-01-03 11:36:37 -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
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
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
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
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
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
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
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
8626fdf027
refactor: move inline tests for being on emulator into a static method
2015-11-17 07:19:37 -08: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
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
Eric House
ddc9c5f920
beginning of rematch menu: enabled correctly, but not yet handled
2015-10-23 05:41:20 -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
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
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
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
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
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
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
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
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
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
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
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
53025f8a99
clean up plurals, adding quantity="one" elements in a few places where
...
they make sense, collapsing a plurals to a string where that made
sense (there will probably never be a one-word wordlist), and removing
an unused plurals.
2015-08-27 07:42:16 -07:00
Eric House
db7aa3923b
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-08-26 07:09:56 -07:00
Eric House
83d3163f0e
rename variable
2015-08-25 22:19:00 -07:00
Eric House
c81f035133
Merge branch 'android_branch' into relay_noconn
2015-08-25 06:40:42 -07:00
Eric House
26114f83a6
fix chat view not being opened if move had arrived after chat by
...
removing unneeded variable whose presence was clearing flags.
2015-08-25 06:38:14 -07:00
Eric House
b79836c61b
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-24 07:52:46 -07:00
Eric House
5fd477be75
use existing string -- Copy to clipboard
2015-08-23 21:52:07 -07:00
Eric House
98bd41bc14
experimental option that puts invite url text into clipboard so user
...
can invite using app of her choice.
Conflicts:
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
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-23 21:44:45 -07:00
Eric House
79ab1214e7
replace send button with menuitem, and add icons for it and clear
2015-08-20 07:38:09 -07:00
Eric House
6b455bf743
make chat compose space multi-line; scroll chat history to bottom on
...
open
2015-08-20 07:37:51 -07:00
Eric House
07e97107ce
confirm before deleting chat history
...
Conflicts:
xwords4/android/XWords4/res/values/strings.xml
2015-08-20 07:37:30 -07:00
Eric House
d08e82220d
replace send button with menuitem, and add icons for it and clear
2015-08-20 07:35:01 -07:00
Eric House
ec6b7207b4
make chat compose space multi-line; scroll chat history to bottom on
...
open
2015-08-20 07:15:20 -07:00
Eric House
f4b39287a5
confirm before deleting chat history
2015-08-20 07:03:21 -07:00
Eric House
e5cf0ee4fb
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-08-19 07:44:17 -07:00
Eric House
a11e5beded
goes with prev commit
2015-08-18 06:41:57 -07:00
Eric House
ff3d587179
really only post messages sent toast when user chose the menuitem
2015-08-18 06:41:34 -07:00
Eric House
aee4d9d6a4
goes with prev commit
2015-08-18 06:40:50 -07:00
Eric House
1703a15aca
really only post messages sent toast when user chose the menuitem
2015-08-18 06:40:31 -07:00
Eric House
0d8fef5c56
cleanup
2015-08-17 08:01:36 -07:00
Eric House
f5e645f62a
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-08-17 06:41:58 -07:00
Eric House
55d67f7599
don't show toast after message send unless user-triggered
2015-08-17 06:34:58 -07:00
Eric House
389a09ac1a
Merge branch 'android_branch' into relay_noconn
...
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-13 07:30:55 -07:00
Eric House
34c70825b9
toward figuring out why relay communication stalls: log network
...
availability state changes.
2015-08-13 07:06:12 -07:00
Eric House
3a32d3a17b
return count of messages sent from comms_resendAll(), and post it as a
...
toast so user sees something happened.
2015-08-13 07:05:06 -07:00
Eric House
47954f82d0
add index of sending player to chat transmission, and on receiving
...
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-08-12 07:43:20 -07:00
Eric House
8f7267b3ec
add index of sending player to chat transmission, and on receiving
...
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
2015-08-12 07:36:36 -07:00
Eric House
4e1a382f1e
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2015-08-11 07:42:05 -07:00
Eric House
be9b8977e5
turn off email invite attachments
2015-08-11 07:30:34 -07:00
Eric House
4a28da1348
Show specific notification on receipt of chat, not rehash of last move
...
played.
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
2015-08-11 06:50:16 -07:00
Eric House
5853b0c5c6
Show specific notification on receipt of chat, not rehash of last move
...
played.
2015-08-11 06:47:10 -07:00
Eric House
c99decaf32
experimental option that puts invite url text into clipboard so user
...
can invite using app of her choice.
2015-08-07 07:55:26 -07:00
Eric House
ec581d1dbd
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/jni/Android.mk
xwords4/android/XWords4/jni/xwjni.c
xwords4/android/XWords4/res/values/common_rsrc.xml
2015-08-04 20:17:56 -07:00
Eric House
a45b698ea9
don't crash when first run without network connection
2015-08-03 05:25:35 -07:00
Eric House
cfa101350a
add logdf, logging for DEBUG builds only
2015-08-03 05:06:38 -07:00
Eric House
97bf616db1
Problem: NBS port is being ignored by dispatcher to broadcast
...
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
2015-08-03 04:58:46 -07:00
Eric House
a5f332dd1d
different logging TAG for different variants
2015-08-03 04:57:35 -07:00
Eric House
1959ff3b2d
fix NPE reported by crittercism
2015-08-03 04:54:42 -07:00
Eric House
a26e642c8e
Problem: NBS port is being ignored by dispatcher to broadcast
...
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
2015-08-02 14:35:05 -07:00
Eric House
af8c6d618d
different logging TAG for different variants
2015-08-02 10:29:17 -07:00
Eric House
8aef67dba4
fix NPE reported by crittercism
2015-08-01 22:17:13 -07:00
Eric House
36adf7f86c
get rid of About menuitem in board -- in main view is enough
2015-07-31 07:14:04 -07:00
Eric House
d9bc713b7b
get rid of About menuitem in board -- in main view is enough
2015-07-31 07:12:27 -07:00
Eric House
f45cafad29
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-07-31 07:05:39 -07:00
Eric House
4a580eabda
handle maintenance messages from relay
2015-07-31 06:36:35 -07:00
Eric House
2dc536dfeb
change button text to Wait (per Kati)
2015-07-30 06:36:47 -07:00
Eric House
8acba7e092
add only phones and computers to list of possible BT opponent devices
2015-07-29 06:39:03 -07:00
Eric House
6b5596590e
catch NumberFormatException: strings come from users (if this feature
...
ships) so this can happen.
2015-07-28 21:10:40 -07:00
Eric House
f6aa4e6d3c
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-07-28 06:28:01 -07:00
Eric House
2ec2972b9b
invalidate menubar when minimizing group. (Thanks Aidan.)
2015-07-28 06:26:25 -07:00
Eric House
037cc73f3e
add rematch menu item shown whenever the game's finished (but not
...
shown for games with > 2 players.
2015-07-27 06:26:28 -07:00
Eric House
0bb51e8b93
show a toast when hint can't find anything, on the principle that user
...
should see some response to every action.
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-07-26 12:09:15 -07:00
Eric House
3ea8102e1e
Revert "add app package name to params to update check script (info.py) which"
...
This reverts part of commit 3579256ef9
.
2015-07-25 22:10:53 -07:00
Eric House
3579256ef9
add app package name to params to update check script (info.py) which
...
can then decide what variant to look for.
2015-07-25 09:10:16 -07:00
Eric House
1484a27daf
add option to send/receive invite data in binary/common form (as relay invites do)
2015-07-24 22:37:41 -07:00
Eric House
ed8d2ba0f6
fix NPE and remove assertion: moving from anon to GCM-based relayID is
...
common
2015-07-24 06:39:39 -07:00
Eric House
3c2a56166c
move static final to where it can be private
2015-07-24 06:10:26 -07:00
Eric House
04c263fe28
for testing relay switch, add optional override of hostname
2015-07-23 07:46:46 -07:00
Eric House
d4e5c9dfdf
convert string to plurals and add some "one" items to others to allow
...
removing [s]. There's more to do still.
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
xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
2015-07-23 07:03:47 -07:00
Eric House
fa00eef151
convert string to plurals and add some "one" items to others to allow
...
removing [s]. There's more to do still.
2015-07-23 06:57:37 -07:00