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

2325 commits

Author SHA1 Message Date
Eric House
5afd93c5f5 fix NPE on Kindle 2012-11-15 06:42:27 -08:00
Eric House
c4df31892e Fix occasional infinite loop of devices sending and receiving the same 
message over and over when getting updated by GCM.  The problem
occurred when one device had an un-ACKable initial message still in
its queue.  I call resendAll a lot, which caused that message to get
resent to the other game which then replied without being able to ACK
it so it remained to be sent again.  This would continue until users
moved forward in the game.  The fix is to add a backoff timer to
resendAll() so that it can't loop.  The timer is reset when an ackable
and new message is received, meaning there's been a change in what's
available to resend.  And since users calling resendAll manually
expect it to do something, add a force param that ignores the backoff.
seems to fix the problem (but needs a lot of testing.)
 2012-11-13 21:25:03 -08:00
Eric House
ba11fcf8df don't bother checking for stream size of 0 in jni since comms does 
that now.
 2012-11-13 21:01:25 -08:00
Eric House
082e6a61f7 comment out unused command 2012-11-12 20:57:39 -08:00
Eric House
60814264e7 compile with XWFEATURE_COMMSACK turned off 2012-11-12 20:56:50 -08:00
Eric House
76c938cc67 fix to compile with API change; to drop relayid when it's rejected and 
to use register with the GCM id on next [re]connect; and to not leave
variable unintialized when unable to call into java world due to being
called without context.
 2012-11-12 08:03:25 -08:00
Eric House
4f3c81417d go back to logging devids for now 2012-11-12 08:01:24 -08:00
Eric House
ba733634cb NPE: don't crash on first install 2012-11-09 06:57:37 -08:00
Eric House
ff16db5c10 remove logging 2012-11-08 20:09:16 -08:00
Eric House
0f21f849d9 fix crash attempting to download dict when there's no network, e.g. in 
airplane mode.
 2012-11-08 20:08:20 -08:00
Eric House
0ef7c8bf46 return TYPE_NONE on devices like Kindle that don't do GCM instead of 
an empty string claiming to be a GCM ID.
 2012-11-08 19:58:03 -08:00
Eric House
07123ac823 cleanup: remove logging and only check for messages when the json data 
holds that command.
 2012-11-08 19:54:09 -08:00
Eric House
5cbafb9f56 up version strings and code 2012-11-08 19:49:45 -08:00
Eric House
283045c649 revert previous trivial change 2012-11-08 19:23:52 -08:00
Eric House
3b1f6a695f don't show "can't do GCM" Toast on Kindle Fire 2012-11-08 06:38:35 -08:00
Eric House
aafcd5144a Better Kindle fix: don't even post message if SMS not supported. 2012-11-07 19:46:33 -08:00
Eric House
949b804f35 fix NPE on Kindle Fire, which has no SMS DB. Duh. 2012-11-07 19:43:08 -08:00
Eric House
1e13d6ac6c look for values in msg sent from server, including one that puts up a 
message via a notification.
 2012-11-06 19:09:15 -08:00
Eric House
39dbed2004 add missing util method (fixing crash) and with it wire up new devID 
scheme: now relay-assigned shorter id will be saved and used for
future games.
 2012-11-06 07:08:06 -08:00
Eric House
9981360c67 put back minsdk stuff accidentally removed in merge. 2012-11-05 06:55:54 -08:00
Eric House
41cfacfee4 don't crash on emulator (which doesn't have library required by GCM) 2012-11-05 06:20:55 -08:00
Eric House
03108f311a Merge branch 'android_branch' into android_gcm 2012-11-05 06:14:21 -08:00
Eric House
0376e25c26 Merge branch 'fix_beta_53' into android_branch 2012-11-05 05:43:33 -08:00
Eric House
bb2e3ffdb1 fix (by dropping second message) assert that there is no first 
message.  This is a TEMPORARY fix.
 2012-11-04 21:36:20 -08:00
