}
- (int) yieldToPopupAlertAnimated:(BOOL)animated;
+
@end
@implementation CYAlertView
- (id) initWithTitle:(NSString *)title buttons:(NSArray *)buttons defaultButtonIndex:(int)index {
- if ((self = [super init])) {
+ if ((self = [super init]) != nil) {
[self setTitle:title];
[self setDelegate:self];
for (NSString *button in buttons) [self addButtonWithTitle:button];
#define TrackResize (0 && !ForRelease)
#define ManualRefresh (1 && !ForRelease)
#define ShowInternals (0 && !ForRelease)
-#define IgnoreInstall (0 && !ForRelease)
#define AlwaysReload (0 && !ForRelease)
#define TryIndexedCollation (0 && !ForRelease)
+ (Address *) addressWithString:(NSString *)string;
- (Address *) initWithString:(NSString *)string;
+
@end
@implementation Address
}
+ (NSArray *) _attributeKeys {
- return [NSArray arrayWithObjects:@"address", @"name", nil];
+ return [NSArray arrayWithObjects:
+ @"address",
+ @"name",
+ nil];
}
- (NSArray *) attributeKeys {
return (end - begin) * fraction + begin;
}
-/* XXX: localize this! */
-NSString *SizeString(double size) {
- bool negative = size < 0;
- if (negative)
- size = -size;
-
- unsigned power = 0;
- while (size > 1024) {
- size /= 1024;
- ++power;
- }
-
- static const char *powers_[] = {"B", "kB", "MB", "GB"};
-
- return [NSString stringWithFormat:@"%s%.1f %s", (negative ? "-" : ""), size, powers_[power]];
-}
-
static _finline const char *StripVersion_(const char *version) {
const char *colon(strchr(version, ':'));
return colon == NULL ? version : colon + 1;
- (pkgSourceList &) list;
- (NSArray *) packages;
- (NSArray *) sources;
+- (Source *) sourceWithKey:(NSString *)key;
- (void) reloadData;
- (void) configure;
}
+ (NSArray *) _attributeKeys {
- return [NSArray arrayWithObjects:@"description", @"distribution", @"host", @"key", @"label", @"name", @"origin", @"trusted", @"type", @"uri", @"version", nil];
+ return [NSArray arrayWithObjects:
+ @"description",
+ @"distribution",
+ @"host",
+ @"key",
+ @"label",
+ @"name",
+ @"origin",
+ @"trusted",
+ @"type",
+ @"uri",
+ @"version",
+ nil];
}
- (NSArray *) attributeKeys {
@end
/* }}} */
-/* Relationship Class {{{ */
-@interface Relationship : NSObject {
- NSString *type_;
- NSString *id_;
+/* CydiaOperation Class {{{ */
+@interface CydiaOperation : NSObject {
+ NSString *operator_;
+ NSString *value_;
}
-- (NSString *) type;
-- (NSString *) id;
-- (NSString *) name;
+- (NSString *) operator;
+- (NSString *) value;
@end
-@implementation Relationship
+@implementation CydiaOperation
- (void) dealloc {
- [type_ release];
- [id_ release];
+ [operator_ release];
+ [value_ release];
[super dealloc];
}
-- (NSString *) type {
- return type_;
+- (id) initWithOperator:(const char *)_operator value:(const char *)value {
+ if ((self = [super init]) != nil) {
+ operator_ = [[NSString alloc] initWithUTF8String:_operator];
+ value_ = [[NSString alloc] initWithUTF8String:value];
+ } return self;
}
-- (NSString *) id {
- return id_;
++ (NSArray *) _attributeKeys {
+ return [NSArray arrayWithObjects:
+ @"operator",
+ @"value",
+ nil];
}
-- (NSString *) name {
- _assert(false);
- return nil;
+- (NSArray *) attributeKeys {
+ return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+ return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
+- (NSString *) operator {
+ return operator_;
+}
+
+- (NSString *) value {
+ return value_;
+}
+
+@end
+/* }}} */
+/* CydiaRelation Class {{{ */
+@interface CydiaRelation : NSObject {
+ NSString *relationship_;
+ NSString *package_;
+ CydiaOperation *version_;
+}
+
+- (NSString *) relationship;
+- (NSString *) package;
+- (CydiaOperation *) version;
+
+@end
+
+@implementation CydiaRelation
+
+- (void) dealloc {
+ [relationship_ release];
+ [package_ release];
+ [version_ release];
+ [super dealloc];
+}
+
+- (id) initWithIterator:(pkgCache::DepIterator &)dep {
+ if ((self = [super init]) != nil) {
+ relationship_ = [[NSString alloc] initWithUTF8String:dep.DepType()];
+ package_ = [[NSString alloc] initWithUTF8String:dep.TargetPkg().Name()];
+
+ if (const char *version = dep.TargetVer())
+ version_ = [[CydiaOperation alloc] initWithOperator:dep.CompType() value:version];
+ else
+ version_ = [[NSNull null] retain];
+ } return self;
+}
+
++ (NSArray *) _attributeKeys {
+ return [NSArray arrayWithObjects:
+ @"package",
+ @"relationship",
+ @"version",
+ nil];
+}
+
+- (NSArray *) attributeKeys {
+ return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+ return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
+- (NSString *) relationship {
+ return relationship_;
+}
+
+- (NSString *) package {
+ return package_;
+}
+
+- (CydiaOperation *) version {
+ return version_;
}
@end
}
+ (NSString *) webScriptNameForSelector:(SEL)selector {
- if (selector == @selector(hasTag:))
+ if (false);
+ else if (selector == @selector(clear))
+ return @"clear";
+ else if (selector == @selector(hasTag:))
return @"hasTag";
+ else if (selector == @selector(install))
+ return @"install";
+ else if (selector == @selector(remove))
+ return @"remove";
else
return nil;
}
}
+ (NSArray *) _attributeKeys {
- return [NSArray arrayWithObjects:@"applications", @"author", @"depiction", @"longDescription", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"longSection", @"maintainer", @"mode", @"name", @"purposes", @"section", @"shortDescription", @"shortSection", @"simpleSection", @"size", @"source", @"sponsor", @"support", @"warnings", nil];
+ return [NSArray arrayWithObjects:
+ @"applications",
+ @"author",
+ @"depiction",
+ @"essential",
+ @"homepage",
+ @"icon",
+ @"id",
+ @"installed",
+ @"latest",
+ @"longDescription",
+ @"longSection",
+ @"maintainer",
+ @"mode",
+ @"name",
+ @"purposes",
+ @"relations",
+ @"section",
+ @"shortDescription",
+ @"shortSection",
+ @"simpleSection",
+ @"size",
+ @"source",
+ @"sponsor",
+ @"support",
+ @"warnings",
+ nil];
}
- (NSArray *) attributeKeys {
return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
}
+- (NSArray *) relations {
+@synchronized (database_) {
+ NSMutableArray *relations([NSMutableArray arrayWithCapacity:16]);
+
+ for (pkgCache::DepIterator dep(version_.DependsList()); !dep.end(); ++dep) {
+ pkgCache::DepIterator start;
+ pkgCache::DepIterator end;
+ dep.GlobOr(start, end); // ++dep
+
+ NSMutableArray *ors([NSMutableArray arrayWithCapacity:2]);
+ [relations addObject:ors];
+
+ _forever {
+ [ors addObject:[[[CydiaRelation alloc] initWithIterator:start] autorelease]];
+
+ // yes, seriously. (wtf?)
+ if (start == end)
+ break;
+ ++start;
+ }
+ }
+
+ return relations;
+} }
+
- (void) parse {
if (parsed_ != NULL)
return;
// XXX: actually implement this thing
_assert(false);
if (deadSources_)
- CFRelease(deadSources_);
+ CFRelease(deadSources_);
[self releasePackages];
apr_pool_destroy(pool_);
NSRecycleZone(zone_);
return sources;
}
-- (NSArray *) issues {
- if (cache_->BrokenCount() == 0)
- return nil;
-
- NSMutableArray *issues([NSMutableArray arrayWithCapacity:4]);
-
- for (Package *package in [self packages]) {
- if (![package broken])
- continue;
- pkgCache::PkgIterator pkg([package iterator]);
-
- NSMutableArray *entry([NSMutableArray arrayWithCapacity:4]);
- [entry addObject:[package name]];
- [issues addObject:entry];
-
- pkgCache::VerIterator ver(cache_[pkg].InstVerIter(cache_));
- if (ver.end())
- continue;
-
- for (pkgCache::DepIterator dep(ver.DependsList()); !dep.end(); ) {
- pkgCache::DepIterator start;
- pkgCache::DepIterator end;
- dep.GlobOr(start, end); // ++dep
-
- if (!cache_->IsImportantDep(end))
- continue;
- if ((cache_[end] & pkgDepCache::DepGInstall) != 0)
- continue;
-
- NSMutableArray *failure([NSMutableArray arrayWithCapacity:4]);
- [entry addObject:failure];
- [failure addObject:[NSString stringWithUTF8String:start.DepType()]];
-
- NSString *name([NSString stringWithUTF8String:start.TargetPkg().Name()]);
- if (Package *package = [self packageWithName:name])
- name = [package name];
- [failure addObject:name];
-
- pkgCache::PkgIterator target(start.TargetPkg());
- if (target->ProvidesList != 0)
- [failure addObject:@"?"];
- else {
- pkgCache::VerIterator ver(cache_[target].InstVerIter(cache_));
- if (!ver.end())
- [failure addObject:[NSString stringWithUTF8String:ver.VerStr()]];
- else if (!cache_[target].CandidateVerIter(cache_).end())
- [failure addObject:@"-"];
- else if (target->ProvidesList == 0)
- [failure addObject:@"!"];
- else
- [failure addObject:@"%"];
- }
-
- _forever {
- if (start.TargetVer() != 0)
- [failure addObject:[NSString stringWithFormat:@"%s %s", start.CompType(), start.TargetVer()]];
- if (start == end)
- break;
- ++start;
- }
- }
- }
-
- return issues;
+- (Source *) sourceWithKey:(NSString *)key {
+ for (Source *source in [self sources]) {
+ if ([[source key] isEqualToString:key])
+ return source;
+ } return nil;
}
- (bool) popErrorWithTitle:(NSString *)title {
delete resolver_;
resolver_ = new pkgProblemResolver(cache_);
- for (pkgCache::PkgIterator iterator(cache_->PkgBegin()); !iterator.end(); ++iterator) {
- if (!cache_[iterator].Keep()) {
+ for (pkgCache::PkgIterator iterator(cache_->PkgBegin()); !iterator.end(); ++iterator)
+ if (!cache_[iterator].Keep())
cache_->MarkKeep(iterator, false);
+ else if ((cache_[iterator].iFlags & pkgDepCache::ReInstall) != 0)
cache_->SetReInstall(iterator, false);
- }
- }
} }
- (void) configure {
}
- (id) initWithDelegate:(IndirectDelegate *)indirect;
+
@end
@implementation CydiaObject
}
+ (NSArray *) _attributeKeys {
- return [NSArray arrayWithObjects:@"device", @"firewire", @"imei", @"mac", @"serial", nil];
+ return [NSArray arrayWithObjects:
+ @"device",
+ @"firewire",
+ @"imei",
+ @"mac",
+ @"serial",
+ nil];
}
- (NSArray *) attributeKeys {
#endif
+ (NSString *) webScriptNameForSelector:(SEL)selector {
- if (selector == @selector(close))
+ if (false);
+ else if (selector == @selector(close))
return @"close";
+ else if (selector == @selector(du:))
+ return @"du";
+ else if (selector == @selector(stringWithFormat:arguments:))
+ return @"format";
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(localizedStringForKey:value:table:))
+ return @"localize";
else if (selector == @selector(setButtonImage:withStyle:toFunction:))
return @"setButtonImage";
else if (selector == @selector(setButtonTitle:withStyle:toFunction:))
return @"setToken";
else if (selector == @selector(setViewportWidth:))
return @"setViewportWidth";
- else if (selector == @selector(supports:))
- return @"supports";
- else if (selector == @selector(stringWithFormat:arguments:))
- return @"format";
- else if (selector == @selector(localizedStringForKey:value:table:))
- return @"localize";
- else if (selector == @selector(du:))
- return @"du";
else if (selector == @selector(statfs:))
return @"statfs";
+ else if (selector == @selector(supports:))
+ return @"supports";
else
return nil;
}
@implementation CYLoadingIndicator
-- (id)initWithFrame:(CGRect)frame {
- if ((self = [super initWithFrame:frame])) {
+- (id) initWithFrame:(CGRect)frame {
+ if ((self = [super initWithFrame:frame]) != nil) {
container_ = [[[UIView alloc] init] autorelease];
[container_ setAutoresizingMask:UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin];
[spinner_ setFrame:spinrect];
[label_ setFrame:textrect];
[self addSubview:container_];
- }
+ } return self;
+}
- return self;
+- (UILabel *) label {
+ return label_;
}
-- (UILabel *)label { return label_; }
-- (UIActivityIndicatorView *)activityIndicatorView { return spinner_; }
+- (UIActivityIndicatorView *) activityIndicatorView {
+ return spinner_;
+}
@end
/* }}} */
UITabBar *tabbar_;
UINavigationBar *navbar_;
}
+
@end
@implementation CYEmulatedLoadingController
}
- (id) initWithDatabase:(Database *)database {
- if ((self = [super init])) {
+ if ((self = [super init]) != nil) {
database_ = database;
[database_ setDelegate:self];
} return self;
@end
/* }}} */
+// CydiaScript {{{
+@interface NSObject (CydiaScript)
+- (id) Cydia$webScriptObjectInContext:(WebScriptObject *)context;
+@end
+
+@implementation NSObject (CydiaScript)
+
+- (id) Cydia$webScriptObjectInContext:(WebScriptObject *)context {
+ return self;
+}
+
+@end
+
+@implementation NSArray (CydiaScript)
+
+- (id) Cydia$webScriptObjectInContext:(WebScriptObject *)context {
+ WebScriptObject *object([context evaluateWebScript:@"[]"]);
+ for (size_t i(0), e([self count]); i != e; ++i)
+ [object setWebScriptValueAtIndex:i value:[[self objectAtIndex:i] Cydia$webScriptObjectInContext:context]];
+ return object;
+}
+
+@end
+
+@implementation NSDictionary (CydiaScript)
+
+- (id) Cydia$webScriptObjectInContext:(WebScriptObject *)context {
+ WebScriptObject *object([context evaluateWebScript:@"({})"]);
+ for (id i in self)
+ [object setValue:[[self objectForKey:i] Cydia$webScriptObjectInContext:context] forKey:i];
+ return object;
+}
+
+@end
+// }}}
+
/* Confirmation Controller {{{ */
bool DepSubstrate(const pkgCache::VerIterator &iterator) {
if (!iterator.end())
@interface ConfirmationController : CYBrowserController {
_transient Database *database_;
+
UIAlertView *essential_;
- NSArray *changes_;
- NSArray *issues_;
- NSArray *sizes_;
+
+ NSDictionary *changes_;
+ NSMutableArray *issues_;
+ NSDictionary *sizes_;
+
BOOL substrate_;
}
- (void) dealloc {
[changes_ release];
- if (issues_ != nil)
- [issues_ release];
+ [issues_ release];
[sizes_ release];
+
if (essential_ != nil)
[essential_ release];
+
[super dealloc];
}
- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
[super webView:view didClearWindowObject:window forFrame:frame];
- [window setValue:changes_ forKey:@"changes"];
- [window setValue:issues_ forKey:@"issues"];
- [window setValue:sizes_ forKey:@"sizes"];
+
+ [window setValue:[changes_ Cydia$webScriptObjectInContext:window] forKey:@"changes"];
+ [window setValue:[issues_ Cydia$webScriptObjectInContext:window] forKey:@"issues"];
+ [window setValue:[sizes_ Cydia$webScriptObjectInContext:window] forKey:@"sizes"];
+
[window setValue:self forKey:@"queue"];
}
if ((self = [super init]) != nil) {
database_ = database;
- [[self navigationItem] setTitle:UCLocalize("CONFIRM")];
-
- NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16];
- NSMutableArray *reinstalling = [NSMutableArray arrayWithCapacity:16];
- NSMutableArray *upgrading = [NSMutableArray arrayWithCapacity:16];
- NSMutableArray *downgrading = [NSMutableArray arrayWithCapacity:16];
- NSMutableArray *removing = [NSMutableArray arrayWithCapacity:16];
+ NSMutableArray *installs([NSMutableArray arrayWithCapacity:16]);
+ NSMutableArray *reinstalls([NSMutableArray arrayWithCapacity:16]);
+ NSMutableArray *upgrades([NSMutableArray arrayWithCapacity:16]);
+ NSMutableArray *downgrades([NSMutableArray arrayWithCapacity:16]);
+ NSMutableArray *removes([NSMutableArray arrayWithCapacity:16]);
bool remove(false);
+ pkgCacheFile &cache([database_ cache]);
+ NSArray *packages([database_ packages]);
pkgDepCache::Policy *policy([database_ policy]);
- pkgCacheFile &cache([database_ cache]);
- NSArray *packages = [database_ packages];
+ issues_ = [[NSMutableArray arrayWithCapacity:4] retain];
+
for (Package *package in packages) {
- pkgCache::PkgIterator iterator = [package iterator];
+ pkgCache::PkgIterator iterator([package iterator]);
+ NSString *name([package id]);
+
+ if ([package broken]) {
+ NSMutableArray *reasons([NSMutableArray arrayWithCapacity:4]);
+
+ [issues_ addObject:[NSDictionary dictionaryWithObjectsAndKeys:
+ name, @"package",
+ reasons, @"reasons",
+ nil]];
+
+ pkgCache::VerIterator ver(cache[iterator].InstVerIter(cache));
+ if (ver.end())
+ continue;
+
+ for (pkgCache::DepIterator dep(ver.DependsList()); !dep.end(); ) {
+ pkgCache::DepIterator start;
+ pkgCache::DepIterator end;
+ dep.GlobOr(start, end); // ++dep
+
+ if (!cache->IsImportantDep(end))
+ continue;
+ if ((cache[end] & pkgDepCache::DepGInstall) != 0)
+ continue;
+
+ _forever {
+ NSString *reason, *installed((NSString *) [WebUndefined undefined]);
+
+ pkgCache::PkgIterator target(start.TargetPkg());
+ if (target->ProvidesList != 0)
+ reason = @"missing";
+ else {
+ pkgCache::VerIterator ver(cache[target].InstVerIter(cache));
+ if (!ver.end()) {
+ reason = @"installed";
+ installed = [NSString stringWithUTF8String:ver.VerStr()];
+ } else if (!cache[target].CandidateVerIter(cache).end())
+ reason = @"uninstalled";
+ else if (target->ProvidesList == 0)
+ reason = @"uninstallable";
+ else
+ reason = @"virtual";
+ }
+
+ NSDictionary *version(start.TargetVer() == 0 ? [NSNull null] : [NSDictionary dictionaryWithObjectsAndKeys:
+ [NSString stringWithUTF8String:start.CompType()], @"operator",
+ [NSString stringWithUTF8String:start.TargetVer()], @"value",
+ nil]);
+
+ [reasons addObject:[NSDictionary dictionaryWithObjectsAndKeys:
+ [NSString stringWithUTF8String:start.DepType()], @"relation",
+ [NSString stringWithUTF8String:start.TargetPkg().Name()], @"package",
+ version, @"version",
+ reason, @"reason",
+ installed, @"installed",
+ nil]];
+
+ // yes, seriously. (wtf?)
+ if (start == end)
+ break;
+ ++start;
+ }
+ }
+ }
+
pkgDepCache::StateCache &state(cache[iterator]);
- NSString *name([package name]);
+ static Pcre special_r("^(firmware$|gsc\\.|cy\\+)");
if (state.NewInstall())
- [installing addObject:name];
+ [installs addObject:name];
else if (!state.Delete() && (state.iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)
- [reinstalling addObject:name];
+ [reinstalls addObject:name];
else if (state.Upgrade())
- [upgrading addObject:name];
+ [upgrades addObject:name];
else if (state.Downgrade())
- [downgrading addObject:name];
- else if (state.Delete()) {
+ [downgrades addObject:name];
+ else if (!state.Delete())
+ continue;
+ else if (special_r(name))
+ [issues_ addObject:[NSDictionary dictionaryWithObjectsAndKeys:
+ [NSNull null], @"package",
+ [NSArray arrayWithObjects:
+ [NSDictionary dictionaryWithObjectsAndKeys:
+ @"Conflicts", @"relation",
+ name, @"package",
+ [NSNull null], @"version",
+ @"installed", @"reason",
+ nil],
+ nil], @"reasons",
+ nil]];
+ else {
if ([package essential])
remove = true;
- [removing addObject:name];
- } else continue;
+ [removes addObject:name];
+ }
substrate_ |= DepSubstrate(policy->GetCandidateVer(iterator));
substrate_ |= DepSubstrate(iterator.CurrentVer());
message:UCLocalize("REMOVING_ESSENTIALS_EX")
delegate:self
cancelButtonTitle:[NSString stringWithFormat:parenthetical, UCLocalize("CANCEL_OPERATION"), UCLocalize("SAFE")]
- otherButtonTitles:[NSString stringWithFormat:parenthetical, UCLocalize("FORCE_REMOVAL"), UCLocalize("UNSAFE")], nil
+ otherButtonTitles:
+ [NSString stringWithFormat:parenthetical, UCLocalize("FORCE_REMOVAL"), UCLocalize("UNSAFE")],
+ nil
];
[essential_ setContext:@"remove"];
[essential_ setContext:@"unable"];
}
- changes_ = [[NSArray alloc] initWithObjects:
- installing,
- reinstalling,
- upgrading,
- downgrading,
- removing,
+ changes_ = [[NSDictionary alloc] initWithObjectsAndKeys:
+ installs, @"installs",
+ reinstalls, @"reinstalls",
+ upgrades, @"upgrades",
+ downgrades, @"downgrades",
+ removes, @"removes",
nil];
- issues_ = [database_ issues];
- if (issues_ != nil)
- issues_ = [issues_ retain];
-
- sizes_ = [[NSArray alloc] initWithObjects:
- SizeString([database_ fetcher].FetchNeeded()),
- SizeString([database_ fetcher].PartialPresent()),
+ sizes_ = [[NSDictionary alloc] initWithObjectsAndKeys:
+ [NSNumber numberWithInteger:[database_ fetcher].FetchNeeded()], @"downloading",
+ [NSNumber numberWithInteger:[database_ fetcher].PartialPresent()], @"resuming",
nil];
[self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/confirm/", UI_]]];
} return self;
}
+#if !AlwaysReload
- (void) applyRightButton {
-#if !AlwaysReload && !IgnoreInstall
- if (issues_ == nil && ![self isLoading])
+ if ([issues_ count] == 0 && ![self isLoading])
[[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
initWithTitle:UCLocalize("CONFIRM")
style:UIBarButtonItemStyleDone
action:@selector(confirmButtonClicked)
] autorelease]];
else
- [super applyRightButton];
-#else
- [[self navigationItem] setRightBarButtonItem:nil];
-#endif
+ [[self navigationItem] setRightBarButtonItem:nil];
}
+#endif
- (void) cancelButtonClicked {
[self dismissModalViewControllerAnimated:YES];
#if !AlwaysReload
- (void) confirmButtonClicked {
-#if IgnoreInstall
- return;
-#endif
if (essential_ != nil)
[essential_ show];
else {
- (SEL) selector;
- (id) target;
- (id) object;
+
@end
@implementation ProgressData
[self positionViews];
}
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
[self positionViews];
}
message:[NSString stringWithFormat:@"%@\n\n%@", UCLocalize("CONFIGURATION_UPGRADE_EX"), ofile]
delegate:self
cancelButtonTitle:UCLocalize("KEEP_OLD_COPY")
- otherButtonTitles:UCLocalize("ACCEPT_NEW_COPY"),
- // XXX: UCLocalize("SEE_WHAT_CHANGED"),
+ otherButtonTitles:
+ UCLocalize("ACCEPT_NEW_COPY"),
+ // XXX: UCLocalize("SEE_WHAT_CHANGED"),
nil
] autorelease];
[super dealloc];
}
-- (void) release {
- [super release];
-}
-
- (NSURL *) navigationURL {
- return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@", [package_ id]]];
+ return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@", name_]];
}
/* XXX: this is not safe at all... localization of /fail/ */
}
#endif
-- (void) viewWillAppear:(BOOL)animated {
- [super viewWillAppear:animated];
-}
-
- (id) initWithDatabase:(Database *)database forPackage:(NSString *)name {
if ((self = [super init]) != nil) {
database_ = database;
buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
name_ = [[NSString alloc] initWithString:name];
- [self reloadData];
} return self;
}
/* Home Controller {{{ */
@interface HomeController : CYBrowserController {
}
+
@end
@implementation HomeController
}
- (void) queueStatusDidChange;
+
@end
@implementation ManageController
}
- (void) viewDidLoad {
- [[self navigationItem] setTitle:UCLocalize("MANAGE")];
-
[[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
initWithTitle:UCLocalize("SETTINGS")
style:UIBarButtonItemStylePlain
[prompt_ setFrame:prmrect];
}
-- (void)setFrame:(CGRect)frame {
+- (void) setFrame:(CGRect)frame {
[super setFrame:frame];
-
[self positionViews];
}
- (id) initWithFrame:(CGRect)frame delegate:(id)delegate {
- if ((self = [super initWithFrame:frame])) {
+ if ((self = [super initWithFrame:frame]) != nil) {
[self setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
[self setBarStyle:UIBarStyleBlack];
_trace();
}
-- (void)editButtonClicked {
- [self setEditing:!editing_];
+- (void) editButtonClicked {
+ [self setEditing:(!editing_)];
}
@end
} return self;
}
-- (void)viewDidAppear:(BOOL)animated {
+- (void) viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
if (!searchloaded_) {
}
- (id) initWithDatabase:(Database *)database package:(NSString *)package {
- if ((self = [super init])) {
+ if ((self = [super init]) != nil) {
database_ = database;
name_ = [package retain];
} return self;
/* }}} */
/* Source Controller {{{ */
@interface SourceController : FilteredPackageListController {
- Source *source_;
+ _transient Source *source_;
+ NSString *key_;
}
- (id) initWithDatabase:(Database *)database source:(Source *)source;
}
- (id) initWithDatabase:(Database *)database source:(Source *)source {
- source_ = source;
-
if ((self = [super initWithDatabase:database title:[source label] filter:@selector(isVisibleInSource:) with:source]) != nil) {
+ source_ = source;
+ key_ = [[source key] retain];
} return self;
}
+- (void) reloadData {
+ source_ = [database_ sourceWithKey:key_];
+ [key_ release];
+ key_ = [[source_ key] retain];
+ [self setObject:source_];
+ [[self navigationItem] setTitle:[source_ label]];
+
+ [super reloadData];
+}
+
@end
/* }}} */
/* Sources Controller {{{ */
[[self navigationController] pushViewController:controller animated:YES];
}
-- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+- (BOOL) tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
Source *source = [self sourceAtIndexPath:indexPath];
return [source record] != nil;
}
-- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
+- (void) tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
Source *source = [self sourceAtIndexPath:indexPath];
[Sources_ removeObjectForKey:[source key]];
[delegate_ syncData];
message:warning
delegate:self
cancelButtonTitle:UCLocalize("CANCEL")
- otherButtonTitles:UCLocalize("ADD_ANYWAY"), nil
+ otherButtonTitles:
+ UCLocalize("ADD_ANYWAY"),
+ nil
] autorelease];
[alert setContext:@"warning"];
return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
}
-- (void)alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
+- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
NSString *context([alert context]);
if ([context isEqualToString:@"source"]) {
message:nil
delegate:self
cancelButtonTitle:UCLocalize("CANCEL")
- otherButtonTitles:UCLocalize("ADD_SOURCE"), nil
+ otherButtonTitles:
+ UCLocalize("ADD_SOURCE"),
+ nil
] autorelease];
[alert setContext:@"source"];
}
- (id) initWithDatabase:(Database *)database delegate:(id)delegate {
- if ((self = [super init])) {
+ if ((self = [super init]) != nil) {
database_ = database;
roledelegate_ = delegate;
} return self;
return 0; // :(
}
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
return nil; // This method is required by the protocol.
}
UILabel *status_;
UILabel *caption_;
}
+
@end
@implementation StashController
message:UCLocalize("HALFINSTALLED_PACKAGE_EX")
delegate:self
cancelButtonTitle:UCLocalize("FORCIBLY_CLEAR")
- otherButtonTitles:UCLocalize("TEMPORARY_IGNORE"), nil
+ otherButtonTitles:
+ UCLocalize("TEMPORARY_IGNORE"),
+ nil
] autorelease];
[alert setContext:@"fixhalf"];
message:UCLocalize("ESSENTIAL_UPGRADE_EX")
delegate:self
cancelButtonTitle:UCLocalize("TEMPORARY_IGNORE")
- otherButtonTitles:UCLocalize("UPGRADE_ESSENTIAL"), UCLocalize("COMPLETE_UPGRADE"), nil
+ otherButtonTitles:
+ UCLocalize("UPGRADE_ESSENTIAL"),
+ UCLocalize("COMPLETE_UPGRADE"),
+ nil
] autorelease];
[alert setContext:@"upgrade"];
}
- (bool) perform {
+ // XXX: this is a really crappy way of doing this.
+ // like, seriously: this state machine is still broken, and cancelling this here doesn't really /fix/ that.
+ // for one, the user can still /start/ a reloading data event while they have a queue, which is stupid
+ // for two, this just means there is a race condition between the refresh completing and the confirmation controller appearing.
+ if ([tabbar_ updating])
+ [tabbar_ cancelUpdate];
+
if (![database_ prepare])
return false;
return [[[CYPackageController alloc] initWithDatabase:database_ forPackage:name] autorelease];
}
-- (CYViewController *) pageForURL:(NSURL *)url {
+- (CYViewController *) pageForURL:(NSURL *)url forExternal:(BOOL)external {
NSString *scheme([[url scheme] lowercaseString]);
if ([[url absoluteString] length] <= [scheme length] + 3)
return nil;
if ([base isEqualToString:@"url"]) {
// This kind of URL can contain slashes in the argument, so we can't parse them below.
NSString *destination = [[url absoluteString] substringFromIndex:([scheme length] + [@"://" length] + [base length] + [@"/" length])];
- controller = [[[CYBrowserController alloc] init] autorelease];
- [(CYBrowserController *)controller loadURL:[NSURL URLWithString:destination]];
- } else if ([components count] == 1) {
- if ([base isEqualToString:@"storage"]) {
- controller = [[[CYBrowserController alloc] init] autorelease];
- [(CYBrowserController *)controller loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"storage" ofType:@"html"]]];
- }
-
+ controller = [[[CYBrowserController alloc] initWithURL:[NSURL URLWithString:destination]] autorelease];
+ } else if (!external && [components count] == 1) {
if ([base isEqualToString:@"manage"]) {
controller = [[[ManageController alloc] init] autorelease];
}
controller = [self pageForPackage:argument];
}
- if ([base isEqualToString:@"search"]) {
+ if (!external && [base isEqualToString:@"search"]) {
controller = [[[SearchController alloc] initWithDatabase:database_] autorelease];
[(SearchController *)controller setSearchTerm:argument];
}
- if ([base isEqualToString:@"sections"]) {
+ if (!external && [base isEqualToString:@"sections"]) {
if ([argument isEqualToString:@"all"])
argument = nil;
controller = [[[SectionController alloc] initWithDatabase:database_ section:argument] autorelease];
}
- if ([base isEqualToString:@"sources"]) {
+ if (!external && [base isEqualToString:@"sources"]) {
if ([argument isEqualToString:@"add"]) {
controller = [[[SourcesController alloc] initWithDatabase:database_] autorelease];
[(SourcesController *)controller showAddSourcePrompt];
} else {
- NSArray *sources = [database_ sources];
- for (Source *source in sources) {
- if ([[source name] caseInsensitiveCompare:argument] == NSOrderedSame) {
- controller = [[[SourceController alloc] initWithDatabase:database_ source:source] autorelease];
- break;
- }
- }
+ Source *source = [database_ sourceWithKey:argument];
+ controller = [[[SourceController alloc] initWithDatabase:database_ source:source] autorelease];
}
}
- if ([base isEqualToString:@"launch"]) {
+ if (!external && [base isEqualToString:@"launch"]) {
[self launchApplicationWithIdentifier:argument suspended:NO];
return nil;
}
- } else if ([components count] == 3) {
+ } else if (!external && [components count] == 3) {
NSString *arg1 = [components objectAtIndex:1];
NSString *arg2 = [components objectAtIndex:2];
return controller;
}
-- (BOOL) openCydiaURL:(NSURL *)url {
- CYViewController *page([self pageForURL:url]);
+- (BOOL) openCydiaURL:(NSURL *)url forExternal:(BOOL)external {
+ CYViewController *page([self pageForURL:url forExternal:external]);
if (page != nil) {
CYNavigationController *nav = [[[CYNavigationController alloc] init] autorelease];
[super applicationOpenURL:url];
if (!loaded_) starturl_ = [url retain];
- else [self openCydiaURL:url];
+ else [self openCydiaURL:url forExternal:YES];
}
- (void) applicationWillResignActive:(UIApplication *)application {
[tabbar_ setUpdateDelegate:self];
}
-- (CYEmulatedLoadingController *)showEmulatedLoadingControllerInView:(UIView *)view {
+- (CYEmulatedLoadingController *) showEmulatedLoadingControllerInView:(UIView *)view {
static CYEmulatedLoadingController *fake = nil;
if (view != nil) {
enough = NO;
if (!recently || !items || !enough) {
+ selectedIndex = 0;
items = [NSMutableArray array];
[items addObject:[NSArray arrayWithObject:@"cydia://home"]];
[items addObject:[NSArray arrayWithObject:@"cydia://sections"]];
for (unsigned int nav = 0; nav < [stack count]; nav++) {
NSString *addr = [stack objectAtIndex:nav];
NSURL *url = [NSURL URLWithString:addr];
- CYViewController *page = [self pageForURL:url];
+ CYViewController *page = [self pageForURL:url forExternal:NO];
if (page != nil)
[current addObject:page];
}
// (Try to) show the startup URL.
if (starturl_ != nil) {
- [self openCydiaURL:starturl_];
+ [self openCydiaURL:starturl_ forExternal:NO];
[starturl_ release];
starturl_ = nil;
}
projects / cydia.git / blobdiff