narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

Merge pull request #549 from emdete/p2

Browse source 
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

8
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -573,7 +573,11 @@ public class StartConversationActivity extends XmppActivity {
setIntent(null); setIntent(null);
} }
@TargetApi(16) @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
Invite getInviteJellyBean(NdefRecord record) {
return new Invite(record.toUri());
}
protected boolean handleIntent(Intent intent) { protected boolean handleIntent(Intent intent) {
if (intent == null || intent.getAction() == null) { if (intent == null || intent.getAction() == null) {
return false; return false;
@ -592,7 +596,7 @@ public class StartConversationActivity extends XmppActivity {
case NdefRecord.TNF_WELL_KNOWN: case NdefRecord.TNF_WELL_KNOWN:
if (Arrays.equals(record.getType(), NdefRecord.RTD_URI)) { if (Arrays.equals(record.getType(), NdefRecord.RTD_URI)) {
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
return new Invite(record.toUri()).invite(); return getInviteJellyBean(record).invite();
} else { } else {
byte[] payload = record.getPayload(); byte[] payload = record.getPayload();
if (payload[0] == 0) { if (payload[0] == 0) {