apktools 0.4.0 → 0.4.1

data/lib/apktools/apkresources.rb

@@ -316,6 +316,7 @@ class ApkResources
 	#
 	# If xml_format is true, return value will be @<type>/<key>
 	# If xml_format is false or missing, return value will be R.<type>.<key>
+	# If the resource id does not exist, return value will be nil
 	
 	def get_resource_key(res_id, xml_format=false)
 		if res_id.is_a? String
@@ -329,7 +330,7 @@ class ApkResources
 
 		if res_package != @package_header.id
 			# This is not a resource we can parse
-			return res_id_to_s(res_id)
+			return nil
 		end
 		
 		res_spec = @type_data[res_type-1]
@@ -337,7 +338,7 @@ class ApkResources
 		
 		if entry == nil
 			# There is no entry in our table for this resource
-			return res_id_to_s(res_id)
+			return nil
 		end
 		
 		if xml_format
@@ -355,10 +356,18 @@ class ApkResources
 	# Returns: The default ResTypeEntry to the given id, or nil if no default exists
 	
 	def get_default_resource_value(res_id)
-		entries = get_resource_value(res_id)
-		default = ResTypeConfig.new(0, 0, 0, 0, 0, 0, 0, 0)
+		if res_id.is_a? String
+			res_id = res_id.hex
+		end
 		
-		return entries[default]
+		entries = get_resource_value(res_id)
+		if entries != nil
+			default = ResTypeConfig.new(0, 0, 0, 0, 0, 0, 0, 0)
+			default_entry = entries[default]
+			return default_entry
+		else
+			return nil
+		end
 	end
 
 	##
@@ -368,6 +377,7 @@ class ApkResources
 	# res_id: ID value of a resource as a FixNum or String representation (i.e. 0x7F060001)
 	#
 	# Returns: Hash of all entries matching this id, keyed by their matching ResTypeConfig
+	# or nil if the resource id cannot be found.
 	
 	def get_resource_value(res_id)
 		if res_id.is_a? String
@@ -381,7 +391,7 @@ class ApkResources
 
 		if res_package != @package_header.id
 			# This is not a resource we can parse
-			return res_id_to_s(res_id)
+			return nil
 		end
 		
 		res_spec = @type_data[res_type-1]
@@ -389,7 +399,7 @@ class ApkResources
 		entries = res_spec.types.entries[res_index]
 		if entries == nil
 			puts "Could not find #{type_name} ResType chunk" if DEBUG
-			return res_id_to_s(res_id)
+			return nil
 		end
 		
 		return entries
@@ -436,6 +446,8 @@ class ApkResources
 	
 	#Flag Constants
 	FLAG_UTF8 = 0x100 # :nodoc:
+	FLAG_COMPLEX = 0x0001 # :nodoc:
+	FLAG_PUBLIC = 0x0002 # :nodoc:
 	
 	OFFSET_NO_ENTRY = 0xFFFFFFFF # :nodoc:
 	HEADER_START = 0 # :nodoc:

data/lib/apktools/apkxml.rb

@@ -229,13 +229,21 @@ class ApkXml
 					attr_value = nil
 					if attr_raw != nil # Use raw value
 						attr_value = attr_raw
-					elsif entry.data_type == 1
+					elsif entry.data_type == 1 # Value is a references to a resource
 						# Find the resource
 						default_res = apk_resources.get_default_resource_value(entry.data)
 						if resolve_resources && default_res != nil
+							# Use the default resource value
 							attr_value = default_res.data
 						else
-							attr_value = apk_resources.get_resource_key(entry.data, true)
+							key_value = apk_resources.get_resource_key(entry.data, true)
+							if key_value != nil
+								# Use the key string
+								attr_value = key_value
+							else
+								#No key found, use raw id marked as a resource
+								attr_value = "res:0x#{entry.data.to_s(16)}"
+							end
 						end
 					else # Value is a constant
 						attr_value = "0x#{entry.data.to_s(16)}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apktools
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: APKTools