]> git.saurik.com Git - cydia.git/blobdiff - Cydia.mm
Figured out (a while ago, on my iPhone) why table cell diselection was broken.
[cydia.git] / Cydia.mm
index 2d94935b5a3ad73b06fe5d850b62b041a6fdedcf..129ba0ebbce0892c48e3c4be24c0cfc0bcc9f8b8 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -61,6 +61,7 @@
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/cachefile.h>
+#include <apt-pkg/clean.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/error.h>
@@ -134,6 +135,29 @@ extern "C" {
 #endif
 /* }}} */
 
+#ifdef __OBJC2__
+typedef enum {
+    kUIProgressIndicatorStyleMediumWhite = 1,
+    kUIProgressIndicatorStyleSmallWhite = 0,
+    kUIProgressIndicatorStyleSmallBlack = 4
+} UIProgressIndicatorStyle;
+#else
+typedef enum {
+    kUIProgressIndicatorStyleMediumWhite = 0,
+    kUIProgressIndicatorStyleSmallWhite = 2,
+    kUIProgressIndicatorStyleSmallBlack = 3
+} UIProgressIndicatorStyle;
+#endif
+
+typedef enum {
+    kUIControlEventMouseDown = 1 << 0,
+    kUIControlEventMouseMovedInside = 1 << 2, // mouse moved inside control target
+    kUIControlEventMouseMovedOutside = 1 << 3, // mouse moved outside control target
+    kUIControlEventMouseUpInside = 1 << 6, // mouse up inside control target
+    kUIControlEventMouseUpOutside = 1 << 7, // mouse up outside control target
+    kUIControlAllEvents = (kUIControlEventMouseDown | kUIControlEventMouseMovedInside | kUIControlEventMouseMovedOutside | kUIControlEventMouseUpInside | kUIControlEventMouseUpOutside)
+} UIControlEventMasks;
+
 @interface NSString (UIKit)
 - (NSString *) stringByAddingPercentEscapes;
 - (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
@@ -383,7 +407,13 @@ class GSFont {
 static const int PulseInterval_ = 50000;
 static const int ButtonBarHeight_ = 48;
 static const float KeyboardTime_ = 0.4f;
+static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist";
+
+#ifndef Cydia_
+#define Cydia_ ""
+#endif
 
+static CGColor Blueish_;
 static CGColor Black_;
 static CGColor Clear_;
 static CGColor Red_;
@@ -404,6 +434,7 @@ unsigned Major_;
 unsigned Minor_;
 unsigned BugFix_;
 
+CFLocaleRef Locale_;
 CGColorSpaceRef space_;
 
 #define FW_LEAST(major, minor, bugfix) \
@@ -412,7 +443,7 @@ CGColorSpaceRef space_;
             bugfix <= BugFix_))
 
 bool bootstrap_;
-bool restart_;
+bool reload_;
 
 static NSMutableDictionary *Metadata_;
 static NSMutableDictionary *Packages_;
@@ -425,12 +456,10 @@ NSString *GetLastUpdate() {
     if (update == nil)
         return @"Never or Unknown";
 
-    CFLocaleRef locale = CFLocaleCopyCurrent();
-    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
     CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
 
     CFRelease(formatter);
-    CFRelease(locale);
 
     return [(NSString *) formatted autorelease];
 }
@@ -452,6 +481,13 @@ NSString *SizeString(double size) {
     return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]];
 }
 
+NSString *StripVersion(NSString *version) {
+    NSRange colon = [version rangeOfString:@":"];
+    if (colon.location != NSNotFound)
+        version = [version substringFromIndex:(colon.location + 1)];
+    return version;
+}
+
 static const float TextViewOffset_ = 22;
 
 UITextView *GetTextView(NSString *value, float left, bool html) {
@@ -491,8 +527,22 @@ NSString *Simplify(NSString *title) {
 @class Package;
 @class Source;
 
+@interface NSObject (ProgressDelegate)
+@end
+
+@implementation NSObject(ProgressDelegate)
+
+- (void) _setProgressError:(NSArray *)args {
+    [self performSelector:@selector(setProgressError:forPackage:)
+        withObject:[args objectAtIndex:0]
+        withObject:([args count] == 1 ? nil : [args objectAtIndex:1])
+    ];
+}
+
+@end
+
 @protocol ProgressDelegate
-- (void) setProgressError:(NSString *)error;
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id;
 - (void) setProgressTitle:(NSString *)title;
 - (void) setProgressPercent:(float)percent;
 - (void) addProgressOutput:(NSString *)output;
@@ -516,7 +566,7 @@ class Status :
     public pkgAcquireStatus
 {
   private:
-    _transient id<ProgressDelegate> delegate_;
+    _transient NSObject<ProgressDelegate> *delegate_;
 
   public:
     Status() :
@@ -549,7 +599,10 @@ class Status :
         )
             return;
 
-        [delegate_ setProgressError:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()]];
+        [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+            withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()], nil]
+            waitUntilDone:YES
+        ];
     }
 
     virtual bool Pulse(pkgAcquire *Owner) {
@@ -614,14 +667,16 @@ class Progress :
     NSMutableDictionary *sources_;
     NSMutableArray *packages_;
 
-    _transient id<ConfigurationDelegate, ProgressDelegate> delegate_;
+    _transient NSObject<ConfigurationDelegate, ProgressDelegate> *delegate_;
     Status status_;
     Progress progress_;
 
+    int cydiafd_;
     int statusfd_;
     FILE *input_;
 }
 
+- (void) _readCydia:(NSNumber *)fd;
 - (void) _readStatus:(NSNumber *)fd;
 - (void) _readOutput:(NSNumber *)fd;
 
@@ -867,6 +922,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     NSString *tagline_;
     NSString *icon_;
     NSString *website_;
+    Address *sponsor_;
+    Address *author_;
 
     NSArray *relationships_;
 }
