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

use setNdefPushMessageCallback instead of setNdefPushMessage; seems to

Browse source 
make invitations work more reliably.
This commit is contained in:
Eric House 2013-11-13 07:11:56 -08:00
parent 3b3746d2e5
commit 41f61e3748
2 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -574,6 +574,8 @@ public class BoardActivity extends XWActivity
m_haveInvited = intent.getBooleanExtra( GameUtils.INVITED, false ); m_haveInvited = intent.getBooleanExtra( GameUtils.INVITED, false );
m_overNotShown = true; m_overNotShown = true;
NFCUtils.register( this ); // Don't seem to need to unregister...
setBackgroundColor(); setBackgroundColor();
setKeepScreenOn(); setKeepScreenOn();
} // onCreate } // onCreate

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

@ -26,6 +26,7 @@ import android.content.Intent;
import android.nfc.NdefMessage; import android.nfc.NdefMessage;
import android.nfc.NdefRecord; import android.nfc.NdefRecord;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.nfc.NfcEvent;
import android.nfc.NfcManager; import android.nfc.NfcManager;
import android.os.Parcelable; import android.os.Parcelable;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@ -33,6 +34,7 @@ import java.nio.charset.Charset;
public class NFCUtils { public class NFCUtils {
private static boolean s_inSDK = private static boolean s_inSDK =
14 <= Integer.valueOf( android.os.Build.VERSION.SDK ); 14 <= Integer.valueOf( android.os.Build.VERSION.SDK );
private static String s_data = null;
public static boolean nfcAvail( Context context ) public static boolean nfcAvail( Context context )
{ {
@ -46,19 +48,31 @@ public class NFCUtils {
return result; return result;
} }
public static void register( final Activity activity )
{
NfcAdapter.CreateNdefMessageCallback cb =
new NfcAdapter.CreateNdefMessageCallback() {
public NdefMessage createNdefMessage( NfcEvent event ) {
NdefMessage msg = null;
if ( null != s_data ) {
msg = makeMessage( activity, s_data );
}
return msg;
}
};
NfcManager manager =
(NfcManager)activity.getSystemService( Context.NFC_SERVICE );
NfcAdapter adapter = manager.getDefaultAdapter();
adapter.setNdefPushMessageCallback( cb, activity );
}
public static void buildAndPush( Activity activity, String data ) public static void buildAndPush( Activity activity, String data )
{ {
NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter( activity ); s_data = data;
String mimeType = activity.getString( R.string.xwords_nfc_mime ); // NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter( activity );
NdefMessage msg = new NdefMessage( new NdefRecord[] { // NdefMessage msg = makeMessage( activity, data );
new NdefRecord(NdefRecord.TNF_MIME_MEDIA, mimeType // nfcAdapter.setNdefPushMessage( msg, activity );
.getBytes(Charset.forName("US-ASCII")),
new byte[0],
data.getBytes(Charset.forName("US-ASCII")))
,NdefRecord.
createApplicationRecord( activity.getPackageName() )
});
nfcAdapter.setNdefPushMessage( msg, activity );
} }
public static String getFromIntent( Intent intent ) public static String getFromIntent( Intent intent )
@ -76,4 +90,18 @@ public class NFCUtils {
return result; return result;
} }
private static NdefMessage makeMessage( Activity activity, String data )
{
String mimeType = activity.getString( R.string.xwords_nfc_mime );
NdefMessage msg = new NdefMessage( new NdefRecord[] {
new NdefRecord(NdefRecord.TNF_MIME_MEDIA, mimeType
.getBytes(Charset.forName("US-ASCII")),
new byte[0],
data.getBytes(Charset.forName("US-ASCII")))
,NdefRecord.
createApplicationRecord( activity.getPackageName() )
});
return msg;
}
} }