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

Merge pull request #625 from SamWhited/linterfix 

Make linter ignore properly checked API mismatch
This commit is contained in:
Daniel Gultsch 2014-11-04 17:59:26 +01:00
parent cd5a56e8e7 b234b690c9
commit ff22f93185
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package eu.siacs.conversations.ui; package eu.siacs.conversations.ui;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.ActionBar.Tab; import android.app.ActionBar.Tab;
import android.app.ActionBar.TabListener; import android.app.ActionBar.TabListener;
@ -572,6 +573,7 @@ public class StartConversationActivity extends XmppActivity {
setIntent(null); setIntent(null);
} }
@TargetApi(16)
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;
@ -587,7 +589,7 @@ public class StartConversationActivity extends XmppActivity {
Log.d(Config.LOGTAG, "received message=" + message); Log.d(Config.LOGTAG, "received message=" + message);
for (NdefRecord record : ((NdefMessage)message).getRecords()) { for (NdefRecord record : ((NdefMessage)message).getRecords()) {
switch (record.getTnf()) { switch (record.getTnf()) {
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 new Invite(record.toUri()).invite();