X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/8e8fca7f589f3be7ca96926dbef9c62ca12dd3eb..5699667afc26b1e9068364495dc94403e0253065:/MobileCydia.mm diff --git a/MobileCydia.mm b/MobileCydia.mm index 1fad558c..ebe42b4a 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -1075,22 +1075,13 @@ NSString *SizeString(double size) { return [NSString stringWithFormat:@"%s%.1f %s", (negative ? "-" : ""), size, powers_[power]]; } -const char *StripVersion_(const char *version) { +static _finline const char *StripVersion_(const char *version) { const char *colon(strchr(version, ':')); if (colon != NULL) version = colon + 1; return version; } -CFStringRef StripVersion(const char *version) { - const char *colon(strchr(version, ':')); - if (colon != NULL) - version = colon + 1; - return CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast(version), strlen(version), kCFStringEncodingUTF8, NO); - // XXX: performance - return CYStringCreate(version); -} - NSString *LocalizeSection(NSString *section) { static Pcre title_r("^(.*?) \\((.*)\\)$"); if (title_r(section)) { @@ -1185,6 +1176,7 @@ bool isSectionVisible(NSString *section) { - (void) syncData; - (void) showSettings; - (UIProgressHUD *) addProgressHUD; +- (BOOL) hudIsShowing; - (void) removeProgressHUD:(UIProgressHUD *)hud; - (CYViewController *) pageForPackage:(NSString *)name; - (PackageController *) packageController; @@ -1494,6 +1486,7 @@ typedef std::map< unsigned long, _H > SourceMap; } - (void) dealloc { + // XXX: this is a very inefficient way to call these deconstructors [self _clear]; [super dealloc]; } @@ -1710,11 +1703,10 @@ typedef std::map< unsigned long, _H > SourceMap; pkgCache::VerFileIterator file_; Source *source_; - bool cached_; bool parsed_; CYString section_; - NSString *section$_; + _transient NSString *section$_; bool essential_; bool required_; bool visible_; @@ -1974,8 +1966,6 @@ struct PackageNameOrdering : - (void) dealloc { if (source_ != nil) [source_ release]; - if (section$_ != nil) - [section$_ release]; if (latest_ != nil) [latest_ release]; @@ -2095,11 +2085,16 @@ struct PackageNameOrdering : pool_ = pool; version_ = version; - iterator_ = version.ParentPkg(); + + _profile(Package$initWithVersion$ParentPkg) + iterator_ = version.ParentPkg(); + _end + database_ = database; _profile(Package$initWithVersion$Latest) - latest_ = (NSString *) StripVersion(version_.VerStr()); + const char *latest(StripVersion_(version_.VerStr())); + latest_ = (NSString *) CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast(latest), strlen(latest), kCFStringEncodingASCII, NO); _end pkgCache::VerIterator current; @@ -2121,7 +2116,7 @@ struct PackageNameOrdering : name_.set(pool, iterator_.Display()); _end - _profile(Package$lowercaseString) + _profile(Package$initWithVersion$lowercaseString) char *data(id_.data()); for (size_t i(0), e(id_.size()); i != e; ++i) // XXX: do not use tolower() as this is not locale-specific? :( @@ -2130,10 +2125,7 @@ struct PackageNameOrdering : if (!file_.end()) { _profile(Package$initWithVersion$Source) - source_ = [database_ getSource:file_.File()]; - if (source_ != nil) - [source_ retain]; - cached_ = true; + source_ = [([database_ getSource:file_.File()] ?: (Source *) [NSNull null]) retain]; _end } @@ -2145,7 +2137,7 @@ struct PackageNameOrdering : tags_ = [[NSMutableArray alloc] initWithCapacity:8]; do { const char *name(tag.Name()); - [tags_ addObject:(NSString *)CYStringCreate(name)]; + [tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]]; if (role_ == nil && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/) role_ = (NSString *) CYStringCreate(name + 6); if (required_ && strncmp(name, "require::", 9) == 0 && ( @@ -2209,9 +2201,14 @@ struct PackageNameOrdering : section_.set(pool_, iterator_.Section()); _end - obsolete_ = [self hasTag:@"cydia::obsolete"]; - essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"]; - [self setVisible]; + _profile(Package$initWithVersion$hasTag) + obsolete_ = [self hasTag:@"cydia::obsolete"]; + essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"]; + _end + + _profile(Package$initWithVersion$setVisible) + [self setVisible]; + _end _end } return self; } @@ -2242,7 +2239,7 @@ struct PackageNameOrdering : if (section_.empty()) return nil; - std::replace(section_.data(), section_.data() + section_.size(), ' ', '_'); + std::replace(section_.data(), section_.data() + section_.size(), '_', ' '); NSString *name(section_); lookup: @@ -2252,7 +2249,7 @@ struct PackageNameOrdering : goto lookup; } - section$_ = [[name stringByReplacingCharacter:'_' withCharacter:' '] retain]; + section$_ = name; } return section$_; } @@ -2391,8 +2388,28 @@ struct PackageNameOrdering : } - (BOOL) unfiltered { - NSString *section([self section]); - return !obsolete_ && [self hasSupportingRole] && (section == nil || isSectionVisible(section)); + _profile(Package$unfiltered$obsolete) + if (obsolete_) + return false; + _end + + _profile(Package$unfiltered$hasSupportingRole) + if (![self hasSupportingRole]) + return false; + _end + + NSString *section; + + _profile(Package$unfiltered$section) + section = [self section]; + _end + + _profile(Package$unfiltered$isSectionVisible) + if (section != nil && !isSectionVisible(section)) + return false; + _end + + return true; } - (BOOL) visible { @@ -2611,21 +2628,16 @@ struct PackageNameOrdering : } - (Source *) source { - if (!cached_) { + if (source_ == nil) { @synchronized (database_) { if ([database_ era] != era_ || file_.end()) - source_ = nil; - else { - source_ = [database_ getSource:file_.File()]; - if (source_ != nil) - [source_ retain]; - } - - cached_ = true; + source_ = (Source *) [NSNull null]; + else + source_ = [([database_ getSource:file_.File()] ?: (Source *) [NSNull null]) retain]; } } - return source_; + return source_ == (Source *) [NSNull null] ? nil : source_; } - (NSString *) role { @@ -2796,7 +2808,7 @@ struct PackageNameOrdering : } - (bool) isInstalledAndVisible:(NSNumber *)number { - return (![number boolValue] || [self visible]) && ![self uninstalled]; + return ((![number boolValue] && ![role_ isEqualToString:@"cydia"]) || [self visible]) && ![self uninstalled]; } - (bool) isVisibleInSection:(NSString *)name { @@ -2954,6 +2966,7 @@ static NSString *Warning_; } - (void) dealloc { + // XXX: actually implement this thing _assert(false); NSRecycleZone(zone_); // XXX: malloc_destroy_zone(zone_); @@ -3078,7 +3091,7 @@ static NSString *Warning_; [NSThread detachNewThreadSelector:@selector(_readCydia:) toTarget:self - withObject:[[NSNumber numberWithInt:fds[0]] retain] + withObject:[NSNumber numberWithInt:fds[0]] ]; _assert(pipe(fds) != -1); @@ -3087,7 +3100,7 @@ static NSString *Warning_; [NSThread detachNewThreadSelector:@selector(_readStatus:) toTarget:self - withObject:[[NSNumber numberWithInt:fds[0]] retain] + withObject:[NSNumber numberWithInt:fds[0]] ]; _assert(pipe(fds) != -1); @@ -3103,7 +3116,7 @@ static NSString *Warning_; [NSThread detachNewThreadSelector:@selector(_readOutput:) toTarget:self - withObject:[[NSNumber numberWithInt:fds[0]] retain] + withObject:[NSNumber numberWithInt:fds[0]] ]; } return self; } @@ -3599,7 +3612,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* Web Scripting {{{ */ @interface CydiaObject : NSObject { id indirect_; - id delegate_; + _transient id delegate_; } - (id) initWithDelegate:(IndirectDelegate *)indirect; @@ -4082,32 +4095,30 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"confirm" ofType:@"html"]]]; - UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] initWithTitle:UCLocalize("CANCEL") // OLD: [NSString stringWithFormat:UCLocalize("SLASH_DELIMITED"), UCLocalize("CANCEL"), UCLocalize("QUEUE")] style:UIBarButtonItemStylePlain target:self action:@selector(cancelButtonClicked) - ]; - [[self navigationItem] setLeftBarButtonItem:leftItem]; - [leftItem release]; + ] autorelease]]; } return self; } - (void) applyRightButton { - UIBarButtonItem *rightItem = [[UIBarButtonItem alloc] - initWithTitle:UCLocalize("CONFIRM") - style:UIBarButtonItemStylePlain - target:self - action:@selector(confirmButtonClicked) - ]; #if !AlwaysReload && !IgnoreInstall - if (issues_ == nil && ![self isLoading]) [[self navigationItem] setRightBarButtonItem:rightItem]; - else [super applyRightButton]; + if (issues_ == nil && ![self isLoading]) + [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("CONFIRM") + style:UIBarButtonItemStylePlain + target:self + action:@selector(confirmButtonClicked) + ] autorelease]]; + else + [super applyRightButton]; #else [[self navigationItem] setRightBarButtonItem:nil]; #endif - [rightItem release]; } - (void) cancelButtonClicked { @@ -4136,8 +4147,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* Progress Data {{{ */ @interface ProgressData : NSObject { SEL selector_; - id target_; - id object_; + // XXX: should these really both be _transient? + _transient id target_; + _transient id object_; } - (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object; @@ -4267,8 +4279,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { bounds.size.height - prgsize.height - 20 }, prgsize}; - float closewidth = bounds.size.width - 20; - if (closewidth > 300) closewidth = 300; + float closewidth = std::min(bounds.size.width - 20, 300.0f); [progress_ setFrame:prgrect]; [status_ setFrame:CGRectMake( @@ -4308,8 +4319,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ([context isEqualToString:@"conffile"]) { FILE *input = [database_ input]; - if (button == [alert cancelButtonIndex]) fprintf(input, "N\n"); - else if (button == [alert firstOtherButtonIndex]) fprintf(input, "Y\n"); + if (button == [alert cancelButtonIndex]) + fprintf(input, "N\n"); + else if (button == [alert firstOtherButtonIndex]) + fprintf(input, "Y\n"); fflush(input); } } @@ -4399,8 +4412,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) _detachNewThreadData:(ProgressData *)data { _pooled [[data target] performSelector:[data selector] withObject:[data object]]; - [data release]; - [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES]; } @@ -4454,11 +4465,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [NSThread detachNewThreadSelector:@selector(_detachNewThreadData:) toTarget:self - withObject:[[ProgressData alloc] + withObject:[[[ProgressData alloc] initWithSelector:selector target:target object:object - ] + ] autorelease] ]; } @@ -4832,7 +4843,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { NSString *count_; UIImage *icon_; ContentView *content_; - id switch_; + UISwitch *switch_; BOOL editing_; } @@ -4876,7 +4887,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier { if ((self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) != nil) { icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain]; - switch_ = [[objc_getClass("UISwitch") alloc] initWithFrame:CGRectMake(218, 9, 60, 25)]; + switch_ = [[UISwitch alloc] initWithFrame:CGRectMake(218, 9, 60, 25)]; [switch_ addTarget:self action:@selector(onSwitch:) forEvents:UIControlEventValueChanged]; UIView *content([self contentView]); @@ -5301,9 +5312,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { UITableView *list_; NSMutableArray *index_; NSMutableDictionary *indices_; - id target_; + // XXX: this target_ seems to be delegate_. :( + _transient id target_; SEL action_; - id delegate_; + // XXX: why do we even have this delegate_? + _transient id delegate_; } - (id) initWithFrame:(CGRect)frame database:(Database *)database target:(id)target action:(SEL)action; @@ -5758,7 +5771,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @implementation SourceTable -- (void) _deallocConnection:(NSURLConnection *)connection { +- (void) _releaseConnection:(NSURLConnection *)connection { if (connection != nil) { [connection cancel]; //[connection setDelegate:nil]; @@ -5774,11 +5787,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (error_ != nil) [error_ release]; - //[self _deallocConnection:installer_]; - [self _deallocConnection:trivial_]; - [self _deallocConnection:trivial_gz_]; - [self _deallocConnection:trivial_bz2_]; - //[self _deallocConnection:automatic_]; + //[self _releaseConnection:installer_]; + [self _releaseConnection:trivial_]; + [self _releaseConnection:trivial_gz_]; + [self _releaseConnection:trivial_bz2_]; + //[self _releaseConnection:automatic_]; [sources_ release]; [list_ release]; @@ -5899,6 +5912,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) _endConnection:(NSURLConnection *)connection { + // XXX: the memory management in this method is horribly awkward + NSURLConnection **field = NULL; if (connection == trivial_) field = &trivial_; @@ -6038,6 +6053,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { cydia_ = false; + // XXX: this is stupid hud_ = [[delegate_ addProgressHUD] retain]; [hud_ setText:UCLocalize("VERIFYING_URL")]; } break; @@ -6102,11 +6118,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [sources_ sortUsingSelector:@selector(compareByNameAndType:)]; _trace(); - int count([sources_ count]); + int count([sources_ count]); offset_ = 0; for (int i = 0; i != count; i++) { - if ([[sources_ objectAtIndex:i] record] == nil) break; - else offset_++; + if ([[sources_ objectAtIndex:i] record] == nil) + break; + offset_++; } [list_ setEditing:NO]; @@ -6145,34 +6162,27 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) updateButtonsForEditingStatus:(BOOL)editing animated:(BOOL)animated { - UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] + [[self navigationItem] setLeftBarButtonItem:(editing ? [[[UIBarButtonItem alloc] initWithTitle:UCLocalize("ADD") style:UIBarButtonItemStylePlain target:self action:@selector(addButtonClicked) - ]; - [[self navigationItem] setLeftBarButtonItem:editing ? leftItem : [[self navigationItem] backBarButtonItem] animated:animated]; - [leftItem release]; + ] autorelease] : [[self navigationItem] backBarButtonItem]) animated:animated]; - UIBarButtonItem *rightItem = [[UIBarButtonItem alloc] - initWithTitle:editing ? UCLocalize("DONE") : UCLocalize("EDIT") - style:editing ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain + [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:(editing ? UCLocalize("DONE") : UCLocalize("EDIT")) + style:(editing ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain) target:self action:@selector(editButtonClicked) - ]; - [[self navigationItem] setRightBarButtonItem:rightItem animated:animated]; - [rightItem release]; + ] autorelease] animated:animated]; - if (IsWildcat_ && !editing) { - UIBarButtonItem *settingsItem = [[UIBarButtonItem alloc] + if (IsWildcat_ && !editing) + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] initWithTitle:UCLocalize("SETTINGS") style:UIBarButtonItemStylePlain target:self action:@selector(settingsButtonClicked) - ]; - [[self navigationItem] setLeftBarButtonItem:settingsItem]; - [settingsItem release]; - } + ] autorelease]]; } - (void) settingsButtonClicked { @@ -6224,15 +6234,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) queueStatusDidChange { #if !AlwaysReload if (IsWildcat_) { - UIBarButtonItem *queueItem = [[UIBarButtonItem alloc] - initWithTitle:UCLocalize("QUEUE") - style:UIBarButtonItemStyleDone - target:self - action:@selector(queueButtonClicked) - ]; - if (Queuing_) [[self navigationItem] setLeftBarButtonItem:queueItem]; - else [[self navigationItem] setLeftBarButtonItem:nil]; - [queueItem release]; + if (Queuing_) { + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("QUEUE") + style:UIBarButtonItemStyleDone + target:self + action:@selector(queueButtonClicked) + ] autorelease]]; + } else { + [[self navigationItem] setLeftBarButtonItem:nil]; + } } #endif } @@ -6242,14 +6253,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) updateRoleButton { - UIBarButtonItem *rightItem = [[UIBarButtonItem alloc] - initWithTitle:expert_ ? UCLocalize("EXPERT") : UCLocalize("SIMPLE") - style:expert_ ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain - target:self - action:@selector(roleButtonClicked) - ]; - if (Role_ != nil && ![Role_ isEqualToString:@"Developer"]) [[self navigationItem] setRightBarButtonItem:rightItem]; - [rightItem release]; + if (Role_ != nil && ![Role_ isEqualToString:@"Developer"]) + [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:(expert_ ? UCLocalize("EXPERT") : UCLocalize("SIMPLE")) + style:(expert_ ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain) + target:self + action:@selector(roleButtonClicked) + ] autorelease]]; } - (void) roleButtonClicked { @@ -6340,14 +6350,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ((self = [super init]) != nil) { [[self navigationItem] setTitle:UCLocalize("MANAGE")]; - UIBarButtonItem *settingsItem = [[UIBarButtonItem alloc] + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] initWithTitle:UCLocalize("SETTINGS") style:UIBarButtonItemStylePlain target:self action:@selector(settingsButtonClicked) - ]; - [[self navigationItem] setLeftBarButtonItem:settingsItem]; - [settingsItem release]; + ] autorelease]]; [self queueStatusDidChange]; } return self; @@ -6374,15 +6382,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) queueStatusDidChange { #if !AlwaysReload if (!IsWildcat_ && Queuing_) { - UIBarButtonItem *queueItem = [[UIBarButtonItem alloc] + [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] initWithTitle:UCLocalize("QUEUE") style:UIBarButtonItemStyleDone target:self action:@selector(queueButtonClicked) - ]; - [[self navigationItem] setRightBarButtonItem:queueItem]; - - [queueItem release]; + ] autorelease]]; } else { [[self navigationItem] setRightBarButtonItem:nil]; } @@ -6408,6 +6413,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @implementation RefreshBar +- (void) dealloc { + [indicator_ release]; + [prompt_ release]; + [progress_ release]; + [cancel_ release]; + [super dealloc]; +} + - (void) positionViews { CGRect frame = [cancel_ frame]; frame.origin.x = [self frame].size.width - frame.size.width - 5; @@ -6508,7 +6521,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* Cydia Tab Bar Controller {{{ */ @interface CYTabBarController : UITabBarController { - Database *database_; + _transient Database *database_; } @end @@ -6538,7 +6551,7 @@ freeing the view controllers on tab change */ /* Cydia Navigation Controller {{{ */ @interface CYNavigationController : UINavigationController { _transient Database *database_; - id delegate_; + _transient id delegate_; } - (id) initWithDatabase:(Database *)database; @@ -6739,7 +6752,9 @@ freeing the view controllers on tab change */ static NSString *reuseIdentifier = @"SectionCell"; SectionCell *cell = (SectionCell *) [tableView dequeueReusableCellWithIdentifier:reuseIdentifier]; - if (cell == nil) cell = [[[SectionCell alloc] initWithFrame:CGRectZero reuseIdentifier:reuseIdentifier] autorelease]; + if (cell == nil) + cell = [[[SectionCell alloc] initWithFrame:CGRectZero reuseIdentifier:reuseIdentifier] autorelease]; + [cell setSection:[self sectionAtIndexPath:indexPath] editing:editing_]; return cell; @@ -6885,14 +6900,12 @@ freeing the view controllers on tab change */ [filtered_ addObject:section]; } - UIBarButtonItem *rightItem = [[UIBarButtonItem alloc] - initWithTitle:[sections_ count] == 0 ? nil : UCLocalize("EDIT") + [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:([sections_ count] == 0 ? nil : UCLocalize("EDIT")) style:UIBarButtonItemStylePlain target:self action:@selector(editButtonClicked) - ]; - [[self navigationItem] setRightBarButtonItem:rightItem animated:[[self navigationItem] rightBarButtonItem] != nil]; - [rightItem release]; + ] autorelease] animated:([[self navigationItem] rightBarButtonItem] != nil)]; [list_ reloadData]; _trace(); @@ -7140,23 +7153,21 @@ freeing the view controllers on tab change */ [list_ reloadData]; - UIBarButtonItem *rightItem = [[UIBarButtonItem alloc] - initWithTitle:[NSString stringWithFormat:UCLocalize("PARENTHETICAL"), UCLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]] - style:UIBarButtonItemStylePlain - target:self - action:@selector(upgradeButtonClicked) - ]; - if (upgrades_ > 0) [[self navigationItem] setRightBarButtonItem:rightItem]; - [rightItem release]; + if (upgrades_ > 0) + [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:[NSString stringWithFormat:UCLocalize("PARENTHETICAL"), UCLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]] + style:UIBarButtonItemStylePlain + target:self + action:@selector(upgradeButtonClicked) + ] autorelease]]; - UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] - initWithTitle:UCLocalize("REFRESH") - style:UIBarButtonItemStylePlain - target:self - action:@selector(refreshButtonClicked) - ]; - if (![delegate_ updating]) [[self navigationItem] setLeftBarButtonItem:leftItem]; - [leftItem release]; + if (![delegate_ updating]) + [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("REFRESH") + style:UIBarButtonItemStylePlain + target:self + action:@selector(refreshButtonClicked) + ] autorelease]]; } @end @@ -7238,8 +7249,8 @@ freeing the view controllers on tab change */ NSString *name_; Package *package_; UITableView *table_; - id subscribedSwitch_; - id ignoredSwitch_; + UISwitch *subscribedSwitch_; + UISwitch *ignoredSwitch_; UITableViewCell *subscribedCell_; UITableViewCell *ignoredCell_; } @@ -7335,11 +7346,11 @@ freeing the view controllers on tab change */ [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [[self view] addSubview:table_]; - subscribedSwitch_ = [[objc_getClass("UISwitch") alloc] initWithFrame:CGRectMake(0, 0, 50, 20)]; + subscribedSwitch_ = [[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)]; [subscribedSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:UIControlEventValueChanged]; - ignoredSwitch_ = [[objc_getClass("UISwitch") alloc] initWithFrame:CGRectMake(0, 0, 50, 20)]; + ignoredSwitch_ = [[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)]; [ignoredSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:UIControlEventValueChanged]; @@ -7417,7 +7428,8 @@ freeing the view controllers on tab change */ UITableViewDelegate > { _transient Database *database_; - id roledelegate_; + // XXX: ok, "roledelegate_"?... + _transient id roledelegate_; UITableView *table_; UISegmentedControl *segment_; UIView *container_; @@ -7527,20 +7539,29 @@ freeing the view controllers on tab change */ [self showDoneButton]; } -- (void) doneButtonClicked { +- (void) saveAndClose { [self save]; + + [[self navigationItem] setRightBarButtonItem:nil]; [[self navigationController] dismissModalViewControllerAnimated:YES]; } +- (void) doneButtonClicked { + UIActivityIndicatorView *spinner = [[[UIActivityIndicatorView alloc] initWithFrame:CGRectMake(0, 0, 20.0f, 20.0f)] autorelease]; + [spinner startAnimating]; + UIBarButtonItem *spinItem = [[[UIBarButtonItem alloc] initWithCustomView:spinner] autorelease]; + [[self navigationItem] setRightBarButtonItem:spinItem]; + + [self performSelector:@selector(saveAndClose) withObject:nil afterDelay:0]; +} + - (void) showDoneButton { - UIBarButtonItem *rightItem = [[UIBarButtonItem alloc] + [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc] initWithTitle:UCLocalize("DONE") style:UIBarButtonItemStyleDone target:self action:@selector(doneButtonClicked) - ]; - [[self navigationItem] setRightBarButtonItem:rightItem animated:[[self navigationItem] rightBarButtonItem] == nil]; - [rightItem release]; + ] autorelease] animated:([[self navigationItem] rightBarButtonItem] == nil)]; } - (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { @@ -7570,22 +7591,21 @@ freeing the view controllers on tab change */ } - (CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - if (section == 3) return 44.0f; - else return 0; + return section == 3 ? 44.0f : 0; } - (UIView *) tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - if (section == 3) return container_; - else return nil; + return section == 3 ? container_ : nil; } @end /* }}} */ /* Stash Controller {{{ */ @interface CYStashController : CYViewController { - UIActivityIndicatorView *spinner_; - UILabel *status_; - UILabel *caption_; + // XXX: just delete these things + _transient UIActivityIndicatorView *spinner_; + _transient UILabel *status_; + _transient UILabel *caption_; } @end @@ -7594,14 +7614,13 @@ freeing the view controllers on tab change */ if ((self = [super init])) { [[self view] setBackgroundColor:[UIColor viewFlipsideBackgroundColor]]; - spinner_ = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; + spinner_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge] autorelease]; CGRect spinrect = [spinner_ frame]; spinrect.origin.x = ([[self view] frame].size.width / 2) - (spinrect.size.width / 2); spinrect.origin.y = [[self view] frame].size.height - 80.0f; [spinner_ setFrame:spinrect]; [spinner_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin]; [[self view] addSubview:spinner_]; - [spinner_ release]; [spinner_ startAnimating]; CGRect captrect; @@ -7609,7 +7628,7 @@ freeing the view controllers on tab change */ captrect.size.height = 40.0f; captrect.origin.x = 0; captrect.origin.y = ([[self view] frame].size.height / 2) - (captrect.size.height * 2); - caption_ = [[UILabel alloc] initWithFrame:captrect]; + caption_ = [[[UILabel alloc] initWithFrame:captrect] autorelease]; [caption_ setText:@"Initializing Filesystem"]; [caption_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin]; [caption_ setFont:[UIFont boldSystemFontOfSize:28.0f]]; @@ -7618,14 +7637,13 @@ freeing the view controllers on tab change */ [caption_ setShadowColor:[UIColor blackColor]]; [caption_ setTextAlignment:UITextAlignmentCenter]; [[self view] addSubview:caption_]; - [caption_ release]; CGRect statusrect; statusrect.size.width = [[self view] frame].size.width; statusrect.size.height = 30.0f; statusrect.origin.x = 0; statusrect.origin.y = ([[self view] frame].size.height / 2) - statusrect.size.height; - status_ = [[UILabel alloc] initWithFrame:statusrect]; + status_ = [[[UILabel alloc] initWithFrame:statusrect] autorelease]; [status_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin]; [status_ setText:@"(Cydia will exit when complete.)"]; [status_ setFont:[UIFont systemFontOfSize:16.0f]]; @@ -7634,7 +7652,6 @@ freeing the view controllers on tab change */ [status_ setShadowColor:[UIColor blackColor]]; [status_ setTextAlignment:UITextAlignmentCenter]; [[self view] addSubview:status_]; - [status_ release]; } return self; } @@ -7651,8 +7668,10 @@ freeing the view controllers on tab change */ bool dropped_; bool updating_; - id updatedelegate_; - UITabBarController *root_; + // 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; @@ -7694,7 +7713,7 @@ freeing the view controllers on tab change */ } - (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientation { - return IsWildcat_ || orientation == UIInterfaceOrientationPortrait; + return ![updatedelegate_ hudIsShowing] && (IsWildcat_ || orientation == UIInterfaceOrientationPortrait); } - (void) setTabBarController:(UITabBarController *)controller { @@ -7732,7 +7751,8 @@ freeing the view controllers on tab change */ } - (void) completeUpdate { - if (!updating_) return; + if (!updating_) + return; updating_ = false; [self raiseBar:YES]; @@ -7814,7 +7834,8 @@ freeing the view controllers on tab change */ } - (void) dropBar:(BOOL)animated { - if (dropped_) return; + if (dropped_) + return; dropped_ = true; [[self view] addSubview:refreshbar_]; @@ -7825,12 +7846,14 @@ freeing the view controllers on tab change */ barframe.origin.y = sboffset; [refreshbar_ setFrame:barframe]; - if (animated) [UIView beginAnimations:nil context:NULL]; + 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]; + if (animated) + [UIView commitAnimations]; // Ensure bar has the proper width for our view, it might have changed barframe.size.width = viewframe.size.width; @@ -7841,20 +7864,23 @@ freeing the view controllers on tab change */ } - (void) raiseBar:(BOOL)animated { - if (!dropped_) return; + if (!dropped_) + return; dropped_ = false; [refreshbar_ removeFromSuperview]; CGFloat sboffset = [self statusBarHeight]; - if (animated) [UIView beginAnimations:nil context:NULL]; + 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]; + if (animated) + [UIView commitAnimations]; // XXX: fix Apple's layout bug [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation]; @@ -7916,11 +7942,14 @@ typedef enum { ConfirmationControllerDelegate, ProgressControllerDelegate, CydiaDelegate, - UINavigationControllerDelegate + UINavigationControllerDelegate, + UITabBarControllerDelegate > { + // XXX: evaluate all fields for _transient + UIWindow *window_; CYContainer *container_; - id tabbar_; + CYTabBarController *tabbar_; NSMutableArray *essential_; NSMutableArray *broken_; @@ -7930,7 +7959,7 @@ typedef enum { int tag_; UIKeyboard *keyboard_; - UIProgressHUD *hud_; + int huds_; SectionsController *sections_; ChangesController *changes_; @@ -8035,7 +8064,8 @@ static _finline void _setHomePage(Cydia *self) { - (int)indexOfTabWithTag:(int)tag { int i = 0; for (UINavigationController *controller in [tabbar_ viewControllers]) { - if ([[controller tabBarItem] tag] == tag) return i; + if ([[controller tabBarItem] tag] == tag) + return i; i += 1; } @@ -8104,7 +8134,8 @@ static _finline void _setHomePage(Cydia *self) { [database_ yieldToSelector:@selector(reloadData) withObject:nil]; - if (hud) [self removeProgressHUD:hud]; + if (hud != nil) + [self removeProgressHUD:hud]; size_t changes(0); @@ -8176,7 +8207,8 @@ static _finline void _setHomePage(Cydia *self) { ProgressController *progress = [[[ProgressController alloc] initWithDatabase:database_ delegate:self] autorelease]; CYNavigationController *navigation = [[[CYNavigationController alloc] initWithRootViewController:progress] autorelease]; - if (IsWildcat_) [navigation setModalPresentationStyle:UIModalPresentationFormSheet]; + if (IsWildcat_) + [navigation setModalPresentationStyle:UIModalPresentationFormSheet]; [container_ presentModalViewController:navigation animated:YES]; [progress @@ -8211,10 +8243,11 @@ static _finline void _setHomePage(Cydia *self) { ConfirmationController *page([[[ConfirmationController alloc] initWithDatabase:database_] autorelease]); [page setDelegate:self]; - CYNavigationController *confirm_ = [[CYNavigationController alloc] initWithRootViewController:page]; + CYNavigationController *confirm_([[[CYNavigationController alloc] initWithRootViewController:page] autorelease]); [confirm_ setDelegate:self]; - if (IsWildcat_) [confirm_ setModalPresentationStyle:UIModalPresentationFormSheet]; + if (IsWildcat_) + [confirm_ setModalPresentationStyle:UIModalPresentationFormSheet]; [container_ presentModalViewController:confirm_ animated:YES]; return true; @@ -8280,7 +8313,8 @@ static _finline void _setHomePage(Cydia *self) { [navigation pushViewController:progress animated:YES]; } else { navigation = [[[CYNavigationController alloc] initWithRootViewController:progress] autorelease]; - if (IsWildcat_) [navigation setModalPresentationStyle:UIModalPresentationFormSheet]; + if (IsWildcat_) + [navigation setModalPresentationStyle:UIModalPresentationFormSheet]; [container_ presentModalViewController:navigation animated:YES]; } @@ -8301,9 +8335,9 @@ static _finline void _setHomePage(Cydia *self) { CYNavigationController *navController = (CYNavigationController *) [tabbar_ selectedViewController]; [navController setViewControllers:[NSArray arrayWithObject:page]]; - for (CYNavigationController *page in [tabbar_ viewControllers]) { - if (page != navController) [page setViewControllers:nil]; - } + for (CYNavigationController *page in [tabbar_ viewControllers]) + if (page != navController) + [page setViewControllers:nil]; } - (CYViewController *) _pageForURL:(NSURL *)url withClass:(Class)_class { @@ -8330,7 +8364,8 @@ static _finline void _setHomePage(Cydia *self) { _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]] withClass:[ManageController class] ] retain]; - if (!IsWildcat_) queueDelegate_ = manage_; + if (!IsWildcat_) + queueDelegate_ = manage_; } return manage_; } @@ -8350,12 +8385,13 @@ static _finline void _setHomePage(Cydia *self) { - (InstalledController *) installedController { if (installed_ == nil) { installed_ = [[InstalledController alloc] initWithDatabase:database_]; - if (IsWildcat_) queueDelegate_ = installed_; + if (IsWildcat_) + queueDelegate_ = installed_; } return installed_; } -- (void) tabBarController:(id)tabBarController didSelectViewController:(UIViewController *)viewController { +- (void) tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController { int tag = [[viewController tabBarItem] tag]; if (tag == tag_) { [(CYNavigationController *)[tabbar_ selectedViewController] popToRootViewControllerAnimated:YES]; @@ -8381,9 +8417,10 @@ static _finline void _setHomePage(Cydia *self) { } - (void) showSettings { - RoleController *role = [[RoleController alloc] initWithDatabase:database_ delegate:self]; - CYNavigationController *nav = [[CYNavigationController alloc] initWithRootViewController:role]; - if (IsWildcat_) [nav setModalPresentationStyle:UIModalPresentationFormSheet]; + RoleController *role = [[[RoleController alloc] initWithDatabase:database_ delegate:self] autorelease]; + CYNavigationController *nav = [[[CYNavigationController alloc] initWithRootViewController:role] autorelease]; + if (IsWildcat_) + [nav setModalPresentationStyle:UIModalPresentationFormSheet]; [container_ presentModalViewController:nav animated:YES]; } @@ -8404,7 +8441,8 @@ static _finline void _setHomePage(Cydia *self) { // Returns the navigation controller for the queuing badge. - (id) queueBadgeController { int index = [self indexOfTabWithTag:kManageTag]; - if (index == -1) index = [self indexOfTabWithTag:kInstalledTag]; + if (index == -1) + index = [self indexOfTabWithTag:kInstalledTag]; return [[tabbar_ viewControllers] objectAtIndex:index]; } @@ -8491,6 +8529,10 @@ static _finline void _setHomePage(Cydia *self) { [super applicationWillSuspend]; } +- (BOOL) hudIsShowing { + return (huds_ > 0); +} + - (void) applicationSuspend:(__GSEvent *)event { // Use external process status API internally. // This is probably a really bad idea. @@ -8501,17 +8543,17 @@ static _finline void _setHomePage(Cydia *self) { notify_cancel(notify_token); } - if (hud_ == nil && status == 0) + if (![self hudIsShowing] && status == 0) [super applicationSuspend:event]; } - (void) _animateSuspension:(BOOL)arg0 duration:(double)arg1 startTime:(double)arg2 scale:(float)arg3 { - if (hud_ == nil) + if (![self hudIsShowing]) [super _animateSuspension:arg0 duration:arg1 startTime:arg2 scale:arg3]; } - (void) _setSuspended:(BOOL)value { - if (hud_ == nil) + if (![self hudIsShowing]) [super _setSuspended:value]; } @@ -8526,6 +8568,7 @@ static _finline void _setHomePage(Cydia *self) { while ([target modalViewController] != nil) target = [target modalViewController]; [[target view] addSubview:hud]; + huds_++; return hud; } @@ -8533,6 +8576,7 @@ static _finline void _setHomePage(Cydia *self) { [hud show:NO]; [hud removeFromSuperview]; [window_ setUserInteractionEnabled:YES]; + huds_--; } - (CYViewController *) pageForPackage:(NSString *)name { @@ -8608,7 +8652,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 ([container_ updating]) + [container_ cancelUpdate]; if ([[self superclass] instancesRespondToSelector:@selector(applicationWillResignActive:)]) [super applicationWillResignActive:application]; @@ -8709,6 +8754,9 @@ static _finline void _setHomePage(Cydia *self) { false ) { [self addStashController]; + // XXX: this would be much cleaner as a yieldToSelector: + // that way the removeStashController could happen right here inline + // we also could no longer require the useless stash_ field anymore [self performSelector:@selector(stash) withObject:nil afterDelay:0]; return; } @@ -8738,15 +8786,14 @@ _trace(); [window_ setUserInteractionEnabled:NO]; - UIView *container = [[UIView alloc] init]; + UIView *container = [[[UIView alloc] init] autorelease]; [container setAutoresizingMask:UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin]; - UIActivityIndicatorView *spinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; + UIActivityIndicatorView *spinner = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray] autorelease]; [spinner startAnimating]; [container addSubview:spinner]; - [spinner release]; - UILabel *label = [[UILabel alloc] init]; + UILabel *label = [[[UILabel alloc] init] autorelease]; [label setFont:[UIFont boldSystemFontOfSize:15.0f]]; [label setBackgroundColor:[UIColor clearColor]]; [label setTextColor:[UIColor blackColor]]; @@ -8754,7 +8801,6 @@ _trace(); [label setShadowOffset:CGSizeMake(0, 1)]; [label setText:UCLocalize("LOADING_DATA")]; [container addSubview:label]; - [label release]; CGSize viewsize = [[tabbar_ view] frame].size; CGSize spinnersize = [spinner bounds].size; @@ -8778,7 +8824,6 @@ _trace(); [spinner setFrame:spinrect]; [label setFrame:textrect]; [[container_ view] addSubview:container]; - [container release]; [self reloadData]; PrintTimes();