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

9535 commits

Author SHA1 Message Date
Eric House
a8ebaaf789 better summary text 2016-03-13 14:42:50 -07:00
Eric House
1bcd977fa0 oops: fix crash by passing the right table name 2016-03-13 14:42:37 -07:00
Eric House
365695423c add a bunch of logging to code converting old-format chat. I've seen 
this code fail once, can't reproduce even on the same data, so I want
this in place (debug builds only) in case it happens again.
 2016-03-13 13:55:46 -07:00
Eric House
d25d33689a put a colon after chat sender's name in display 2016-03-13 12:50:09 -07:00
Eric House
b07a783fe1 revert to sdk 19 for gradle builds too (though they're just for 
debugging at this point)
 2016-03-13 12:42:31 -07:00
Eric House
0338bedf38 revert change adding new notification icon. It's not required when 
building for SDK 19, and I don't want to release it without testing on
more OS versions.
 2016-03-12 17:40:20 -08:00
Eric House
a157c9bb43 up strings and changelog for release 2016-03-12 17:39:18 -08:00
Eric House
d208e4ef51 ignore more AS metadata 2016-03-12 17:38:25 -08:00
Eric House
78f0ac7783 delete a game's entries in chats table when it's deleted 2016-03-12 17:23:25 -08:00
Eric House
9e9d9a740c add and use fragment for dict browser. Works except for the relaunch 
logic around changing the parameters (e.g. word length filters.)
 2016-03-12 16:46:44 -08:00
Eric House
117752d965 move static stuff from activity to delegate 2016-03-12 15:47:34 -08:00
Eric House
a111cf8953 move static stuff from activity to delegate 2016-03-12 15:46:59 -08:00
Eric House
8981765897 fix finish() so it pops stack in fragment case 2016-03-12 15:32:53 -08:00
Eric House
31d01e4ef0 remove dead file 2016-03-12 15:32:32 -08:00
Eric House
5928c8a9e6 handle dialogs correctly in Fragment activity, at least to the extent 
of fixing the new game name one.
 2016-03-12 15:17:19 -08:00
Eric House
e72443b850 go straight to single-pane implementation for non-debug builds. If this works 
might be able to fold this branch into what I'm releasing from.
 2016-03-12 15:14:06 -08:00
Eric House
04144213d5 fix so at least games list and board work. Required finishing the list view implementation. 2016-03-12 14:29:16 -08:00
Eric House
aa4f4e0e99 launch the Main activity after installing 2016-03-12 14:28:40 -08:00
Eric House
9837fc61bf fix gradle build: compile support library 2016-03-12 14:23:38 -08:00
Eric House
29992a5d8b changes the initial post-merge commit didn't pick up. Still no idea if it runs. 2016-03-11 22:21:07 -08:00
Eric House
b7694b67d2 Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence. 
Conflicts:
	xwords4/android/XWords4/.gitignore
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res/values/styles.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/BTInviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/Delegator.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayGameDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java
	xwords4/android/scripts/adb-install.sh
	xwords4/android/scripts/find-and-ant.sh
 2016-03-11 22:19:37 -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
5d9de30170 merge remote changes 2016-03-08 07:27:30 -08:00
Eric House
a03dd9423d move dbg build back to target-19 too 2016-03-08 07:20:52 -08:00
Eric House
78fb130e4f stack-overflow config wierdness to fix long chat lines not 
wrapping. Needs testing on multiple OS versions.
 2016-03-08 07:20:40 -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
