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

282 commits

Author SHA1 Message Date
Eric House
1e22a33d55 go back to android-7 SDK version to support 2.1, and to make that work 
remove use of java base64 encoding in favor of the C version I'd
already written (and that was probably compiled into the library
anyway unless the strip step catched unused code.)
 2012-03-26 20:03:29 -07:00
Eric House
235807df4f remove logging 2012-03-19 07:37:16 -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
631666cede don't call DeleteLocalRef on an object to be returned from the JNI. 
Crashes ICS bigtime.  This needs to be ported back to android_branch.
 2012-03-14 20:26:23 -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
739b0b6125 fix off-by-one assertion 2012-03-09 23:51:39 -08:00
Eric House
fdfbd792f7 Merge branch 'android_branch' into android_bt 2012-03-05 20:08:43 -08:00
Eric House
edf13be4c8 I'm getting a crash on 2.1 in the simulator when calling 
DeleteGlobalRef then NewGlobalRef on the same ref.  So use a temp to
reverse the order.  May fix reported crash as well.
 2012-03-05 20:04:32 -08:00
Eric House
cb1e1692b2 turn off BT in main part of tree and fix a couple of places not 
dealing with that correctly.
 2012-02-29 06:47:19 -08:00
Eric House
b7f82475b8 fix to compile when XWFEATURE_BLUETOOTH not set 2012-02-27 20:31:01 -08:00
Eric House
2282a976f3 add missing PKG_PATH invocation 2012-02-27 20:01:12 -08:00
Eric House
642ba9bc61 fix off-by-one assertion 2012-02-22 12:58:33 -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
88ad6d81ef Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/jni/xportwrapper.c
	xwords4/android/XWords4/jni/xwjni.c
 2012-02-13 22:38:17 -08:00
Eric House
82b232cf74 use a macro instead of lots of repetitions of the package path to make 
it easier to modify.
 2012-02-13 22:13:23 -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
Eric House
3bda56420c turn on XWFEATURE_BLUETOOTH 2012-02-07 17:38:50 -08:00
Eric House
47c3bd3090 track a BT game's set (singleton for two-device game) of remote 
devices in summary DB so, e.g., we can quickly determine what games
care when a devices becomes available via BT.  First use of this is
notifying when a remote game's deleted -- least that's the plan.  This
commit just adds to the DB and scans the DB to build a map of
device->gameIDs array.
 2012-02-06 19:02:19 -08:00
Eric House
796baffa6d Merge branch 'android_branch' into android_bt 2012-02-06 18:13:57 -08:00
Eric House
bfe04a08b5 removed unneeded null-byte addition 2012-02-06 18:11:30 -08:00
Eric House
a2b5274b6c on ICS CreateGlobalRef doesn't return the same value as is passed in. 
So stop assuming it does!  Fixes multiple crashes on ICS and need to
be ported to android_branch.
 2012-02-05 19:12:09 -08:00
Eric House
8947ddca0b on ICS CreateGlobalRef doesn't return the same value as is passed in. 
So stop assuming it does!  Fixes multiple crashes on ICS and need to
be ported to android_branch.
 2012-02-05 19:11:38 -08:00
Eric House
8793d8f4fd include seed and missingPlayers in any non-standalone game summary 2012-02-03 17:03:47 -08:00
Eric House
b4b7609894 include hwAddr as well as device name in bt section of address 2012-01-31 18:48:59 -08:00
Eric House
e91c0daf65 check for null obj before calling through its vtable 2012-01-31 06:44:54 -08:00
Eric House
094d08e903 Get play via BT working!!! Replace BTConnection with BTService to make 
keeping the listener/sender threads going much easier.  Create new
message sink to dispatch incoming messages, and start passing return
addresses into comms (not required before when relay was only
transport as it has no return addresses.)
 2012-01-30 06:39:18 -08:00
Eric House
0934f83106 add gameID to params passed to comms' sendproc, including passing 
through to java layer.
 2012-01-25 18:27:37 -08:00
Eric House
ac6ecfa845 copy bt_hostName as part of address 2012-01-24 06:51:40 -08:00
Eric House
5f77ef6e13 get uuid from C code so can ensure linux version has same. 2012-01-19 18:28:27 -08:00
Eric House
2a51f8d621 cleanup 2012-01-17 06:53:47 -08:00
Eric House
d0999d1944 update build scripts to use newer NDK. 2012-01-02 18:11:36 -08:00
Andy2
2a34cd1e05 remove second param from server_do() -- it doesn't work anyway. 2011-12-21 18:45:05 -08:00
Andy2
17edc79aaf Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2011-12-06 19:56:10 -08:00
Andy2
0474984b82 export new preference from jni and add a checkbox setting for it 2011-12-06 18:18:50 -08:00
eehouse@eehouse.org
e1e8516e1b Merge branch 'android_branch' into send_in_background 2011-12-02 19:04:12 -08:00
Andy2
52d02f04dd pass tile value into drawCell(). Java code doesn't use it yet, but I 
want to play with drawing cells tray-tile-style when they're big
enough.
 2011-12-02 18:58:52 -08:00
Andy2
d37424ad7f Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/linuxutl.h
 2011-11-21 22:18:52 -08:00
Andy2
e1e9a68d8f fix ptr out-of-bounds test. Was failing an empty dict. 2011-11-21 18:04:20 -08:00
Andy2
b86330c71f add dict_iter_getCounts() 2011-11-18 21:10:17 -08:00
Andy2
f06eaa573b fix to compile with API changes 2011-11-18 07:41:13 -08:00
Andy2
4760ceda5a Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/anddict.c
 2011-11-17 20:55:02 -08:00
Andy2
aab9fd9df2 test the variable that may have been changed, not the one that holds 
the pre-change value.
 2011-11-17 06:54:26 -08:00
Andy2
63c0c5cf09 fix compile warning by passing ptr to embedded super 2011-11-17 06:11:42 -08:00
Andy2
2492e7cfc5 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/cursesmain.c
 2011-11-13 17:10:46 -08:00
Andy2
44c5500ab0 don't crash when empty or corrupt dict file passed in. 2011-11-11 18:29:26 -08:00
Andy2
9ff4596667 fix compile warning by passing ptr to embedded super 2011-11-11 07:42:00 -08:00
Andy2
92eb6b857d allow null info ptr so getInfo can be used solely to run sanity check 
on dict.
 2011-11-11 07:41:31 -08:00
Andy2
dddec50f1d Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/linux/Makefile
	xwords4/linux/linuxmain.c
 2011-11-10 19:22:57 -08:00