@@ -888,15 +945,22 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (NSString *) installed;
 
 - (BOOL) valid;
-- (BOOL) upgradable;
+- (BOOL) upgradableAndEssential:(BOOL)essential;
 - (BOOL) essential;
 - (BOOL) broken;
 
+- (BOOL) half;
+- (BOOL) halfConfigured;
+- (BOOL) halfInstalled;
+- (BOOL) hasMode;
+- (NSString *) mode;
+
 - (NSString *) id;
 - (NSString *) name;
 - (NSString *) tagline;
 - (NSString *) icon;
 - (NSString *) website;
+- (Address *) author;
 
 - (NSArray *) relationships;
 
@@ -936,6 +1000,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [icon_ release];
     if (website_ != nil)
         [website_ release];
+    if (sponsor_ != nil)
+        [sponsor_ release];
+    if (author_ != nil)
+        [author_ release];
 
     if (relationships_ != nil)
         [relationships_ release];
@@ -949,7 +1017,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         database_ = database;
 
         version_ = [database_ policy]->GetCandidateVer(iterator_);
-        latest_ = version_.end() ? nil : [[NSString stringWithUTF8String:version_.VerStr()] retain];
+        latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain];
 
         if (!version_.end())
             file_ = version_.FileList();
@@ -959,7 +1027,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         }
 
         pkgCache::VerIterator current = iterator_.CurrentVer();
-        installed_ = current.end() ? nil : [[NSString stringWithUTF8String:current.VerStr()] retain];
+        installed_ = current.end() ? nil : [StripVersion([NSString stringWithUTF8String:current.VerStr()]) retain];
 
         id_ = [[[NSString stringWithUTF8String:iterator_.Name()] lowercaseString] retain];
 
@@ -976,9 +1044,17 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             icon_ = Scour("Icon", begin, end);
             if (icon_ != nil)
                 icon_ = [icon_ retain];
-            website_ = Scour("Website", begin, end);
+            website_ = Scour("Homepage", begin, end);
+            if (website_ == nil)
+                website_ = Scour("Website", begin, end);
             if (website_ != nil)
                 website_ = [website_ retain];
+            NSString *sponsor = Scour("Sponsor", begin, end);
+            if (sponsor != nil)
+                sponsor_ = [[Address addressWithString:sponsor] retain];
+            NSString *author = Scour("Author", begin, end);
+            if (author != nil)
+                author_ = [[Address addressWithString:author] retain];
         }
 
         NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
@@ -1061,11 +1137,11 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return !version_.end();
 }
 
