Merge pull request #842 from MarcMil/faster-sysclass

Make FlowDroid's Android entry point creator more extensible

Author: StevenArzt

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

@@ -29,11 +29,15 @@ public AbstractAndroidEntryPointCreator(IManifestHandler manifest) {
 	@Override
 	public SootMethod createDummyMain() {
 		// Initialize the utility class
-		this.entryPointUtils = new AndroidEntryPointUtils();
+		this.entryPointUtils = createEntryPointUtils();
 
 		return super.createDummyMain();
 	}
 
+	protected AndroidEntryPointUtils createEntryPointUtils() {
+		return new AndroidEntryPointUtils();
+	}
+
 	protected Stmt searchAndBuildMethod(String subsignature, Local classLocal) {
 		return searchAndBuildMethod(subsignature, classLocal, Collections.<SootClass>emptySet());
 	}

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

@@ -96,14 +96,14 @@ public ComponentType getComponentType(SootClass currentClass) {
 
 		// Check the type of this class
 		ComponentType ctype = ComponentType.Plain;
-		FastHierarchy fh = Scene.v().getOrMakeFastHierarchy();
+		FastHierarchy fh = getFastHierarchy();
 
 		if (fh != null) {
 			// We first look for the specialized types
 
 			// (a1) android.app.Fragment
-			if (osClassFragment != null && Scene.v().getOrMakeFastHierarchy().canStoreType(currentClass.getType(),
-					osClassFragment.getType()))
+			if (osClassFragment != null
+					&& getFastHierarchy().canStoreType(currentClass.getType(), osClassFragment.getType()))
 				ctype = ComponentType.Fragment;
 			else if (osClassSupportFragment != null
 					&& fh.canStoreType(currentClass.getType(), osClassSupportFragment.getType()))
@@ -168,7 +168,7 @@ else if (osClassContentProvider != null
 	 */
 	public boolean isApplicationClass(SootClass clazz) {
 		return osClassApplication != null
-				&& Scene.v().getOrMakeFastHierarchy().canStoreType(clazz.getType(), osClassApplication.getType());
+				&& getFastHierarchy().canStoreType(clazz.getType(), osClassApplication.getType());
 	}
 
 	/**
@@ -180,7 +180,7 @@ public boolean isApplicationClass(SootClass clazz) {
 	 */
 	public boolean isComponentFactoryClass(SootClass clazz) {
 		return osClassComponentFactory != null
-				&& Scene.v().getOrMakeFastHierarchy().canStoreType(clazz.getType(), osClassComponentFactory.getType());
+				&& getFastHierarchy().canStoreType(clazz.getType(), osClassComponentFactory.getType());
 	}
 
 	/**
@@ -291,7 +291,7 @@ private static Collection<? extends MethodOrMethodContext> getLifecycleMethods(S
 		SootMethodRepresentationParser parser = SootMethodRepresentationParser.v();
 
 		Scene scene = Scene.v();
-		FastHierarchy fh = Scene.v().getOrMakeFastHierarchy();
+		FastHierarchy fh = scene.getOrMakeFastHierarchy();
 		nextMethod: for (String sig : methods) {
 			SootClass currentClass = sc;
 			String name = parser.getMethodNameFromSubSignature(sig);
@@ -328,6 +328,14 @@ private static Collection<? extends MethodOrMethodContext> getLifecycleMethods(S
 		return lifecycleMethods;
 	}
 
+	/**
+	 * Returns the used fast hierarchy
+	 * @return the used fast hierarchy
+	 */
+	protected FastHierarchy getFastHierarchy() {
+		return Scene.v().getOrMakeFastHierarchy();
+	}
+
 	/**
 	 * Checks whether a method is potentially callable from JavaScript
 	 * @param m the method