Eric House
e8720ec419 add link to changelog 2012-11-04 17:53:42 -08:00
Eric House
3942a49cac Add a debug preference allowing to provide, or override, the download 
dir.  This will let users work around bugs on devices like my Blaze 4G
where the OS gives the wrong path, and also allows testing.  Inval
DictUtil's dict cache eash time this is changed, so in effect adding a
wrong path pref hides all dicts in the Downloads dir.
 2012-11-04 17:47:30 -08:00
Eric House
69108fd8a1 cleanup: import class to make declarations shorter. 2012-11-04 17:33:07 -08:00
Eric House
30675cfd3e remove logging 2012-11-04 17:21:37 -08:00
Eric House
90480aca4c don't put up toast when checking SMS DB 2012-11-04 07:40:24 -08:00
Eric House
68d6e10ab7 up version strings for quick bugfix release. 2012-11-03 17:27:46 -07:00
Eric House
4dd094b2b3 if the download dir doesn't exist (and on my "Blaze 4G" the function 
getDownloadCacheDirectory() returns a path that doesn't) then don't
offer to move things there.
 2012-11-03 17:26:43 -07:00
Eric House
47f9eb03b9 merge in changes from the -gcm directory: GCM will be a feature of the 
non-variant build now.
 2012-11-02 05:35:31 -07:00
Eric House
ecd6d81228 Merge branch 'android_branch' into android_gcm 2012-11-01 19:50:07 -07:00
Eric House
a73a5e8077 there seems to be no way to fix the warning so add comment 2012-11-01 19:46:38 -07:00
Eric House
a4787d5614 remove unused strings 2012-11-01 19:45:13 -07:00
Eric House
364acb6dcd cleanup: remove some logging and unused string resources 2012-11-01 19:32:29 -07:00
Eric House
27935752a8 check cursor still open in attempt to fix crash seen on Galaxy Nexus 2012-11-01 18:39:26 -07:00
Eric House
057a41e4a9 check cursor still open in attempt to fix crash seen on Galaxy Nexus 2012-11-01 07:59:42 -07:00
Eric House
3e289adc18 move related methods together 2012-11-01 07:58:27 -07:00
Eric House
1b7a618454 send the right dev id 2012-10-31 06:03:31 -07:00
Eric House
6014e3d76f turn on devid code and implement support in java. Untested, but should work. 2012-10-30 07:57:17 -07:00
Eric House
c93dfd6605 Merge branch 'android_branch' into android_gcm 
Conflicts:
	xwords4/android/XWords4/res/values/common_rsrc.xml
 2012-10-30 07:10:42 -07:00
Eric House
80a79b6991 Make it less likely that a message received while I'm not intercepting 
them will be opened more than once: track whether I've searched the
SMS db, and only clear that setting when SMS play is *disabled*.
 2012-10-29 21:20:32 -07:00
Eric House
ba0f91c438 cleanup: use constant 2012-10-29 20:43:02 -07:00
Eric House
e90621ec1d use existing string rather than invent a new one 2012-10-29 07:30:09 -07:00
Eric House
e39b776d80 Add button to alert warning that SMS isn't on that takes you to 
Preferences.
 2012-10-29 07:20:11 -07:00
Eric House
2375a6730a tweak text 2012-10-27 15:31:49 -07:00
Eric House
b83e587d91 changelog and version strings for beta 53 2012-10-27 15:21:33 -07:00
Eric House
5aef1afec3 point URL at android part of sf.net site, not home. 2012-10-27 13:18:08 -07:00
Eric House
fb747304eb put sms at bottom of new-game dialog 2012-10-26 07:00:23 -07:00
Eric House
d7d666e4f9 Merge branch 'android_branch' into android_gcm 2012-10-25 08:12:02 -07:00
Eric House
6e39466b09 somehow new dict-download code is storing some in info DB with 
langcode of 0.  Work around that by rebuilding cache entry when that's
seen.
 2012-10-25 08:03:56 -07:00
