X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/a6884de30a7d1133cd25141f0cb4564534835ec4..e0c9f6b48aed7882012fc56df96035f00df8bd20:/Cydia.mm diff --git a/Cydia.mm b/Cydia.mm index 579d17f4..53ea2eac 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -1,5 +1,5 @@ /* Cydia - iPhone UIKit Front-End for Debian APT - * Copyright (C) 2008-2009 Jay Freeman (saurik) + * Copyright (C) 2008-2010 Jay Freeman (saurik) */ /* Modified BSD License {{{ */ @@ -72,6 +72,8 @@ #include +#undef ABS + #include #include #include @@ -189,59 +191,11 @@ void PrintTimes() { #define _end } /* }}} */ -/* Objective-C Handle<> {{{ */ -template -class _H { - typedef _H This_; - - private: - Type_ *value_; - - _finline void Retain_() { - if (value_ != nil) - [value_ retain]; - } - - _finline void Clear_() { - if (value_ != nil) - [value_ release]; - } - - public: - _finline _H(const This_ &rhs) : - value_(rhs.value_ == nil ? nil : [rhs.value_ retain]) - { - } - - _finline _H(Type_ *value = NULL, bool mended = false) : - value_(value) - { - if (!mended) - Retain_(); - } - - _finline ~_H() { - Clear_(); - } - - _finline operator Type_ *() const { - return value_; - } - - _finline This_ &operator =(Type_ *value) { - if (value_ != value) { - Type_ *old(value_); - value_ = value; - Retain_(); - if (old != nil) - [old release]; - } return *this; - } -}; -/* }}} */ #define _pooled _H _pool([[NSAutoreleasePool alloc] init], true); +static const NSUInteger UIViewAutoresizingFlexibleBoth(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight); + void NSLogPoint(const char *fix, const CGPoint &point) { NSLog(@"%s(%g,%g)", fix, point.x, point.y); } @@ -327,7 +281,7 @@ static _finline NSString *CydiaURL(NSString *path) { @end /* }}} */ -@interface CYActionSheet : UIActionSheet { +@interface CYActionSheet : UIAlertView { unsigned button_; } @@ -337,12 +291,15 @@ static _finline NSString *CydiaURL(NSString *path) { @implementation CYActionSheet - (id) initWithTitle:(NSString *)title buttons:(NSArray *)buttons defaultButtonIndex:(int)index { - if ((self = [super initWithTitle:title buttons:buttons defaultButtonIndex:index delegate:self context:nil]) != nil) { + if ((self = [super init])) { + [self setDelegate:self]; + for (NSString *button in buttons) [self addButtonWithTitle:button]; + [self setCancelButtonIndex:index]; } return self; } -- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - button_ = button; +- (void) alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex { + button_ = buttonIndex + 1; } - (int) yieldToPopupAlertAnimated:(BOOL)animated { @@ -409,10 +366,14 @@ static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | - (void) popSubview:(UIView *)view { UITransitionView *transition([[[PopTransitionView alloc] initWithFrame:[self bounds]] autorelease]); - [transition setDelegate:transition]; + [transition setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; [self addSubview:transition]; - UIView *blank = [[[UIView alloc] initWithFrame:[transition bounds]] autorelease]; + [transition setDelegate:transition]; + + UIView *blank([[[UIView alloc] initWithFrame:[transition bounds]] autorelease]); + [blank setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [transition transition:UITransitionNone toView:blank]; [transition transition:UITransitionPushFromBottom toView:view]; } @@ -422,7 +383,7 @@ static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | #define lprintf(args...) fprintf(stderr, args) -#define ForRelease 1 +#define ForRelease 0 #define TraceLogging (1 && !ForRelease) #define HistogramInsertionSort (0 && !ForRelease) #define ProfileTimes (0 && !ForRelease) @@ -433,8 +394,8 @@ static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | #define ShowInternals (0 && !ForRelease) #define IgnoreInstall (0 && !ForRelease) #define RecycleWebViews 0 -#define RecyclePackageViews 1 -#define AlwaysReload (0 && !ForRelease) +#define RecyclePackageViews (1 && ForRelease) +#define AlwaysReload (1 && !ForRelease) #if !TraceLogging #undef _trace @@ -667,6 +628,19 @@ void CFArrayInsertionSortValues(CFMutableArrayRef array, CFRange range, CFCompar @end /* }}} */ +NSUInteger WebScriptObject$countByEnumeratingWithState$objects$count$(WebScriptObject *self, SEL sel, NSFastEnumerationState *state, id *objects, NSUInteger count) { + size_t length([self count] - state->state); + if (length <= 0) + return 0; + else if (length > count) + length = count; + for (size_t i(0); i != length; ++i) + objects[i] = [self objectAtIndex:state->state++]; + state->itemsPtr = objects; + state->mutationsPtr = (unsigned long *) self; + return length; +} + NSUInteger DOMNodeList$countByEnumeratingWithState$objects$count$(DOMNodeList *self, SEL sel, NSFastEnumerationState *state, id *objects, NSUInteger count) { size_t length([self length] - state->state); if (length <= 0) @@ -742,11 +716,8 @@ NSUInteger DOMNodeList$countByEnumeratingWithState$objects$count$(DOMNodeList *s - (NSString *) stringByCachingURLWithCurrentCDN { return [self - stringByReplacingOccurrencesOfString:@"://" - withString:@"://ne.edgecastcdn.net/8003A4/" - options:0 - /* XXX: this is somewhat inaccurate */ - range:NSMakeRange(0, 10) + stringByReplacingOccurrencesOfString:@"://cydia.saurik.com/" + withString:@"://cache.cydia.saurik.com/" ]; } @@ -847,6 +818,8 @@ class CYString { if (size_ == 0) return nil; cache_ = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(data_), size_, kCFStringEncodingUTF8, NO, kCFAllocatorNull); + if (cache_ == NULL) + cache_ = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(data_), size_, kCFStringEncodingISOLatin1, NO, kCFAllocatorNull); } return cache_; } @@ -1049,6 +1022,7 @@ class CGColor { /* Random Global Variables {{{ */ static const int PulseInterval_ = 50000; +static const int ButtonBarWidth_ = 60; static const int ButtonBarHeight_ = 48; static const float KeyboardTime_ = 0.3f; @@ -1089,6 +1063,7 @@ static const char *Machine_ = NULL; static const NSString *System_ = NULL; static const NSString *SerialNumber_ = nil; static const NSString *ChipID_ = nil; +static const NSString *Token_ = nil; static const NSString *UniqueID_ = nil; static const NSString *Build_ = nil; static const NSString *Product_ = nil; @@ -1110,6 +1085,8 @@ static _transient NSMutableDictionary *Sources_; static bool Changed_; static NSDate *now_; +static bool IsWildcat_; + #if RecycleWebViews static NSMutableArray *Documents_; #endif @@ -1239,6 +1216,7 @@ bool isSectionVisible(NSString *section) { - (void) setPackageView:(PackageView *)view; - (void) clearPackage:(Package *)package; - (void) installPackage:(Package *)package; +- (void) installPackages:(NSArray *)packages; - (void) removePackage:(Package *)package; - (void) slideUp:(UIActionSheet *)alert; - (void) distUpgrade; @@ -1775,6 +1753,7 @@ typedef std::map< unsigned long, _H > SourceMap; bool essential_; bool required_; bool visible_; + bool obsolete_; NSString *latest_; CYString installed_; @@ -1884,6 +1863,7 @@ typedef std::map< unsigned long, _H > SourceMap; - (void) remove; - (bool) isUnfilteredAndSearchedForBy:(NSString *)search; +- (bool) isUnfilteredAndSelectedForBy:(NSString *)search; - (bool) isInstalledAndVisible:(NSNumber *)number; - (bool) isVisibleInSection:(NSString *)section; - (bool) isVisibleInSource:(Source *)source; @@ -1982,6 +1962,11 @@ CFComparisonResult PackageNameCompare(Package *lhs, Package *rhs, void *arg) { CYString &rhi(PackageName(rhs, @selector(cyname))); CFStringRef lhn(lhi), rhn(rhi); + if (lhn == NULL) + return rhn == NULL ? NSOrderedSame : NSOrderedAscending; + else if (rhn == NULL) + return NSOrderedDescending; + _profile(PackageNameCompare$NumbersLast) if (!lhi.empty() && !rhi.empty()) { UniChar lhc(CFStringGetCharacterAtIndex(lhn, 0)); @@ -2132,7 +2117,7 @@ struct PackageNameOrdering : } - (void) setVisible { - visible_ = required_ && [self hasSupportingRole] && [self unfiltered]; + visible_ = required_ && [self unfiltered]; } - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database { @@ -2231,13 +2216,12 @@ struct PackageNameOrdering : if (version == nil) { [metadata_ setObject:latest_ forKey:@"LastVersion"]; changed = true; - } else { - if (![version isEqualToString:latest_]) { + } else if (![version isEqualToString:latest_]) { [metadata_ setObject:latest_ forKey:@"LastVersion"]; lastSeen_ = now_; [metadata_ setObject:lastSeen_ forKey:@"LastSeen"]; changed = true; - } } + } } metadata_ = [metadata_ retain]; @@ -2252,6 +2236,7 @@ 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]; } _end } return self; @@ -2433,7 +2418,7 @@ struct PackageNameOrdering : - (BOOL) unfiltered { NSString *section([self section]); - return section == nil || isSectionVisible(section); + return !obsolete_ && [self hasSupportingRole] && (section == nil || isSectionVisible(section)); } - (BOOL) visible { @@ -2815,6 +2800,25 @@ struct PackageNameOrdering : _end } +- (bool) isUnfilteredAndSelectedForBy:(NSString *)search { + if ([search length] == 0) + return false; + + _profile(Package$isUnfilteredAndSelectedForBy) + bool value(true); + + _profile(Package$isUnfilteredAndSelectedForBy$Unfiltered) + value &= [self unfiltered]; + _end + + _profile(Package$isUnfilteredAndSelectedForBy$Match) + value &= [[self name] compare:search options:MatchCompareOptions_ range:NSMakeRange(0, [search length])] == NSOrderedSame; + _end + + return value; + _end +} + - (bool) isInstalledAndVisible:(NSNumber *)number { return (![number boolValue] || [self visible]) && ![self uninstalled]; } @@ -3621,6 +3625,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* Web Scripting {{{ */ @interface CydiaObject : NSObject { id indirect_; + id delegate_; } - (id) initWithDelegate:(IndirectDelegate *)indirect; @@ -3639,6 +3644,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } return self; } +- (void) setDelegate:(id)delegate { + delegate_ = delegate; +} + + (NSArray *) _attributeKeys { return [NSArray arrayWithObjects:@"device", @"firewire", @"imei", @"mac", @"serial", nil]; } @@ -3680,8 +3689,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { + (NSString *) webScriptNameForSelector:(SEL)selector { if (selector == @selector(close)) return @"close"; + else if (selector == @selector(getInstalledPackages)) + return @"getInstalledPackages"; else if (selector == @selector(getPackageById:)) return @"getPackageById"; + else if (selector == @selector(installPackages:)) + return @"installPackages"; else if (selector == @selector(setAutoPopup:)) return @"setAutoPopup"; else if (selector == @selector(setButtonImage:withStyle:toFunction:)) @@ -3694,6 +3707,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return @"setPopupHook"; else if (selector == @selector(setSpecial:)) return @"setSpecial"; + else if (selector == @selector(setToken:)) + return @"setToken"; else if (selector == @selector(setViewportWidth:)) return @"setViewportWidth"; else if (selector == @selector(supports:)) @@ -3718,6 +3733,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return [feature isEqualToString:@"window.open"]; } +- (NSArray *) getInstalledPackages { + NSArray *packages([[Database sharedInstance] packages]); + NSMutableArray *installed([NSMutableArray arrayWithCapacity:[packages count]]); + for (Package *package in packages) + if ([package installed] != nil) + [installed addObject:package]; + return installed; +} + - (Package *) getPackageById:(NSString *)id { Package *package([[Database sharedInstance] packageWithName:id]); [package parse]; @@ -3785,6 +3809,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [indirect_ close]; } +- (void) installPackages:(NSArray *)packages { + [delegate_ performSelectorOnMainThread:@selector(installPackages:) withObject:packages waitUntilDone:NO]; +} + - (void) setAutoPopup:(BOOL)popup { [indirect_ setAutoPopup:popup]; } @@ -3801,6 +3829,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [indirect_ setSpecial:function]; } +- (void) setToken:(NSString *)token { + if (Token_ != nil) + [Token_ release]; + Token_ = [token retain]; + + [Metadata_ setObject:Token_ forKey:@"Token"]; + Changed_ = true; +} + - (void) setFinishHook:(id)function { [indirect_ setFinishHook:function]; } @@ -3846,9 +3883,33 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [super dealloc]; } +- (void) setHeaders:(NSDictionary *)headers forHost:(NSString *)host { +} + - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { [super webView:sender didClearWindowObject:window forFrame:frame]; - [window setValue:cydia_ forKey:@"cydia"]; + + WebDataSource *source([frame dataSource]); + NSURLResponse *response([source response]); + NSURL *url([response URL]); + NSString *scheme([url scheme]); + + NSHTTPURLResponse *http; + if (scheme != nil && ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"])) + http = (NSHTTPURLResponse *) response; + else + http = nil; + + NSDictionary *headers([http allHeaderFields]); + NSString *host([url host]); + [self setHeaders:headers forHost:host]; + + if ( + [host isEqualToString:@"cydia.saurik.com"] || + [host hasSuffix:@".cydia.saurik.com"] || + [scheme isEqualToString:@"file"] + ) + [window setValue:cydia_ forKey:@"cydia"]; } - (void) _setMoreHeaders:(NSMutableURLRequest *)request { @@ -3856,8 +3917,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [request setValue:System_ forHTTPHeaderField:@"X-System"]; if (Machine_ != NULL) [request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"]; - if (UniqueID_ != nil) - [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"]; + if (Token_ != nil) + [request setValue:Token_ forHTTPHeaderField:@"X-Cydia-Token"]; if (Role_ != nil) [request setValue:Role_ forHTTPHeaderField:@"X-Role"]; } @@ -3868,11 +3929,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return copy; } +- (void) setDelegate:(id)delegate { + [super setDelegate:delegate]; + [cydia_ setDelegate:delegate]; +} + - (id) initWithBook:(RVBook *)book forWidth:(float)width { if ((self = [super initWithBook:book forWidth:width ofClass:[CydiaBrowserView class]]) != nil) { cydia_ = [[CydiaObject alloc] initWithDelegate:indirect_]; - WebView *webview([webview_ webView]); + WebView *webview([document_ webView]); Package *package([[Database sharedInstance] packageWithName:@"cydia"]); @@ -4017,6 +4083,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { context:@"remove" ]; + [essential_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [essential_ setDestructiveButtonIndex:1]; [essential_ setBodyText:UCLocalize("REMOVING_ESSENTIALS_EX")]; } else { @@ -4028,6 +4096,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { context:@"unable" ]; + [essential_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [essential_ setBodyText:UCLocalize("UNABLE_TO_COMPLY_EX")]; } @@ -4050,6 +4120,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { nil]; [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"confirm" ofType:@"html"]]]; + + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -4198,9 +4270,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { delegate_ = delegate; transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]]; + [transition_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [transition_ setDelegate:self]; overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]]; + [overlay_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; background_ = [[UIView alloc] initWithFrame:[self bounds]]; [background_ setBackgroundColor:[UIColor blackColor]]; @@ -4212,6 +4286,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { CGRect navrect = {{0, 0}, navsize}; navbar_ = [[UINavigationBar alloc] initWithFrame:navrect]; + [navbar_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; [overlay_ addSubview:navbar_]; [navbar_ setBarStyle:1]; @@ -4229,6 +4304,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { }, prgsize}; progress_ = [[UIProgressBar alloc] initWithFrame:prgrect]; + [progress_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)]; [progress_ setStyle:0]; status_ = [[UITextLabel alloc] initWithFrame:CGRectMake( @@ -4238,6 +4314,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { 24 )]; + [status_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)]; + [status_ setColor:[UIColor whiteColor]]; [status_ setBackgroundColor:[UIColor clearColor]]; @@ -4251,6 +4329,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { bounds.size.height - navsize.height - 62 - navrect.size.height )]; + [output_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [overlay_ addSubview:output_]; + //[output_ setTextFont:@"Courier New"]; [output_ setFont:[[output_ font] fontWithSize:12]]; @@ -4261,8 +4342,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [output_ setAllowsRubberBanding:YES]; [output_ setEditable:NO]; - [overlay_ addSubview:output_]; - close_ = [[UIPushButton alloc] initWithFrame:CGRectMake( 10, bounds.size.height - prgsize.height - 50, @@ -4270,6 +4349,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { 32 + prgsize.height )]; + [close_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)]; + [close_ setAutosizesToFit:NO]; [close_ setDrawsShadow:YES]; [close_ setStretchBackground:YES]; @@ -4389,55 +4470,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { case 4: [close_ setTitle:UCLocalize("REBOOT_DEVICE")]; break; } -#define ListCache_ "/User/Library/Caches/com.apple.mobile.installation.plist" -#define IconCache_ "/User/Library/Caches/com.apple.springboard-imagecache-icons.plist" - - unlink(IconCache_); - - if (NSMutableDictionary *cache = [[NSMutableDictionary alloc] initWithContentsOfFile:@ListCache_]) { - [cache autorelease]; - - NSFileManager *manager([NSFileManager defaultManager]); - NSError *error(nil); - - id system([cache objectForKey:@"System"]); - if (system == nil) - goto error; - - struct stat info; - if (stat(ListCache_, &info) == -1) - goto error; - - [system removeAllObjects]; - - if (NSArray *apps = [manager contentsOfDirectoryAtPath:@"/Applications" error:&error]) { - for (NSString *app in apps) - if ([app hasSuffix:@".app"]) { - NSString *path = [@"/Applications" stringByAppendingPathComponent:app]; - NSString *plist = [path stringByAppendingPathComponent:@"Info.plist"]; - if (NSMutableDictionary *info = [[NSMutableDictionary alloc] initWithContentsOfFile:plist]) { - [info autorelease]; - if ([info objectForKey:@"CFBundleIdentifier"] != nil) { - [info setObject:path forKey:@"Path"]; - [info setObject:@"System" forKey:@"ApplicationType"]; - [system addInfoDictionary:info]; - } - } - } - } else goto error; - - [cache writeToFile:@ListCache_ atomically:YES]; - - if (chown(ListCache_, info.st_uid, info.st_gid) == -1) - goto error; - if (chmod(ListCache_, info.st_mode) == -1) - goto error; - - if (false) error: - lprintf("%s\n", error == nil ? strerror(errno) : [[error localizedDescription] UTF8String]); - } - - notify_post("com.apple.mobile.application_installed"); + system("su -c /usr/bin/uicache mobile"); [delegate_ setStatusBarShowsProgress:NO]; } @@ -4591,6 +4624,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { context:@"conffile" ] autorelease]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [sheet setBodyText:[NSString stringWithFormat:@"%@\n\n%@", UCLocalize("CONFIGURATION_UPGRADE_EX"), ofile]]; [sheet popupAlertAnimated:YES]; } @@ -4665,6 +4700,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { delegate_ = delegate; } +/* Fix landscape: redraw when frame changes. */ +- (void) setFrame:(CGRect)frame { + [super setFrame:frame]; + [self setNeedsDisplay]; +} + - (void) drawRect:(CGRect)rect { [super drawRect:rect]; [delegate_ drawContentRect:rect]; @@ -4725,13 +4766,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ((self = [super initWithFrame:frame reuseIdentifier:@"Package"]) != nil) { UIView *content([self contentView]); CGRect bounds([content bounds]); + content_ = [[ContentView alloc] initWithFrame:bounds]; + [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [content addSubview:content_]; + [content_ setDelegate:self]; - [content_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; [content_ setOpaque:YES]; - [content addSubview:content_]; if ([self respondsToSelector:@selector(selectionPercent)]) faded_ = YES; + + [self setNeedsDisplayOnBoundsChange:YES]; } return self; } @@ -4755,7 +4800,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { icon_ = [[package icon] retain]; name_ = [[package name] retain]; - description_ = [[package shortDescription] retain]; + + if (IsWildcat_) + description_ = [package longDescription]; + if (description_ == nil) + description_ = [package shortDescription]; + if (description_ != nil) + description_ = [description_ retain]; + commercial_ = [package isCommercial]; package_ = [package retain]; @@ -4796,6 +4848,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) drawContentRect:(CGRect)rect { bool selected([self isSelected]); + float width([self bounds].size.width); #if 0 CGContextRef context(UIGraphicsGetCurrentContext()); @@ -4830,15 +4883,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!selected) UISetColor(commercial_ ? Purple_ : Black_); - [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(placard_ == nil ? 240 : 214) withFont:Font18Bold_ ellipsis:2]; - [source_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2]; + [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ ellipsis:2]; + [source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ ellipsis:2]; if (!selected) UISetColor(commercial_ ? Purplish_ : Gray_); - [description_ drawAtPoint:CGPointMake(12, 46) forWidth:274 withFont:Font14_ ellipsis:2]; + [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ ellipsis:2]; if (placard_ != nil) - [placard_ drawAtPoint:CGPointMake(268, 9)]; + [placard_ drawAtPoint:CGPointMake(width - 52, 9)]; } - (void) setSelected:(BOOL)selected animated:(BOOL)fade { @@ -4855,6 +4908,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* }}} */ /* Section Cell {{{ */ @interface SectionCell : UISimpleTableCell { + NSString *basic_; NSString *section_; NSString *name_; NSString *count_; @@ -4871,6 +4925,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @implementation SectionCell - (void) clearSection { + if (basic_ != nil) { + [basic_ release]; + basic_ = nil; + } + if (section_ != nil) { [section_ release]; section_ = nil; @@ -4897,17 +4956,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (id) init { if ((self = [super init]) != nil) { icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain]; - switch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(218, 9, 60, 25)]; [switch_ addTarget:self action:@selector(onSwitch:) forEvents:UIControlEventTouchUpInside]; } return self; } - (void) onSwitch:(id)sender { - NSMutableDictionary *metadata = [Sections_ objectForKey:section_]; + NSMutableDictionary *metadata = [Sections_ objectForKey:basic_]; if (metadata == nil) { metadata = [NSMutableDictionary dictionaryWithCapacity:2]; - [Sections_ setObject:metadata forKey:section_]; + [Sections_ setObject:metadata forKey:basic_]; } Changed_ = true; @@ -4929,17 +4987,28 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { name_ = [UCLocalize("ALL_PACKAGES") retain]; count_ = nil; } else { + basic_ = [section name]; + if (basic_ != nil) + basic_ = [basic_ retain]; + section_ = [section localized]; if (section_ != nil) section_ = [section_ retain]; + name_ = [(section_ == nil || [section_ length] == 0 ? UCLocalize("NO_SECTION") : section_) retain]; count_ = [[NSString stringWithFormat:@"%d", [section count]] retain]; if (editing_) - [switch_ setValue:(isSectionVisible(section_) ? 1 : 0) animated:NO]; + [switch_ setValue:(isSectionVisible(basic_) ? 1 : 0) animated:NO]; } } +- (void) setFrame:(CGRect)frame { + [super setFrame:frame]; + CGRect rect([switch_ frame]); + [switch_ setFrame:CGRectMake(frame.size.width - 102, 9, rect.size.width, rect.size.height)]; +} + - (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected { [icon_ drawInRect:CGRectMake(8, 7, 32, 32)]; @@ -4948,7 +5017,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!selected) UISetColor(Black_); - [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(editing_ ? 164 : 250) withFont:Font22Bold_ ellipsis:2]; + + float width(rect.size.width + 23); + if (editing_) + width -= 110; + + [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 70) withFont:Font22Bold_ ellipsis:2]; CGSize size = [count_ sizeWithFont:Font14_]; @@ -5030,6 +5104,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [list_ addTableColumn:column]; [list_ setDelegate:self]; [list_ setReusesTableCells:YES]; + + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -5253,15 +5330,18 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [buttons_ addObject:UCLocalize("REMOVE")]; if (special_ != NULL) { - CGRect frame([webview_ frame]); + CGRect frame([document_ frame]); frame.size.width = 320; frame.size.height = 0; - [webview_ setFrame:frame]; + [document_ setFrame:frame]; - [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; + if ([scroller_ respondsToSelector:@selector(scrollPointVisibleAtTopLeft:)]) + [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; + else + [scroller_ scrollRectToVisible:CGRectZero animated:NO]; WebThreadLock(); - [[[webview_ webView] windowScriptObject] setValue:package_ forKey:@"package"]; + [[[document_ webView] windowScriptObject] setValue:package_ forKey:@"package"]; [self setButtonTitle:nil withStyle:nil toFunction:nil]; @@ -5392,13 +5472,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { sections_ = [[NSMutableArray arrayWithCapacity:16] retain]; list_ = [[UITableView alloc] initWithFrame:[self bounds] style:UITableViewStylePlain]; + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [self addSubview:list_]; + [list_ setDataSource:self]; [list_ setDelegate:self]; - [self addSubview:list_]; - - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -5489,6 +5569,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) setObject:(id)object; +- (void) setObject:(id)object forFilter:(SEL)filter; - (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object; @@ -5502,6 +5583,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [super dealloc]; } +- (void) setFilter:(SEL)filter { + filter_ = filter; + + /* XXX: this is an unsafe optimization of doomy hell */ + Method method(class_getInstanceMethod([Package class], filter)); + _assert(method != NULL); + imp_ = method_getImplementation(method); + _assert(imp_ != NULL); +} + - (void) setObject:(id)object { if (object_ != nil) [object_ release]; @@ -5511,6 +5602,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { object_ = [object retain]; } +- (void) setObject:(id)object forFilter:(SEL)filter { + [self setFilter:filter]; + [self setObject:object]; + +} + - (bool) hasPackage:(Package *)package { _profile(FilteredPackageTable$hasPackage) return [package valid] && (*reinterpret_cast(imp_))(package, filter_, object_); @@ -5519,15 +5616,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object { if ((self = [super initWithBook:book database:database title:title]) != nil) { - filter_ = filter; + [self setFilter:filter]; object_ = object == nil ? nil : [object retain]; - - /* XXX: this is an unsafe optimization of doomy hell */ - Method method(class_getInstanceMethod([Package class], filter)); - _assert(method != NULL); - imp_ = method_getImplementation(method); - _assert(imp_ != NULL); - [self reloadData]; } return self; } @@ -5593,6 +5683,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected { + float width(rect.size.width); + if (icon_ != nil) [icon_ drawInRect:CGRectMake(10, 10, 30, 30)]; @@ -5601,15 +5693,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!selected) UISetColor(Black_); - [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2]; + [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - 80) withFont:Font18Bold_ ellipsis:2]; if (!selected) UISetColor(Blue_); - [label_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2]; + [label_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ ellipsis:2]; if (!selected) UISetColor(Gray_); - [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2]; + [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 40) withFont:Font14_ ellipsis:2]; [super drawContentInRect:rect selected:selected]; } @@ -5814,8 +5906,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { context:@"warning" ] autorelease]; - [sheet setNumberOfRows:1]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [sheet setNumberOfRows:1]; [sheet setBodyText:warning]; [sheet popupAlertAnimated:YES]; } else @@ -5829,6 +5922,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { context:@"urlerror" ] autorelease]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [sheet setBodyText:[error_ localizedDescription]]; [sheet popupAlertAnimated:YES]; } else { @@ -5840,6 +5935,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { context:@"trivial" ] autorelease]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [sheet setBodyText:UCLocalize("NOT_REPOSITORY_EX")]; [sheet popupAlertAnimated:YES]; } @@ -5884,7 +5981,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:href] cachePolicy:NSURLRequestUseProtocolCachePolicy - timeoutInterval:20.0 + timeoutInterval:120.0 ]; [request setHTTPMethod:method]; @@ -5893,7 +5990,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"]; if (UniqueID_ != nil) [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"]; - if (Role_ != nil) [request setValue:Role_ forHTTPHeaderField:@"X-Role"]; @@ -5964,9 +6060,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { //list_ = [[UITable alloc] initWithFrame:[self bounds]]; list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO]; - [list_ setShouldHideHeaderInShortLists:NO]; - + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [self addSubview:list_]; + + [list_ setShouldHideHeaderInShortLists:NO]; [list_ setDataSource:self]; UITableColumn *column = [[UITableColumn alloc] @@ -5982,8 +6079,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self reloadData]; - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -6026,8 +6122,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { context:@"source" ] autorelease]; - [sheet setNumberOfRows:1]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [sheet setNumberOfRows:1]; [sheet addTextFieldWithValue:@"http://" label:@""]; UITextInputTraits *traits = [[sheet textField] textInputTraits]; @@ -6096,10 +6193,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { with:[NSNumber numberWithBool:YES] ]; + [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [self addSubview:packages_]; - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -6163,33 +6260,24 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [super _setMoreHeaders:request]; if (ChipID_ != nil) [request setValue:ChipID_ forHTTPHeaderField:@"X-Chip-ID"]; + if (UniqueID_ != nil) + [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"]; } - (void) _leftButtonClicked { - UIActionSheet *sheet = [[[UIActionSheet alloc] - initWithTitle:UCLocalize("ABOUT_CYDIA") - buttons:[NSArray arrayWithObjects:UCLocalize("CLOSE"), nil] - defaultButtonIndex:0 - delegate:self - context:@"about" - ] autorelease]; + UIAlertView *alert = [[[UIAlertView alloc] init] autorelease]; + [alert setTitle:UCLocalize("ABOUT_CYDIA")]; + [alert addButtonWithTitle:UCLocalize("CLOSE")]; + [alert setCancelButtonIndex:0]; - [sheet setBodyText: - @"Copyright (C) 2008-2009\n" + [alert setMessage: + @"Copyright (C) 2008-2010\n" "Jay Freeman (saurik)\n" "saurik@saurik.com\n" - "http://www.saurik.com/\n" - "\n" - "The Okori Group\n" - "http://www.theokorigroup.com/\n" - "\n" - "College of Creative Studies,\n" - "University of California,\n" - "Santa Barbara\n" - "http://www.ccs.ucsb.edu/" + "http://www.saurik.com/" ]; - [sheet popupAlertAnimated:YES]; + [alert show]; } - (NSString *) leftButtonTitle { @@ -6252,11 +6340,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { UIProgressBar *progress_; UINavigationButton *cancel_; bool updating_; + bool dropped_; } - (id) initWithFrame:(CGRect)frame database:(Database *)database; - (void) update; - (BOOL) updating; +- (void) setUpdate:(NSDate *)date; @end @@ -6279,7 +6369,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return updating_; } -- (void) update { +- (void) dropBar { + if (dropped_) + return; + dropped_ = true; + [UIView beginAnimations:nil context:NULL]; CGRect ovrframe = [overlay_ frame]; @@ -6296,6 +6390,37 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [transition_ setFrame:trnframe]; [UIView endAnimations]; +} + +- (void) raiseBar { + if (!dropped_) + return; + dropped_ = false; + + [UIView beginAnimations:nil context:NULL]; + + CGRect ovrframe = [overlay_ frame]; + ovrframe.origin.y = -ovrframe.size.height; + [overlay_ setFrame:ovrframe]; + + CGRect barframe = [navbar_ frame]; + barframe.origin.y -= ovrframe.size.height; + [navbar_ setFrame:barframe]; + + CGRect trnframe = [transition_ frame]; + trnframe.origin.y -= ovrframe.size.height; + trnframe.size.height += ovrframe.size.height; + [transition_ setFrame:trnframe]; + + [UIView commitAnimations]; +} + +- (void) setUpdate:(NSDate *)date { + [self update]; +} + +- (void) update { + [self dropBar]; [indicator_ startAnimation]; [prompt_ setText:UCLocalize("UPDATING_DATABASE")]; @@ -6323,22 +6448,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [indicator_ stopAnimation]; - [UIView beginAnimations:nil context:NULL]; - - CGRect ovrframe = [overlay_ frame]; - ovrframe.origin.y = -ovrframe.size.height; - [overlay_ setFrame:ovrframe]; - - CGRect barframe = [navbar_ frame]; - barframe.origin.y -= ovrframe.size.height; - [navbar_ setFrame:barframe]; - - CGRect trnframe = [transition_ frame]; - trnframe.origin.y -= ovrframe.size.height; - trnframe.size.height += ovrframe.size.height; - [transition_ setFrame:trnframe]; - - [UIView commitAnimations]; + [self raiseBar]; [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0]; } @@ -6352,13 +6462,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { ovrrect.origin.y = -ovrrect.size.height; overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect]; + [overlay_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; [self addSubview:overlay_]; ovrrect.origin.y = frame.size.height; underlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect]; - [underlay_ setTintColor:[UIColor colorWithRed:0.23 green:0.23 blue:0.23 alpha:1]]; + [underlay_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; [self addSubview:underlay_]; + [underlay_ setTintColor:[UIColor colorWithRed:0.23 green:0.23 blue:0.23 alpha:1]]; + [overlay_ setBarStyle:1]; [underlay_ setBarStyle:1]; @@ -6402,10 +6515,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } , prgsize}; progress_ = [[UIProgressBar alloc] initWithFrame:prgrect]; - [progress_ setStyle:0]; + [progress_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; [overlay_ addSubview:progress_]; + [progress_ setStyle:0]; + cancel_ = [[UINavigationButton alloc] initWithTitle:UCLocalize("CANCEL") style:UINavigationButtonStyleHighlighted]; + [progress_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside]; CGRect frame = [cancel_ frame]; @@ -6449,6 +6565,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { context:@"refresh" ] autorelease]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [sheet setBodyText:error]; [sheet popupAlertAnimated:YES]; @@ -6605,7 +6723,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { _transient Database *database_; NSMutableArray *sections_; NSMutableArray *filtered_; - UITransitionView *transition_; UITable *list_; UIView *accessory_; BOOL editing_; @@ -6625,7 +6742,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [sections_ release]; [filtered_ release]; - [transition_ release]; [list_ release]; [accessory_ release]; [super dealloc]; @@ -6703,11 +6819,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { sections_ = [[NSMutableArray arrayWithCapacity:16] retain]; filtered_ = [[NSMutableArray arrayWithCapacity:16] retain]; - transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]]; - [self addSubview:transition_]; - - list_ = [[UITable alloc] initWithFrame:[transition_ bounds]]; - [transition_ transition:0 toView:list_]; + list_ = [[UITable alloc] initWithFrame:[self bounds]]; + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [self addSubview:list_]; UITableColumn *column = [[[UITableColumn alloc] initWithTitle:UCLocalize("NAME") @@ -6723,8 +6837,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self reloadData]; - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -6864,7 +6977,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { unsigned upgrades_; } -- (id) initWithBook:(RVBook *)book database:(Database *)database; +- (id) initWithBook:(RVBook *)book database:(Database *)database delegate:(id)delegate; - (void) reloadData; @end @@ -6935,7 +7048,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [delegate_ distUpgrade]; } -- (id) initWithBook:(RVBook *)book database:(Database *)database { +- (id) initWithBook:(RVBook *)book database:(Database *)database delegate:(id)delegate { if ((self = [super initWithBook:book]) != nil) { database_ = database; @@ -6943,6 +7056,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { sections_ = [[NSMutableArray arrayWithCapacity:16] retain]; list_ = [[UITableView alloc] initWithFrame:[self bounds] style:UITableViewStylePlain]; + [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [self addSubview:list_]; //XXX:[list_ setShouldHideHeaderInShortLists:NO]; @@ -6950,19 +7064,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [list_ setDelegate:self]; //[list_ setSectionListStyle:1]; + delegate_ = delegate; [self reloadData]; - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } -- (void) reloadData { - NSArray *packages = [database_ packages]; - - [packages_ removeAllObjects]; - [sections_ removeAllObjects]; - +- (void) _reloadPackages:(NSArray *)packages { _trace(); for (Package *package in packages) if ( @@ -6974,6 +7083,20 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { _trace(); [packages_ radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withContext:NULL]; _trace(); +} + +- (void) reloadData { + NSArray *packages = [database_ packages]; + + [packages_ removeAllObjects]; + [sections_ removeAllObjects]; + + UIProgressHUD *hud([delegate_ addProgressHUD]); + // XXX: localize + [hud setText:@"Loading Changes"]; + NSLog(@"HUD:%@::%@", delegate_, hud); + [self yieldToSelector:@selector(_reloadPackages:) withObject:packages]; + [delegate_ removeProgressHUD:hud]; Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease]; Section *ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") localize:NO] autorelease]; @@ -7071,7 +7194,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { UIView *accessory_; UISearchField *field_; FilteredPackageTable *table_; - UIView *dimmed_; bool reload_; } @@ -7088,7 +7210,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [accessory_ release]; [field_ release]; [table_ release]; - [dimmed_ release]; [super dealloc]; } @@ -7122,21 +7243,26 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (show) [animator performSelector:@selector(startAnimation:) withObject:animation afterDelay:delay]; - [delegate_ showKeyboard:show]; + //[delegate_ showKeyboard:show]; } - (void) textFieldDidBecomeFirstResponder:(UITextField *)field { [self _showKeyboard:YES]; + [table_ setObject:[field_ text] forFilter:@selector(isUnfilteredAndSelectedForBy:)]; + [self reloadData]; } - (void) textFieldDidResignFirstResponder:(UITextField *)field { [self _showKeyboard:NO]; + [table_ setObject:[field_ text] forFilter:@selector(isUnfilteredAndSearchedForBy:)]; + [self reloadData]; } - (void) keyboardInputChanged:(UIFieldEditor *)editor { if (reload_) { NSString *text([field_ text]); [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)]; + [table_ setObject:text forFilter:@selector(isUnfilteredAndSelectedForBy:)]; [self reloadData]; reload_ = false; } @@ -7164,10 +7290,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ((self = [super initWithBook:book]) != nil) { CGRect pageBounds = [book_ pageBounds]; - dimmed_ = [[UIView alloc] initWithFrame:pageBounds]; - CGColor dimmed(space_, 0, 0, 0, 0.5); - [dimmed_ setBackgroundColor:[UIColor colorWithCGColor:dimmed]]; - table_ = [[FilteredPackageTable alloc] initWithBook:book database:database @@ -7176,9 +7298,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { with:nil ]; - [table_ setShouldHideHeaderInShortLists:NO]; + [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [self addSubview:table_]; + [table_ setShouldHideHeaderInShortLists:NO]; + CGRect cnfrect = {{7, 38}, {17, 18}}; CGRect area; @@ -7190,6 +7314,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { area.size.height = [UISearchField defaultHeight]; field_ = [[UISearchField alloc] initWithFrame:area]; + [field_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; UIFont *font = [UIFont systemFontOfSize:16]; [field_ setFont:font]; @@ -7207,10 +7332,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height}}; accessory_ = [[UIView alloc] initWithFrame:accrect]; + [accessory_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; [accessory_ addSubview:field_]; - [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; - [table_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [self setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; } return self; } @@ -7222,7 +7347,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) reloadData { - [table_ setObject:[field_ text]]; _profile(SearchView$reloadData) [table_ reloadData]; _end @@ -7482,6 +7606,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @end /* }}} */ +@interface CydiaViewController : UIViewController { +} + +@end + +@implementation CydiaViewController + +- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientation { + return NO; // XXX: return YES; +} + +@end + @interface Cydia : UIApplication < ConfirmationViewDelegate, ProgressViewDelegate, @@ -7489,11 +7626,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { CydiaDelegate > { UIWindow *window_; + CydiaViewController *root_; UIView *underlay_; UIView *overlay_; CYBook *book_; - UIToolbar *toolbar_; + + NSArray *items_; + UITabBar *toolbar_; RVBook *confirm_; @@ -7503,7 +7643,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { Database *database_; ProgressView *progress_; - unsigned tag_; + int tag_; UIKeyboard *keyboard_; UIProgressHUD *hud_; @@ -7529,6 +7669,10 @@ static _finline void _setHomePage(Cydia *self) { @implementation Cydia +- (UIView *) rotatingContentViewForWindow:(UIWindow *)window { + return window_; +} + - (void) _loaded { if ([broken_ count] != 0) { int count = [broken_ count]; @@ -7544,6 +7688,8 @@ static _finline void _setHomePage(Cydia *self) { context:@"fixhalf" ] autorelease]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [sheet setBodyText:UCLocalize("HALFINSTALLED_PACKAGE_EX")]; [sheet popupAlertAnimated:YES]; } else if (!Ignored_ && [essential_ count] != 0) { @@ -7561,6 +7707,8 @@ static _finline void _setHomePage(Cydia *self) { context:@"upgrade" ] autorelease]; + [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [sheet setBodyText:UCLocalize("ESSENTIAL_UPGRADE_EX")]; [sheet popupAlertAnimated:YES]; } @@ -7589,11 +7737,11 @@ static _finline void _setHomePage(Cydia *self) { [self _saveConfig]; /* XXX: this is just stupid */ - if (tag_ != 2 && sections_ != nil) + if (tag_ != 1 && sections_ != nil) [sections_ reloadData]; - if (tag_ != 3 && changes_ != nil) + if (tag_ != 2 && changes_ != nil) [changes_ reloadData]; - if (tag_ != 5 && search_ != nil) + if (tag_ != 4 && search_ != nil) [search_ reloadData]; [book_ reloadData]; @@ -7629,17 +7777,17 @@ static _finline void _setHomePage(Cydia *self) { if (changes != 0) { NSString *badge([[NSNumber numberWithInt:changes] stringValue]); - [toolbar_ setBadgeValue:badge forButton:3]; + [[[toolbar_ items] objectAtIndex:2] setBadgeValue:badge]; if ([toolbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)]) - [toolbar_ setBadgeAnimated:([essential_ count] != 0) forButton:3]; + [[[toolbar_ items] objectAtIndex:2] setAnimatedBadge:YES]; if ([self respondsToSelector:@selector(setApplicationBadge:)]) [self setApplicationBadge:badge]; else [self setApplicationBadgeString:badge]; } else { - [toolbar_ setBadgeValue:nil forButton:3]; + [[[toolbar_ items] objectAtIndex:2] setBadgeValue:nil]; if ([toolbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)]) - [toolbar_ setBadgeAnimated:NO forButton:3]; + [[[toolbar_ items] objectAtIndex:2] setAnimatedBadge:NO]; if ([self respondsToSelector:@selector(removeApplicationBadge)]) [self removeApplicationBadge]; else // XXX: maybe use setApplicationBadgeString also? @@ -7647,7 +7795,7 @@ static _finline void _setHomePage(Cydia *self) { } Queuing_ = false; - [toolbar_ setBadgeValue:nil forButton:4]; + [[[toolbar_ items] objectAtIndex:3] setBadgeValue:nil]; [self _updateData]; @@ -7656,13 +7804,15 @@ static _finline void _setHomePage(Cydia *self) { else { loaded = true; - if (NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]) { + NSDate *update([Metadata_ objectForKey:@"LastUpdate"]); + + if (update != nil) { NSTimeInterval interval([update timeIntervalSinceNow]); if (interval <= 0 && interval > -(15*60)) goto loaded; } - [book_ update]; + [book_ setUpdate:update]; } } @@ -7729,6 +7879,7 @@ static _finline void _setHomePage(Cydia *self) { return false; confirm_ = [[RVBook alloc] initWithFrame:[self popUpBounds]]; + [confirm_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [confirm_ setDelegate:self]; ConfirmationView *page([[[ConfirmationView alloc] initWithBook:confirm_ database:database_] autorelease]); @@ -7754,6 +7905,15 @@ static _finline void _setHomePage(Cydia *self) { } } +- (void) installPackages:(NSArray *)packages { + @synchronized (self) { + for (Package *package in packages) + [package install]; + [self resolve]; + [self perform]; + } +} + - (void) installPackage:(Package *)package { @synchronized (self) { [package install]; @@ -7838,21 +7998,42 @@ static _finline void _setHomePage(Cydia *self) { return sections_; } -- (void) buttonBarItemTapped:(id)sender { - unsigned tag = [sender tag]; +- (ChangesView *) changesView { + if (changes_ == nil) + changes_ = [[ChangesView alloc] initWithBook:book_ database:database_ delegate:self]; + return changes_; +} + +- (ManageView *) manageView { + if (manage_ == nil) + manage_ = (ManageView *) [[self + _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]] + withClass:[ManageView class] + ] retain]; + return manage_; +} + +- (SearchView *) searchView { + if (search_ == nil) + search_ = [[SearchView alloc] initWithBook:book_ database:database_]; + return search_; +} + +- (void) tabBar:(UITabBar *)sender didSelectItem:(UITabBarItem *)item { + int tag = [item tag]; if (tag == tag_) { [book_ resetViewAnimated:YES]; return; - } else if (tag_ == 2) + } else if (tag_ == 1) [[self sectionsView] resetView]; switch (tag) { - case 1: _setHomePage(self); break; + case 0: _setHomePage(self); break; - case 2: [self setPage:[self sectionsView]]; break; - case 3: [self setPage:changes_]; break; - case 4: [self setPage:manage_]; break; - case 5: [self setPage:search_]; break; + case 1: [self setPage:[self sectionsView]]; break; + case 2: [self setPage:[self changesView]]; break; + case 3: [self setPage:[self manageView]]; break; + case 4: [self setPage:[self searchView]]; break; _nodefault } @@ -7959,7 +8140,7 @@ static _finline void _setHomePage(Cydia *self) { [self _reloadData]; else { Queuing_ = true; - [toolbar_ setBadgeValue:UCLocalize("Q_D") forButton:4]; + [[[toolbar_ items] objectAtIndex:3] setBadgeValue:UCLocalize("Q_D")]; [book_ reloadData]; } @@ -8049,6 +8230,8 @@ static _finline void _setHomePage(Cydia *self) { - (UIProgressHUD *) addProgressHUD { UIProgressHUD *hud([[[UIProgressHUD alloc] initWithWindow:window_] autorelease]); + [hud setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [window_ setUserInteractionEnabled:NO]; [hud show:YES]; [progress_ addSubview:hud]; @@ -8075,7 +8258,7 @@ static _finline void _setHomePage(Cydia *self) { - (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag { if (tag != NULL) - tag = 0; + *tag = -1; NSString *href([url absoluteString]); if ([href hasPrefix:@"apptapp://package/"]) @@ -8127,8 +8310,8 @@ static _finline void _setHomePage(Cydia *self) { int tag; if (RVPage *page = [self pageForURL:url hasTag:&tag]) { [self setPage:page]; - [toolbar_ showSelectionForButton:tag]; tag_ = tag; + [toolbar_ setSelectedItem:(tag_ == -1 ? nil : [items_ objectAtIndex:tag_])]; } } @@ -8143,23 +8326,31 @@ static _finline void _setHomePage(Cydia *self) { Font18Bold_ = [[UIFont boldSystemFontOfSize:18] retain]; Font22Bold_ = [[UIFont boldSystemFontOfSize:22] retain]; - tag_ = 1; + tag_ = 0; essential_ = [[NSMutableArray alloc] initWithCapacity:4]; broken_ = [[NSMutableArray alloc] initWithCapacity:4]; - window_ = [[UIWindow alloc] initWithContentRect:[UIHardware fullScreenApplicationContentRect]]; + UIScreen *screen([UIScreen mainScreen]); + + window_ = [[UIWindow alloc] initWithFrame:[screen bounds]]; [window_ orderFront:self]; [window_ makeKey:self]; [window_ setHidden:NO]; + root_ = [[CydiaViewController alloc] init]; + [window_ addSubview:[root_ view]]; + database_ = [Database sharedInstance]; - progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self]; + progress_ = [[ProgressView alloc] initWithFrame:[[root_ view] bounds] database:database_ delegate:self]; + [progress_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; + [[root_ view] addSubview:progress_]; + [database_ setDelegate:progress_]; - [window_ setContentView:progress_]; underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]]; + [underlay_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [progress_ setContentView:underlay_]; [progress_ resetView]; @@ -8182,7 +8373,7 @@ static _finline void _setHomePage(Cydia *self) { [hud_ setText:@"Reorganizing\n\nWill Automatically\nClose When Done"]; [self setStatusBarShowsProgress:YES]; - [self yieldToSelector:@selector(system) withObject:@"http://www.hipsterwave.com/tag/cydia/"]; + [self yieldToSelector:@selector(system:) withObject:@"/usr/libexec/cydia/free.sh"]; [self setStatusBarShowsProgress:NO]; [self removeProgressHUD:hud_]; @@ -8201,112 +8392,68 @@ static _finline void _setHomePage(Cydia *self) { _trace(); overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]]; + [overlay_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; CGRect screenrect = [UIHardware fullScreenApplicationContentRect]; + book_ = [[CYBook alloc] initWithFrame:CGRectMake( 0, 0, screenrect.size.width, screenrect.size.height - 48 ) database:database_]; - [book_ setDelegate:self]; - + [book_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [overlay_ addSubview:book_]; - NSArray *buttonitems = [NSArray arrayWithObjects: - [NSDictionary dictionaryWithObjectsAndKeys: - @"buttonBarItemTapped:", kUIButtonBarButtonAction, - @"home-up.png", kUIButtonBarButtonInfo, - @"home-dn.png", kUIButtonBarButtonSelectedInfo, - [NSNumber numberWithInt:1], kUIButtonBarButtonTag, - self, kUIButtonBarButtonTarget, - @"Cydia", kUIButtonBarButtonTitle, - @"0", kUIButtonBarButtonType, - nil], - - [NSDictionary dictionaryWithObjectsAndKeys: - @"buttonBarItemTapped:", kUIButtonBarButtonAction, - @"install-up.png", kUIButtonBarButtonInfo, - @"install-dn.png", kUIButtonBarButtonSelectedInfo, - [NSNumber numberWithInt:2], kUIButtonBarButtonTag, - self, kUIButtonBarButtonTarget, - UCLocalize("SECTIONS"), kUIButtonBarButtonTitle, - @"0", kUIButtonBarButtonType, - nil], - - [NSDictionary dictionaryWithObjectsAndKeys: - @"buttonBarItemTapped:", kUIButtonBarButtonAction, - @"changes-up.png", kUIButtonBarButtonInfo, - @"changes-dn.png", kUIButtonBarButtonSelectedInfo, - [NSNumber numberWithInt:3], kUIButtonBarButtonTag, - self, kUIButtonBarButtonTarget, - UCLocalize("CHANGES"), kUIButtonBarButtonTitle, - @"0", kUIButtonBarButtonType, - nil], - - [NSDictionary dictionaryWithObjectsAndKeys: - @"buttonBarItemTapped:", kUIButtonBarButtonAction, - @"manage-up.png", kUIButtonBarButtonInfo, - @"manage-dn.png", kUIButtonBarButtonSelectedInfo, - [NSNumber numberWithInt:4], kUIButtonBarButtonTag, - self, kUIButtonBarButtonTarget, - UCLocalize("MANAGE"), kUIButtonBarButtonTitle, - @"0", kUIButtonBarButtonType, - nil], - - [NSDictionary dictionaryWithObjectsAndKeys: - @"buttonBarItemTapped:", kUIButtonBarButtonAction, - @"search-up.png", kUIButtonBarButtonInfo, - @"search-dn.png", kUIButtonBarButtonSelectedInfo, - [NSNumber numberWithInt:5], kUIButtonBarButtonTag, - self, kUIButtonBarButtonTarget, - UCLocalize("SEARCH"), kUIButtonBarButtonTitle, - @"0", kUIButtonBarButtonType, - nil], - nil]; + [book_ setDelegate:self]; - toolbar_ = [[UIToolbar alloc] - initInView:overlay_ - withFrame:CGRectMake( + items_ = [[NSArray arrayWithObjects: + [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home.png"] tag:0] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("SECTIONS") image:[UIImage applicationImageNamed:@"install.png"] tag:1] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage applicationImageNamed:@"changes.png"] tag:2] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("MANAGE") image:[UIImage applicationImageNamed:@"manage.png"] tag:3] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search.png"] tag:4] autorelease], + nil] retain]; + + toolbar_ = [[UITabBar alloc] + initWithFrame:CGRectMake( 0, screenrect.size.height - ButtonBarHeight_, screenrect.size.width, ButtonBarHeight_ ) - withItemList:buttonitems ]; + [toolbar_ setItems:items_]; + + [toolbar_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)]; + [overlay_ addSubview:toolbar_]; + [toolbar_ setDelegate:self]; - [toolbar_ setBarStyle:1]; - [toolbar_ setButtonBarTrackingMode:2]; - int buttons[5] = {1, 2, 3, 4, 5}; + /*int buttons[5] = {1, 2, 3, 4, 5}; [toolbar_ registerButtonGroup:0 withButtons:buttons withCount:5]; [toolbar_ showButtonGroup:0 withDuration:0]; - for (int i = 0; i != 5; ++i) - [[toolbar_ viewWithTag:(i + 1)] setFrame:CGRectMake( - i * 64 + 2, 1, 60, ButtonBarHeight_ + for (int i = 0; i != 5; ++i) { + UIView *button([toolbar_ viewWithTag:(i + 1)]); + + [button setFrame:CGRectMake( + i * (screenrect.size.width / 5) + (screenrect.size.width / 5 - ButtonBarWidth_) / 2, 1, + ButtonBarWidth_, ButtonBarHeight_ )]; - [toolbar_ showSelectionForButton:1]; - [overlay_ addSubview:toolbar_]; + [button setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; + }*/ + + [toolbar_ setSelectedItem:[items_ objectAtIndex:0]]; [UIKeyboard initImplementationNow]; - CGSize keysize = [UIKeyboard defaultSize]; + /*CGSize keysize = [UIKeyboard defaultSize]; CGRect keyrect = {{0, [overlay_ bounds].size.height}, keysize}; keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect]; - [overlay_ addSubview:keyboard_]; + [overlay_ addSubview:keyboard_];*/ [underlay_ addSubview:overlay_]; [self reloadData]; - [self sectionsView]; - changes_ = [[ChangesView alloc] initWithBook:book_ database:database_]; - search_ = [[SearchView alloc] initWithBook:book_ database:database_]; - - manage_ = (ManageView *) [[self - _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]] - withClass:[ManageView class] - ] retain]; - #if RecyclePackageViews details_ = [[NSMutableArray alloc] initWithCapacity:4]; [details_ addObject:[self _packageView]]; @@ -8345,6 +8492,7 @@ static _finline void _setHomePage(Cydia *self) { } - (void) slideUp:(UIActionSheet *)alert { + [alert setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; [alert presentSheetInView:overlay_]; } @@ -8375,9 +8523,16 @@ MSHook(void, UIWebDocumentView$_setUIKitDelegate$, UIWebDocumentView *self, SEL int main(int argc, char *argv[]) { _pooled _trace(); + if (Class $UIDevice = objc_getClass("UIDevice")) { + UIDevice *device([$UIDevice currentDevice]); + IsWildcat_ = [device respondsToSelector:@selector(isWildcat)] && [device isWildcat]; + } else + IsWildcat_ = false; + PackageName = reinterpret_cast(method_getImplementation(class_getInstanceMethod([Package class], @selector(cyname)))); /* Library Hacks {{{ */ + class_addMethod(objc_getClass("WebScriptObject"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &WebScriptObject$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16"); class_addMethod(objc_getClass("DOMNodeList"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &DOMNodeList$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16"); $WebDefaultUIKitDelegate = objc_getClass("WebDefaultUIKitDelegate"); @@ -8392,12 +8547,16 @@ int main(int argc, char *argv[]) { _pooled Languages_ = [NSLocale preferredLanguages]; //CFStringRef locale(CFLocaleGetIdentifier(Locale_)); //NSLog(@"%@", [Languages_ description]); + const char *lang; if (Languages_ == nil || [Languages_ count] == 0) + // XXX: consider just setting to C and then falling through? lang = NULL; - else + else { lang = [[Languages_ objectAtIndex:0] UTF8String]; - setenv("LANG", lang, true); + setenv("LANG", lang, true); + } + //std::setlocale(LC_ALL, lang); NSLog(@"Setting Language: %s", lang); /* }}} */ @@ -8517,6 +8676,8 @@ int main(int argc, char *argv[]) { _pooled Packages_ = [Metadata_ objectForKey:@"Packages"]; Sections_ = [Metadata_ objectForKey:@"Sections"]; Sources_ = [Metadata_ objectForKey:@"Sources"]; + + Token_ = [Metadata_ objectForKey:@"Token"]; } if (Settings_ != nil) @@ -8544,15 +8705,19 @@ int main(int argc, char *argv[]) { _pooled Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil]; + if (substrate && access("/Library/MobileSubstrate/DynamicLibraries/SimulatedKeyEvents.dylib", F_OK) == 0) + dlopen("/Library/MobileSubstrate/DynamicLibraries/SimulatedKeyEvents.dylib", RTLD_LAZY | RTLD_GLOBAL); if (substrate && access("/Applications/WinterBoard.app/WinterBoard.dylib", F_OK) == 0) dlopen("/Applications/WinterBoard.app/WinterBoard.dylib", RTLD_LAZY | RTLD_GLOBAL); /*if (substrate && access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0) dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);*/ + int version([[NSString stringWithContentsOfFile:@"/var/lib/cydia/firmware.ver"] intValue]); + if (access("/tmp/.cydia.fw", F_OK) == 0) { unlink("/tmp/.cydia.fw"); goto firmware; - } else if (access("/User", F_OK) != 0) { + } else if (access("/User", F_OK) != 0 || version < 2) { firmware: _trace(); system("/usr/libexec/cydia/firmware.sh"); @@ -8603,7 +8768,8 @@ int main(int argc, char *argv[]) { _pooled if ($GSFontSetUseLegacyFontMetrics != NULL) $GSFontSetUseLegacyFontMetrics(YES); - UIKeyboardDisableAutomaticAppearance(); + // XXX: I have a feeling this was important + //UIKeyboardDisableAutomaticAppearance(); /* }}} */ Colon_ = UCLocalize("COLON_DELIMITED");