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
5710 commits 21 branches 243 tags 33 MiB
Commit graph

1967 commits

Author SHA1 Message Date
Eric House
459ddf6e96 Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
 2012-04-12 18:05:58 -07:00
Eric House
5efe959584 move test for whether this is first boot on new version into Utils, 
and add test for whether it's new boot ever (to be used with sms on
another branch.)
 2012-04-12 18:04:21 -07:00
Eric House
31659bc514 improvements to smsinviter dialog: add explanatory empty text, dialog 
that warns when non-mobile number being added, always check
newly-added number, etc.
 2012-04-11 18:54:38 -07:00
Eric House
0c241cf207 fix crash in sms message sink when address null -- same as bt message sink. 2012-04-10 21:47:15 -07:00
Eric House
522fd29b44 fix to show/return individual phone numbers. Still todo: warn rather 
than drop numbers not flagged as mobile.
 2012-04-10 19:25:22 -07:00
Eric House
e703685021 add new pref controlling whether networked games have hints enabled by 
default.
 2012-04-10 07:53:39 -07:00
Eric House
90bca47e1b query and send name with SMS invite -- same as for BT. 2012-04-10 07:26:56 -07:00
Eric House
f841b8ccce use different SMS-headers for different variants so they can coexist 
and not poach each others' conversations.
 2012-04-10 06:49:43 -07:00
Eric House
e6c8c898fc hide '+' button when no number text entered 2012-04-10 06:36:34 -07:00
Eric House
b98be90869 tweak sms-inviter button text for greater clarity 2012-04-10 06:36:17 -07:00
Eric House
d72cd547b7 fix bug where new game gets data from just deleted: clear cache! 2012-04-08 21:35:50 -07:00
Eric House
d6a3aafaec factor upward code from BTEvent so that SMSService can use same 
mechanism to send asynchronous results, then use to notify when a game
on other end has been deleted.  This flushed out a bug where a rowid
will get reused and a new game wind up with data from the previous
one -- but otherwise works.
 2012-04-06 23:00:47 -07:00
Eric House
d9ba0c4229 display phones sorted by contact name. 2012-04-05 18:35:29 -07:00
Eric House
523af50d1b use a single custom class rather than three parallel arrays. 2012-04-05 18:22:08 -07:00
Eric House
2a121b1635 get rid of debug formatting 2012-04-05 07:50:40 -07:00
Eric House
bffc403c0c fix problems tracking what's checked by keeping separate array of 
booleans -- since list items come and go as you scroll.  Means moving
some behavior out of InviteActivity superclass, and that untested BT
subclass may have new bugs.
 2012-04-05 07:47:59 -07:00
Eric House
8aa570c490 name game locally too. But still need the option, present with BT 
games, to change the name from the default before it's sent.
 2012-04-03 07:16:48 -07:00
Eric House
d37b4423a7 log when fail to delete a game. 2012-04-03 07:04:19 -07:00
Eric House
2406287a34 don't crash when msg doesn't match expected pattern. 2012-04-02 19:12:25 -07:00
Eric House
51cfbb196e to deal with case where somebody invites a friend who doesn't have 
Crosswords installed, add a URL to texts that will show up if it makes
it to an inbox and takes user to an explanation and download URL.
 2012-03-31 10:05:31 -07:00
Eric House
18a781d516 add debug-prefs checkbox to turn on Toasts when SMS sent or received; 
send on emulator too -- which works to test between two instances.
 2012-03-31 08:25:43 -07:00
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
0fd9e6c30f Merge branch 'android_branch' into android_bt 2012-03-26 07:14:46 -07:00
Eric House
14a1e22c5e remove dead strings (should cherry-pick) 2012-03-26 07:13:46 -07:00
Eric House
55980386fa test for mobile numbers works only on my ICS device, so comment out for now. 2012-03-26 05:34:16 -07:00
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
de4b72e5ff null is ok for intents to be sent by SendTextMessage 2012-03-24 11:51:12 -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
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
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
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
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
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
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
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
2a8a5eb2e9 up version strings and changes list 2012-03-06 06:23:48 -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
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
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
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
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
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
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
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
213f1454fb remove duplicate string since it's ignored anyway. 2012-02-27 19:38:27 -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
Eric House
34f3c38b48 Add "clear selected" button to btinviter UI that's enabled when one or 
more is checked.  On launch, get the set of known device, and on scan
do NOT start by emptying.  This allows to maintain a set of devices
and still scan without losing those not present.
 2012-02-25 10:43:08 -08:00
Eric House
99e0fea3c3 use resource rather than hard-coding name of game. 2012-02-22 14:09:03 -08:00
Eric House
1b542a1d22 using the version of BluetoothServerSocket.accept that doesn't take a 
timeout makes it slightly more likely that HTC Sensation will notice
an incoming connection, but it's still unusable most of the time.
 2012-02-22 14:08:38 -08:00
Eric House
cf77872dd4 test for null object before calling method 2012-02-22 14:06:47 -08:00
Eric House
7cef230e2c BTEventListener is implemented by superclass, so override rather then 
implement the interface.
 2012-02-22 14:06:15 -08:00
Eric House
7a21d4c151 show the giving up message as a dialog rather than a toast 2012-02-22 14:04:36 -08:00
Eric House
8c7487dc91 use GameUtils.getName() to avoid NPE -- it doesn't return null 2012-02-22 13:00:16 -08:00
Eric House
642ba9bc61 fix off-by-one assertion 2012-02-22 12:58:33 -08:00
Eric House
9c217e924c use dialog theme for btinviter activity 2012-02-22 12:58:15 -08:00
Eric House
12de8bf38b change button text from Ok to Invite 2012-02-22 10:37:10 -08:00