2ca0fe5ca4 add board_getSelPlayer() 2016-03-06 06:34:49 -08:00
Eric House
d67d9a704c script to make it easier to launch logcat with multiple devices connected 2016-03-06 06:34:25 -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
ff12cc6f91 tweak scripts to have better default behavior 2016-03-05 12:16:23 -08:00
Eric House
d536d05e24 remove unnecessary override (identical to parent's implemenation) 2016-03-04 19:49:59 -08:00
Eric House
4402b81bdf fix crash (assertion failure) finding words associated with a cell 
when there's a trade above it on the move stack.
 2016-03-04 19:29:42 -08:00
Eric House
9fb5f49595 when a game's opened from an Android db, there's no row data to delete 2016-03-04 19:28:38 -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
830d66e538 ignore AS metadata 2016-02-25 21:37:15 -08:00
Eric House
03dc1206a5 remove Android Studio metadata. 2016-02-25 21:34:00 -08:00
Eric House
b8c98487d7 use sdk 22 for gradle builds too; rename apk file based on git revision number 2016-02-25 21:20:17 -08:00
Eric House
ca41a2390c usage should exit with an error 2016-02-24 22:16:56 -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
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
841715a78b pass constant 2016-02-21 08:01:27 -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
50107949f2 merge local heads 2016-02-18 07:47:46 -08:00
Eric House
86883eb51a handle tap on scoreboard by showing last move summary (as happens for 
long-tap) when option to switch users is disabled.
 2016-02-18 07:46:36 -08:00
Eric House
53f44af199 fix assertion failure by handling missing case 2016-02-18 07:45:41 -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
4157169d91 add dict.xwd so I don't have to keep creating it 2016-02-16 20:48:28 -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
5084e70843 fix bug: if you're iterating through hints and you drag a tile to the 
left of tray divider (without moving divider) it may still be included
in hinted moves. Fix is to reset engine whenever the set of tiles left
of divider changes.
 2016-02-05 07:29:51 -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
3bff4c070a fix compiler warning 2016-01-21 06:25:19 -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
c62c9899eb Hack: use sed to strip utf-8 marker from start of file. 2016-01-04 20:38:49 -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
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
efd47d731a send the correctly calculated hash value, and up strings for another 
release.  This is the minimum required for a new release on top of the
previous one, but not enough if released on this branch!
 2016-01-03 20:23:46 -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
b8c597ab98 oops -- fix prematurely committed script. 2016-01-03 19:53:16 -08:00
Eric House
ba712046a2 add git version to file in assets/ so can tell .apk's version in 
filesystem (before it's installed).
 2016-01-03 19:27:33 -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
a51b01491d up strings for new version, and copyright for new year 2016-01-02 09:21:59 -08:00
Eric House
929141f36d fix compiler warning 2016-01-01 21:13:35 -08:00
Eric House
8dfddea508 up initial client vers id sent to relay 2016-01-01 21:09:10 -08:00
Eric House
ccb86f0358 0 len is ok 2016-01-01 21:05:28 -08:00
Eric House
6a0bcaee26 add missing parameter 2016-01-01 19:48:22 -08:00
Eric House
8c26cf726a file for new French wordlist (not publicly available yet) 2016-01-01 19:32:32 -08:00
Eric House
a4a135b953 up CV version for testing 2016-01-01 19:30:35 -08:00
Eric House
ebcae1a523 move hashing into memstream impl, and reintroduce the old/broken 
treatment of the final 8 bits. I'll need to release a version that
still produces the incorrect hash for compatibility with existing
clients that expect it, but that also looks for the correct hash. When
that's out there I can do a new release that sends the correct hash.
 2016-01-01 17:57:14 -08:00
Eric House
4813c95976 cleanup: rename function and remove unused param 2015-12-31 15:47:48 -08:00
Eric House
02d5d26c60 when a move comes in whose hash doesn't match the top of the move 
stack, go down the stack looking for a match. If it's found, pop down
to that point then apply the move. This fixes stalls in the test
engine when undo is enabled, and so I assume that undos and turns are
somehow coming in out-of-order. Should be rare that this happens.
 2015-12-31 06:04:55 -08:00
Eric House
dd242c3ff5 make undo ratio operate on 1/1000 scale -- and even with this it's 
overwhelming when more than 40 clients are running.
 2015-12-30 21:23:29 -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
c9264eecac add debug-only code to assert that the hash on the move stack remains 
unchanged across a push and pop. Was used to verify memstream.c change
just committed.
 2015-12-30 06:31:02 -08:00
Eric House
0a91f852cc add commented-out flag 2015-12-30 05:59:52 -08:00
Eric House
a2ca381890 remove assert when hashes don't match. As currently implemented, this 
can happen when somebody does an undo, since the ordering of undos and
moves is not assured. The result is a temporary (I think) stall, where
a move is rejected because the hash doesn't match, but that will be
accepted later when the undo's been processed and the hash will now
match.
 2015-12-30 05:59:06 -08:00
Eric House
89138edae1 when dumping stream, preserve the subset of bits in the last word 
that's real data. This fixes assertions that after popping a move off
the move stack the hash is the same as before it was pushed. It may or
may not be sufficient to fix reported stalls, but it's certainly
necessary.
 2015-12-30 05:56:01 -08:00
Eric House
6ce1fbe465 add red Dbg to the middle of variant's icon 2015-12-30 05:53:37 -08:00
Eric House
4ed843a529 start UDP at 100% by default since all clients will be that way now 2015-12-29 19:01:15 -08:00
Eric House
c96861b329 wrap hash-related logging in ifdefs so can be easily turned on 2015-12-29 19:00:30 -08:00
Eric House
e3d6cb74fc for some reason log files are now considered binary by grep, so -a option's needed 2015-12-29 18:59:52 -08:00
Eric House
5e3f7d0731 remove logging 2015-12-29 18:58:28 -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
299b8ddc70 assert when hashes don't match. This may be legit, but I need to 
understand when it can happen because I think it's the cause of games
failing to communicate in the field
 2015-12-29 07:11:05 -08:00
Eric House
78d435c8cc fix what are errors with new compiler 2015-12-29 07:09:50 -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
49caf6505a up strings and changelog for new release 2015-12-21 18:50:04 -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
c48580b4ba generated changes 2015-12-21 18:04:35 -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
7cb1714568 fix compile -- new compiler, probably 2015-12-21 17:46:50 -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
2a3bd60740 supply missing param 2015-12-08 07:15:26 -08:00
Eric House
db9c079356 fix to show files appearing in only one apk 2015-12-05 11:13:13 -08:00
Eric House
4e14477faf script to compare .apk files, meant to aid in confirming that gradle 
and ant are producing the same thing.
 2015-12-04 21:51:10 -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
e3e4ebd7de changes AS made 2015-11-23 07:51:54 -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
0b0bd02e79 remove logging 2015-11-20 23:15:24 -08:00
Eric House
d468866a01 no more variables called socket; all are "sock" now. 2015-11-20 23:15:04 -08:00
Eric House
b7b664bee6 rename .apks to match the ant ones, including git revision info 2015-11-18 21:28:56 -08:00
Eric House
dc5b979e8a including .apk signing, and turn on proguard, for release gradle builds 2015-11-18 06:27:11 -08:00
Eric House
e0cb84a332 AS changes -- should I be tracking these files? 2015-11-17 07:37:21 -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
a2e00794fa some stuff AS changed. I hope it stops doing this eventually 2015-11-12 07:30:09 -08:00
Eric House
6d948a33dd name debug .apk using my convention, to include git rev 2015-11-12 07:29:49 -08:00
Eric House
58bf3ba07b Merge remote-tracking branch 'maidu2/android_branch' into android_branch 
Conflicts:
	xwords4/android/XWords4/.gitignore
	xwords4/android/XWords4/build.gradle
	xwords4/android/scripts/common_targets.xml
 2015-11-11 22:36:19 -08:00
Eric House
aa11bb50de fix to work with modified script 2015-11-11 22:23:39 -08:00
Eric House
2f4fe1de72 some AS changes when run the first time. Source-level debugging of 
java works!
 2015-11-11 19:04:58 -08:00
Eric House
adbc3615c1 changes to run under gradle 2015-11-11 18:59:00 -08:00
Eric House
ca83f2ab8b add exactly as came from modified sample app 2015-11-11 18:55:24 -08:00
Mario Frasca
0d688ab80e Translated using Weblate (Slovak) 
Currently translated at 69.0% (476 of 689 strings)
 2015-11-09 21:45:04 +01:00
Eric House
46cb5404d0 fix so debug and release builds have the right setting passed to 
ndk-build and keep their .o and .so files separate.
 2015-11-06 21:10:45 -08:00
Eric House
9f28e5c350 more gradle improvements. Seems to build a usable .apk, but isn't 
doing release/debug right yet.
 2015-11-05 20:19:07 -08:00
Eric House
7aff11d7b0 files necessary for a gradle build (untested; need to commit and clone 
elsewhere to be sure). I'm not moving things to the conventional
gradle locations yet -- want to keep the ant build working too for
now.
 2015-11-04 06:28:57 -08:00
naofum
6a5462194e Translated using Weblate (Japanese) 
Currently translated at 100.0% (689 of 689 strings)
 2015-11-04 09:44:43 +01:00
naofum
153f6a75c3 Translated using Weblate (Japanese) 
Currently translated at 100.0% (689 of 689 strings)
 2015-10-31 07:47:53 +01:00
Eric House
5d82636c26 allow using env variables in ant files 2015-10-30 05:42:27 -07: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
c581bb93ad change default to checked so code doesn't have to set it 2015-10-29 06:32:18 -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
Luiz Wagner Tavares Nascimento
5737277444 Translated using Weblate (Portuguese) 
Currently translated at 61.6% (425 of 689 strings)
 2015-10-26 03:44:54 +01:00
Eric House
ddc9c5f920 beginning of rematch menu: enabled correctly, but not yet handled 2015-10-23 05:41:20 -07:00
Eric House
5886394fd7 move menus 2015-10-23 05:26:14 -07:00
Eric House
082b0e06ac tweak <one> elements to not substitute in the digit 2015-10-22 06:31:58 -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