aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-04 17:59:26 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-04 17:59:26 +0100
commitff22f93185264f2153b5a5cd48538d752849b668 (patch)
tree0c784710b664e7f5ff03c1fb3047ed92b2f078f1 /src/main/java/eu
parentcd5a56e8e795e76f9cc775e2d213fafc1155c2e7 (diff)
parentb234b690c998295651164b74ec7418185648784f (diff)
Merge pull request #625 from SamWhited/linterfix
Make linter ignore properly checked API mismatch
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 0f5e728f..5b0be9c7 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -1,6 +1,7 @@
package eu.siacs.conversations.ui;
import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
import android.app.ActionBar;
import android.app.ActionBar.Tab;
import android.app.ActionBar.TabListener;
@@ -572,6 +573,7 @@ public class StartConversationActivity extends XmppActivity {
setIntent(null);
}
+ @TargetApi(16)
protected boolean handleIntent(Intent intent) {
if (intent == null || intent.getAction() == null) {
return false;
@@ -587,7 +589,7 @@ 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();