Eric House
6180834ada log case where game has no dicts 2012-10-25 08:02:30 -07:00
Eric House
4ed1446e06 Fix new bug: don't null out default dict just because we don't have one. 2012-10-25 07:58:39 -07:00
Eric House
b40e9b7928 assert non-0 lang code 2012-10-25 07:10:54 -07:00
Eric House
f2684e5652 log device ID even when it's not newly assigned 2012-10-25 06:24:19 -07:00
Eric House
4c1c0ddaaa Merge branch 'android_branch' into android_gcm 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
 2012-10-24 08:05:50 -07:00
Eric House
9bb8c9cddf don't allow change of dict in in-play networked game 2012-10-24 08:01:52 -07:00
Eric House
3d14ed96e7 cleanup and rename method 2012-10-24 07:40:14 -07:00
Eric House
643a301214 cleanup: add additional param to downloadFinished() iface method 2012-10-24 07:22:26 -07:00
Eric House
aec03fc572 When a game's consumated and guest discovers it isn't using the same 
dict, give chance to switch, and to download if required.  Because of
the way the JNI thread works, and JNI's requirement in general that
env instances match up (e.g. dicts must be destroyed in the same
thread that creates them), substituting into a live game is too hard.
So the game's saved with its new dict and then reloaded.
 2012-10-24 07:17:21 -07:00
Eric House
521d7042be remove redundant class name (no code change) 2012-10-23 06:50:49 -07:00
Eric House
1ce7b36b59 add pref to replace querying on each download where to store dict. 
And use new background-download for update-triggered downloads.
 2012-10-22 19:35:47 -07:00
Eric House
80e2b8955e comments to remind not to remove code not called from java; no code change 2012-10-22 19:29:05 -07:00
Eric House
8e911fef05 use import to shorten type -- no code change 2012-10-22 07:30:44 -07:00
Eric House
ca561f225c make dict storage location a default set in preference rather than 
something queried each time.
 2012-10-22 07:06:12 -07:00
Eric House
6ba5d4f7c8 use new internal download code for download to get dict required for 
SMS invite as well.  Still to do: put back the query for where the
thing should be stored.  Hard-coded to go in INTERNAL for now.
 2012-10-20 18:28:14 -07:00
Eric House
13557b6e25 use Utils.showToast() everywhere 2012-10-19 18:03:00 -07:00
Eric House
04f56ccf74 download dicts without the browser. This is a partial implementation 
that will need to be generalized and used in other places, basically
whenever the full URL can be known.
 2012-10-19 17:57:17 -07:00
Eric House
6c34f43df7 show toast when update requested manually and nothing found 2012-10-18 19:51:40 -07:00
Eric House
cb1a0093c3 Merge branch 'android_branch' into android_gcm 2012-10-17 21:23:09 -07:00
Eric House
e5feded0b1 When receiving an invite for a dict we don't have, post a notification 
to DictsActivity that offers to download, and on download completion
arranges for notification of SMSService so the game can be created.
 2012-10-17 21:20:08 -07:00
Eric House
3e83af3b97 pass dict name (in addition to language) with SMS invite, and 
currently on recipient device refuse to create a game if dict not
installed.  Next step is to give a choice to download the thing or
decline.
 2012-10-17 07:11:39 -07:00
Eric House
04f51bd392 add haveDict() 2012-10-17 07:10:08 -07:00
Eric House
a8c77bca88 fix NPE 2012-10-17 07:01:01 -07:00
Eric House
de5dcdc5f9 starting new variant for GCM 2012-10-16 07:41:04 -07:00
Eric House
077270f1cd merge in SMS-version UI -- there will not be a separate version for 
SMS any more.
 2012-10-15 08:29:46 -07:00
