app description now including the icon url

maaaaz · Jul 13, 2012 · 451bbef · 451bbef
1 parent 6b838f8
commit 451bbef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Report/template/template.html b/Report/template/template.html
@@ -7,7 +7,7 @@
 {%- macro render_list_h_level(list, h_level) -%}
 {%- if list -%}
 	{%- for item in list -%}
-		<h{{h_level}}>{{ item|replace("\n","<br/><br/>") }}</h{{h_level}}>
+		<h{{h_level}}>{{ item|replace("\n","<br/>") }}</h{{h_level}}>
 	{%- endfor -%}
 {%- endif -%}
 {%- endmacro -%}

diff --git a/androwarn/analysis/analysis.py b/androwarn/analysis/analysis.py
@@ -95,18 +95,18 @@ def AnalyzeDex(filename, raw=False) :
 # Consolidate all data
 def perform_analysis(apk_file, a, d, x, no_connection) :
 	"""
-		@param apk_file : apk file path
-		@param a 		: an APK instance, DalvikVMFormat, and VMAnalysis objects
-		@param d 		: a DalvikVMFormat instance
-		@param x 		: a VMAnalysis instance
+		@param apk_file 		: apk file path
+		@param a 				: an APK instance, DalvikVMFormat, and VMAnalysis objects
+		@param d 				: a DalvikVMFormat instance
+		@param x 				: a VMAnalysis instance
+		@param no_connection	: enable/disable online lookups
 	
 		@rtype : a list of dictionaries of strings lists [ { "Application_info": [("Application_name", ["com.test.test"]), ("Application_version", ["1.0", ".1"])] } ]
 	"""
-
 	# application general information 
 	app_package_name = grab_application_package_name(a)
-	app_name, app_description, app_icon	= grab_application_name_description_icon(app_package_name, no_connection)
-
+	app_name, app_desc, app_icon = grab_application_name_description_icon(app_package_name, no_connection)
+	app_description = [app_icon, app_desc]
 
 	# data gathering
 	data = []
@@ -117,7 +117,7 @@ def perform_analysis(apk_file, a, d, x, no_connection) :
 						( "application_name", 				[app_name] ),
 						( "application_version", 			[grab_androidversion_name(a)] ),
 						( "package_name", 					[app_package_name] ),
-						( "description", 					[app_description] )#inserer icone dans desc
+						( "description", 					 app_description )#inserer icone dans desc
 					]
 				}
 	)

diff --git a/androwarn/search/manifest/manifest.py b/androwarn/search/manifest/manifest.py
@@ -153,8 +153,8 @@ def grab_certificate_information(apk) :
 		log.error("Can not read the certificate %s from the APK" % cert_found)
 		return []
 
-	cert_info_issuer  = ["Issuer:", "C=%s" % cert.issuerC(), "ST=%s" % cert.issuerS(), "L=%s" % cert.issuerL(), "O=%s" % cert.issuerO() , "OU=%s" % cert.issuerOU() , "CN=%s\n" % cert.issuerCN() ]
-	cert_info_subject  = ["Subject:", "C=%s" % cert.subjectC(), "ST=%s" % cert.subjectS(), "L=%s" % cert.subjectL(), "O=%s" % cert.subjectO() , "OU=%s" % cert.subjectOU() , "CN=%s\n" % cert.subjectCN() ]
+	cert_info_issuer  = ["Issuer:", "C=%s" % cert.issuerC(), "ST=%s" % cert.issuerS(), "L=%s" % cert.issuerL(), "O=%s" % cert.issuerO() , "OU=%s" % cert.issuerOU() , "CN=%s\n\n" % cert.issuerCN() ]
+	cert_info_subject  = ["Subject:", "C=%s" % cert.subjectC(), "ST=%s" % cert.subjectS(), "L=%s" % cert.subjectL(), "O=%s" % cert.subjectO() , "OU=%s" % cert.subjectOU() , "CN=%s\n\n" % cert.subjectCN() ]
 
 	cert_info = []