phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't crash if no NfcAdapter present; Replace constructor from API 16+

Browse Source
This commit is contained in:
fkloft 2014-01-26 15:33:17 +01:00
parent 23a092f187
commit bb31fbd9f8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
View File

@ -149,7 +149,7 @@ public class IITC_Mobile extends Activity
registerReceiver(mBroadcastReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)); registerReceiver(mBroadcastReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
final NfcAdapter nfc = NfcAdapter.getDefaultAdapter(this); final NfcAdapter nfc = NfcAdapter.getDefaultAdapter(this);
nfc.setNdefPushMessageCallback(this, this); if (nfc != null) nfc.setNdefPushMessageCallback(this, this);
handleIntent(getIntent(), true); handleIntent(getIntent(), true);
} }
@ -793,12 +793,17 @@ public class IITC_Mobile extends Activity
@Override @Override
public NdefMessage createNdefMessage(final NfcEvent event) { public NdefMessage createNdefMessage(final NfcEvent event) {
NdefRecord[] records;
if (mPermalink == null) { // no permalink yet, just provide AAR if (mPermalink == null) { // no permalink yet, just provide AAR
return new NdefMessage(NdefRecord.createApplicationRecord(getPackageName())); records = new NdefRecord[] {
NdefRecord.createApplicationRecord(getPackageName())
};
} else {
records = new NdefRecord[] {
NdefRecord.createUri(mPermalink),
NdefRecord.createApplicationRecord(getPackageName())
};
} }
return new NdefMessage(records);
return new NdefMessage(
NdefRecord.createUri(mPermalink),
NdefRecord.createApplicationRecord(getPackageName()));
} }
} }