-- (BOOL) upgradable {
+- (BOOL) upgradableAndEssential:(BOOL)essential {
     pkgCache::VerIterator current = iterator_.CurrentVer();
 
     if (current.end())
-        return [self essential];
+        return essential && [self essential];
     else {
         pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_);
         return !candidate.end() && candidate != current;
@@ -1077,7 +1153,61 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (BOOL) broken {
-    return (*[database_ cache])[iterator_].InstBroken();
+    return [database_ cache][iterator_].InstBroken();
+}
+
+- (BOOL) half {
+    unsigned char current = iterator_->CurrentState;
+    return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled;
+}
+
+- (BOOL) halfConfigured {
+    return iterator_->CurrentState == pkgCache::State::HalfConfigured;
+}
+
+- (BOOL) halfInstalled {
+    return iterator_->CurrentState == pkgCache::State::HalfInstalled;
+}
+
+- (BOOL) hasMode {
+    pkgDepCache::StateCache &state([database_ cache][iterator_]);
+    return state.Mode != pkgDepCache::ModeKeep;
+}
+
+- (NSString *) mode {
+    pkgDepCache::StateCache &state([database_ cache][iterator_]);
+
+    switch (state.Mode) {
+        case pkgDepCache::ModeDelete:
+            if ((state.iFlags & pkgDepCache::Purge) != 0)
+                return @"Purge";
+            else
+                return @"Remove";
+            _assert(false);
+        case pkgDepCache::ModeKeep:
+            if ((state.iFlags & pkgDepCache::AutoKept) != 0)
+                return nil;
+            else
+                return nil;
+            _assert(false);
+        case pkgDepCache::ModeInstall:
+            if ((state.iFlags & pkgDepCache::ReInstall) != 0)
+                return @"Reinstall";
+            else switch (state.Status) {
+                case -1:
+                    return @"Downgrade";
+                case 0:
+                    return @"Install";
+                case 1:
+                    return @"Upgrade";
+                case 2:
+                    return @"New Install";
+                default:
+                    _assert(false);
+            }
+        default:
+            _assert(false);
+    }
 }
 
 - (NSString *) id {
@@ -1100,6 +1230,14 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return website_;
 }
 
+- (Address *) sponsor {
+    return sponsor_;
+}
+
+- (Address *) author {
+    return author_;
+}
+
 - (NSArray *) relationships {
     return relationships_;
 }
@@ -1186,8 +1324,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (NSComparisonResult) compareForChanges:(Package *)package {
-    BOOL lhs = [self upgradable];
-    BOOL rhs = [package upgradable];
+    BOOL lhs = [self upgradableAndEssential:YES];
+    BOOL rhs = [package upgradableAndEssential:YES];
 
     if (lhs != rhs)
         return lhs ? NSOrderedAscending : NSOrderedDescending;
@@ -1302,6 +1440,23 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [super dealloc];
 }
 
+- (void) _readCydia:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;
+
+    while (std::getline(is, line)) {
+        const char *data(line.c_str());
+        //size_t size = line.size();
+        fprintf(stderr, "C:%s\n", data);
+    }
+
+    [pool release];
+    _assert(false);
+}
+
 - (void) _readStatus:(NSNumber *)fd {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
@@ -1315,7 +1470,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     while (std::getline(is, line)) {
         const char *data(line.c_str());
         size_t size = line.size();
-        fprintf(stderr, "%s\n", data);
+        fprintf(stderr, "S:%s\n", data);
 
         if (conffile_r(data, size)) {
             [delegate_ setConfigurationData:conffile_r[1]];
@@ -1323,14 +1478,19 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             NSString *string = [NSString stringWithUTF8String:(data + 8)];
             [delegate_ setProgressTitle:string];
         } else if (pmstatus_r(data, size)) {
+            std::string type([pmstatus_r[1] UTF8String]);
+            NSString *id = pmstatus_r[2];
+
             float percent([pmstatus_r[3] floatValue]);
             [delegate_ setProgressPercent:(percent / 100)];
 
             NSString *string = pmstatus_r[4];
-            std::string type([pmstatus_r[1] UTF8String]);
 
             if (type == "pmerror")
-                [delegate_ setProgressError:string];
+                [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+                    withObject:[NSArray arrayWithObjects:string, id, nil]
+                    waitUntilDone:YES
+                ];
             else if (type == "pmstatus")
                 [delegate_ setProgressTitle:string];
             else if (type == "pmconffile")
@@ -1351,7 +1511,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     std::string line;
 
     while (std::getline(is, line)) {
-        fprintf(stderr, "%s\n", line.c_str());
+        fprintf(stderr, "O:%s\n", line.c_str());
         [delegate_ addProgressOutput:[NSString stringWithUTF8String:line.c_str()]];
     }
 
@@ -1383,6 +1543,18 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
         int fds[2];
 
+        _assert(pipe(fds) != -1);
+        cydiafd_ = fds[1];
+
+        _config->Set("APT::Keep-Fds::", cydiafd_);
+        setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 0"] UTF8String], _not(int));
+
+        [NSThread
+            detachNewThreadSelector:@selector(_readCydia:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];
+
         _assert(pipe(fds) != -1);
         statusfd_ = fds[1];
 
@@ -1464,9 +1636,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             [delegate_ repairWithSelector:@selector(configure)];
         else if (error == "The package lists or status file could not be parsed or opened.")
             [delegate_ repairWithSelector:@selector(update)];
-        else if (error == "Could not get lock /var/lib/dpkg/lock - open (35 Resource temporarily unavailable)")
-            [delegate_ repairWithSelector:@selector(unlock)];
-        //else if (error == "The list of sources could not be read.")
+        // else if (error == "Could not open lock file /var/lib/dpkg/lock - open (13 Permission denied)")
+        // else if (error == "Could not get lock /var/lib/dpkg/lock - open (35 Resource temporarily unavailable)")
+        // else if (error == "The list of sources could not be read.")
         else _assert(false);
 
         return;
@@ -1483,6 +1655,15 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     list_ = new pkgSourceList();
     _assert(list_->ReadMainList());
 
+    _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
+    _assert(pkgApplyStatus(cache_));
+
+    if (cache_->BrokenCount() != 0) {
+        _assert(pkgFixBroken(cache_));
+        _assert(cache_->BrokenCount() == 0);
+        _assert(pkgMinimizeUpgrade(cache_));
+    }
+
     [sources_ removeAllObjects];
     for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) {
         std::vector<pkgIndexFile *> *indices = (*source)->GetIndexFiles();
@@ -1501,15 +1682,38 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [packages_ sortUsingSelector:@selector(compareByName:)];
 }
 
-- (void) unlock {
-    system("killall dpkg");
-}
-
 - (void) configure {
     NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_];
     system([dpkg UTF8String]);
 }
 
+- (void) clean {
+    if (lock_ != NULL)
+        return;
+
+    FileFd Lock;
+    Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+    _assert(!_error->PendingError());
+
+    pkgAcquire fetcher;
+    fetcher.Clean(_config->FindDir("Dir::Cache::Archives"));
+
+    class LogCleaner :
+        public pkgArchiveCleaner
+    {
+      protected:
+        virtual void Erase(const char *File, std::string Pkg, std::string Ver, struct stat &St) {
+            unlink(File);
+        }
+    } cleaner;
+
+    if (!cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)) {
+        std::string error;
+        while (_error->PopMessage(error))
+            fprintf(stderr, "ArchiveCleaner: %s\n", error.c_str());
+    }
+}
+
 - (void) prepare {
     pkgRecords records(cache_);
 
@@ -1559,15 +1763,6 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (void) upgrade {
-    _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
-    _assert(pkgApplyStatus(cache_));
-
-    if (cache_->BrokenCount() != 0) {
-        _assert(pkgFixBroken(cache_));
-        _assert(cache_->BrokenCount() == 0);
-        _assert(pkgMinimizeUpgrade(cache_));
-    }
-
     _assert(pkgDistUpgrade(cache_));
 }
 
@@ -1696,8 +1891,23 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [essential_ dismiss];
-    [self cancel];
+    NSString *context = [sheet context];
+
+    if ([context isEqualToString:@"remove"])
+        switch (button) {
+            case 1:
+                [self cancel];
+                break;
+            case 2:
+                [delegate_ confirm];
+                break;
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"unable"])
+        [self cancel];
+
+    [sheet dismiss];
 }
 
 - (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
@@ -1789,7 +1999,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         CGRect bounds = [overlay_ bounds];
 
         navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [navbar_ setBarStyle:1];
+        if (Advanced_)
+            [navbar_ setBarStyle:1];
         [navbar_ setDelegate:self];
 
         UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];
@@ -1832,16 +2043,32 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         if (!remove)
             essential_ = nil;
-        else {
+        else if (Advanced_ || true) {
+            essential_ = [[UIAlertSheet alloc]
+                initWithTitle:@"Removing Essentials"
+                buttons:[NSArray arrayWithObjects:
+                    @"Cancel Operation (Safe)",
+                    @"Force Removal (Unsafe)",
+                nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"remove"
+            ];
+
+#ifndef __OBJC2__
+            [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
+#endif
+            [essential_ setBodyText:@"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."];
+        } else {
             essential_ = [[UIAlertSheet alloc]
                 initWithTitle:@"Unable to Comply"
                 buttons:[NSArray arrayWithObjects:@"Okay", nil]
                 defaultButtonIndex:0
                 delegate:self
-                context:@"remove"
+                context:@"unable"
             ];
 
-            [essential_ setBodyText:@"One or more of the packages you are about to remove are marked 'Essential' and cannot be removed by Cydia. Please use apt-get."];
+            [essential_ setBodyText:@"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."];
         }
 
         AddTextView(fields_, installing, @"Installing");
@@ -1928,6 +2155,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     UIProgressBar *progress_;
     UITextView *output_;
     UITextLabel *status_;
+    UIPushButton *close_;
     id delegate_;
 }
 
@@ -1962,6 +2190,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [progress_ release];
     [output_ release];
     [status_ release];
+    [close_ release];
     [super dealloc];
 }
 
@@ -2011,7 +2240,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         }, prgsize};
 
         progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
