#include "SDURLCache/SDURLCache.h"
#include "substrate.h"
+
+#include "Version.h"
/* }}} */
/* Profiler {{{ */
static const NSUInteger UIViewAutoresizingFlexibleBoth(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
static _finline NSString *CydiaURL(NSString *path) {
- char page[25];
- page[0] = 'h'; page[1] = 't'; page[2] = 't'; page[3] = 'p'; page[4] = ':';
- page[5] = '/'; page[6] = '/'; page[7] = 'c'; page[8] = 'y'; page[9] = 'd';
- page[10] = 'i'; page[11] = 'a'; page[12] = '.'; page[13] = 's'; page[14] = 'a';
- page[15] = 'u'; page[16] = 'r'; page[17] = 'i'; page[18] = 'k'; page[19] = '.';
- page[20] = 'c'; page[21] = 'o'; page[22] = 'm'; page[23] = '/'; page[24] = '\0';
+ char page[26];
+ page[0] = 'h'; page[1] = 't'; page[2] = 't'; page[3] = 'p'; page[4] = 's';
+ page[5] = ':'; page[6] = '/'; page[7] = '/'; page[8] = 'c'; page[9] = 'y';
+ page[10] = 'd'; page[11] = 'i'; page[12] = 'a'; page[13] = '.'; page[14] = 's';
+ page[15] = 'a'; page[16] = 'u'; page[17] = 'r'; page[18] = 'i'; page[19] = 'k';
+ page[20] = '.'; page[21] = 'c'; page[22] = 'o'; page[23] = 'm'; page[24] = '/';
+ page[25] = '\0';
return [[NSString stringWithUTF8String:page] stringByAppendingString:path];
}
static UIColor *RemovingColor_;
static NSString *App_;
-static NSString *Home_;
static BOOL Advanced_;
static BOOL Ignored_;
static NSString *System_ = nil;
static NSString *SerialNumber_ = nil;
static NSString *ChipID_ = nil;
-static NSString *Token_ = nil;
+static _H<NSString> Token_;
static NSString *UniqueID_ = nil;
static NSString *PLMN_ = nil;
static NSString *Build_ = nil;
bool IsWildcat_;
static CGFloat ScreenScale_;
+static NSString *Idiom_;
/* }}} */
/* Display Helpers {{{ */
@interface CydiaProgressEvent : NSObject {
_H<NSString> message_;
_H<NSString> type_;
+
+ _H<NSArray> item_;
_H<NSString> package_;
- _H<NSString> uri_;
+ _H<NSString> url_;
+ _H<NSString> version_;
}
+ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type;
+ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type forPackage:(NSString *)package;
++ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type forItem:(pkgAcquire::ItemDesc &)item;
- (id) initWithMessage:(NSString *)message ofType:(NSString *)type;
- (NSString *) message;
- (NSString *) type;
+
+- (NSArray *) item;
- (NSString *) package;
-- (NSString *) uri;
+- (NSString *) url;
+- (NSString *) version;
+- (void) setItem:(NSArray *)item;
- (void) setPackage:(NSString *)package;
+- (void) setURL:(NSString *)url;
+- (void) setVersion:(NSString *)version;
- (NSString *) compound:(NSString *)value;
- (NSString *) compoundMessage;
@protocol ProgressDelegate
- (void) addProgressEvent:(CydiaProgressEvent *)event;
- (void) setProgressPercent:(NSNumber *)percent;
+- (void) setProgressStatus:(NSDictionary *)status;
- (void) setProgressCancellable:(NSNumber *)cancellable;
- (bool) isProgressCancelled;
- (void) setTitle:(NSString *)title;
virtual void Fetch(pkgAcquire::ItemDesc &item) {
NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]);
- CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:UCLocalize("DOWNLOADING_"), name] ofType:@"STATUS"]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:UCLocalize("DOWNLOADING_"), name] ofType:@"STATUS" forItem:item]);
[delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
if (error.empty())
return;
- //NSString *description([NSString stringWithUTF8String:item.Description.c_str()]);
- //NSArray *fields([description componentsSeparatedByString:@" "]);
- //NSString *source([fields count] == 0 ? nil : [fields objectAtIndex:0]);
-
- CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:@"ERROR"]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:@"ERROR" forItem:item]);
[delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
virtual bool Pulse(pkgAcquire *Owner) {
bool value = pkgAcquireStatus::Pulse(Owner);
- float percent(
+ double percent(
double(CurrentBytes + CurrentItems) /
double(TotalBytes + TotalItems)
);
- [delegate_ performSelectorOnMainThread:@selector(setProgressPercent:) withObject:[NSNumber numberWithFloat:percent] waitUntilDone:YES];
+ [delegate_ performSelectorOnMainThread:@selector(setProgressStatus:) withObject:[NSDictionary dictionaryWithObjectsAndKeys:
+ [NSNumber numberWithDouble:percent], @"Percent",
+
+ [NSNumber numberWithDouble:CurrentBytes], @"Current",
+ [NSNumber numberWithDouble:TotalBytes], @"Total",
+ [NSNumber numberWithDouble:CurrentCPS], @"Speed",
+ nil] waitUntilDone:YES];
+
if (value && ![delegate_ isProgressCancelled])
return true;
else {
virtual void Stop() {
pkgAcquireStatus::Stop();
[delegate_ performSelectorOnMainThread:@selector(setProgressCancellable:) withObject:[NSNumber numberWithBool:NO] waitUntilDone:YES];
+ [delegate_ performSelectorOnMainThread:@selector(setProgressStatus:) withObject:nil waitUntilDone:YES];
}
};
/* }}} */
return event;
}
++ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type forItem:(pkgAcquire::ItemDesc &)item {
+ CydiaProgressEvent *event([self eventWithMessage:message ofType:type]);
+
+ NSString *description([NSString stringWithUTF8String:item.Description.c_str()]);
+ NSArray *fields([description componentsSeparatedByString:@" "]);
+ [event setItem:fields];
+
+ if ([fields count] > 3) {
+ [event setPackage:[fields objectAtIndex:2]];
+ [event setVersion:[fields objectAtIndex:3]];
+ }
+
+ [event setURL:[NSString stringWithUTF8String:item.URI.c_str()]];
+
+ return event;
+}
+
+ (NSArray *) _attributeKeys {
return [NSArray arrayWithObjects:
+ @"item",
@"message",
@"package",
@"type",
- @"uri",
+ @"url",
+ @"version",
nil];
}
return type_;
}
-- (NSString *) package {
- return package_;
+- (NSArray *) item {
+ return (id) item_ ?: [NSNull null];
}
-- (NSString *) uri {
- return uri_;
+- (void) setItem:(NSArray *)item {
+ item_ = item;
+}
+
+- (NSString *) package {
+ return (id) package_ ?: [NSNull null];
}
- (void) setPackage:(NSString *)package {
package_ = package;
}
+- (NSString *) url {
+ return (id) url_ ?: [NSNull null];
+}
+
+- (void) setURL:(NSString *)url {
+ url_ = url;
+}
+
+- (void) setVersion:(NSString *)version {
+ version_ = version;
+}
+
+- (NSString *) version {
+ return (id) version_ ?: [NSNull null];
+}
+
- (NSString *) compound:(NSString *)value {
if (value != nil) {
NSString *mode(nil); {
size_t size(line.size());
lprintf("S:%s\n", data);
- if (conffile_r(data, size))
+ if (conffile_r(data, size)) {
+ // status: /fail : conffile-prompt : '/fail' '/fail.dpkg-new' 1 1
[delegate_ performSelectorOnMainThread:@selector(setConfigurationData:) withObject:conffile_r[1] waitUntilDone:YES];
- else if (strncmp(data, "status: ", 8) == 0) {
+ } else if (strncmp(data, "status: ", 8) == 0) {
+ // status: <package>: {unpacked,half-configured,installed}
CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:(data + 8)] ofType:@"STATUS"]);
- [progress_ performSelectorOnMainThread:@selector(addProgressEvent) withObject:event waitUntilDone:YES];
+ [progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
+ } else if (strncmp(data, "processing: ", 12) == 0) {
+ // processing: configure: config-test
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:(data + 12)] ofType:@"STATUS"]);
+ [progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
} else if (pmstatus_r(data, size)) {
std::string type([pmstatus_r[1] UTF8String]);
+
NSString *package = pmstatus_r[2];
+ if ([package isEqualToString:@"dpkg-exec"])
+ package = nil;
float percent([pmstatus_r[3] floatValue]);
[progress_ performSelectorOnMainThread:@selector(setProgressPercent:) withObject:[NSNumber numberWithFloat:(percent / 100)] waitUntilDone:YES];
[delegate_ repairWithSelector:@selector(configure)];
else if (error == "The package lists or status file could not be parsed or opened.")
[delegate_ repairWithSelector:@selector(update)];
- // else if (error == "Could not open lock file /var/lib/dpkg/lock - open (13 Permission denied)")
// else if (error == "Could not get lock /var/lib/dpkg/lock - open (35 Resource temporarily unavailable)")
+ // else if (error == "Could not open lock file /var/lib/dpkg/lock - open (13 Permission denied)")
+ // else if (error == "Malformed Status line")
// else if (error == "The list of sources could not be read.")
else {
[delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:(warning ? @"WARNING" : @"ERROR")] forTask:title];
return [NSArray arrayWithObjects:
@"device",
@"ecid",
+ @"firmware",
+ @"hostname",
+ @"idiom",
@"model",
@"plmn",
@"role",
@"serial",
+ @"token",
+ @"version",
nil];
}
return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
}
+- (NSString *) version {
+ return @ Cydia_;
+}
+
- (NSString *) device {
return [[UIDevice currentDevice] uniqueIdentifier];
}
+- (NSString *) firmware {
+ return [[UIDevice currentDevice] systemVersion];
+}
+
+- (NSString *) hostname {
+ return [[UIDevice currentDevice] name];
+}
+
+- (NSString *) idiom {
+ return (id) Idiom_ ?: [NSNull null];
+}
+
- (NSString *) plmn {
- return PLMN_;
+ return (id) PLMN_ ?: [NSNull null];
}
- (NSString *) ecid {
- return ChipID_;
+ return (id) ChipID_ ?: [NSNull null];
}
- (NSString *) serial {
}
- (NSString *) role {
- return Role_;
+ return (id) Role_ ?: [NSNull null];
}
- (NSString *) model {
return [NSString stringWithUTF8String:Machine_];
}
+- (NSString *) token {
+ return (id) Token_ ?: [NSNull null];
+}
+
+ (NSString *) webScriptNameForSelector:(SEL)selector {
if (false);
else if (selector == @selector(addTrivialSource:))
return @"refreshSources";
else if (selector == @selector(removeButton))
return @"removeButton";
+ else if (selector == @selector(substitutePackageNames:))
+ return @"substitutePackageNames";
else if (selector == @selector(scrollToBottom:))
return @"scrollToBottom";
else if (selector == @selector(setButtonImage:withStyle:toFunction:))
return @"setButtonImage";
else if (selector == @selector(setButtonTitle:withStyle:toFunction:))
return @"setButtonTitle";
+ else if (selector == @selector(setHidesBackButton:))
+ return @"setHidesBackButton";
+ else if (selector == @selector(setHidesNavigationBar:))
+ return @"setHidesNavigationBar";
+ else if (selector == @selector(setNavigationBarStyle:))
+ return @"setNavigationBarStyle";
+ else if (selector == @selector(setNavigationBarTintRed:green:blue:alpha:))
+ return @"setNavigationBarTintColor";
else if (selector == @selector(setPopupHook:))
return @"setPopupHook";
else if (selector == @selector(setToken:))
} }
- (Package *) getPackageById:(NSString *)id {
- Package *package([[Database sharedInstance] packageWithName:id]);
- [package parse];
- return package;
+ if (Package *package = [[Database sharedInstance] packageWithName:id]) {
+ [package parse];
+ return package;
+ } else
+ return (Package *) [NSNull null];
}
- (NSArray *) statfs:(NSString *)path {
[delegate_ performSelectorOnMainThread:@selector(installPackages:) withObject:packages waitUntilDone:NO];
}
+- (NSString *) substitutePackageNames:(NSString *)message {
+ NSMutableArray *words([[message componentsSeparatedByString:@" "] mutableCopy]);
+ for (size_t i(0), e([words count]); i != e; ++i) {
+ NSString *word([words objectAtIndex:i]);
+ if (Package *package = [[Database sharedInstance] packageWithName:word])
+ [words replaceObjectAtIndex:i withObject:[package name]];
+ }
+
+ return [words componentsJoinedByString:@" "];
+}
+
- (void) removeButton {
[indirect_ removeButton];
}
[indirect_ setButtonTitle:button withStyle:style toFunction:function];
}
+- (void) setHidesBackButton:(NSString *)value {
+ [indirect_ performSelectorOnMainThread:@selector(setHidesBackButtonByNumber:) withObject:value waitUntilDone:NO];
+}
+
+- (void) setHidesNavigationBar:(NSString *)value {
+ [indirect_ performSelectorOnMainThread:@selector(setHidesNavigationBarByNumber:) withObject:value waitUntilDone:NO];
+}
+
+- (void) setNavigationBarStyle:(NSString *)value {
+ [indirect_ performSelectorOnMainThread:@selector(setNavigationBarStyle:) withObject:value waitUntilDone:NO];
+}
+
+- (void) setNavigationBarTintRed:(NSNumber *)red green:(NSNumber *)green blue:(NSNumber *)blue alpha:(NSNumber *)alpha {
+ float opacity(alpha == (id) [WebUndefined undefined] ? 1 : [alpha floatValue]);
+ UIColor *color([UIColor colorWithRed:[red floatValue] green:[green floatValue] blue:[blue floatValue] alpha:opacity]);
+ [indirect_ performSelectorOnMainThread:@selector(setNavigationBarTintColor:) withObject:color waitUntilDone:NO];
+}
+
- (void) _setToken:(NSString *)token {
- if (Token_ != nil)
- [Token_ release];
- Token_ = [token retain];
+ Token_ = token;
+
+ if (token == nil)
+ [Metadata_ removeObjectForKey:@"Token"];
+ else
+ [Metadata_ setObject:Token_ forKey:@"Token"];
- [Metadata_ setObject:Token_ forKey:@"Token"];
Changed_ = true;
}
} return self;
}
+// XXX: factor this out somewhere
+- (UIColor *) groupTableViewBackgroundColor {
+ UIDevice *device([UIDevice currentDevice]);
+ bool iPad([device respondsToSelector:@selector(userInterfaceIdiom)] && [device userInterfaceIdiom] == UIUserInterfaceIdiomPad);
+ return iPad ? [UIColor colorWithRed:0.821 green:0.834 blue:0.860 alpha:1] : [UIColor groupTableViewBackgroundColor];
+}
+
- (void) loadView {
[self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
- [[self view] setBackgroundColor:[UIColor pinStripeColor]];
+ [[self view] setBackgroundColor:[self groupTableViewBackgroundColor]];
indicator_ = [[[CYLoadingIndicator alloc] initWithFrame:[[self view] bounds]] autorelease];
[indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
WebView *webview([[webview_ _documentView] webView]);
- Package *package([[Database sharedInstance] packageWithName:@"cydia"]);
-
- NSString *application = package == nil ? @"Cydia" : [NSString
- stringWithFormat:@"Cydia/%@",
- [package installed]
- ];
+ NSString *application([NSString stringWithFormat:@"Cydia/%@", @ Cydia_]);
if (Safari_ != nil)
application = [NSString stringWithFormat:@"Safari/%@ %@", Safari_, application];
[NSNumber numberWithInteger:[database_ fetcher].PartialPresent()], @"resuming",
nil];
- [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/confirm/", UI_]]];
+ [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/confirm/", UI_]]];
[[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
initWithTitle:UCLocalize("CANCEL")
_transient id delegate_;
bool running_;
- float progress_;
+ float percent_;
+
+ float current_;
+ float total_;
+ float speed_;
_H<NSMutableArray> events_;
_H<NSString> title_;
+ (NSArray *) _attributeKeys {
return [NSArray arrayWithObjects:
+ @"current",
@"events",
@"finish",
- @"progress",
+ @"percent",
@"running",
+ @"speed",
@"title",
+ @"total",
nil];
}
delegate_ = delegate;
}
-- (void) setProgress:(float)value {
- progress_ = value;
+- (void) setPercent:(float)value {
+ percent_ = value;
+}
+
+- (NSNumber *) percent {
+ return [NSNumber numberWithFloat:percent_];
+}
+
+- (void) setCurrent:(float)value {
+ current_ = value;
+}
+
+- (NSNumber *) current {
+ return [NSNumber numberWithFloat:current_];
}
-- (NSNumber *) progress {
- return [NSNumber numberWithFloat:progress_];
+- (void) setTotal:(float)value {
+ total_ = value;
+}
+
+- (NSNumber *) total {
+ return [NSNumber numberWithFloat:total_];
+}
+
+- (void) setSpeed:(float)value {
+ speed_ = value;
+}
+
+- (NSNumber *) speed {
+ return [NSNumber numberWithFloat:speed_];
}
- (NSArray *) events {
[super dealloc];
}
+- (void) updateCancel {
+ [[self navigationItem] setLeftBarButtonItem:(cancel_ == 1 ? [[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("CANCEL")
+ style:UIBarButtonItemStylePlain
+ target:self
+ action:@selector(cancel)
+ ] autorelease] : nil)];
+}
+
- (id) initWithDatabase:(Database *)database delegate:(id)delegate {
if ((self = [super init]) != nil) {
database_ = database;
progress_ = [[[CydiaProgressData alloc] init] autorelease];
[progress_ setDelegate:self];
+
+ [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/progress/", UI_]]];
+
+ [scroller_ setBackgroundColor:[UIColor blackColor]];
+
+ [[self navigationItem] setHidesBackButton:YES];
+
+ [self updateCancel];
} return self;
}
[self dispatchEvent:@"CydiaProgressUpdate"];
}
-- (void) updateCancel {
- [[self navigationItem] setLeftBarButtonItem:(cancel_ == 1 ? [[[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("CANCEL")
- style:UIBarButtonItemStylePlain
- target:self
- action:@selector(cancel)
- ] autorelease] : nil)];
-}
-
- (void) viewWillAppear:(BOOL)animated {
- if (![self hasLoaded]) {
- [scroller_ setBackgroundColor:[UIColor blackColor]];
- [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/progress/", UI_]]];
- }
-
- [super viewDidAppear:animated];
-
- [[[self navigationController] navigationBar] setBarStyle:UIBarStyleBlack];
-
- [[self navigationItem] setHidesBackButton:YES];
+ if (![self hasLoaded])
+ [[[self navigationController] navigationBar] setBarStyle:UIBarStyleBlack];
- [self updateCancel];
+ [super viewWillAppear:animated];
}
- (void) close {
}
- (UIBarButtonItem *) rightButton {
- return [[[UIBarButtonItem alloc]
+ return [[progress_ running] boolValue] ? nil : [[[UIBarButtonItem alloc]
initWithTitle:UCLocalize("CLOSE")
style:UIBarButtonItemStylePlain
target:self
}
- (void) setProgressPercent:(NSNumber *)percent {
- [progress_ setProgress:[percent floatValue]];
+ [progress_ setPercent:[percent floatValue]];
+ [self updateProgress];
+}
+
+- (void) setProgressStatus:(NSDictionary *)status {
+ if (status == nil) {
+ [progress_ setCurrent:0];
+ [progress_ setTotal:0];
+ [progress_ setSpeed:0];
+ } else {
+ [progress_ setPercent:[[status objectForKey:@"Percent"] floatValue]];
+
+ [progress_ setCurrent:[[status objectForKey:@"Current"] floatValue]];
+ [progress_ setTotal:[[status objectForKey:@"Total"] floatValue]];
+ [progress_ setSpeed:[[status objectForKey:@"Speed"] floatValue]];
+ }
+
[self updateProgress];
}
UIActionSheetDelegate
> {
_transient Database *database_;
- Package *package_;
- NSString *name_;
+ _H<Package> package_;
+ _H<NSString> name_;
bool commercial_;
- NSMutableArray *buttons_;
- UIBarButtonItem *button_;
+ _H<NSMutableArray> buttons_;
+ _H<UIBarButtonItem> button_;
}
- (id) initWithDatabase:(Database *)database forPackage:(NSString *)name;
@implementation CYPackageController
-- (void) dealloc {
- if (package_ != nil)
- [package_ release];
- if (name_ != nil)
- [name_ release];
-
- [buttons_ release];
-
- if (button_ != nil)
- [button_ release];
-
- [super dealloc];
+- (NSURL *) navigationURL {
+ return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@", (id) name_]];
}
-- (NSURL *) navigationURL {
- return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@", name_]];
+- (bool) _allowNavigationAction {
+ // XXX: damn it... I really want this.
+ return true;
}
/* XXX: this is not safe at all... localization of /fail/ */
- (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 setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/package/#!/%@", UI_, name_]]];
+ buttons_ = [NSMutableArray arrayWithCapacity:4];
+ name_ = [NSString stringWithString:name];
+ [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/package/%@", UI_, (id) name_]]];
} return self;
}
- (void) reloadData {
- if (package_ != nil)
- [package_ autorelease];
package_ = [database_ packageWithName:name_];
[buttons_ removeAllObjects];
if (package_ != nil) {
- [package_ parse];
+ [(Package *) package_ parse];
- package_ = [package_ retain];
commercial_ = [package_ isCommercial];
if ([package_ mode] != nil)
[buttons_ addObject:UCLocalize("REMOVE")];
}
- if (button_ != nil)
- [button_ release];
-
NSString *title;
switch ([buttons_ count]) {
case 0: title = nil; break;
default: title = UCLocalize("MODIFY"); break;
}
- button_ = [[UIBarButtonItem alloc]
+ button_ = [[[UIBarButtonItem alloc]
initWithTitle:title
style:UIBarButtonItemStylePlain
target:self
action:@selector(customButtonClicked)
- ];
+ ] autorelease];
[super reloadData];
}
@implementation HomeController
-+ (BOOL) shouldHideNavigationBar {
- return NO;
+- (id) init {
+ if ((self = [super init]) != nil) {
+ [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/home/", UI_]]];
+ } return self;
}
- (NSURL *) navigationURL {
[alert show];
}
-- (void) viewWillDisappear:(BOOL)animated {
- [super viewWillDisappear:animated];
-
- if ([[self class] shouldHideNavigationBar])
- [[self navigationController] setNavigationBarHidden:NO animated:animated];
-}
-
-- (void) viewWillAppear:(BOOL)animated {
- if (![self hasLoaded])
- [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/home/", UI_]]];
-
- [super viewWillAppear:animated];
-
- if ([[self class] shouldHideNavigationBar])
- [[self navigationController] setNavigationBarHidden:YES animated:animated];
-}
-
- (void) viewDidLoad {
[[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
initWithTitle:UCLocalize("ABOUT")
@implementation ManageController
-- (NSURL *) navigationURL {
- return [NSURL URLWithString:@"cydia://manage"];
+- (id) init {
+ if ((self = [super init]) != nil) {
+ [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/manage/", UI_]]];
+ } return self;
}
-- (void) viewWillAppear:(BOOL)animated {
- if (![self hasLoaded])
- [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/manage/", UI_]]];
-
- [super viewWillAppear:animated];
+- (NSURL *) navigationURL {
+ return [NSURL URLWithString:@"cydia://manage"];
}
- (void) viewDidLoad {
[refreshbar_ setProgress:[percent floatValue]];
}
+- (void) setProgressStatus:(NSDictionary *)status {
+ if (status != nil)
+ [self setProgressPercent:[status objectForKey:@"Percent"]];
+}
+
- (void) setUpdateDelegate:(id)delegate {
updatedelegate_ = delegate;
}
NSURL *url([request URL]);
if (url == nil)
return NO;
+
NSString *scheme([[url scheme] lowercaseString]);
- if (scheme == nil || ![scheme isEqualToString:@"cydia"])
- return NO;
- return YES;
+ if (scheme != nil && [scheme isEqualToString:@"cydia"])
+ return YES;
+ if ([[url absoluteString] hasPrefix:@"about:cydia-"])
+ return YES;
+
+ return NO;
}
+ (NSURLRequest *) canonicalRequestForRequest:(NSURLRequest *)request {
NSURL *url([request URL]);
NSString *href([url absoluteString]);
+ NSString *scheme([[url scheme] lowercaseString]);
+
+ NSString *path;
+
+ if ([scheme isEqualToString:@"cydia"])
+ path = [href substringFromIndex:8];
+ else if ([scheme isEqualToString:@"about"])
+ path = [href substringFromIndex:12];
+ else _assert(false);
- NSString *path([href substringFromIndex:8]);
NSRange slash([path rangeOfString:@"/"]);
NSString *command;
/* Section Controller {{{ */
@interface SectionController : FilteredPackageListController {
- NSString *section_;
+ _H<NSString> section_;
}
- (id) initWithDatabase:(Database *)database section:(NSString *)section;
@interface SearchController : FilteredPackageListController <
UISearchBarDelegate
> {
- UISearchBar *search_;
+ _H<UISearchBar> search_;
BOOL searchloaded_;
}
@implementation SearchController
- (void) dealloc {
- [search_ release];
+ [search_ setDelegate:nil];
[super dealloc];
}
- (id) initWithDatabase:(Database *)database {
if ((self = [super initWithDatabase:database title:UCLocalize("SEARCH") filter:@selector(isUnfilteredAndSearchedForBy:) with:nil])) {
- search_ = [[UISearchBar alloc] init];
+ search_ = [[[UISearchBar alloc] init] autorelease];
+ [search_ setDelegate:self];
} return self;
}
textField = MSHookIvar<UITextField *>(search_, "_searchField");
[textField setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
- [search_ setDelegate:self];
[textField setEnablesReturnKeyAutomatically:NO];
[[self navigationItem] setTitleView:textField];
}
] autorelease];
[alert setContext:@"fixhalf"];
+ [alert setNumberOfRows:2];
[alert show];
} else if (!Ignored_ && [essential_ count] != 0) {
int count = [essential_ count];
}
}
-- (void) presentModalViewController:(UIViewController *)controller {
+- (void) disemulate {
+ if (emulated_ == nil)
+ return;
+
+ [window_ addSubview:[tabbar_ view]];
+ [[emulated_ view] removeFromSuperview];
+ [emulated_ release];
+ emulated_ = nil;
+ [window_ setUserInteractionEnabled:YES];
+}
+
+- (void) presentModalViewController:(UIViewController *)controller force:(BOOL)force {
UINavigationController *navigation([[[CYNavigationController alloc] initWithRootViewController:controller] autorelease]);
if (IsWildcat_)
[navigation setModalPresentationStyle:UIModalPresentationFormSheet];
- [((UIViewController *) emulated_ ?: tabbar_) presentModalViewController:navigation animated:YES];
+
+ UIViewController *parent;
+ if (emulated_ == nil)
+ parent = tabbar_;
+ else if (!force)
+ parent = emulated_;
+ else {
+ [self disemulate];
+ parent = tabbar_;
+ }
+
+ [parent presentModalViewController:navigation animated:YES];
}
- (ProgressController *) invokeNewProgress:(NSInvocation *)invocation forController:(UINavigationController *)navigation withTitle:(NSString *)title {
if (navigation != nil)
[navigation pushViewController:progress animated:YES];
else
- [self presentModalViewController:progress];
+ [self presentModalViewController:progress force:YES];
[progress invoke:invocation withTitle:title];
return progress;
] autorelease];
[alert setContext:@"conffile"];
+ [alert setNumberOfRows:2];
[alert show];
}
_trace();
if (Role_ == nil) {
[window_ setUserInteractionEnabled:YES];
- [self presentModalViewController:[[[SettingsController alloc] initWithDatabase:database_ delegate:self] autorelease]];
+ [self presentModalViewController:[[[SettingsController alloc] initWithDatabase:database_ delegate:self] autorelease] force:NO];
return;
} else {
if ([emulated_ modalViewController] != nil)
[self reloadData];
PrintTimes();
- [window_ addSubview:[tabbar_ view]];
-
- [[emulated_ view] removeFromSuperview];
- [emulated_ release];
- emulated_ = nil;
-
- [window_ setUserInteractionEnabled:YES];
+ [self disemulate];
int selectedIndex = 0;
NSMutableArray *items = nil;
else
ScreenScale_ = 1;
- NSMutableArray *parts([NSMutableArray arrayWithCapacity:2]);
- if (ScreenScale_ > 1)
- [parts addObject:@"@2x"];
- [parts addObject:(IsWildcat_ ? @"~ipad" : @"~iphone")];
- UI_ = CydiaURL([NSString stringWithFormat:@"ui/ios%@", [parts componentsJoinedByString:@""]]);
+ UIDevice *device([UIDevice currentDevice]);
+ if (![device respondsToSelector:@selector(userInterfaceIdiom)])
+ Idiom_ = @"iphone";
+ else {
+ UIUserInterfaceIdiom idiom([device userInterfaceIdiom]);
+ if (idiom == UIUserInterfaceIdiomPhone)
+ Idiom_ = @"iphone";
+ else if (idiom == UIUserInterfaceIdiomPad)
+ Idiom_ = @"ipad";
+ else
+ NSLog(@"unknown UIUserInterfaceIdiom!");
+ }
+
+ UI_ = CydiaURL([NSString stringWithFormat:@"ui/ios~%@", Idiom_]);
PackageName = reinterpret_cast<CYString &(*)(Package *, SEL)>(method_getImplementation(class_getInstanceMethod([Package class], @selector(cyname))));
else {
lang = [[Languages_ objectAtIndex:0] UTF8String];
setenv("LANG", lang, true);
+ std::setlocale(LC_ALL, lang);
}
- //std::setlocale(LC_ALL, lang);
NSLog(@"Setting Language: %s", lang);
/* }}} */
/* }}} */
App_ = [[NSBundle mainBundle] bundlePath];
- Home_ = NSHomeDirectory();
Advanced_ = YES;
setuid(0);
Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
#define MobileSubstrate_(name) \
- if (substrate && access("/Library/MobileSubstrate/DynamicLibraries/" #name ".dylib", F_OK) == 0) \
- dlopen("/Library/MobileSubstrate/DynamicLibraries/" #name ".dylib", RTLD_LAZY | RTLD_GLOBAL);
+ if (substrate && access("/Library/MobileSubstrate/DynamicLibraries/" #name ".dylib", F_OK) == 0) { \
+ void *handle(dlopen("/Library/MobileSubstrate/DynamicLibraries/" #name ".dylib", RTLD_LAZY | RTLD_GLOBAL)); \
+ if (handle == NULL) \
+ NSLog(@"%s", dlerror()); \
+ }
MobileSubstrate_(Activator)
MobileSubstrate_(libstatusbar)
projects / cydia.git / blobdiff