Eric House
eb47e75c50 put up more user-friendly message when dicts don't match. 2012-10-15 08:07:17 -07:00
Eric House
5f247db29c use the same missing-players message for all three connection types 
(even though the way they're reported is, though shouldn't be,
different.)
 2012-10-15 07:31:02 -07:00
Eric House
c811282591 UI change: networked games are no longer allowed to have per-player 
dicts.  Now you select a single dict for such games in a new spinner
just below the lang spinner, and player's dicts are no longer
displayed.  For standalone games, the single dict choice isn't there,
the individual dicts are displayed, and you must open a player config
to change the dict as before.  The idea is that this will be less
confusing, particularly when I need to tell the guest that the host is
using a different dict.
 2012-10-14 19:21:27 -07:00
Eric House
e90c5ee94f pass index of resigning player into util_notifyGameOver. Not yet 
passed into java.
 2012-10-09 05:31:12 -07:00
Eric House
ce58750b92 change "resign" menu text once game is over 2012-10-08 07:09:44 -07:00
Eric House
e64ecfb78d implement resign on top of existing endGame logic, adding "quitter" as 
new param passed to remote and changing final score formatting and
menu items to match.  Still need to show old menu on android in case
where game has already ended.
 2012-10-07 12:47:06 -07:00
Eric House
fd9b9f85e2 make util_hiliteCell conditional, and remove from android where it 
wasn't used anyway.
 2012-10-05 18:51:32 -07:00
Eric House
b11da9d8eb use GamesList's Handler to set timers to redraw turn expiry indicators 
when the percent left changes.  This may be done -- except for
deciding what to do when the time actually runs out.
 2012-10-02 07:30:31 -07:00
Eric House
0a60419802 make ExpiringDelegate responsible for figuring percentage of time left 
given start time and having a constant for how long a turn lasts.  Eventually
the constant will be replaced by a second number passed in.
 2012-10-01 19:07:23 -07:00
Eric House
cd776a34dd Revert "Display turn start time in game summary. This is definitely not its" 
This reverts commit ebaa22594d.
 2012-10-01 17:53:35 -07:00
Eric House
bec596c744 remove no-longer-needed drawable 2012-10-01 17:52:56 -07:00
Eric House
0579253b8d Also override TextView to show turn left there. Works, requiring only 
that actual percentage of turn remainning be calculated.
 2012-10-01 07:24:45 -07:00
Eric House
50b10cd365 new classes overriding LinearLayout to allow framing is-turn rect to 
be drawn in two colors showing how much time left for turn.  Required
because there's no (reasonably-easy) way to create nine-parts
dynamically.
 2012-10-01 06:57:40 -07:00
Eric House
8281bd7f10 call back into java for util_getCurSeconds implementation so java and 
C world are sure to be using the same clock.
 2012-09-29 19:27:02 -07:00
Eric House
ebaa22594d Display turn start time in game summary. This is definitely not its 
final form!
 2012-09-27 07:48:30 -07:00
Eric House
2c89f13383 add turn as param to util_turnChanged, and call from server rather 
than board.
 2012-09-27 07:04:57 -07:00
Eric House
94103a4212 track time of most recent turn start, and include it in summary table. 2012-09-27 06:55:46 -07:00
Eric House
65598cdb7b replace DeleteLocalRef calls 2012-09-24 07:44:43 -07:00
Eric House
140c982d41 merge from android_branch 2012-09-24 07:39:44 -07:00
Eric House
4909dde622 call a script rather than an html file so file doesn't have to be 
updated with every release.
 2012-09-24 07:35:14 -07:00
Eric House
c76c5f5868 don't create obits for apps that don't have relayIDs (and presumably 
never connected.)
 2012-09-20 07:45:04 -07:00
Eric House
96e277c7ba don't offer to copy DB from sdcard when there is none. 2012-09-20 07:29:00 -07:00
Eric House
598a154693 factor common code into function 2012-09-19 08:09:27 -07:00