Eric House
45d3c1fd78
Merge branch 'android_branch' into android_bt
2012-03-14 20:29:34 -07:00
Eric House
f9cd6190db
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:28:53 -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
e58747f2ec
add code to build, encode, send, receive, decode and disassemble an
...
new-game invitation. Not yet tested on device.
2012-03-14 18:13:43 -07:00
Eric House
7a6593582d
use sdk-api-8 for now to get Base64 stuff. Can and should revert later.
2012-03-14 18:10:08 -07:00
Eric House
8ca6535a81
don't require Context inside CommsAddrRec
2012-03-14 07:49:37 -07:00
Eric House
60d91f1a21
add UI (some of it rough) to invite to play a new game via NBS and to
...
invite if a game is opened that has not been connected to yet.
2012-03-14 06:06:25 -07:00
Eric House
905be85e92
add temp menu that gets a phone number and sends an NBS message to it,
...
and modify NBSReceiver to print sender phone number and message
contents. Works for send-to-self!
2012-03-13 07:51:45 -07:00
Eric House
49aefabfc5
remove inaccurate comment
2012-03-13 07:49:07 -07:00
Eric House
8cefbabd8a
add different app name for BT/SMS -- as I thought I'd done before
2012-03-13 07:24:00 -07:00
Eric House
d96395c808
Merge branch 'android_branch' into android_bt
2012-03-12 21:21:03 -07:00
Eric House
326671081a
Remove support for versions prior to 2.1, as nobody's using them.
...
Remove code to avoid classload crash when multitouch support not
present since now it always will be.
2012-03-12 20:34:34 -07:00
Eric House
5a3f6d6194
remove dead code
2012-03-12 20:32:21 -07:00
Eric House
3865a5f8c6
complete changelog
2012-03-12 19:52:35 -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
3b5dcdc2e0
add const param decls; remove redundant method call
2012-03-12 06:59:08 -07:00
Eric House
f51c0b39e6
use const where possible for game_writeToStream and others it calls.
...
No other code changes.
2012-03-11 18:28:14 -07:00
Eric House
2a728ce4b0
turn off debug flag that's started crashing the gtk app (presumably
...
due to an upgrade to a stricter version of glib)
2012-03-11 15:06:57 -07:00
Eric House
07fba2c71b
Fix problem with writing server to stream changing its internal state
...
so that snapshotting made score strings disappear. Also rename
stream_copyFromStream to stream_getFromStream to make it clearer that
the src is modified. And swap params in stream_setPos().
2012-03-11 14:57:28 -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
5c11f1b284
add XP_LOGSTREAM
2012-03-11 14:46:03 -07:00
Eric House
739b0b6125
fix off-by-one assertion
2012-03-09 23:51:39 -08:00
Eric House
e145a04111
add missing variable assigment
2012-03-09 22:11:51 -08:00
Eric House
d732094c59
rename LookupView to LookupActivity
2012-03-08 07:58:19 -08:00
Eric House
0d69c6097a
Go back to lookup dialog as dialog-themed activity. I just can't get
...
contrast right on all platforms any other way. Previous change to
using dialogs was motivated by speed, but I don't see any slowdown so
far. Will address if I find it.
2012-03-08 07:54:36 -08:00
Eric House
25f4e8b707
Merge remote-tracking branch 'origin/android_bt' into android_bt
2012-03-06 21:27:53 -08:00
Eric House
3aa6932f03
Merge remote-tracking branch 'origin/android_branch' into android_branch
2012-03-06 21:27:38 -08:00
Eric House
a2493ffa97
Merge branch 'android_branch' into android_bt
2012-03-06 07:47:05 -08:00
Eric House
6a635d1631
Go back to using a built-in list item resource. Mine was
...
white-on-white on several OS versions. Need to test further to try to
reproduce the conditions that had me trying to manage contrast myself.
Or use a dialog-themed Activity for lookup dialog -- prev checkins say
that was too slow but that might be fixable....
2012-03-06 07:41:33 -08:00
Eric House
9d153b500c
don't insist that dgb .apk exist if it't not what's being installed
2012-03-06 07:36:07 -08:00
Eric House
2a8a5eb2e9
up version strings and changes list
2012-03-06 06:23:48 -08:00
Eric House
24ac205917
cleanup -- no behavior change
2012-03-06 06:23:04 -08:00
Eric House
fb45ea639f
make buttons same size
2012-03-05 20:38:43 -08:00
Eric House
ae81f07997
add test for BTSUPPORTED to function so compiler can strip it
2012-03-05 20:30:02 -08:00
Eric House
57a1759b69
remove empty btconfig area from game config dialog
2012-03-05 20:24:48 -08:00
Eric House
82e1c826a6
add pre-clean target other build.xml files have
2012-03-05 20:14:54 -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
79be6654dc
-p to allow multiple runs
2012-03-05 19:16:03 -08:00
Eric House
319c9da258
add -pre-clean that invokes the jni's 'make clean'
2012-03-05 19:07:49 -08:00
Eric House
a0b38ed83f
Merge branch 'android_branch' into android_bt
2012-03-04 08:19:24 -08:00
Eric House
ef0c301e1a
fix NPEs that would occur if play and back buttons pressed at about
...
the same time by ignoring the second if we've already closed the game
being edited.
2012-03-04 08:18:54 -08:00
Eric House
542f10a3e5
improvements to work with variants -- though jni still doesn't compile.
2012-03-02 05:49:25 -08:00
Eric House
d2952794af
add variant support
2012-03-01 22:10:41 -08:00
Eric House
49b04257d3
tweak date format
2012-03-01 18:16:04 -08:00
Eric House
1fc814b104
0, not -1, is an invalid gameid
2012-03-01 18:14:51 -08:00
Eric House
1a9b3a7c63
make helper class to provide game-name dialog, use it for renaming and
...
to query for name of BT game being created.
2012-03-01 07:57:04 -08:00
Eric House
788f241238
new files to .gitignores; go back to discarding build command output
2012-03-01 06:32:49 -08:00
Eric House
3723cf08fa
remove checked-in variant now that smaller one exists
2012-03-01 06:16:51 -08:00
Eric House
fc607fbd73
fix new standalone games being confused with networked ones by making
...
default new addr type be NONE and checking CurGameInfo for whether
device is networked. The default change may introduce problems: needs
testing.
2012-02-29 18:22:20 -08:00