Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-29 10:26:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
5645 commits 21 branches 243 tags 33 MiB
Commit graph

5580 commits

Author SHA1 Message Date
Eric House
3b10f1593c change "nbs" to "sms" everywhere. No other code change. 2012-03-24 12:52:35 -07:00
Eric House
7b9e835722 fix SMS games not having role/connection status messages. Use same 
for BT and SMS, and show different messages for host and guest.
 2012-03-24 12:30:01 -07:00
Eric House
30e2057496 put up the right new-game notification title 2012-03-24 12:13:10 -07:00
Eric House
ac06d730f8 fix so chat works on SMS (and BT, though untested) 2012-03-24 12:04:07 -07:00
Eric House
de4b72e5ff null is ok for intents to be sent by SendTextMessage 2012-03-24 11:51:12 -07:00
Eric House
d7c77d538d don't add files whose names end with ~ to .gitignored 2012-03-24 11:50:39 -07:00
Eric House
b4242fe123 use SDK-8 for now, and modify build scripts to set up properties based 
on SDK listed in AndroidManifest.xml.
 2012-03-24 11:29:19 -07:00
Eric House
0229c4ca2a go back to requiring SDK 8 APIs for Base64. Will probably need to 
expose the implementation in common via jni since there are still a
lot of SDK-7 devices out there.
 2012-03-24 11:09:13 -07:00
Eric House
606cfef6d6 prefix my messages with a header and when messages with that header 
appear stop other SMS apps from getting them.  Works!
 2012-03-24 11:01:05 -07:00
Eric House
bffa3f7a35 send via text messages rather than NBS/data messages. At this point 
all wind up in inbox, but that can be changed.
 2012-03-24 10:37:50 -07:00
Eric House
fca1e8af64 Revert "get rid of Base64 encoding stuff -- since Android apparently does it" 
This reverts commit 45715ae1e0.

Move back to using Base64 encoding to try working with straight text messages rather than NBS.
 2012-03-24 10:05:16 -07:00
Eric House
fd30b25546 put up dialog when user picks contact that has no mobile number 2012-03-22 18:50:32 -07:00
Eric House
622bf21308 plug leak: remove message store when complete. 2012-03-22 18:49:58 -07:00
Eric House
d8e4cf0c55 cleanup excessive logging 2012-03-21 07:59:24 -07:00
Eric House
495eab9d9b fix NPE 2012-03-21 07:59:11 -07:00
Eric House
859e32e785 add field for manual number entry (and remember the number like all others) 2012-03-21 07:39:21 -07:00
Eric House
3e26bbb450 improve look of dialog, mostly by putting phone number and name on 
separate lines.
 2012-03-21 07:04:12 -07:00
Eric House
ba44f1355c save sms-invite contacts across uses of the dialog 2012-03-21 06:54:25 -07:00
Eric House
84496b3012 get phone numbers from contacts DB: factor some of BTInviteActivity 
into superclass that NBSInviteActivity can share and use to make their
UIs similar: fetch mobile numbers from DB one-at-a-time, keep a list
there, and let you check then delete or return.  Rough, and doesn't
save state the way BT does, but works.
 2012-03-21 06:17:09 -07:00
Eric House
45715ae1e0 get rid of Base64 encoding stuff -- since Android apparently does it 
internally for 'data' messages.
 2012-03-19 19:36:32 -07:00
Eric House
599d01bfc7 Replace most of NBSReceiver with new NBSService. Route outgoing (from 
comms) and incoming (from NBSReceiver) messages through it.  Since
some messages are too big, add header/protocol for breaking them up
and reassemble.  With this commit complete robot-vs-robot games are
possible between two very new Samsung phones on T-mobile.  Older
phones and other networks not tested.
 2012-03-19 07:56:55 -07:00
Eric House
8e3d8c20c1 remove temporary test sms menuitem 2012-03-19 07:39:28 -07:00
Eric House
235807df4f remove logging 2012-03-19 07:37:16 -07:00
Eric House
d63a9860cd turn on XWFEATURE_SMS 2012-03-19 07:36:40 -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
9caeff4a5e recover a bit better from messages not meant for me, as is happening 
when a devices sends to self via SMS and client winds up getting a
registration message it just sent.  Not perfect yet (and may require a
change in the comms protocol -- that's not versioned :-(.
 2012-03-19 07:35:20 -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
Eric House
10d2d222e5 Merge branch 'android_branch' into android_bt 2012-02-29 17:59:54 -08:00
Eric House
9194bbe4b1 replace large with small on the -dbg version 2012-02-29 17:49:34 -08:00
Eric House
dcbbb26e1c move app name out into separate file so the big one doesn't have to be 
checked in in multiple places.
 2012-02-29 17:48:31 -08:00
Eric House
e8ab6ede42 remove BT-related stuff from non-BT variant 2012-02-29 07:59:48 -08:00
Eric House
36908226c1 remove ping command/menu item 2012-02-29 07:36:38 -08:00
Eric House
241e9c1fde check in files that are now different for BT variant (i.e. required 
for BT to be enabled)
 2012-02-29 06:49:30 -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
c1c20db6dd add static final boolean by which to turn BT support off and change so 
UI and background service disappear/don't run when it's off.  Goal's
to ship two apps that differ in this setting, a change in Android.mk,
and little else.
 2012-02-27 20:35:31 -08:00
Eric House
b7f82475b8 fix to compile when XWFEATURE_BLUETOOTH not set 2012-02-27 20:31:01 -08:00
Eric House
eec1cb00a1 wrap UUID in #ifdef XWFEATURE_BLUETOOTH 2012-02-27 20:30:48 -08:00
Eric House
21e69adda7 add various files required for new variant. Plan is this will be a 
separate version of the app with Bluetooth support included.
 2012-02-27 20:02:15 -08:00
Eric House
2282a976f3 add missing PKG_PATH invocation 2012-02-27 20:01:12 -08:00
Eric House
7644eb69cf Merge branch 'android_branch' into android_bt 2012-02-27 19:41:04 -08:00
Eric House
933b812d3a paths within src directory need to change to match class names. Not 
sure how I thought this was working before.
 2012-02-27 19:40:48 -08:00
Eric House
0732da0724 checking this file in -- the first to be different in a variant 2012-02-27 19:39:36 -08:00
Eric House
0578c3de24 remove duplicate string since it's ignored anyway. 2012-02-27 19:39:03 -08:00
Eric House
213f1454fb remove duplicate string since it's ignored anyway. 2012-02-27 19:38:27 -08:00
Eric House
22f866cc87 right dir name 2012-02-27 19:34:02 -08:00
Eric House
ac2fd069f1 wrong dir name 2012-02-27 19:33:44 -08:00
Eric House
1ea892e88e add variant option 2012-02-27 19:32:57 -08:00
Eric House
6496736625 take .apk file as optional param 2012-02-27 19:15:53 -08:00
Eric House
1892ccf640 Merge branch 'android_branch' into android_bt 2012-02-27 18:28:17 -08:00
Eric House
840385b3ad print dates in shorter format so columns don't wrap as frequently 2012-02-27 18:28:04 -08:00
Eric House
f1956ddcb4 prevent continuing attempts to send messages from client after it's 
deleted the game those messages are part of.  I'm keeping a list of
dead games and checking against that, and currently that list will
grow for as long as the sender thread lives.  Shouldn't be a problem
but needs fixing.  Better would be to remove all messages from queues,
but that has synchronization issues.
 2012-02-27 07:57:54 -08:00
Eric House
456dcca7b8 don't crash when device list empty 2012-02-27 07:50:11 -08:00