From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Thu, 10 Mar 2011 06:14:32 +0000 (-0800)
Subject: Fix various forms of icon escape encoding.
X-Git-Tag: v1.1.0%b4~16
X-Git-Url: https://git.saurik.com/cydia.git/commitdiff_plain/84851d87e0bc7d4fcc068abb56d077a0c548ca80

Fix various forms of icon escape encoding.
---

diff --git a/MobileCydia.mm b/MobileCydia.mm
index de34030b..ab827354 100644
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -2606,14 +2606,12 @@ struct PackageNameOrdering :
     if (parsed_ != NULL)
         if (NSString *href = parsed_->icon_)
             if ([href hasPrefix:@"file:///"])
-                // XXX: correct escaping
-                icon = [UIImage imageAtPath:[href substringFromIndex:7]];
+                icon = [UIImage imageAtPath:[[href substringFromIndex:7] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
     if (icon == nil) if (section != nil)
-        icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]];
+        icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, [section stringByReplacingOccurrencesOfString:@" " withString:@"_"]]];
     if (icon == nil) if (Source *source = [self source]) if (NSString *dicon = [source defaultIcon])
         if ([dicon hasPrefix:@"file:///"])
-            // XXX: correct escaping
-            icon = [UIImage imageAtPath:[dicon substringFromIndex:7]];
+            icon = [UIImage imageAtPath:[[dicon substringFromIndex:7] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
     if (icon == nil)
         icon = [UIImage applicationImageNamed:@"unknown.png"];
     return icon;