-        [overlay_ addSubview:progress_];
+        [progress_ setStyle:0];
 
         status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
             10,
@@ -2041,11 +2270,30 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
         [output_ setMarginTop:0];
         [output_ setAllowsRubberBanding:YES];
+        [output_ setEditable:NO];
 
         [overlay_ addSubview:output_];
-        [overlay_ addSubview:status_];
 
-        [progress_ setStyle:0];
+        close_ = [[UIPushButton alloc] initWithFrame:CGRectMake(
+            10,
+            bounds.size.height - prgsize.height - 50,
+            bounds.size.width - 20,
+            32 + prgsize.height
+        )];
+
+        [close_ setAutosizesToFit:NO];
+        [close_ setDrawsShadow:YES];
+        [close_ setStretchBackground:YES];
+        [close_ setTitle:@"Close Window"];
+        [close_ setEnabled:YES];
+
+        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+        [close_ setTitleFont:bold];
+        CFRelease(bold);
+
+        [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside];
+        [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];
+        [close_ setBackground:[UIImage applicationImageNamed:@"green-dn.png"] forState:1];
     } return self;
 }
 
@@ -2066,25 +2314,33 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             case 1:
                 fprintf(input, "N\n");
                 fflush(input);
-            break;
-
+                break;
             case 2:
                 fprintf(input, "Y\n");
                 fflush(input);
-            break;
-
-            default: _assert(false);
+                break;
+            default:
+                _assert(false);
         }
     }
 
     [sheet dismiss];
 }
 
-- (void) _retachThread {
+- (void) closeButtonPushed {
     [delegate_ progressViewIsComplete:self];
     [self resetView];
 }
 
+- (void) _retachThread {
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:@"Complete"];
+
+    [overlay_ addSubview:close_];
+    [progress_ removeFromSuperview];
+    [status_ removeFromSuperview];
+}
+
 - (void) _detachNewThreadData:(ProgressData *)data {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
@@ -2104,6 +2360,10 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [output_ setText:@""];
     [progress_ setProgress:0];
 
+    [close_ removeFromSuperview];
+    [overlay_ addSubview:progress_];
+    [overlay_ addSubview:status_];
+
     [transition_ transition:6 toView:overlay_];
 
     [NSThread
@@ -2134,12 +2394,19 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     ];
 }
 
-- (void) setProgressError:(NSString *)error {
-    [self
-        performSelectorOnMainThread:@selector(_setProgressError:)
-        withObject:error
-        waitUntilDone:YES
-    ];
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    Package *package = id == nil ? nil : [database_ packageWithName:id];
+
+    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        initWithTitle:(package == nil ? @"Source Error" : [package name])
+        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"error"
+    ] autorelease];
+
+    [sheet setBodyText:error];
+    [sheet popupAlertAnimated:YES];
 }
 
 - (void) setProgressTitle:(NSString *)title {
@@ -2191,19 +2458,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [sheet popupAlertAnimated:YES];
 }
 
-- (void) _setProgressError:(NSString *)error {
-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-        initWithTitle:@"Package Error"
-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
-        defaultButtonIndex:0
-        delegate:self
-        context:@"error"
-    ] autorelease];
-
-    [sheet setBodyText:error];
-    [sheet popupAlertAnimated:YES];
-}
-
 - (void) _setProgressTitle:(NSString *)title {
     [status_ setText:[title stringByAppendingString:@"..."]];
 }
@@ -2228,7 +2482,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     UITextLabel *name_;
     UITextLabel *description_;
     UITextLabel *source_;
-    UIImageView *trusted_;
+    //UIImageView *trusted_;
+#ifdef USE_BADGES
+    UIImageView *badge_;
+    UITextLabel *status_;
+#endif
+    BOOL setup_;
 }
 
 - (PackageCell *) init;
@@ -2239,6 +2498,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 - (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
 - (void) _setSelectionFadeFraction:(float)fraction;
 
++ (int) heightForPackage:(Package *)package;
+
 @end
 
 @implementation PackageCell
@@ -2248,7 +2509,11 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [name_ release];
     [description_ release];
     [source_ release];
-    [trusted_ release];
+#ifdef USE_BADGES
+    [badge_ release];
+    [status_ release];
+#endif
+    //[trusted_ release];
     [super dealloc];
 }
 
@@ -2272,8 +2537,20 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [description_ setBackgroundColor:Clear_];
         [description_ setFont:small];
 
-        trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
-        [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];
+        /*trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
+        [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];*/
+
+#ifdef USE_BADGES
+        badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
+
+        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
+        [status_ setBackgroundColor:Clear_];
+        [status_ setFont:small];
+#endif
+
+        /*[icon_ setImage:[UIImage applicationImageNamed:@"unknown.png"]];
+        [icon_ zoomToScale:0.5];
+        [icon_ setFrame:CGRectMake(10, 10, 30, 30)];*/
 
         [self addSubview:icon_];
         [self addSubview:name_];
