fixed a broken component filter

Author: StevenArzt

soot-infoflow-android/src/soot/jimple/infoflow/android/callbacks/filters/ApplicationCallbackFilter.java

@@ -2,6 +2,8 @@
 
 import java.util.Set;
 
+import soot.FastHierarchy;
+import soot.RefType;
 import soot.Scene;
 import soot.SootClass;
 import soot.SootMethod;
@@ -21,6 +23,7 @@ public class ApplicationCallbackFilter extends AbstractCallbackFilter {
 	private SootClass activityLifecycleCallbacks;
 	private SootClass provideAssistDataListener;
 	private SootClass componentCallbacks;
+	private SootClass componentCallbacks2;
 
 	/**
 	 * Creates a new instance of the {@link ApplicationCallbackFilter} class
@@ -65,12 +68,11 @@ public boolean accepts(SootClass component, SootClass callbackHandler) {
 		// not implemented there
 		if (this.applicationClass != null && component.getName().equals(this.applicationClass)
 				&& !callbackHandler.getName().equals(applicationClass)) {
-			if (!Scene.v().getOrMakeFastHierarchy().canStoreType(callbackHandler.getType(),
-					this.activityLifecycleCallbacks.getType())
-					&& !Scene.v().getOrMakeFastHierarchy().canStoreType(callbackHandler.getType(),
-							this.provideAssistDataListener.getType())
-					&& !Scene.v().getOrMakeFastHierarchy().canStoreType(callbackHandler.getType(),
-							this.componentCallbacks.getType()))
+			final FastHierarchy fh = Scene.v().getOrMakeFastHierarchy();
+			final RefType callbackType = callbackHandler.getType();
+			if (!fh.canStoreType(callbackType, this.activityLifecycleCallbacks.getType())
+					&& !fh.canStoreType(callbackType, this.provideAssistDataListener.getType())
+					&& !fh.canStoreType(callbackType, this.componentCallbacks.getType()))
 				return false;
 		}
 
@@ -84,6 +86,8 @@ public void reset() {
 		this.provideAssistDataListener = Scene.v()
 				.getSootClassUnsafe("android.app.Application$OnProvideAssistDataListener");
 		this.componentCallbacks = Scene.v().getSootClassUnsafe(AndroidEntryPointConstants.COMPONENTCALLBACKSINTERFACE);
+		this.componentCallbacks2 = Scene.v()
+				.getSootClassUnsafe(AndroidEntryPointConstants.COMPONENTCALLBACKS2INTERFACE);
 	}
 
 	@Override
@@ -92,10 +96,18 @@ public boolean accepts(SootClass component, SootMethod callback) {
 		// components that are not the application
 		if (component.getName().equals(applicationClass))
 			return true;
+
 		String subSig = callback.getSubSignature();
-		return !AndroidEntryPointConstants.getActivityLifecycleCallbackMethods().contains(subSig)
-				&& !AndroidEntryPointConstants.getComponentCallbackMethods().contains(subSig)
-				&& !AndroidEntryPointConstants.getComponentCallback2Methods().contains(subSig);
+		final FastHierarchy fh = Scene.v().getOrMakeFastHierarchy();
+		final RefType callbackType = callback.getDeclaringClass().getType();
+		if (AndroidEntryPointConstants.getActivityLifecycleCallbackMethods().contains(subSig))
+			return fh.canStoreType(callbackType, this.activityLifecycleCallbacks.getType());
+		if (AndroidEntryPointConstants.getComponentCallbackMethods().contains(subSig))
+			return fh.canStoreType(callbackType, this.componentCallbacks.getType());
+		if (AndroidEntryPointConstants.getComponentCallback2Methods().contains(subSig))
+			return fh.canStoreType(callbackType, this.componentCallbacks2.getType());
+
+		return true;
 	}
 
 }

soot-infoflow-android/src/soot/jimple/infoflow/android/entryPointCreators/AndroidEntryPointUtils.java

@@ -21,7 +21,7 @@ public class AndroidEntryPointUtils {
 
 	private static final Logger logger = LoggerFactory.getLogger(AndroidEntryPointUtils.class);
 
-	private Map<SootClass, ComponentType> componentTypeCache = new HashMap<SootClass, ComponentType>();
+	private Map<SootClass, ComponentType> componentTypeCache = new HashMap<>();
 
 	private SootClass osClassApplication;
 	private SootClass osClassActivity;