Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-22 07:28:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

always have board ready to send invite via NFC

Browse source
This commit is contained in:
Eric House 2013-11-16 09:02:52 -08:00
parent deff81cfd1
commit 0bf28c133d
3 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -65,7 +65,8 @@ import org.eehouse.android.xw4.jni.JNIThread.*;
public class BoardActivity extends XWActivity public class BoardActivity extends XWActivity
implements TransportProcs.TPMsgHandler, View.OnClickListener, implements TransportProcs.TPMsgHandler, View.OnClickListener,
DictImportActivity.DownloadFinishedListener, DictImportActivity.DownloadFinishedListener,
ConnStatusHandler.ConnStatusCBacks { ConnStatusHandler.ConnStatusCBacks,
NFCUtils.NFCActor {
public static final String INTENT_KEY_CHAT = "chat"; public static final String INTENT_KEY_CHAT = "chat";
@ -1158,6 +1159,22 @@ public class BoardActivity extends XWActivity
} }
} }
//////////////////////////////////////////////////
// NFCUtils.NFCActor
//////////////////////////////////////////////////
public String makeNFCMessage()
{
String data = null;
if ( 0 < m_missing ) { // Isn't there a better test??
String inviteID = GameUtils.makeRandomID();
data = NetLaunchInfo.makeLaunchJSON( this, m_room, inviteID,
m_gi.dictLang,
m_gi.dictName, m_gi.nPlayers );
}
return data;
}
////////////////////////////////////////////////// //////////////////////////////////////////////////
// ConnStatusHandler.ConnStatusCBacks // ConnStatusHandler.ConnStatusCBacks
////////////////////////////////////////////////// //////////////////////////////////////////////////

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -536,7 +536,6 @@ public class GameUtils {
if ( null != msgString ) { if ( null != msgString ) {
if ( DlgDelegate.NFC_BTN == chosen ) { if ( DlgDelegate.NFC_BTN == chosen ) {
NFCUtils.buildAndPush( activity, msgString );
Utils.showToast( activity, "Tap the receiving device now" ); Utils.showToast( activity, "Tap the receiving device now" );
} else { } else {
boolean choseEmail = DlgDelegate.EMAIL_BTN == chosen; boolean choseEmail = DlgDelegate.EMAIL_BTN == chosen;

23
xwords4/android/XWords4/src/org/eehouse/android/xw4/NFCUtils.java
View file

@ -30,7 +30,14 @@ import android.nfc.NfcEvent;
import android.nfc.NfcManager; import android.nfc.NfcManager;
import android.os.Parcelable; import android.os.Parcelable;
import junit.framework.Assert;
public class NFCUtils { public class NFCUtils {
public interface NFCActor {
String makeNFCMessage();
}
private static boolean s_inSDK; private static boolean s_inSDK;
private static SafeNFC s_safeNFC; private static SafeNFC s_safeNFC;
static { static {
@ -39,7 +46,6 @@ public class NFCUtils {
s_safeNFC = new SafeNFCImpl(); s_safeNFC = new SafeNFCImpl();
} }
} }
private static String s_data = null;
private static interface SafeNFC { private static interface SafeNFC {
public void register( Activity activity ); public void register( Activity activity );
@ -48,12 +54,15 @@ public class NFCUtils {
private static class SafeNFCImpl implements SafeNFC { private static class SafeNFCImpl implements SafeNFC {
public void register( final Activity activity ) public void register( final Activity activity )
{ {
Assert.assertTrue( activity instanceof NFCActor );
final NFCActor actor = (NFCActor)activity;
NfcAdapter.CreateNdefMessageCallback cb = NfcAdapter.CreateNdefMessageCallback cb =
new NfcAdapter.CreateNdefMessageCallback() { new NfcAdapter.CreateNdefMessageCallback() {
public NdefMessage createNdefMessage( NfcEvent event ) { public NdefMessage createNdefMessage( NfcEvent event ) {
NdefMessage msg = null; NdefMessage msg = null;
if ( null != s_data ) { String data = actor.makeNFCMessage();
msg = makeMessage( activity, s_data ); if ( null != data ) {
msg = makeMessage( activity, data );
} }
return msg; return msg;
} }
@ -78,14 +87,6 @@ public class NFCUtils {
return result; return result;
} }
public static void buildAndPush( Activity activity, String data )
{
s_data = data;
// NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter( activity );
// NdefMessage msg = makeMessage( activity, data );
// nfcAdapter.setNdefPushMessage( msg, activity );
}
public static String getFromIntent( Intent intent ) public static String getFromIntent( Intent intent )
{ {
String result = null; String result = null;