@@ -2287,6 +2564,11 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (void) setPackage:(Package *)package {
+    /*if (setup_)
+        return;
+    else
+        setup_ = YES;*/
+
     Source *source = [package source];
 
     UIImage *image = nil;
@@ -2298,11 +2580,11 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         image = [UIImage applicationImageNamed:@"unknown.png"];
     [icon_ setImage:image];
 
-    if (image != nil) {
+    /*if (image != nil) {
         CGSize size = [image size];
         float scale = 30 / std::max(size.width, size.height);
         [icon_ zoomToScale:scale];
-    }
+    }*/
 
     [icon_ setFrame:CGRectMake(10, 10, 30, 30)];
 
@@ -2329,10 +2611,31 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
     [source_ setText:from];
 
-    if (trusted)
-        [self addSubview:trusted_];
-    else
-        [trusted_ removeFromSuperview];
+#ifdef USE_BADGES
+    [badge_ removeFromSuperview];
+    [status_ removeFromSuperview];
+
+    if (NSString *mode = [package mode]) {
+        [badge_ setImage:[UIImage applicationImageNamed:
+            [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png"
+        ]];
+
+        [status_ setText:[NSString stringWithFormat:@"Queued for %@", mode]];
+        [status_ setColor:Blueish_];
+    } else if ([package half]) {
+        [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
+        [status_ setText:@"Package Damaged"];
+        [status_ setColor:Red_];
+    } else {
+        [badge_ setImage:nil];
+        [status_ setText:nil];
+        goto done;
+    }
+
+    [self addSubview:badge_];
+    [self addSubview:status_];
+  done:;
+#endif
 }
 
 - (void) _setSelected:(float)fraction {
@@ -2369,6 +2672,15 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [super _setSelectionFadeFraction:fraction];
 }
 
++ (int) heightForPackage:(Package *)package {
+#ifdef USE_BADGES
+    if ([package hasMode] || [package half])
+        return 96;
+    else
+#endif
+        return 73;
+}
+
 @end
 /* }}} */
 /* Section Cell {{{ */
@@ -2509,7 +2821,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     return reusing;
 }
 
-- (BOOL) canSelectRow:(int)row {
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
     return NO;
 }
 
@@ -2553,16 +2865,18 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         package_ = [package retain];
         name_ = [[package id] retain];
 
-        NSString *list = [NSString
-            stringWithContentsOfFile:[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_]
-            encoding:kCFStringEncodingUTF8
-            error:NULL
-        ];
+        NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_];
+
+        {
+            std::ifstream fin([path UTF8String]);
+            std::string line;
+            while (std::getline(fin, line))
+                [files_ addObject:[NSString stringWithUTF8String:line.c_str()]];
+        }
 
-        if (list != nil) {
-            [files_ addObjectsFromArray:[list componentsSeparatedByString:@"\n"]];
-            [files_ removeLastObject];
-            [files_ removeObjectAtIndex:0];
+        if ([files_ count] != 0) {
+            if ([[files_ objectAtIndex:0] isEqualToString:@"/."])
+                [files_ removeObjectAtIndex:0];
             [files_ sortUsingSelector:@selector(compareByPath:)];
 
             NSMutableArray *stack = [NSMutableArray arrayWithCapacity:8];
@@ -2671,12 +2985,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 - (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
     if (group-- == 0) {
         int number = 1;
+        if ([package_ author] != nil)
+            ++number;
         if (description_ != nil)
             ++number;
         if ([package_ website] != nil)
             ++number;
-        if ([[package_ source] trusted])
-            ++number;
         return number;
     } else if ([package_ installed] != nil && group-- == 0)
         return 2;
@@ -2686,8 +3000,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             ++number;
         if ([package_ maintainer] != nil)
             ++number;
+        if ([package_ sponsor] != nil)
+            ++number;
         if ([package_ relationships] != nil)
             ++number;
+        if ([[package_ source] trusted])
+            ++number;
         return number;
     } else if ([package_ source] != nil && group-- == 0) {
         Source *source = [package_ source];
@@ -2706,21 +3024,25 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [cell setShowSelection:NO];
 
     if (group-- == 0) {
-        if (row-- == 0) {
+        if (false) {
+        } else if (row-- == 0) {
             [cell setTitle:[package_ name]];
             [cell setValue:[package_ latest]];
+        } else if ([package_ author] != nil && row-- == 0) {
+            [cell setTitle:@"Author"];
+            [cell setValue:[[package_ author] name]];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
         } else if (description_ != nil && row-- == 0) {
             [cell addSubview:description_];
         } else if ([package_ website] != nil && row-- == 0) {
             [cell setTitle:@"More Information"];
             [cell setShowDisclosure:YES];
             [cell setShowSelection:YES];
-        } else if ([[package_ source] trusted] && row-- == 0) {
-            [cell setIcon:[UIImage applicationImageNamed:@"trusted.png"]];
-            [cell setValue:@"This package has been signed."];
         } else _assert(false);
     } else if ([package_ installed] != nil && group-- == 0) {
-        if (row-- == 0) {
+        if (false) {
+        } else if (row-- == 0) {
             [cell setTitle:@"Version"];
             NSString *installed([package_ installed]);
             [cell setValue:(installed == nil ? @"n/a" : installed)];
@@ -2730,7 +3052,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             [cell setShowSelection:YES];
         } else _assert(false);
     } else if (group-- == 0) {
-        if (row-- == 0) {
+        if (false) {
+        } else if (row-- == 0) {
             [cell setTitle:@"Identifier"];
             [cell setValue:[package_ id]];
         } else if (row-- == 0) {
@@ -2745,16 +3068,25 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             [cell setValue:[[package_ maintainer] name]];
             [cell setShowDisclosure:YES];
             [cell setShowSelection:YES];
+        } else if ([package_ sponsor] != nil && row-- == 0) {
+            [cell setTitle:@"Sponsor"];
+            [cell setValue:[[package_ sponsor] name]];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
         } else if ([package_ relationships] != nil && row-- == 0) {
             [cell setTitle:@"Package Relationships"];
             [cell setShowDisclosure:YES];
             [cell setShowSelection:YES];
+        } else if ([[package_ source] trusted] && row-- == 0) {
+            [cell setIcon:[UIImage applicationImageNamed:@"trusted.png"]];
+            [cell setValue:@"This package has been signed."];
         } else _assert(false);
     } else if ([package_ source] != nil && group-- == 0) {
         Source *source = [package_ source];
         NSString *description = [source description];
 
-        if (row-- == 0) {
+        if (false) {
+        } else if (row-- == 0) {
             NSString *label = [source label];
             if (label == nil)
                 label = [source uri];
@@ -2777,34 +3109,67 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [table_ selectedRow];
-    NSString *website = [package_ website];
-    BOOL trusted = [[package_ source] trusted];
-    NSString *installed = [package_ installed];
-
-    if (row == 7
-        + (website == nil ? 0 : 1)
-        + (trusted ? 1 : 0)
-        + (installed == nil ? 0 : 3)
-    )
-        [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
-            [[package_ maintainer] email],
-            [[NSString stringWithFormat:@"regarding apt package \"%@\"", [package_ name]] stringByAddingPercentEscapes]
-        ]]];
-    else if (installed && row == 5
-        + (website == nil ? 0 : 1)
-        + (trusted ? 1 : 0)
-    ) {
-        FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
-        [files setDelegate:delegate_];
-        [files setPackage:package_];
-        [book_ pushPage:files];
-    } else if (website != nil && row == 3) {
-        NSURL *url = [NSURL URLWithString:website];
-        BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
-        [browser setDelegate:delegate_];
-        [book_ pushPage:browser];
-        [browser loadURL:url];
-    }
+    if (row == INT_MAX)
+        return;
+
+    #define _else else goto _label; return; } _label:
+
+    if (true) {
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if ([package_ author] != nil && row-- == 0) {
+            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+                [[package_ author] email],
+                [[NSString stringWithFormat:@"regarding apt package \"%@\"",
+                    [package_ name]
+                ] stringByAddingPercentEscapes]
+            ]]];
+        } else if (description_ != nil && row-- == 0) {
+        } else if ([package_ website] != nil && row-- == 0) {
+            NSURL *url = [NSURL URLWithString:[package_ website]];
+            BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+            [browser setDelegate:delegate_];
+            [book_ pushPage:browser];
+            [browser loadURL:url];
+    } _else if ([package_ installed] != nil) {
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if (row-- == 0) {
+            FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
+            [files setDelegate:delegate_];
+            [files setPackage:package_];
+            [book_ pushPage:files];
+    } _else if (true) {
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if ([package_ size] != 0 && row-- == 0) {
+        } else if ([package_ maintainer] != nil && row-- == 0) {
+            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+                [[package_ maintainer] email],
+                [[NSString stringWithFormat:@"regarding apt package \"%@\"",
+                    [package_ name]
+                ] stringByAddingPercentEscapes]
+            ]]];
+        } else if ([package_ sponsor] != nil && row-- == 0) {
+            NSURL *url = [NSURL URLWithString:[[package_ sponsor] email]];
+            BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+            [browser setDelegate:delegate_];
+            [book_ pushPage:browser];
+            [browser loadURL:url];
+        } else if ([package_ relationships] != nil && row-- == 0) {
+        } else if ([[package_ source] trusted] && row-- == 0) {
+    } _else if ([package_ source] != nil) {
+        Source *source = [package_ source];
+        NSString *description = [source description];
+
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
+        } else if ([source origin] != nil && row-- == 0) {
+    } _else _assert(false);
+
+    #undef _else
 }
 
 - (void) _clickButtonWithName:(NSString *)name {
@@ -2842,7 +3207,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [buttons addObject:@"Cancel"];
 
         [delegate_ slideUp:[[[UIAlertSheet alloc]
-            initWithTitle:@"Manage Package"
+            initWithTitle:nil
             buttons:buttons
             defaultButtonIndex:2
             delegate:self
@@ -2907,10 +3272,10 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [table_ reloadData];
 
         if ([package_ source] == nil);
+        else if ([package_ upgradableAndEssential:NO])
+            [buttons_ addObject:@"Upgrade"];
         else if ([package_ installed] == nil)
             [buttons_ addObject:@"Install"];
-        else if ([package_ upgradable])
-            [buttons_ addObject:@"Upgrade"];
         else
             [buttons_ addObject:@"Reinstall"];
         if ([package_ installed] != nil)
@@ -2985,7 +3350,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
-    return 73;
+    return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];
 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
@@ -3305,9 +3670,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [webview_ setDelegate:self];
         //[webview_ setEnabledGestures:2];
 
-        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:0];
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];
         indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)];
-        [indicator_ setStyle:0];
+        [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];
 
         Package *package([database_ packageWithName:@"cydia"]);
         NSString *application = package == nil ? @"Cydia" : [NSString
@@ -3331,7 +3696,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 - (void) _leftButtonClicked {
     UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-        initWithTitle:@"About Cydia Packager"
+        initWithTitle:@"About Cydia Installer"
         buttons:[NSArray arrayWithObjects:@"Close", nil]
         defaultButtonIndex:0
         delegate:self
@@ -3608,7 +3973,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
-    return 73;
+    return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];
 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
@@ -3680,7 +4045,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
-        if ([package installed] == nil && [package valid] || [package upgradable])
+        if ([package installed] == nil && [package valid] || [package upgradableAndEssential:NO])
             [packages_ addObject:package];
     }
 
@@ -3692,13 +4057,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     upgrades_ = 0;
     bool unseens = false;
 
-    CFLocaleRef locale = CFLocaleCopyCurrent();
-    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
 
     for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
         Package *package = [packages_ objectAtIndex:offset];
 
-        if ([package upgradable]) {
+        if ([package upgradableAndEssential:YES]) {
             ++upgrades_;
             [upgradable addToCount];
         } else {
@@ -3724,7 +4088,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     }
 
     CFRelease(formatter);
-    CFRelease(locale);
 
     if (unseens) {
         Section *last = [sections_ lastObject];
@@ -3877,7 +4240,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     if (show)
         [animator performSelector:@selector(startAnimation:) withObject:animation afterDelay:delay];
 
+#ifndef __OBJC2__
     [delegate_ showKeyboard:show];
+#endif
 }
 
 - (void) textFieldDidBecomeFirstResponder:(UITextField *)field {
@@ -3947,12 +4312,22 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [table_ setShouldHideHeaderInShortLists:NO];
         [transition_ transition:0 toView:table_];
 
-        CGRect cnfrect = {{1, 38}, {17, 18}};
+        CGRect cnfrect = {{
+#ifdef __OBJC2__
+        6 +
+#endif
+        1, 38}, {17, 18}};
 
         CGRect area;
-        area.origin.x = cnfrect.size.width + 15;
+        area.origin.x = cnfrect.origin.x + cnfrect.size.width + 14;
         area.origin.y = 30;
-        area.size.width = [self bounds].size.width - area.origin.x - 18;
+
+        area.size.width =
+#ifdef __OBJC2__
+            8 +
+#endif
+            [self bounds].size.width - area.origin.x - 18;
+
         area.size.height = [UISearchField defaultHeight];
 
         field_ = [[UISearchField alloc] initWithFrame:area];
@@ -3962,9 +4337,14 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         CFRelease(font);
 
         [field_ setPlaceholder:@"Package Names & Descriptions"];
-        [field_ setPaddingTop:5];
         [field_ setDelegate:self];
 
+#ifdef __OBJC2__
+        [field_ setPaddingTop:3];
+#else
+        [field_ setPaddingTop:5];
+#endif
+
 #ifndef __OBJC2__
         UITextTraits *traits = [field_ textTraits];
         [traits setEditingDelegate:self];
@@ -3973,18 +4353,21 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [traits setAutoCorrectionType:1];
 #endif
 
+        CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height + 30}};
+
+        accessory_ = [[UIView alloc] initWithFrame:accrect];
+        [accessory_ addSubview:field_];
+
         UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease];
         [configure setShowPressFeedback:YES];
         [configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
         [configure addTarget:self action:@selector(configurePushed) forEvents:1];
-
-        accessory_ = [[UIView alloc] initWithFrame:CGRectMake(0, 6, cnfrect.size.width + area.size.width + 6 * 3, area.size.height + 30)];
-        [accessory_ addSubview:field_];
         [accessory_ addSubview:configure];
     } return self;
 }
 
 - (void) flipPage {
+#ifndef __OBJC2__
     LKAnimation *animation = [LKTransition animation];
     [animation setType:@"oglFlip"];
     [animation setTimingFunction:[LKTimingFunction functionWithName:@"easeInEaseOut"]];
@@ -3996,6 +4379,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [[transition_ _layer] addAnimation:animation forKey:0];
     [transition_ transition:0 toView:(flipped_ ? (UIView *) table_ : (UIView *) advanced_)];
     flipped_ = !flipped_;
+#endif
 }
 
 - (void) configurePushed {
@@ -4089,22 +4473,29 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             [navbar_ setBarStyle:1];
 
         CGRect ovrrect = [navbar_ bounds];
-        ovrrect.size.height = [UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height;
+        ovrrect.size.height = ([UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height);
 
         overlay_ = [[UIView alloc] initWithFrame:ovrrect];
 
-        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:2];
+        UIProgressIndicatorStyle style = Advanced_ ?
+            kUIProgressIndicatorStyleSmallWhite :
+            kUIProgressIndicatorStyleSmallBlack;
+
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
         unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
         CGRect indrect = {{indoffset, indoffset}, indsize};
 
         indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
-        [indicator_ setStyle:(Advanced_ ? 2 : 3)];
+        [indicator_ setStyle:style];
         [overlay_ addSubview:indicator_];
 
-        CGSize prmsize = {200, indsize.width};
+        CGSize prmsize = {200, indsize.width + 4};
 
         CGRect prmrect = {{
             indoffset * 2 + indsize.width,
+#ifdef __OBJC2__
+            -1 +
+#endif
             (ovrrect.size.height - prmsize.height) / 2
         }, prmsize};
 
@@ -4112,7 +4503,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
         prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
 
-        [prompt_ setColor:(Advanced_ ? White_ : Black_)];
+        [prompt_ setColor:(Advanced_ ? White_ : Blueish_)];
         [prompt_ setBackgroundColor:Clear_];
         [prompt_ setFont:font];
 
@@ -4150,12 +4541,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [pool release];
 }
 
-- (void) setProgressError:(NSString *)error {
-    [self
-        performSelectorOnMainThread:@selector(_setProgressError:)
-        withObject:error
-        waitUntilDone:YES
-    ];
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
 }
 
 - (void) setProgressTitle:(NSString *)title {
@@ -4181,10 +4568,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [sheet dismiss];
 }
 
-- (void) _setProgressError:(NSString *)error {
-    [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
-}
-
 - (void) _setProgressTitle:(NSString *)title {
     [prompt_ setText:[title stringByAppendingString:@"..."]];
 }
@@ -4208,7 +4591,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     UIButtonBar *buttonbar_;
 
     ConfirmationView *confirm_;
+
     NSMutableArray *essential_;
+    NSMutableArray *broken_;
 
     Database *database_;
     ProgressView *progress_;
@@ -4227,6 +4612,39 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 @implementation Cydia
 
+- (void) _loaded {
+    if ([broken_ count] != 0) {
+        int count = [broken_ count];
+
+        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
+            buttons:[NSArray arrayWithObjects:
+                @"Forcibly Clear",
+                @"Ignore (Temporary)",
+            nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"fixhalf"
+        ] autorelease];
+
+        [sheet setBodyText:@"When the shell scripts associated with packages fail, they are left in a bad state known as either half-configured or half-installed. These errors don't go away and instead continue to cause issues. These scripts can be deleted and the packages forcibly removed."];
+        [sheet popupAlertAnimated:YES];
+    } else if (!Ignored_ && [essential_ count] != 0) {
+        int count = [essential_ count];
+
+        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
+            buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"upgrade"
+        ] autorelease];
+
+        [sheet setBodyText:@"One or more essential packages are currently out of date. If these upgrades are not performed you are likely to encounter errors."];
+        [sheet popupAlertAnimated:YES];
+    }
+}
+
 - (void) _reloadData {
     /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
     [hud setText:@"Reloading Data"];
@@ -4241,12 +4659,16 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     }
 
     size_t changes(0);
