Skip to content

Commit 541dc3c

Browse files
louisonlouison
committed
fix bad indent on comments
2 parents 4bf5f49 + ed0b3c3 commit 541dc3c

File tree

58 files changed

+1252
-835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1252
-835
lines changed

‎pom.xml‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>de.fraunhofer.sit.flowdroid</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.6-SNAPSHOT</version>
8+
<version>2.7-SNAPSHOT</version>
99
<name>FlowDroid Parent Module</name>
1010
<packaging>pom</packaging>
1111

@@ -21,4 +21,33 @@
2121
<module>soot-infoflow-cmd</module>
2222
</modules>
2323

24+
<dependencyManagement>
25+
<dependencies>
26+
<dependency>
27+
<groupId>org.slf4j</groupId>
28+
<artifactId>slf4j-api</artifactId>
29+
<version>1.7.5</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>log4j</groupId>
33+
<artifactId>log4j</artifactId>
34+
<version>1.2.15</version>
35+
<scope>test</scope>
36+
<exclusions>
37+
<exclusion>
38+
<groupId>com.sun.jmx</groupId>
39+
<artifactId>jmxri</artifactId>
40+
</exclusion>
41+
<exclusion>
42+
<groupId>com.sun.jdmk</groupId>
43+
<artifactId>jmxtools</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<groupId>javax.jms</groupId>
47+
<artifactId>jms</artifactId>
48+
</exclusion>
49+
</exclusions>
50+
</dependency>
51+
</dependencies>
52+
</dependencyManagement>
2453
</project>

‎soot-infoflow-android/SourcesAndSinks.txt‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,16 @@
1111
<android.telephony.TelephonyManager: java.lang.String getSimSerialNumber()> android.permission.READ_PHONE_STATE -> _SOURCE_
1212
<android.telephony.TelephonyManager: java.lang.String getLine1Number()> android.permission.READ_PHONE_STATE -> _SOURCE_
1313

14-
<java.net.URLConnection: java.io.OutputStream getOutputStream()> -> _SOURCE_
14+
<java.net.URLConnection: void connect()> -> _SINK_
15+
<java.net.URLConnection: java.io.InputStream getInputStream()> -> _BOTH_
16+
<java.net.URLConnection: java.io.OutputStream getOutputStream()> -> _SINK_
17+
18+
<java.net.URL: java.io.InputStream openStream()> -> _BOTH_
19+
<java.net.URL: java.lang.Object getContent()> -> _BOTH_
20+
<java.net.URL: java.lang.Object getContent(java.lang.Class[])> -> _BOTH_
21+
22+
<java.net.URL: void set(java.lang.String,java.lang.String,int,java.lang.String,java.lang.String)> -> _SINK_
23+
<java.net.URL: void set(java.lang.String,java.lang.String,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)> -> _SINK_
1524

1625
<org.apache.http.HttpResponse: org.apache.http.HttpEntity getEntity()> -> _SOURCE_
1726

@@ -149,10 +158,6 @@
149158
<android.os.Bundle: void putStringArrayList(java.lang.String,java.util.ArrayList)> -> _SINK_
150159
<android.os.Bundle: void putAll(android.os.Bundle)> -> _SINK_
151160

152-
<android.app.PendingIntent: android.app.PendingIntent getActivity(android.content.Context,int,android.content.Intent,int)> -> _SOURCE_
153-
<android.app.PendingIntent: android.app.PendingIntent getActivity(android.content.Context,int,android.content.Intent,int,android.os.Bundle)> -> _SOURCE_
154-
<android.app.PendingIntent: android.app.PendingIntent getBroadcast(android.content.Context,int,android.content.Intent,int)> -> _SOURCE_
155-
<android.app.PendingIntent: android.app.PendingIntent getService(android.content.Context,int,android.content.Intent,int)> -> _SOURCE_
156161
<android.media.AudioRecord: int read(short[],int,int)> -> _SOURCE_
157162
<android.media.AudioRecord: int read(byte[],int,int)> -> _SOURCE_
158163
<android.media.AudioRecord: int read(java.nio.ByteBuffer,int)> -> _SOURCE_
@@ -163,12 +168,6 @@
163168
<android.content.pm.PackageManager: java.util.List queryBroadcastReceivers(android.content.Intent,int)> -> _SOURCE_
164169
<android.content.pm.PackageManager: java.util.List queryContentProviders(java.lang.String,int,int)> -> _SOURCE_
165170

166-
<android.os.Handler: android.os.Message obtainMessage()> -> _SOURCE_
167-
<android.os.Handler: android.os.Message obtainMessage(int,int,int)> -> _SOURCE_
168-
<android.os.Handler: android.os.Message obtainMessage(int,int,int,java.lang.Object)> -> _SOURCE_
169-
<android.os.Handler: android.os.Message obtainMessage(int)> -> _SOURCE_
170-
<android.os.Handler: android.os.Message obtainMessage(int,java.lang.Object)> -> _SOURCE_
171-
172171
<android.util.Log: int d(java.lang.String,java.lang.String)> -> _SINK_
173172
<android.util.Log: int d(java.lang.String,java.lang.String,java.lang.Throwable)> -> _SINK_
174173
<android.util.Log: int e(java.lang.String,java.lang.String)> -> _SINK_
@@ -201,10 +200,6 @@
201200

202201
<java.io.OutputStreamWriter: java.io.Writer append(java.lang.CharSequence)> -> _SINK_
203202

204-
<java.net.URL: void set(java.lang.String,java.lang.String,int,java.lang.String,java.lang.String)> -> _SINK_
205-
<java.net.URL: void set(java.lang.String,java.lang.String,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)> -> _SINK_
206-
207-
<java.net.URLConnection: void setRequestProperty(java.lang.String,java.lang.String)> -> _SINK_
208203
<android.content.Intent: android.content.Intent setAction(java.lang.String)> -> _SINK_
209204
<android.content.Intent: android.content.Intent setClassName(android.content.Context,java.lang.Class)> -> _SINK_
210205
<android.content.Intent: android.content.Intent setClassName(android.content.Context,java.lang.String)> -> _SINK_
@@ -276,9 +271,6 @@
276271
<android.provider.Browser: android.database.Cursor getAllBookmarks()> -> _SOURCE_
277272
<android.provider.Browser: android.database.Cursor getAllVisitedUrls()> -> _SOURCE_
278273

279-
<java.net.URL: java.net.URLConnection openConnection()> -> _SOURCE_
280-
<java.net.URL: java.net.URLConnection openConnection()> -> _SINK_
281-
282274
<org.apache.http.impl.client.DefaultHttpClient: org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest)> -> _SINK_
283275
<org.apache.http.client.HttpClient: org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest)> -> _SINK_
284276

‎soot-infoflow-android/pom.xml‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>de.tud.sse</groupId>
66
<artifactId>soot-infoflow-android</artifactId>
77
<name>soot-infoflow-android</name>
8-
<version>2.6-SNAPSHOT</version>
8+
<version>2.7-SNAPSHOT</version>
99
<description>Android-specific components of FlowDroid</description>
1010
<properties>
1111
<maven.compiler.source>1.7</maven.compiler.source>
@@ -93,12 +93,12 @@
9393
<dependency>
9494
<groupId>de.tud.sse</groupId>
9595
<artifactId>soot-infoflow</artifactId>
96-
<version>2.6-SNAPSHOT</version>
96+
<version>2.7-SNAPSHOT</version>
9797
</dependency>
9898
<dependency>
9999
<groupId>heros</groupId>
100100
<artifactId>heros</artifactId>
101-
<version>1.0.0-SNAPSHOT</version>
101+
<version>1.0.1-SNAPSHOT</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>ca.mcgill.sable</groupId>
@@ -122,31 +122,6 @@
122122
<version>1.3</version>
123123
<scope>test</scope>
124124
</dependency>
125-
<dependency>
126-
<groupId>org.slf4j</groupId>
127-
<artifactId>slf4j-api</artifactId>
128-
<version>1.7.25</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>log4j</groupId>
132-
<artifactId>log4j</artifactId>
133-
<version>1.2.15</version>
134-
135-
<exclusions>
136-
<exclusion>
137-
<groupId>com.sun.jmx</groupId>
138-
<artifactId>jmxri</artifactId>
139-
</exclusion>
140-
<exclusion>
141-
<groupId>com.sun.jdmk</groupId>
142-
<artifactId>jmxtools</artifactId>
143-
</exclusion>
144-
<exclusion>
145-
<groupId>javax.jms</groupId>
146-
<artifactId>jms</artifactId>
147-
</exclusion>
148-
</exclusions>
149-
</dependency>
150125
<dependency>
151126
<groupId>pxb.android</groupId>
152127
<artifactId>axml</artifactId>

0 commit comments

Comments
 (0)