Fix adding the statement multiple times

Author: MarcMil

soot-infoflow-android/src/soot/jimple/infoflow/android/AndroidLibraryClassPatcher.java

@@ -84,7 +84,7 @@ protected String[] getAllNames(String className) {
 		return names.toArray(new String[names.size()]);
 	}
 
-	private void patchInstantiate(SootClass sc, String subsig, String... name) {
+	protected void patchInstantiate(SootClass sc, String subsig, String... names) {
 
 		if (!sc.isLibraryClass())
 			sc.setLibraryClass();
@@ -111,7 +111,7 @@ private void patchInstantiate(SootClass sc, String subsig, String... name) {
 
 		Local cmp = null;
 		NopStmt next = null;
-		for (String n : name) {
+		for (String n : names) {
 			if (n != null) {
 				RefType p = RefType.v(n);
 				if (p.hasSootClass() && p.getSootClass().isApplicationClass()) {

soot-infoflow-android/src/soot/jimple/infoflow/android/entryPointCreators/components/AbstractComponentEntryPointCreator.java

@@ -267,7 +267,7 @@ public void assignIntent(SootClass hostComponent, SootMethod method, int indexOf
 			JimpleBody body = (JimpleBody) method.retrieveActiveBody();
 
 			// Some component types such as fragments don't have a getIntent() method
-			SootMethod m = hostComponent.getMethodUnsafe("android.content.Intent getIntent()");
+			SootMethod m = hostComponent.getMethodUnsafe(componentExchangeInfo.getIntentMethod.getSubSignature());
 			if (m != null) {
 				UnitPatchingChain units = body.getUnits();
 				Local thisLocal = body.getThisLocal();
@@ -277,7 +277,8 @@ public void assignIntent(SootClass hostComponent, SootMethod method, int indexOf
 				for (Iterator<Unit> iter = units.snapshotIterator(); iter.hasNext();) {
 					Stmt stmt = (Stmt) iter.next();
 					if (stmt.getTag(SimulatedCodeElementTag.TAG_NAME) != null) {
-						if (stmt.containsInvokeExpr() && stmt.getInvokeExpr().getMethod().equals(m))
+						if (stmt.containsInvokeExpr()
+								&& stmt.getInvokeExpr().getMethod().equals(componentExchangeInfo.getIntentMethod))
 							return;
 					}
 				}
@@ -293,7 +294,7 @@ public void assignIntent(SootClass hostComponent, SootMethod method, int indexOf
 				 * com.google.android.gcm.GCMBroadcastReceiver
 				 */
 				Unit setIntentU = Jimple.v().newAssignStmt(intentV,
-						Jimple.v().newVirtualInvokeExpr(thisLocal, m.makeRef()));
+						Jimple.v().newVirtualInvokeExpr(thisLocal, componentExchangeInfo.getIntentMethod.makeRef()));
 
 				setIntentU.addTag(SimulatedCodeElementTag.TAG);
 				units.insertBefore(setIntentU, stmt);