+
     [essential_ removeAllObjects];
+    [broken_ removeAllObjects];
 
     NSArray *packages = [database_ packages];
     for (int i(0), e([packages count]); i != e; ++i) {
         Package *package = [packages objectAtIndex:i];
-        if ([package upgradable]) {
+        if ([package half])
+            [broken_ addObject:package];
+        if ([package upgradableAndEssential:NO]) {
             if ([package essential])
                 [essential_ addObject:package];
             ++changes;
@@ -4284,22 +4706,11 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [book_ reloadData];
 
     if ([packages count] == 0);
-    else if (!Loaded_) {
+    else if (Loaded_)
+        [self _loaded];
+    else {
         Loaded_ = YES;
         [book_ update];
-    } else if (!Ignored_ && [essential_ count] != 0) {
-        int count = [essential_ count];
-
-        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-            initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
-            buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
-            defaultButtonIndex:0
-            delegate:self
-            context:@"upgrade"
-        ] autorelease];
-
-        [sheet setBodyText:@"One or more essential packages are currently out of date. If these packages are not upgraded you are likely to encounter errors."];
-        [sheet popupAlertAnimated:YES];
     }
 
     /*[hud show:NO];
@@ -4384,7 +4795,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 - (void) confirm {
     [overlay_ removeFromSuperview];
-    restart_ = true;
+    reload_ = true;
 
     [progress_
         detachNewThreadSelector:@selector(perform)
@@ -4425,7 +4836,35 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
     NSString *context = [sheet context];
-    if ([context isEqualToString:@"upgrade"])
+    if ([context isEqualToString:@"fixhalf"])
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [broken_ count]; i != e; ++i) {
+                        Package *broken = [broken_ objectAtIndex:i];
+                        [broken remove];
+
+                        NSString *id = [broken id];
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]);
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;
+
+            case 2:
+                [broken_ removeAllObjects];
+                [self _loaded];
+            break;
+
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"upgrade"])
         switch (button) {
             case 1:
                 @synchronized (self) {
@@ -4443,7 +4882,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
                 Ignored_ = YES;
             break;
 
-            default: _assert(false);
+            default:
+                _assert(false);
         }
 
     [sheet dismiss];
@@ -4486,11 +4926,22 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 - (void) applicationWillSuspend {
     [super applicationWillSuspend];
 
-    if (restart_)
-        if (FW_LEAST(1,1,3))
-            notify_post("com.apple.language.changed");
-        else
-            system("launchctl stop com.apple.SpringBoard");
+    [database_ clean];
+
+    if (reload_) {
+        pid_t pid = ExecFork();
+        if (pid == 0) {
+            sleep(1);
+            if (pid_t child = fork())
+                waitpid(child, NULL, 0);
+            else {
+                execlp("launchctl", "launchctl", "unload", SpringBoard_, NULL);
+                exit(0);
+            }
+            execlp("launchctl", "launchctl", "load", SpringBoard_, NULL);
+            exit(0);
+        }
+    }
 }
 
 - (void) applicationDidFinishLaunching:(id)unused {
@@ -4501,6 +4952,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     tag_ = 1;
 
     essential_ = [[NSMutableArray alloc] initWithCapacity:4];
+    broken_ = [[NSMutableArray alloc] initWithCapacity:4];
 
     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
@@ -4655,7 +5107,10 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (void) slideUp:(UIAlertSheet *)alert {
-    [alert presentSheetFromButtonBar:buttonbar_];
+    if (Advanced_)
+        [alert presentSheetFromButtonBar:buttonbar_];
+    else
+        [alert presentSheetInView:overlay_];
 }
 
 @end
@@ -4775,12 +5230,13 @@ int main(int argc, char *argv[]) {
     else
         Packages_ = [Metadata_ objectForKey:@"Packages"];
 
-    setenv("CYDIA", "", _not(int));
     if (access("/User", F_OK) != 0)
         system("/usr/libexec/cydia/firmware.sh");
 
+    Locale_ = CFLocaleCopyCurrent();
     space_ = CGColorSpaceCreateDeviceRGB();
 
+    Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0);
     Black_.Set(space_, 0.0, 0.0, 0.0, 1.0);
     Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0);
     Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
@@ -4789,6 +5245,7 @@ int main(int argc, char *argv[]) {
     int value = UIApplicationMain(argc, argv, [Cydia class]);
 
     CGColorSpaceRelease(space_);
+    CFRelease(Locale_);
 
     [pool release];
     return value;