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

4849 commits

Author SHA1 Message Date
Eric House
dd0a677d97 upgrade to latest crittercism (java code only) 2016-02-24 07:23:50 -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
3a94f38820 use android-19 instead of -14, which seems to be no longer supported 2016-02-21 13:36:57 -08:00
Eric House
19d1a6059e new script for working with gradle builds. Probably totally broken: 
I'm committing it now because I'm tired of it being in the way during
branch changes.
 2016-02-19 07:12:00 -08:00
Eric House
bf3c0021a6 up version and changelog for new release 2016-02-19 07:10:28 -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
05e82d4ee7 find apks from android root; print cmd in way it can be run from shell 2016-02-18 06:39:06 -08:00
Eric House
c09088658e rewrite to search for variants and attached devices when none 
specified, and more. Requires modern bash now rather than /bin/sh.
 2016-02-17 07:34:10 -08:00
Eric House
ac9ab226a4 Merge remote-tracking branch 'weblate/android_translate' into android_branch 2016-02-09 07:15:57 -08:00
Eric House
ff49ce61a5 ignore new language files 2016-02-05 07:13:55 -08:00
naofum
ccdf1d6bf9 Translated using Weblate (Japanese) 
Currently translated at 100.0% (725 of 725 strings)
 2016-02-05 12:57:57 +01:00
Eric House
bec115568e remove FIXED -- was a one-time thing 2016-02-04 20:45:17 -08:00
Eric House
856bb89749 drop french, since there are better dictionaries; don't say FIXED for 
languages that didn't have the thing before
 2016-02-03 20:53:58 -08:00
Eric House
0684139183 add ability to build a second variant. Works, but they can't both be 
installed because of duplicate permissions.
 2016-02-03 20:44:40 -08:00
Eric House
2cb989022c up name and version code for new release 2016-02-03 20:40:46 -08:00
Eric House
ee5c0707f0 generated files 2016-02-03 20:40:12 -08:00
Eric House
37bf8179aa add to list of languages thefreedictionary.com supports (and put tmp 
FIXED! in its name for people who got used to it being broken)
 2016-02-03 20:39:48 -08:00
Eric House
c4eaf912d6 better string 2016-02-03 20:39:07 -08:00
Eric House
f49925bcb4 fix thefreedictionary lookups, at least for English 2016-02-03 06:16:31 -08:00
Eric House
874b479a69 avoid NPE by dropping message after test 2016-02-02 20:54:35 -08:00
Eric House
5ccb9bf7a3 notes and version code changes for release 2016-02-02 19:41:16 -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
9c6908d14a ignore 2016-02-01 06:55:11 -08:00
Eric House
75939d9203 remove bogus flag (incompatible with my key). And confirm that can be 
installed on top of a build signed with SHA256, the new default.
 2016-02-01 06:27:29 -08:00
Eric House
36551a310a add jarsigner params that are supposed to fix for installing on older devices 2016-02-01 06:17:36 -08:00
Eric House
45224a75fa add (disabled) code for case where game ptr wrapper is passed instead 
of the ptr itself.
 2016-01-31 20:06:45 -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
8327fa71a1 Merge branch 'android_branch' into android_translate 
# 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.
 2016-01-29 06:03:58 -08:00
Eric House
86068cfdfe oops -- forget to let these get generated 2016-01-29 06:01:53 -08:00
Eric House
7b452e37e4 Merge branch 'android_translate' of git://git.weblate.org/xwords into android_translate 
# Conflicts:
#	xwords4/android/XWords4/res_src/values-fr/strings.xml
 2016-01-29 06:00:56 -08:00
jean-christophe
93e3468501 Translated using Weblate (French) 
Currently translated at 99.1% (704 of 710 strings)
 2016-01-29 00:32:38 +01:00
naofum
20c99c61b6 Translated using Weblate (Japanese) 
Currently translated at 100.0% (710 of 710 strings)
 2016-01-28 12:44:42 +01: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
3c92b8837a add changelog mention of weblate additions 2016-01-24 10:32:07 -08:00
Eric House
f07dd2a344 remove unused string 2016-01-23 22:09:40 -08:00
Eric House
e6fa514982 Merge branch 'android_branch' into android_translate 2016-01-23 22:03:40 -08:00
Eric House
5ef7495d51 The Japanese translation has a number of plurals with "one" quantities 
but no "other", which crashes. "Fix" these by making the copy script
turn one into other, which may well make sense given Japanese
grammer. At any rate it prevents crashes until I can work it out with
the translator and/or weblate.
 2016-01-23 21:59:31 -08:00
Eric House
b9b9038c66 remove empty strings 2016-01-23 21:55:07 -08:00
Eric House
c0e8f9cb65 look for plurals too 2016-01-23 21:06:37 -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
ca09c48d95 deal with case where target of symlink is gone 2016-01-23 20:55:32 -08:00
Eric House
3500d8c8b9 bring in latest French changes 2016-01-22 07:26:26 -08:00
Eric House
b289154e19 up app version strings, changes list for new release 2016-01-21 20:56:45 -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
7d62614ced Recent AS metadata changes. I'm waiting for the changes to stop.... 2016-01-20 07:58:41 -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
Bernard Massot
fe235b2348 Translated using Weblate (French) 
Currently translated at 98.8% (702 of 710 strings)
 2016-01-18 21:44:26 +01: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
26d0aedb8f Comment out apk-renaming stuff. It's confusing AS. 2016-01-13 07:58:59 -08:00
Eric House
dffaf2335e get rid of Dialog theme for invite activities for Dbg version too 2016-01-13 06:48:13 -08:00
naofum
7ee18b8995 Translated using Weblate (Japanese) 
Currently translated at 100.0% (710 of 710 strings)
 2016-01-12 18:44:48 +01: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
naofum
ec6a197b2c Translated using Weblate (Japanese) 
Currently translated at 100.0% (710 of 710 strings)
 2016-01-08 16:26:24 +01:00
Weblate
38fef0a4ed Merge remote-tracking branch 'origin/android_translate' into android_translate 2016-01-07 19:17:25 +01:00
Eric House
f5947d25d9 Make invite dialogs full-screen. They're cramped otherwise. 2016-01-07 08:07:26 -08:00
Eric House
df3a213efc remove padding 2016-01-07 08:07:17 -08:00
Eric House
6c4a736cc6 generated files that couldn't be merged 2016-01-07 07:39:46 -08:00
Eric House
0fe5cce97a remove duplicate string 2016-01-07 07:39:31 -08:00
Eric House
5c14ad3f22 Merge remote-tracking branch 'origin/android_branch' into android_translate 2016-01-07 07:30:15 -08:00
Eric House
44ec13ea25 more AS metadata changes (and a comment) 2016-01-07 07:21:03 -08:00
Eric House
6d39780030 generated when I told AS to stop offering to remove braces from one-line IF statements 2016-01-07 07:20:13 -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
79f2bd148f reminder of way I'll probably want to do variants in the future 2016-01-06 06:48:01 -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
9311a2daa0 fix gradle build for changes to script 2016-01-04 08:07:20 -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
a1e381e722 up version code to match main variant 2016-01-04 07:22:59 -08:00