add a few more tests, and some clean-up

Author: Jami Cogswell

java/ql/lib/semmle/code/java/frameworks/android/Intent.qll

@@ -65,9 +65,8 @@ class AndroidReceiveIntentMethod extends Method {
 }
 
 /**
- * A method of type Service that receives an Intent.
- * Namely, `Service.onStart`, `onStartCommand`, `onBind`,
- * `onRebind`, `onUnbind`, or `onTaskRemoved`
+ * The method `Service.onStart`, `onStartCommand`,
+ * `onBind`, `onRebind`, `onUnbind`, or `onTaskRemoved`
  */
 class AndroidServiceIntentMethod extends Method {
   AndroidServiceIntentMethod() {

java/ql/test/library-tests/dataflow/taintsources/IntentSourcesActivity.java

@@ -1,7 +1,6 @@
 package com.example.myapp;
 
 import android.app.Activity;
-import android.content.Intent;
 
 public class IntentSourcesActivity extends Activity {
 

java/ql/test/library-tests/dataflow/taintsources/IntentSourcesReceiver.java

@@ -11,7 +11,13 @@ private static void sink(Object o) {
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
-		String trouble = intent.getStringExtra("data");
-		sink(trouble); // $ hasRemoteTaintFlow
+		{
+			String trouble = intent.getStringExtra("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
+		{
+			String trouble = intent.getExtras().getString("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
 	}
 }

java/ql/test/library-tests/dataflow/taintsources/IntentSourcesService.java

@@ -12,41 +12,77 @@ private static void sink(Object o) {
 
 	@Override
 	public void onStart(Intent intent, int startId) {
-		String trouble = intent.getStringExtra("data");
-		sink(trouble); // $ hasRemoteTaintFlow
+		{
+			String trouble = intent.getStringExtra("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
+		{
+			String trouble = intent.getExtras().getString("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
 	}
 
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
-		String trouble = intent.getStringExtra("data");
-		sink(trouble); // $ hasRemoteTaintFlow
+		{
+			String trouble = intent.getStringExtra("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
+		{
+			String trouble = intent.getExtras().getString("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
 		return -1;
 	}
 
 	@Override
 	public IBinder onBind(Intent intent) {
-		String trouble = intent.getStringExtra("data");
-		sink(trouble); // $ hasRemoteTaintFlow
+		{
+			String trouble = intent.getStringExtra("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
+		{
+			String trouble = intent.getExtras().getString("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
 		return null;
 	}
 
 	@Override
 	public boolean onUnbind(Intent intent) {
-		String trouble = intent.getStringExtra("data");
-		sink(trouble); // $ hasRemoteTaintFlow
+		{
+			String trouble = intent.getStringExtra("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
+		{
+			String trouble = intent.getExtras().getString("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
 		return false;
 	}
 
 	@Override
 	public void onRebind(Intent intent) {
-		String trouble = intent.getStringExtra("data");
-		sink(trouble); // $ hasRemoteTaintFlow
+		{
+			String trouble = intent.getStringExtra("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
+		{
+			String trouble = intent.getExtras().getString("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
 	}
 
 	@Override
 	public void onTaskRemoved(Intent intent) {
-		String trouble = intent.getStringExtra("data");
-		sink(trouble); // $ hasRemoteTaintFlow
+		{
+			String trouble = intent.getStringExtra("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
+		{
+			String trouble = intent.getExtras().getString("data");
+			sink(trouble); // $ hasRemoteTaintFlow
+		}
 	}
 
 }