Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-10 05:26:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
9405 commits 21 branches 243 tags 33 MiB
Commit graph

3135 commits

Author SHA1 Message Date
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