Apply code review suggestions

atorralba · atorralba · commit 6a4d2ee85082 · 2022-01-19T16:08:31.000+01:00
diff --git a/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
@@ -271,7 +271,7 @@ class ExportedAndroidContentProviderInput extends RemoteFlowSource, AndroidConte
  * calls `startActivityForResult` with an implicit Intent.
  */
 class OnActivityResultIntentSource extends OnActivityResultIncomingIntent, RemoteFlowSource {
-  OnActivityResultIntentSource() { isRemoteSource() }
+  OnActivityResultIntentSource() { this.isRemoteSource() }
 
   override string getSourceType() { result = "Android onActivityResult incoming Intent" }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/android/OnActivityResultSource.qll b/java/ql/lib/semmle/code/java/frameworks/android/OnActivityResultSource.qll
@@ -42,11 +42,14 @@ class OnActivityResultIncomingIntent extends DataFlow::Node {
       // and the activity it belongs to defines `onActivityResult`.
       exists(MethodAccess ma |
         ma.getMethod().hasName(["add", "attach", "replace"]) and
-        ma.getMethod().getDeclaringType().hasName("FragmentTransaction") and
+        ma.getMethod().getDeclaringType().hasQualifiedName("android.app", "FragmentTransaction") and
         any(Argument arg | arg = ma.getAnArgument()).getType() = startingType
         or
         ma.getMethod().hasName("show") and
-        ma.getMethod().getDeclaringType().getASupertype*().hasName("DialogFragment") and
+        ma.getMethod()
+            .getDeclaringType()
+            .getASupertype*()
+            .hasQualifiedName("android.app", "DialogFragment") and
         startingType = ma.getQualifier().getType()
       |
         ma.getEnclosingCallable().getDeclaringType() =

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ class ExportedAndroidContentProviderInput extends RemoteFlowSource, AndroidConte`
`271`	`271`	* calls `startActivityForResult` with an implicit Intent.
`272`	`272`	`*/`
`273`	`273`	`class OnActivityResultIntentSource extends OnActivityResultIncomingIntent, RemoteFlowSource {`
`274`		`- OnActivityResultIntentSource() { isRemoteSource() }`
	`274`	`+ OnActivityResultIntentSource() { this.isRemoteSource() }`
`275`	`275`
`276`	`276`	`override string getSourceType() { result = "Android onActivityResult incoming Intent" }`
`277`	`277`	`}`