Merge branch 'master' of git.saurik.com:cydia

2 files changed, 13 insertions, 11 deletions

diff --git a/MobileCydia.app/English.lproj/Localizable.strings b/MobileCydia.app/English.lproj/Localizable.strings
index b1792a5..2a76d1e 100644
--- a/MobileCydia.app/English.lproj/Localizable.strings
+++ b/MobileCydia.app/English.lproj/Localizable.strings
@@ -145,7 +145,7 @@
 "RELOADING_DATA" = "Reloading Data";
 "REMOVE" = "Remove";
 "REMOVING_ESSENTIALS" = "Removing Essentials";
-"REMOVING_ESSENTIALS_EX" = "This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. If you continue, you may not be able to use Cydia to repair any damage.";
+"REMOVING_ESSENTIALS_EX" = "This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iOS. If you continue, you may not be able to use Cydia to repair any damage.";
 "REPAIRING" = "Repairing";
 "REPOSITORY_SIGNATURE" = "View Repository Signature";
 "REQUEST_ADVERTISING_SPACE" = "Request Advertising Space";
@@ -189,7 +189,7 @@
 "THANK_YOU" = "Thank You";
 "QUEUE" = "Queue";
 "UNABLE_TO_COMPLY" = "Unable to Comply";
-"UNABLE_TO_COMPLY_EX" = "This operation requires the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. In order to continue and force this operation you will need to be activate the Advanced mode under to continue and force this operation you will need to be activate the Advanced mode under Settings.";
+"UNABLE_TO_COMPLY_EX" = "This operation requires the removal of one or more packages that are required for the continued operation of either Cydia or iOS. In order to continue and force this operation you will need to be activate the Advanced mode under to continue and force this operation you will need to be activate the Advanced mode under Settings.";
 "UNABLE_TO_LOAD" = "Unable to Load";
 "UNKNOWN" = "Unknown";
 "UNSAFE" = "Unsafe";
diff --git a/MobileCydia.mm b/MobileCydia.mm
index dae7d61..ee5e006 100644
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -1735,6 +1735,7 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
     _transient NSDate *firstSeen_;
     _transient NSDate *lastSeen_;
     bool subscribed_;
+    bool ignored_;
 }
 
 - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;
@@ -2178,6 +2179,8 @@ struct PackageNameOrdering :
             obsolete_ = [self hasTag:@"cydia::obsolete"];
             essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"];
         _end
+
+        ignored_ = iterator_->SelectedState == pkgCache::State::Hold;
     _end } return self;
 }
 
@@ -2315,11 +2318,7 @@ struct PackageNameOrdering :
 }
 
 - (BOOL) ignored {
-    NSDictionary *metadata([self metadata]);
-    if (NSNumber *ignored = [metadata objectForKey:@"IsIgnored"])
-        return [ignored boolValue];
-    else
-        return false;
+    return ignored_;
 }
 
 - (NSString *) latest {
@@ -7020,7 +7019,7 @@ freeing the view controllers on tab change */
 #endif
 
     Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease];
-    Section *ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") localize:NO] autorelease];
+    Section *ignored = nil;
     Section *section = nil;
     NSDate *last = nil;
 
@@ -7061,9 +7060,12 @@ freeing the view controllers on tab change */
             }
 
             [section addToCount];
-        } else if ([package ignored])
+        } else if ([package ignored]) {
+            if (ignored == nil) {
+                ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") row:offset localize:NO] autorelease];
+            }
             [ignored addToCount];
-        else {
+        } else {
             ++upgrades_;
             [upgradable addToCount];
         }
@@ -7249,7 +7251,7 @@ freeing the view controllers on tab change */
 }
 
 - (void) onIgnored:(id)control {
-    [self onSomething:(int) [control isOn] withKey:@"IsIgnored"];
+    // TODO: set Held state - possibly call out to dpkg, etc.
 }
 
 - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {