Apply suggestions from code review

Co-authored-by: Chris Smowton <[email protected]>

Author: atorralba

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

@@ -83,14 +83,12 @@ class ShouldOverrideUrlLoading extends Method {
  */
 predicate isJSEnabled(Expr webview) {
   webview.getType().(RefType).getASupertype*() instanceof TypeWebView and
-  exists(MethodAccess allowJs |
+  exists(MethodAccess allowJs, MethodAccess settings |
     allowJs.getMethod() instanceof AllowJavaScriptMethod and
     allowJs.getArgument(0).(CompileTimeConstantExpr).getBooleanValue() = true and
-    exists(MethodAccess settings |
-      settings.getMethod() instanceof WebViewGetSettingsMethod and
-      DataFlow::localExprFlow(settings, allowJs.getQualifier()) and
-      DataFlow::localExprFlow(webview, settings.getQualifier())
-    )
+    settings.getMethod() instanceof WebViewGetSettingsMethod and
+    DataFlow::localExprFlow(settings, allowJs.getQualifier()) and
+    DataFlow::localExprFlow(webview, settings.getQualifier())
   )
 }
 
@@ -99,14 +97,12 @@ predicate isJSEnabled(Expr webview) {
  * `setAllowFileAccessFromFileURLs` have been set to `true`.
  */
 predicate isAllowFileAccessEnabled(Expr webview) {
-  exists(MethodAccess allowFileAccess |
+  exists(MethodAccess allowFileAccess, MethodAccess settings |
     allowFileAccess.getMethod() instanceof CrossOriginAccessMethod and
     allowFileAccess.getArgument(0).(CompileTimeConstantExpr).getBooleanValue() = true and
-    exists(MethodAccess settings |
-      settings.getMethod() instanceof WebViewGetSettingsMethod and
-      DataFlow::localExprFlow(settings, allowFileAccess.getQualifier()) and
-      DataFlow::localExprFlow(webview, settings.getQualifier())
-    )
+    settings.getMethod() instanceof WebViewGetSettingsMethod and
+    DataFlow::localExprFlow(settings, allowFileAccess.getQualifier()) and
+    DataFlow::localExprFlow(webview, settings.getQualifier())
   )
 }
 

java/ql/lib/semmle/code/java/security/UnsafeAndroidAccess.qll

@@ -77,7 +77,7 @@ private Expr getUnderlyingExpr(Expr e) {
 }
 
 /**
- * Holds if `WebViewLoadUrlMethod` is called on `webview`
+ * Holds if a `WebViewLoadUrlMethod` is called on `webview`
  * with `urlArg` as its first argument.
  */
 private predicate webViewLoadUrl(Argument urlArg, Expr webview) {