X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/3736ff65d8e3dbe7398a30b8cadf489f7fefde5f..9c44cbca951c9f52c63e87181b28a7ba958e2ebb:/MobileCydia.mm diff --git a/MobileCydia.mm b/MobileCydia.mm index d6adebab..c6ba06d0 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -121,6 +121,7 @@ extern "C" { #include #include "UICaboodle/BrowserView.h" +#include "SDURLCache/SDURLCache.h" #include "substrate.h" /* }}} */ @@ -276,8 +277,6 @@ static _finline void UpdateExternalStatus(uint64_t newStatus) { } - (id) yieldToSelector:(SEL)selector withObject:(id)object { - /*return [self performSelector:selector withObject:object];*/ - volatile bool stopped(false); NSMutableArray *context([NSMutableArray arrayWithObjects: @@ -1449,6 +1448,7 @@ struct PackageValue : struct MetaValue : Cytore::Block { + uint32_t active_; Cytore::Offset packages_[1 << 16]; }; @@ -1499,25 +1499,32 @@ static void PackageImport(const void *key, const void *value, void *context) { metadata->first_ = time; } + bool versioned(false); + if (NSDate *date = [package objectForKey:@"LastSeen"]) { time_t time([date timeIntervalSince1970]); if (metadata->last_ < time || metadata->last_ == 0) { metadata->last_ = time; - goto last; + versioned = true; } - } else if (metadata->last_ == 0) last: { - NSString *version([package objectForKey:@"LastVersion"]); - if (CFStringGetCString((CFStringRef) version, buffer, sizeof(buffer), kCFStringEncodingUTF8)) { - size_t length(strlen(buffer)); - uint16_t vhash(hashlittle(buffer, length)); + } else if (metadata->last_ == 0) { + metadata->last_ = metadata->first_; + if (metadata->version_[0] == '\0') + versioned = true; + } - size_t capped(std::min(8, length)); - char *latest(buffer + length - capped); + if (versioned) + if (NSString *version = [package objectForKey:@"LastVersion"]) + if (CFStringGetCString((CFStringRef) version, buffer, sizeof(buffer), kCFStringEncodingUTF8)) { + size_t length(strlen(buffer)); + uint16_t vhash(hashlittle(buffer, length)); - strncpy(metadata->version_, latest, sizeof(metadata->version_)); - metadata->vhash_ = vhash; - } - } + size_t capped(std::min(8, length)); + char *latest(buffer + length - capped); + + strncpy(metadata->version_, latest, sizeof(metadata->version_)); + metadata->vhash_ = vhash; + } } // }}} @@ -1968,9 +1975,6 @@ uint32_t PackageChangesRadix(Package *self, void *) { return _not(uint32_t) - value.key; } -_finline static void Stifle(uint8_t &value) { -} - uint32_t PackagePrefixRadix(Package *self, void *context) { size_t offset(reinterpret_cast(context)); CYString &name([self cyname]); @@ -1993,8 +1997,6 @@ uint32_t PackagePrefixRadix(Package *self, void *context) { uint8_t data[4]; - // 0.607997 - if (offset == 0 && zeros != 0) { memset(data, '0', zeros); memcpy(data + zeros, text, 4 - zeros); @@ -2205,7 +2207,6 @@ struct PackageNameOrdering : _end _profile(Package$initWithVersion$Cache) - id_.set(NULL, iterator.Name()); name_.set(NULL, iterator.Display()); latest_.set(NULL, StripVersion_(version_.VerStr())); @@ -2215,19 +2216,6 @@ struct PackageNameOrdering : installed_.set(NULL, StripVersion_(current.VerStr())); _end - _profile(Package$initWithVersion$Lower) - // XXX: do not use tolower() as this is not locale-specific? :( - char *data(id_.data()); - for (size_t i(0), e(id_.size()); i != e; ++i) - if ((data[i] & 0x20) == 0) { - id_.copy(pool); - data = id_.data(); - for (; i != e; ++i) - data[i] |= 0x20; - break; - } - _end - _profile(Package$initWithVersion$Tags) pkgCache::TagIterator tag(iterator.TagList()); if (!tag.end()) { @@ -2252,9 +2240,19 @@ struct PackageNameOrdering : _end _profile(Package$initWithVersion$Metadata) - PackageValue *metadata(PackageFind(id_.data(), id_.size())); + const char *mixed(iterator.Name()); + size_t size(strlen(mixed)); + char lower[size + 1]; + + for (size_t i(0); i != size; ++i) + lower[i] = mixed[i] | 0x20; + lower[size] = '\0'; + + PackageValue *metadata(PackageFind(lower, size)); metadata_ = metadata; + id_.set(NULL, metadata->name_, size); + const char *latest(version_.VerStr()); size_t length(strlen(latest)); @@ -2266,12 +2264,15 @@ struct PackageNameOrdering : if (metadata->first_ == 0) metadata->first_ = now_; + if (metadata->last_ == 0) + metadata->last_ = metadata->first_; + if (metadata->vhash_ != vhash || strncmp(metadata->version_, latest, sizeof(metadata->version_)) != 0) { - metadata->last_ = now_; + if (metadata->version_[0] != '\0') + metadata->last_ = now_; strncpy(metadata->version_, latest, sizeof(metadata->version_)); metadata->vhash_ = vhash; - } else if (metadata->last_ == 0) - metadata->last_ = metadata->first_; + } _end _profile(Package$initWithVersion$Section) @@ -3151,7 +3152,13 @@ static NSString *Warning_; zone_ = NSCreateZone(1024 * 1024, 256 * 1024, NO); apr_pool_create(&pool_, NULL); - packages_ = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL); + size_t capacity(MetaFile_->active_); + if (capacity == 0) + capacity = 16384; + else + capacity += 1024; + + packages_ = CFArrayCreateMutable(kCFAllocatorDefault, capacity, NULL); int fds[2]; @@ -3353,7 +3360,9 @@ static NSString *Warning_; cache_.Close(); apr_pool_clear(pool_); + NSRecycleZone(zone_); + zone_ = NSCreateZone(1024 * 1024, 256 * 1024, NO); int chk(creat("/tmp/cydia.chk", 0644)); if (chk != -1) @@ -3474,6 +3483,8 @@ static NSString *Warning_; _trace(); size_t count(CFArrayGetCount(packages_)); + MetaFile_->active_ = count; + for (size_t index(0); index != count; ++index) [(Package *) CFArrayGetValueAtIndex(packages_, index) setIndex:index]; @@ -6610,10 +6621,25 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @class CYNavigationController; /* Cydia Tab Bar Controller {{{ */ -@interface CYTabBarController : UITabBarController { +@interface CYTabBarController : UITabBarController < + ProgressDelegate +> { _transient Database *database_; + RefreshBar *refreshbar_; + + bool dropped_; + bool updating_; + // XXX: ok, "updatedelegate_"?... + _transient NSObject *updatedelegate_; + + id root_; } +- (void) dropBar:(BOOL)animated; +- (void) beginUpdate; +- (void) raiseBar:(BOOL)animated; +- (BOOL) updating; + @end @implementation CYTabBarController @@ -6632,9 +6658,233 @@ freeing the view controllers on tab change */ - (id) initWithDatabase:(Database *)database { if ((self = [super init]) != nil) { database_ = database; + + [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarFrameChanged:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil]; + + refreshbar_ = [[RefreshBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, [UINavigationBar defaultSize].height) delegate:self]; } return self; } +- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientation { + return ![updatedelegate_ hudIsShowing] && (IsWildcat_ || orientation == UIInterfaceOrientationPortrait); +} + +- (void) setUpdate:(NSDate *)date { + [self beginUpdate]; +} + +- (void) beginUpdate { + [self dropBar:YES]; + [refreshbar_ start]; + + updating_ = true; + + [NSThread + detachNewThreadSelector:@selector(performUpdate) + toTarget:self + withObject:nil + ]; +} + +- (void) performUpdate { _pooled + Status status; + status.setDelegate(self); + [database_ updateWithStatus:status]; + + [self + performSelectorOnMainThread:@selector(completeUpdate) + withObject:nil + waitUntilDone:NO + ]; +} + +- (void) completeUpdate { + if (!updating_) + return; + updating_ = false; + + [self raiseBar:YES]; + [refreshbar_ stop]; + [updatedelegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0]; +} + +- (void) cancelUpdate { + updating_ = false; + [self raiseBar:YES]; + [refreshbar_ stop]; + [updatedelegate_ performSelector:@selector(updateData) withObject:nil afterDelay:0]; +} + +- (void) cancelPressed { + [self cancelUpdate]; +} + +- (BOOL) updating { + return updating_; +} + +- (void) setProgressError:(NSString *)error withTitle:(NSString *)title { + [refreshbar_ setPrompt:[NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), UCLocalize("ERROR"), error]]; +} + +- (void) startProgress { +} + +- (void) setProgressTitle:(NSString *)title { + [self + performSelectorOnMainThread:@selector(_setProgressTitle:) + withObject:title + waitUntilDone:YES + ]; +} + +- (bool) isCancelling:(size_t)received { + return !updating_; +} + +- (void) setProgressPercent:(float)percent { + [self + performSelectorOnMainThread:@selector(_setProgressPercent:) + withObject:[NSNumber numberWithFloat:percent] + waitUntilDone:YES + ]; +} + +- (void) addProgressOutput:(NSString *)output { + [self + performSelectorOnMainThread:@selector(_addProgressOutput:) + withObject:output + waitUntilDone:YES + ]; +} + +- (void) _setProgressTitle:(NSString *)title { + [refreshbar_ setPrompt:title]; +} + +- (void) _setProgressPercent:(NSNumber *)percent { + [refreshbar_ setProgress:[percent floatValue]]; +} + +- (void) _addProgressOutput:(NSString *)output { +} + +- (void) setUpdateDelegate:(id)delegate { + updatedelegate_ = delegate; +} + +- (CGFloat) statusBarHeight { + if (UIInterfaceOrientationIsPortrait([self interfaceOrientation])) { + return [[UIApplication sharedApplication] statusBarFrame].size.height; + } else { + return [[UIApplication sharedApplication] statusBarFrame].size.width; + } +} + +- (UIView *) transitionView { + if ([self respondsToSelector:@selector(_transitionView)]) + return [self _transitionView]; + else + return MSHookIvar(self, "_viewControllerTransitionView"); +} + +- (void) dropBar:(BOOL)animated { + if (dropped_) + return; + dropped_ = true; + + UIView *transition([self transitionView]); + [[self view] addSubview:refreshbar_]; + + CGRect barframe([refreshbar_ frame]); + + if (false) // XXX: _UIApplicationLinkedOnOrAfter(4) + barframe.origin.y = [self statusBarHeight]; + else + barframe.origin.y = 0; + + [refreshbar_ setFrame:barframe]; + + if (animated) + [UIView beginAnimations:nil context:NULL]; + + CGRect viewframe = [transition frame]; + viewframe.origin.y += barframe.size.height; + viewframe.size.height -= barframe.size.height; + [transition setFrame:viewframe]; + + if (animated) + [UIView commitAnimations]; + + // Ensure bar has the proper width for our view, it might have changed + barframe.size.width = viewframe.size.width; + [refreshbar_ setFrame:barframe]; + + // XXX: fix Apple's layout bug + [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation]; +} + +- (void) raiseBar:(BOOL)animated { + if (!dropped_) + return; + dropped_ = false; + + UIView *transition([self transitionView]); + [refreshbar_ removeFromSuperview]; + + CGRect barframe([refreshbar_ frame]); + + if (animated) + [UIView beginAnimations:nil context:NULL]; + + CGRect viewframe = [transition frame]; + viewframe.origin.y -= barframe.size.height; + viewframe.size.height += barframe.size.height; + [transition setFrame:viewframe]; + + if (animated) + [UIView commitAnimations]; + + // XXX: fix Apple's layout bug + // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation]; +} + +#if 0 +- (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration { + // XXX: fix Apple's layout bug + // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation]; +} +#endif + +- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { + bool dropped(dropped_); + + if (dropped) + [self raiseBar:NO]; + + [super didRotateFromInterfaceOrientation:fromInterfaceOrientation]; + + if (dropped) + [self dropBar:NO]; + + // XXX: fix Apple's layout bug + // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation]; +} + +- (void) statusBarFrameChanged:(NSNotification *)notification { + if (dropped_) { + [self raiseBar:NO]; + [self dropBar:NO]; + } +} + +- (void) dealloc { + [refreshbar_ release]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [super dealloc]; +} + @end /* }}} */ @@ -7262,7 +7512,13 @@ freeing the view controllers on tab change */ search_ = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] bounds].size.width, 44.0f)]; [search_ layoutSubviews]; [search_ setPlaceholder:UCLocalize("SEARCH_EX")]; - UITextField *textField = [search_ searchField]; + + UITextField *textField; + if ([search_ respondsToSelector:@selector(searchField)]) + textField = [search_ searchField]; + else + textField = MSHookIvar(search_, "_searchField"); + [textField setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin]; [search_ setDelegate:self]; [textField setEnablesReturnKeyAutomatically:NO]; @@ -7693,273 +7949,6 @@ freeing the view controllers on tab change */ @end /* }}} */ -/* Cydia Container {{{ */ -@interface CYContainer : UIViewController { - _transient Database *database_; - RefreshBar *refreshbar_; - - bool dropped_; - bool updating_; - // XXX: ok, "updatedelegate_"?... - _transient NSObject *updatedelegate_; - // XXX: can't we query for this variable when we need it? - _transient UITabBarController *root_; -} - -- (void) setTabBarController:(UITabBarController *)controller; - -- (void) dropBar:(BOOL)animated; -- (void) beginUpdate; -- (void) raiseBar:(BOOL)animated; -- (BOOL) updating; - -@end - -@implementation CYContainer - -- (BOOL) _reallyWantsFullScreenLayout { - return YES; -} - -// NOTE: UIWindow only sends the top controller these messages, -// So we have to forward them on. - -- (void) viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - [root_ viewDidAppear:animated]; -} - -- (void) viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [root_ viewWillAppear:animated]; -} - -- (void) viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; - [root_ viewDidDisappear:animated]; -} - -- (void) viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - [root_ viewWillDisappear:animated]; -} - -- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientation { - return ![updatedelegate_ hudIsShowing] && (IsWildcat_ || orientation == UIInterfaceOrientationPortrait); -} - -- (void) setTabBarController:(UITabBarController *)controller { - root_ = controller; - [[self view] addSubview:[root_ view]]; -} - -- (void) setUpdate:(NSDate *)date { - [self beginUpdate]; -} - -- (void) beginUpdate { - [self dropBar:YES]; - [refreshbar_ start]; - - updating_ = true; - - [NSThread - detachNewThreadSelector:@selector(performUpdate) - toTarget:self - withObject:nil - ]; -} - -- (void) performUpdate { _pooled - Status status; - status.setDelegate(self); - [database_ updateWithStatus:status]; - - [self - performSelectorOnMainThread:@selector(completeUpdate) - withObject:nil - waitUntilDone:NO - ]; -} - -- (void) completeUpdate { - if (!updating_) - return; - updating_ = false; - - [self raiseBar:YES]; - [refreshbar_ stop]; - [updatedelegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0]; -} - -- (void) cancelUpdate { - updating_ = false; - [self raiseBar:YES]; - [refreshbar_ stop]; - [updatedelegate_ performSelector:@selector(updateData) withObject:nil afterDelay:0]; -} - -- (void) cancelPressed { - [self cancelUpdate]; -} - -- (BOOL) updating { - return updating_; -} - -- (void) setProgressError:(NSString *)error withTitle:(NSString *)title { - [refreshbar_ setPrompt:[NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), UCLocalize("ERROR"), error]]; -} - -- (void) startProgress { -} - -- (void) setProgressTitle:(NSString *)title { - [self - performSelectorOnMainThread:@selector(_setProgressTitle:) - withObject:title - waitUntilDone:YES - ]; -} - -- (bool) isCancelling:(size_t)received { - return !updating_; -} - -- (void) setProgressPercent:(float)percent { - [self - performSelectorOnMainThread:@selector(_setProgressPercent:) - withObject:[NSNumber numberWithFloat:percent] - waitUntilDone:YES - ]; -} - -- (void) addProgressOutput:(NSString *)output { - [self - performSelectorOnMainThread:@selector(_addProgressOutput:) - withObject:output - waitUntilDone:YES - ]; -} - -- (void) _setProgressTitle:(NSString *)title { - [refreshbar_ setPrompt:title]; -} - -- (void) _setProgressPercent:(NSNumber *)percent { - [refreshbar_ setProgress:[percent floatValue]]; -} - -- (void) _addProgressOutput:(NSString *)output { -} - -- (void) setUpdateDelegate:(id)delegate { - updatedelegate_ = delegate; -} - -- (CGFloat) statusBarHeight { - if (UIInterfaceOrientationIsPortrait([self interfaceOrientation])) { - return [[UIApplication sharedApplication] statusBarFrame].size.height; - } else { - return [[UIApplication sharedApplication] statusBarFrame].size.width; - } -} - -- (void) dropBar:(BOOL)animated { - if (dropped_) - return; - dropped_ = true; - - [[self view] addSubview:refreshbar_]; - - CGFloat sboffset = [self statusBarHeight]; - - CGRect barframe = [refreshbar_ frame]; - barframe.origin.y = sboffset; - [refreshbar_ setFrame:barframe]; - - if (animated) - [UIView beginAnimations:nil context:NULL]; - CGRect viewframe = [[root_ view] frame]; - viewframe.origin.y += barframe.size.height + sboffset; - viewframe.size.height -= barframe.size.height + sboffset; - [[root_ view] setFrame:viewframe]; - if (animated) - [UIView commitAnimations]; - - // Ensure bar has the proper width for our view, it might have changed - barframe.size.width = viewframe.size.width; - [refreshbar_ setFrame:barframe]; - - // XXX: fix Apple's layout bug - [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation]; -} - -- (void) raiseBar:(BOOL)animated { - if (!dropped_) - return; - dropped_ = false; - - [refreshbar_ removeFromSuperview]; - - CGFloat sboffset = [self statusBarHeight]; - - if (animated) - [UIView beginAnimations:nil context:NULL]; - CGRect barframe = [refreshbar_ frame]; - CGRect viewframe = [[root_ view] frame]; - viewframe.origin.y -= barframe.size.height + sboffset; - viewframe.size.height += barframe.size.height + sboffset; - [[root_ view] setFrame:viewframe]; - if (animated) - [UIView commitAnimations]; - - // XXX: fix Apple's layout bug - [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation]; -} - -- (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration { - // XXX: fix Apple's layout bug - [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation]; -} - -- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { - if (dropped_) { - [self raiseBar:NO]; - [self dropBar:NO]; - } - - // XXX: fix Apple's layout bug - [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation]; -} - -- (void) statusBarFrameChanged:(NSNotification *)notification { - if (dropped_) { - [self raiseBar:NO]; - [self dropBar:NO]; - } -} - -- (void) dealloc { - [refreshbar_ release]; - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [super dealloc]; -} - -- (id) initWithDatabase:(Database *)database { - if ((self = [super init]) != nil) { - database_ = database; - - [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarFrameChanged:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil]; - - refreshbar_ = [[RefreshBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, [UINavigationBar defaultSize].height) delegate:self]; - } return self; -} - -@end -/* }}} */ - typedef enum { kCydiaTag = 0, kSectionsTag = 1, @@ -7980,7 +7969,6 @@ typedef enum { // XXX: evaluate all fields for _transient UIWindow *window_; - CYContainer *container_; CYTabBarController *tabbar_; NSMutableArray *essential_; @@ -8009,6 +7997,9 @@ typedef enum { - (void) setPage:(CYViewController *)page; - (void) loadData; +// XXX: I hate prototypes +- (id) queueBadgeController; + @end static _finline void _setHomePage(Cydia *self) { @@ -8018,11 +8009,11 @@ static _finline void _setHomePage(Cydia *self) { @implementation Cydia - (void) beginUpdate { - [container_ beginUpdate]; + [tabbar_ beginUpdate]; } - (BOOL) updating { - return [container_ updating]; + return [tabbar_ updating]; } - (UIView *) rotatingContentViewForWindow:(UIWindow *)window { @@ -8093,6 +8084,9 @@ static _finline void _setHomePage(Cydia *self) { [search_ reloadData]; [(CYNavigationController *)[tabbar_ selectedViewController] reloadData]; + + [queueDelegate_ queueStatusDidChange]; + [[[self queueBadgeController] tabBarItem] setBadgeValue:(Queuing_ ? UCLocalize("Q_D") : nil)]; } - (int)indexOfTabWithTag:(int)tag { @@ -8153,7 +8147,7 @@ static _finline void _setHomePage(Cydia *self) { // If we can reach the server, auto-refresh! if (reachable) - [container_ performSelectorOnMainThread:@selector(setUpdate:) withObject:update waitUntilDone:NO]; + [tabbar_ performSelectorOnMainThread:@selector(setUpdate:) withObject:update waitUntilDone:NO]; [pool release]; } @@ -8242,7 +8236,7 @@ static _finline void _setHomePage(Cydia *self) { CYNavigationController *navigation = [[[CYNavigationController alloc] initWithRootViewController:progress] autorelease]; if (IsWildcat_) [navigation setModalPresentationStyle:UIModalPresentationFormSheet]; - [container_ presentModalViewController:navigation animated:YES]; + [tabbar_ presentModalViewController:navigation animated:YES]; [progress detachNewThreadSelector:@selector(update_) @@ -8281,7 +8275,7 @@ static _finline void _setHomePage(Cydia *self) { if (IsWildcat_) [confirm_ setModalPresentationStyle:UIModalPresentationFormSheet]; - [container_ presentModalViewController:confirm_ animated:YES]; + [tabbar_ presentModalViewController:confirm_ animated:YES]; return true; } @@ -8340,6 +8334,8 @@ static _finline void _setHomePage(Cydia *self) { } - (void) confirmWithNavigationController:(UINavigationController *)navigation { + Queuing_ = false; + ProgressController *progress = [[[ProgressController alloc] initWithDatabase:database_ delegate:self] autorelease]; if (navigation != nil) { @@ -8348,7 +8344,7 @@ static _finline void _setHomePage(Cydia *self) { navigation = [[[CYNavigationController alloc] initWithRootViewController:progress] autorelease]; if (IsWildcat_) [navigation setModalPresentationStyle:UIModalPresentationFormSheet]; - [container_ presentModalViewController:navigation animated:YES]; + [tabbar_ presentModalViewController:navigation animated:YES]; } [progress @@ -8454,7 +8450,7 @@ static _finline void _setHomePage(Cydia *self) { CYNavigationController *nav = [[[CYNavigationController alloc] initWithRootViewController:role] autorelease]; if (IsWildcat_) [nav setModalPresentationStyle:UIModalPresentationFormSheet]; - [container_ presentModalViewController:nav animated:YES]; + [tabbar_ presentModalViewController:nav animated:YES]; } - (void) setPackageController:(PackageController *)view { @@ -8484,18 +8480,12 @@ static _finline void _setHomePage(Cydia *self) { @synchronized (self) { if (clear) { [database_ clear]; - - // Stop queuing. Queuing_ = false; - [[[self queueBadgeController] tabBarItem] setBadgeValue:nil]; } else { - // Start queuing. Queuing_ = true; - [[[self queueBadgeController] tabBarItem] setBadgeValue:UCLocalize("Q_D")]; } [self _updateData]; - [queueDelegate_ queueStatusDidChange]; } } @@ -8587,7 +8577,7 @@ static _finline void _setHomePage(Cydia *self) { [window_ setUserInteractionEnabled:NO]; [hud show:YES]; - UIViewController *target = container_; + UIViewController *target = tabbar_; while ([target modalViewController] != nil) target = [target modalViewController]; [[target view] addSubview:hud]; @@ -8687,8 +8677,8 @@ static _finline void _setHomePage(Cydia *self) { - (void) applicationWillResignActive:(UIApplication *)application { // Stop refreshing if you get a phone call or lock the device. - if ([container_ updating]) - [container_ cancelUpdate]; + if ([tabbar_ updating]) + [tabbar_ cancelUpdate]; if ([[self superclass] instancesRespondToSelector:@selector(applicationWillResignActive:)]) [super applicationWillResignActive:application]; @@ -8755,6 +8745,12 @@ static _finline void _setHomePage(Cydia *self) { - (void) applicationDidFinishLaunching:(id)unused { _trace(); + [NSURLCache setSharedURLCache:[[[SDURLCache alloc] + initWithMemoryCapacity:524288 + diskCapacity:10485760 + diskPath:[NSString stringWithFormat:@"%@/Library/Caches/com.saurik.Cydia/SDURLCache", @"/var/root"] + ] autorelease]]; + [CYBrowserController _initialize]; [NSURLProtocol registerClass:[CydiaURLProtocol class]]; @@ -8800,14 +8796,11 @@ _trace(); database_ = [Database sharedInstance]; [self setupTabBarController]; - - container_ = [[CYContainer alloc] initWithDatabase:database_]; - [container_ setUpdateDelegate:self]; - [container_ setTabBarController:tabbar_]; - [window_ addSubview:[container_ view]]; + [tabbar_ setUpdateDelegate:self]; + [window_ addSubview:[tabbar_ view]]; // Show pinstripes while loading data. - [[container_ view] setBackgroundColor:[UIColor pinStripeColor]]; + [[tabbar_ view] setBackgroundColor:[UIColor pinStripeColor]]; [self performSelector:@selector(loadData) withObject:nil afterDelay:0]; _trace(); @@ -8859,7 +8852,7 @@ _trace(); [container setFrame:containrect]; [spinner setFrame:spinrect]; [label setFrame:textrect]; - [[container_ view] addSubview:container]; + [[tabbar_ view] addSubview:container]; [self reloadData]; PrintTimes(); @@ -8876,7 +8869,7 @@ _trace(); [window_ setUserInteractionEnabled:YES]; // XXX: does this actually slow anything down? - [[container_ view] setBackgroundColor:[UIColor clearColor]]; + [[tabbar_ view] setBackgroundColor:[UIColor clearColor]]; [container removeFromSuperview]; }