aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-08 13:32:13 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-08 13:32:13 +0100
commit8a2f20b6ed4a121e47410f9ffe368caf0dae891a (patch)
tree87bc84183adcb7ae5ee45ab95692ddc7bfd5615e /src/main/java
parent014f5a195b84a02c44401acf4d99b29020a4951a (diff)
parente22d3b49467d93ccf1fa3ebcf3471cbbe54cf2e9 (diff)
Merge pull request #549 from emdete/p2
adjust api level wrapping
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 5b0be9c7..ed6b2a85 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -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) {