Merge pull request #625 from SamWhited/linterfix
Make linter ignore properly checked API mismatch
This commit is contained in:
		
						commit
						ff22f93185
					
				|  | @ -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(); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Daniel Gultsch
						Daniel Gultsch