sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #549 from emdete/p2 

adjust api level wrapping
This commit is contained in:
Daniel Gultsch 2014-11-08 13:32:13 +01:00
parent 014f5a195b e22d3b4946
commit 8a2f20b6ed
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View File

@ -573,7 +573,11 @@ public class StartConversationActivity extends XmppActivity {
setIntent(null);
}
@TargetApi(16)
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
Invite getInviteJellyBean(NdefRecord record) {
return new Invite(record.toUri());
}
protected boolean handleIntent(Intent intent) {
if (intent == null || intent.getAction() == null) {
return false;
@ -589,10 +593,10 @@ public class StartConversationActivity extends XmppActivity {
Log.d(Config.LOGTAG, "received message=" + message);
for (NdefRecord record : ((NdefMessage)message).getRecords()) {
switch (record.getTnf()) {
case NdefRecord.TNF_WELL_KNOWN:
case NdefRecord.TNF_WELL_KNOWN:
if (Arrays.equals(record.getType(), NdefRecord.RTD_URI)) {
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
return new Invite(record.toUri()).invite();
return getInviteJellyBean(record).invite();
} else {
byte[] payload = record.getPayload();
if (payload[0] == 0) {