Merge pull request #10115 from atorralba/atorralba/fragment-fix

Java: Add support for androidx.fragment.app.Fragment

Author: atorralba

java/ql/lib/change-notes/2022-08-19-androidx-fragments.md

@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The class `AndroidFragment` now also models the Android Jetpack version of the `Fragment` class (`androidx.fragment.app.Fragment`).

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

@@ -4,7 +4,9 @@ import java
 
 /** The class `android.app.Fragment`. */
 class AndroidFragment extends Class {
-  AndroidFragment() { this.getAnAncestor().hasQualifiedName("android.app", "Fragment") }
+  AndroidFragment() {
+    this.getAnAncestor().hasQualifiedName(["android.app", "androidx.fragment.app"], "Fragment")
+  }
 }
 
 /** The method `instantiate` of the class `android.app.Fragment`. */

java/ql/test/library-tests/frameworks/android/fragments/TestFragment.java

@@ -0,0 +1,6 @@
+import androidx.fragment.app.Fragment;
+
+public class TestFragment extends Fragment {
+    class SecondFragment extends android.app.Fragment {
+    }
+}

java/ql/test/library-tests/frameworks/android/fragments/options

@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/google-android-9.0.0

java/ql/test/library-tests/frameworks/android/fragments/test.expected

@@ -0,0 +1,2 @@
+| TestFragment.java:3:14:3:25 | TestFragment |
+| TestFragment.java:4:11:4:24 | SecondFragment |

java/ql/test/library-tests/frameworks/android/fragments/test.ql

@@ -0,0 +1,6 @@
+import java
+import semmle.code.java.frameworks.android.Fragment
+
+from AndroidFragment f
+where f.getFile().getBaseName() = "TestFragment.java"
+select f

java/ql/test/library-tests/frameworks/android/sources/TestActivityAndFragment.java

@@ -1,7 +1,7 @@
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
+import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
 public class TestActivityAndFragment extends Activity {

java/ql/test/query-tests/security/CWE-470/MainActivity.java

@@ -1,11 +1,7 @@
 package com.example.myapp;
 
-import android.app.Fragment;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
+import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentTransaction;