Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-23 07:27:22 +01:00
Code Issues Projects Releases Packages Wiki Activity
9949 commits 21 branches 243 tags 33 MiB
Commit graph

86 commits

Author SHA1 Message Date
Eric House
49242f78cf more script fixes; move jni code 2017-01-18 07:27:23 -08:00
Eric House
1a830fbff2 use clang instead of gcc for ndk builds 
And make changes to C code to fix resulting warning. The .so file
basically works but is not thoroughly tested.
 2016-10-25 06:09:40 -07:00
Eric House
406eb77f54 post notification (rather than just play sound) when turn comes into 
boarddelegate but it's not visible
 2016-04-14 22:16:18 -07: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
b2970069c1 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:38:18 -07:00
Eric House
a612a89ac6 fix variant crashes: had forgotten PKG_PATH on new method 2015-08-03 04:59:15 -07:00
Eric House
d4bfaca127 cleanup: mostly removing logging and wrapping rematch code in an 
if(false) so it goes away.
 2015-06-14 22:39:47 -07:00
Eric House
16e3ef9246 assert I've got the plurals vs singular strings right 2015-03-24 07:33:24 -07:00
Eric House
36839ac82b fix so multiple strings can be cached per id to support <plurals> 
strings crossing jni boundary.
 2015-03-19 23:03:15 -07:00
Eric House
5f33d99c2e toward making full use of getQuantityString(): add util method to pass 
quantity through to java world, use it, convert English <string>
resources to <plurals> (using python script) based on parallel changes
in French, and modify callsites to call getQuantityString() where
R.string.xxx became R.plurals.xxx.
 2015-03-18 21:23:30 -07:00
Eric House
4701fe2b90 pass in number of devices already connected so forceChannel can be set 
more correctly; put up alert when device rejects an invitation as a
duplicate.
 2015-01-03 09:50:07 -08:00
Eric House
938756a34f switch for loop to using C99-style variable declarations; no other change 2014-11-25 06:09:18 -08:00
Eric House
3fe3b1724a replace stacked tracking of env with explicit mapping from pthread to 
env for that thread to fix occasional assertion failure that indicated
I was using the wrong env occasionally.  I'm not super confident in
this because I've seen the env for a thread change, but that could be
due to reuse of the thread id.
 2014-10-22 06:58:42 -07:00
Eric House
878a16b3bc snapshot: android compiles, and works well enough to exchange moves 
via relay!  Lots of changes, mostly around treating connTypes as a Set
inside the java world.  Jni to translate to that is a pain.
 2014-10-16 06:45:24 -07:00
Eric House
f601f2bf57 use dictmgr in java. This requires jni globals that live across boards being opened and that include a mempool dicts will be allocated out of. Seems to work, and to get ref counts as high as 6 or so before they drop down to one when all boards are closed. (The final is held by the dictmgr which won't give it up until the app itself is GC'd) 2014-03-10 19:14:59 -07:00
Eric House
11bde2b7fd remove logging 2013-11-27 07:10:08 -08:00
Eric House
a25d664eb5 Merge branch 'from_android_beta_65' into android_branch 
Conflicts:
	xwords4/android/XWords4/res/raw/changes
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2013-09-09 08:01:28 -07:00
Eric House
04eeebc3a4 fix so still compiles when chat feature is disabled 2013-09-08 19:08:58 -07:00
Eric House
235346b7a4 fix signature string (and log when there's a mismatch) 2013-08-23 07:41:10 -07:00
Eric House
a522266ce4 add message checksumming for android too by making it part of util 
(compiled out by default)
 2013-07-10 08:05:47 -07: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
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
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
6014e3d76f turn on devid code and implement support in java. Untested, but should work. 2012-10-30 07:57:17 -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
e90c5ee94f pass index of resigning player into util_notifyGameOver. Not yet 
passed into java.
 2012-10-09 05:31:12 -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
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
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
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
ee1df7eeb7 replace DeleteLocalRef calls with version that checks for NULL 2012-09-15 15:57:38 -07:00
Eric House
95a7b14a3a transmit dict's md5sum along with name in initial message from host to 
guest.  On guest, pass that sum into client code along with names so
the appropriate tests can be done and corrections taken.
 2012-09-08 20:23:48 -07:00
Eric House
4f180e9e14 pass rejecting dict name into java layer and display as part of turn 
lost message.
 2012-09-06 19:04:40 -07:00
Eric House
270a19f3aa Revert "first of a set of changes to communicate to clients dictionary being" 
This reverts commit b7a0f1489b, which I didn't mean to check in on this branch.
 2012-09-03 21:34:51 -07:00
Eric House
ea4d805d5f first of a set of changes to communicate to clients dictionary being 
used by server.  Clients need to care if e.g. the server's disallowing
phonies based on its dict.  Can only be sent if client is of latest
version.  In that case, common code calls into new util function.  In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it.  Once it's available, will want to install it.
 2012-09-03 21:33:46 -07:00
Eric House
b7a0f1489b first of a set of changes to communicate to clients dictionary being 
used by server.  Clients need to care if e.g. the server's disallowing
phonies based on its dict.  Can only be sent if client is of latest
version.  In that case, common code calls into new util function.  In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it.  Once it's available, will want to install it.
 2012-09-03 21:29:21 -07:00
Eric House
9ba663ab98 implement util_phoneNumbersSame in java and call telephony's number 
compare method.  Skip the java call when the numbers are
strcmp-identical.
 2012-05-18 07:41:46 -07:00
Eric House
867e9ffc2f implement stubbed-out util_phoneNumbersSame so that three-device SMS 
games work in emulator.  May need to call into java to use Android's
more sophisticated phone number comparison to work on devices.
 2012-05-18 07:17:21 -07:00
Eric House
3a54aa0ebc add util_informUndo() that gets called, and puts up a dialog, after 
remote device has performed an undo on a committed turn.
 2012-05-14 07:01:02 -07:00
Eric House
013d9c689b fix bug introduced with dictionary lookup of words played that meant 
trades didn't get reported as remote moves -- it just became your turn
without notice.
 2012-05-09 18:22:05 -07:00
Eric House
fe614e9efc delegate phone number comparison to platform code which in Android 
case has a method for it.  strcmp is not enough.
 2012-03-19 07:36:18 -07:00
Eric House
cd8889f90e Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
	xwords4/linux/Makefile
 2012-03-12 07:04:06 -07:00
Eric House
a8cf03f68e optimization: allocate tmp buffer on stack rather than with malloc. 2012-03-11 14:51:51 -07:00
Eric House
2282a976f3 add missing PKG_PATH invocation 2012-02-27 20:01:12 -08:00
Eric House
1f4f6a06a8 Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/jni/xwjni.c
 2012-02-15 18:18:26 -08:00
Eric House
8590aae9b2 fix emacs compile-commands 2012-02-15 18:07:19 -08:00
Eric House
74aeeca8e0 move BT device listing into its own Activity. Call it from 
NewGameActivity and from BoardActivity when the new notifyMissing
method gets called.  Works as before called from NewGameActivity but
BoardActivity crashes on iterating over list of devices returned.
 2012-02-09 05:21:23 -08:00
Andy2
f06eaa573b fix to compile with API changes 2011-11-18 07:41:13 -08:00
Andy2
ac875894a6 replace assert that occasionally fails with logging. Not sure why it 
fails, but I just drop the (timer) event in the non-debug case so it's
probably harmless.
 2011-11-04 17:19:50 -07:00