#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];
}
NSRunLoop *loop([NSRunLoop currentRunLoop]);
NSDate *future([NSDate distantFuture]);
+ NSString *mode([loop currentMode] ?: NSDefaultRunLoopMode);
- while (!stopped && [loop runMode:NSDefaultRunLoopMode beforeDate:future]);
+ while (!stopped && [loop runMode:mode beforeDate:future]);
return [context count] == 0 ? nil : [context objectAtIndex:0];
}
@end
/* }}} */
+@interface NSInvocation (Cydia)
++ (NSInvocation *) invocationWithSelector:(SEL)selector forTarget:(id)target;
+@end
+
+@implementation NSInvocation (Cydia)
+
++ (NSInvocation *) invocationWithSelector:(SEL)selector forTarget:(id)target {
+ NSInvocation *invocation([NSInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]]);
+ [invocation setTarget:target];
+ [invocation setSelector:selector];
+ return invocation;
+}
+
+@end
+
@implementation WebScriptObject (NSFastEnumeration)
- (NSUInteger) countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)objects count:(NSUInteger)count {
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_;
+
+static NSMutableSet *CydiaHosts_;
/* }}} */
/* Display Helpers {{{ */
/* Delegate Prototypes {{{ */
@class Package;
@class Source;
+@class CydiaProgressEvent;
-@interface NSObject (ProgressDelegate)
-@end
-
-@protocol ProgressDelegate
-- (void) setProgressError:(NSString *)error withTitle:(NSString *)id;
-- (void) setProgressTitle:(NSString *)title;
-- (void) setProgressPercent:(NSNumber *)percent;
-- (void) startProgress;
-- (void) addProgressOutput:(NSString *)output;
-- (bool) isCancelling:(size_t)received;
-@end
-
-@protocol ConfigurationDelegate
+@protocol DatabaseDelegate
- (void) repairWithSelector:(SEL)selector;
- (void) setConfigurationData:(NSString *)data;
+- (void) addProgressEventOnMainThread:(CydiaProgressEvent *)event forTask:(NSString *)task;
@end
@class CYPackageController;
- (CYViewController *) pageForPackage:(NSString *)name;
- (void) showActionSheet:(UIActionSheet *)sheet fromItem:(UIBarButtonItem *)item;
- (void) reloadDataWithInvocation:(NSInvocation *)invocation;
+- (void) addCydiaHost:(NSString *)host;
@end
-
-static NSObject<CydiaDelegate> *CydiaApp;
/* }}} */
+/* ProgressEvent Interface/Delegate {{{ */
+@interface CydiaProgressEvent : NSObject {
+ _H<NSString> message_;
+ _H<NSString> type_;
+
+ _H<NSArray> item_;
+ _H<NSString> package_;
+ _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 *) 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;
+- (NSString *) compoundTitle;
+
+@end
+
+@protocol ProgressDelegate
+- (void) addProgressEvent:(CydiaProgressEvent *)event;
+- (void) setProgressPercent:(NSNumber *)percent;
+- (void) setProgressStatus:(NSDictionary *)status;
+- (void) setProgressCancellable:(NSNumber *)cancellable;
+- (bool) isProgressCancelled;
+- (void) setTitle:(NSString *)title;
+@end
+/* }}} */
/* Status Delegation {{{ */
class Status :
public pkgAcquireStatus
{
private:
_transient NSObject<ProgressDelegate> *delegate_;
+ bool cancelled_;
public:
Status() :
- delegate_(nil)
+ delegate_(nil),
+ cancelled_(false)
{
}
- void setDelegate(id delegate) {
+ void setDelegate(NSObject<ProgressDelegate> *delegate) {
delegate_ = delegate;
}
}
virtual void Fetch(pkgAcquire::ItemDesc &item) {
- //NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]);
- [delegate_
- performSelectorOnMainThread:@selector(setProgressTitle:)
- withObject:[NSString stringWithFormat:UCLocalize("DOWNLOADING_"), [NSString stringWithUTF8String:item.ShortDesc.c_str()]]
- waitUntilDone:YES
- ];
+ NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:UCLocalize("DOWNLOADING_"), name] ofType:@"STATUS" forItem:item]);
+ [delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
virtual void Done(pkgAcquire::ItemDesc &item) {
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]);
-
- [delegate_ performSelectorOnMainThread:@selector(_setProgressErrorPackage:)
- withObject:[NSArray arrayWithObjects:
- [NSString stringWithUTF8String:error.c_str()],
- source,
- nil]
- waitUntilDone:YES
- ];
+ 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_ setProgressPercent:[NSNumber numberWithFloat:percent]];
- return [delegate_ isCancelling:CurrentBytes] ? false : value;
+ [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 {
+ cancelled_ = true;
+ return false;
+ }
+ }
+
+ _finline bool WasCancelled() const {
+ return cancelled_;
}
virtual void Start() {
- [delegate_ startProgress];
+ pkgAcquireStatus::Start();
+ [delegate_ performSelectorOnMainThread:@selector(setProgressCancellable:) withObject:[NSNumber numberWithBool:YES] waitUntilDone:YES];
}
virtual void Stop() {
+ pkgAcquireStatus::Stop();
+ [delegate_ performSelectorOnMainThread:@selector(setProgressCancellable:) withObject:[NSNumber numberWithBool:NO] waitUntilDone:YES];
+ [delegate_ performSelectorOnMainThread:@selector(setProgressStatus:) withObject:nil waitUntilDone:YES];
}
};
/* }}} */
-
/* Database Interface {{{ */
typedef std::map< unsigned long, _H<Source> > SourceMap;
CFMutableArrayRef packages_;
- _transient NSObject<ConfigurationDelegate, ProgressDelegate> *delegate_;
+ _transient NSObject<DatabaseDelegate> *delegate_;
+ _transient NSObject<ProgressDelegate> *progress_;
+
Status status_;
int cydiafd_;
- (void) updateWithStatus:(Status &)status;
-- (void) setDelegate:(id)delegate;
+- (void) setDelegate:(NSObject<DatabaseDelegate> *)delegate;
+
+- (void) setProgressDelegate:(NSObject<ProgressDelegate> *)delegate;
+- (NSObject<ProgressDelegate> *) progressDelegate;
+
- (Source *) getSource:(pkgCache::PkgFileIterator)file;
- (NSString *) mappedSectionForPointer:(const char *)pointer;
@end
/* }}} */
-/* Delegate Helpers {{{ */
-@implementation NSObject (ProgressDelegate)
+/* ProgressEvent Implementation {{{ */
+@implementation CydiaProgressEvent
-- (void) _setProgressErrorPackage:(NSArray *)args {
- [self performSelector:@selector(setProgressError:forPackage:)
- withObject:[args objectAtIndex:0]
- withObject:([args count] == 1 ? nil : [args objectAtIndex:1])
- ];
++ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type {
+ return [[[CydiaProgressEvent alloc] initWithMessage:message ofType:type] autorelease];
}
-- (void) _setProgressErrorTitle:(NSArray *)args {
- [self performSelector:@selector(setProgressError:withTitle:)
- withObject:[args objectAtIndex:0]
- withObject:([args count] == 1 ? nil : [args objectAtIndex:1])
- ];
++ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type forPackage:(NSString *)package {
+ CydiaProgressEvent *event([self eventWithMessage:message ofType:type]);
+ [event setPackage:package];
+ return event;
}
-- (void) _setProgressError:(NSString *)error withTitle:(NSString *)title {
- [self performSelectorOnMainThread:@selector(_setProgressErrorTitle:)
- withObject:[NSArray arrayWithObjects:error, title, nil]
- waitUntilDone:YES
- ];
++ (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;
}
-- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
- Package *package = id == nil ? nil : [[Database sharedInstance] packageWithName:id];
++ (NSArray *) _attributeKeys {
+ return [NSArray arrayWithObjects:
+ @"item",
+ @"message",
+ @"package",
+ @"type",
+ @"url",
+ @"version",
+ nil];
+}
- [self performSelector:@selector(setProgressError:withTitle:)
- withObject:error
- withObject:(package == nil ? id : [package name])
- ];
+- (NSArray *) attributeKeys {
+ return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+ return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
+- (id) initWithMessage:(NSString *)message ofType:(NSString *)type {
+ if ((self = [super init]) != nil) {
+ message_ = message;
+ type_ = type;
+ } return self;
+}
+
+- (NSString *) message {
+ return message_;
+}
+
+- (NSString *) type {
+ return type_;
+}
+
+- (NSArray *) item {
+ return (id) item_ ?: [NSNull null];
+}
+
+- (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); {
+ NSString *type([self type]);
+ if ([type isEqualToString:@"ERROR"])
+ mode = UCLocalize("ERROR");
+ else if ([type isEqualToString:@"WARNING"])
+ mode = UCLocalize("WARNING");
+ }
+
+ if (mode != nil)
+ value = [NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), mode, value];
+ }
+
+ return value;
+}
+
+- (NSString *) compoundMessage {
+ return [self compound:[self message]];
+}
+
+- (NSString *) compoundTitle {
+ NSString *title;
+
+ if (package_ == nil)
+ title = nil;
+ else if (Package *package = [[Database sharedInstance] packageWithName:package_])
+ title = [package name];
+ else
+ title = package_;
+
+ return [self compound:title];
}
@end
CYString type_;
CYString version_;
- NSString *host_;
- NSString *authority_;
+ _H<NSString> host_;
+ _H<NSString> authority_;
CYString defaultIcon_;
- NSDictionary *record_;
+ _H<NSDictionary> record_;
BOOL trusted_;
}
version_.clear();
defaultIcon_.clear();
- if (record_ != nil) {
- [record_ release];
- record_ = nil;
- }
-
- if (host_ != nil) {
- [host_ release];
- host_ = nil;
- }
-
- if (authority_ != nil) {
- [authority_ release];
- authority_ = nil;
- }
+ record_ = nil;
+ host_ = nil;
+ authority_ = nil;
}
- (void) dealloc {
}
record_ = [Sources_ objectForKey:[self key]];
- if (record_ != nil)
- record_ = [record_ retain];
NSURL *url([NSURL URLWithString:uri_]);
host_ = [url host];
if (host_ != nil)
- host_ = [[host_ lowercaseString] retain];
+ host_ = [host_ lowercaseString];
if (host_ != nil)
- authority_ = host_;
+ // XXX: this is due to a bug in _H<>
+ authority_ = (id) host_;
else
authority_ = [url path];
-
- if (authority_ != nil)
- authority_ = [authority_ retain];
}
- (Source *) initWithMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool {
}
- (NSString *) name {
- return origin_.empty() ? authority_ : origin_;
+ return origin_.empty() ? (id) authority_ : origin_;
}
- (NSString *) description {
}
- (NSString *) label {
- return label_.empty() ? authority_ : label_;
+ return label_.empty() ? (id) authority_ : label_;
}
- (NSString *) origin {
@"purposes",
@"relations",
@"section",
+ @"selection",
@"shortDescription",
@"shortSection",
@"simpleSection",
@"size",
@"source",
@"sponsor",
+ @"state",
@"support",
+ @"tags",
@"warnings",
nil];
}
return files;
}
+- (NSString *) state {
+@synchronized (database_) {
+ if ([database_ era] != era_ || file_.end())
+ return nil;
+
+ switch (iterator_->CurrentState) {
+ case pkgCache::State::NotInstalled:
+ return @"NotInstalled";
+ case pkgCache::State::UnPacked:
+ return @"UnPacked";
+ case pkgCache::State::HalfConfigured:
+ return @"HalfConfigured";
+ case pkgCache::State::HalfInstalled:
+ return @"HalfInstalled";
+ case pkgCache::State::ConfigFiles:
+ return @"ConfigFiles";
+ case pkgCache::State::Installed:
+ return @"Installed";
+ case pkgCache::State::TriggersAwaited:
+ return @"TriggersAwaited";
+ case pkgCache::State::TriggersPending:
+ return @"TriggersPending";
+ }
+
+ return (NSString *) [NSNull null];
+} }
+
+- (NSString *) selection {
+@synchronized (database_) {
+ if ([database_ era] != era_ || file_.end())
+ return nil;
+
+ switch (iterator_->SelectedState) {
+ case pkgCache::State::Unknown:
+ return @"Unknown";
+ case pkgCache::State::Install:
+ return @"Install";
+ case pkgCache::State::Hold:
+ return @"Hold";
+ case pkgCache::State::DeInstall:
+ return @"DeInstall";
+ case pkgCache::State::Purge:
+ return @"Purge";
+ }
+
+ return (NSString *) [NSNull null];
+} }
+
- (NSArray *) warnings {
NSMutableArray *warnings([NSMutableArray arrayWithCapacity:4]);
const char *name(iterator_.Name());
_assert(false);
}
+- (NSArray *) tags {
+ return tags_;
+}
+
- (BOOL) hasTag:(NSString *)tag {
return tags_ == nil ? NO : [tags_ containsObject:tag];
}
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)
- [delegate_ performSelectorOnMainThread:@selector(setProgressTitle:) withObject:[NSString stringWithUTF8String:(data + 8)] waitUntilDone:YES];
- else if (pmstatus_r(data, size)) {
+ } 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];
+ } 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 *id = pmstatus_r[2];
+
+ NSString *package = pmstatus_r[2];
+ if ([package isEqualToString:@"dpkg-exec"])
+ package = nil;
float percent([pmstatus_r[3] floatValue]);
- [delegate_ performSelectorOnMainThread:@selector(setProgressPercent:) withObject:[NSNumber numberWithFloat:(percent / 100)] waitUntilDone:YES];
+ [progress_ performSelectorOnMainThread:@selector(setProgressPercent:) withObject:[NSNumber numberWithFloat:(percent / 100)] waitUntilDone:YES];
NSString *string = pmstatus_r[4];
- if (type == "pmerror")
- [delegate_ performSelectorOnMainThread:@selector(_setProgressErrorPackage:)
- withObject:[NSArray arrayWithObjects:string, id, nil]
- waitUntilDone:YES
- ];
- else if (type == "pmstatus")
- [delegate_ performSelectorOnMainThread:@selector(setProgressTitle:) withObject:string waitUntilDone:YES];
- else if (type == "pmconffile")
+ if (type == "pmerror") {
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:string ofType:@"ERROR" forPackage:package]);
+ [progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
+ } else if (type == "pmstatus") {
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:string ofType:@"STATUS" forPackage:package]);
+ [progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
+ } else if (type == "pmconffile")
[delegate_ performSelectorOnMainThread:@selector(setConfigurationData:) withObject:string waitUntilDone:YES];
else
lprintf("E:unknown pmstatus\n");
while (std::getline(is, line)) {
lprintf("O:%s\n", line.c_str());
- [delegate_ performSelectorOnMainThread:@selector(addProgressOutput:) withObject:[NSString stringWithUTF8String:line.c_str()] waitUntilDone:YES];
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:line.c_str()] ofType:@"INFORMATION"]);
+ [progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
_assume(false);
- (bool) popErrorWithTitle:(NSString *)title {
bool fatal(false);
- std::string message;
while (!_error->empty()) {
std::string error;
bool warning(!_error->PopMessage(error));
if (!warning)
fatal = true;
+
for (;;) {
size_t size(error.size());
if (size == 0 || error[size - 1] != '\n')
break;
error.resize(size - 1);
}
+
lprintf("%c:[%s]\n", warning ? 'W' : 'E', error.c_str());
- if (!message.empty())
- message += "\n\n";
- message += error;
+ [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:(warning ? @"WARNING" : @"ERROR")] forTask:title];
}
- if (fatal && !message.empty())
- [delegate_ _setProgressError:[NSString stringWithUTF8String:message.c_str()] withTitle:[NSString stringWithFormat:Colon_, fatal ? Error_ : Warning_, title]];
-
return fatal;
}
[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 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 == "Could not get lock /var/lib/dpkg/lock - open (35 Resource temporarily unavailable)")
- [delegate_ _setProgressError:[NSString stringWithUTF8String:error.c_str()] withTitle:[NSString stringWithFormat:Colon_, Error_, title]];
+ // else if (error == "Malformed Status line")
// else if (error == "The list of sources could not be read.")
else {
- [delegate_ _setProgressError:[NSString stringWithUTF8String:error.c_str()] withTitle:[NSString stringWithFormat:Colon_, warning ? Warning_ : Error_, title]];
+ [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:(warning ? @"WARNING" : @"ERROR")] forTask:title];
return;
}
return;
if (cache_->DelCount() != 0 || cache_->InstCount() != 0) {
- [delegate_ _setProgressError:@"COUNTS_NONZERO_EX" withTitle:title];
+ [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:UCLocalize("COUNTS_NONZERO_EX") ofType:@"ERROR"] forTask:title];
return;
}
return;
if (cache_->BrokenCount() != 0) {
- [delegate_ _setProgressError:@"STILL_BROKEN_EX" withTitle:title];
+ [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:UCLocalize("STILL_BROKEN_EX") ofType:@"ERROR"] forTask:title];
return;
}
[before addObject:[NSString stringWithUTF8String:(*source)->GetURI().c_str()]];
}
- [CydiaApp performSelectorOnMainThread:@selector(retainNetworkActivityIndicator) withObject:nil waitUntilDone:YES];
+ [delegate_ performSelectorOnMainThread:@selector(retainNetworkActivityIndicator) withObject:nil waitUntilDone:YES];
if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue) {
_trace();
if ((*item)->Status == pkgAcquire::Item::StatIdle)
continue;
- std::string uri = (*item)->DescURI();
- std::string error = (*item)->ErrorText;
-
- lprintf("pAf:%s:%s\n", uri.c_str(), error.c_str());
failed = true;
-
- [delegate_ performSelectorOnMainThread:@selector(_setProgressErrorPackage:)
- withObject:[NSArray arrayWithObjects:
- [NSString stringWithUTF8String:error.c_str()],
- nil]
- waitUntilDone:YES
- ];
}
- [CydiaApp performSelectorOnMainThread:@selector(releaseNetworkActivityIndicator) withObject:nil waitUntilDone:YES];
+ [delegate_ performSelectorOnMainThread:@selector(releaseNetworkActivityIndicator) withObject:nil waitUntilDone:YES];
if (failed) {
_trace();
}
- (void) updateWithStatus:(Status &)status {
- _transient NSObject<ProgressDelegate> *delegate(status.getDelegate());
NSString *title(UCLocalize("REFRESHING_DATA"));
pkgSourceList list;
- if (!list.ReadMainList())
- [delegate _setProgressError:@"Unable to read source list." withTitle:title];
+ if ([self popErrorWithTitle:title forOperation:list.ReadMainList()])
+ return;
FileFd lock;
lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
if ([self popErrorWithTitle:title])
return;
- if ([self popErrorWithTitle:title forOperation:ListUpdate(status, list, PulseInterval_)])
- /* XXX: ignore this because users suck and don't understand why refreshing is important: return */
- /* XXX: why the hell is an empty if statement a clang error? */ (void) 0;
+ [delegate_ performSelectorOnMainThread:@selector(retainNetworkActivityIndicator) withObject:nil waitUntilDone:YES];
+
+ bool success(ListUpdate(status, list, PulseInterval_));
+ if (status.WasCancelled())
+ _error->Discard();
+ else
+ [self popErrorWithTitle:title forOperation:success];
+
+ [delegate_ performSelectorOnMainThread:@selector(releaseNetworkActivityIndicator) withObject:nil waitUntilDone:YES];
[Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
Changed_ = true;
}
-- (void) setDelegate:(id)delegate {
+- (void) setDelegate:(NSObject<DatabaseDelegate> *)delegate {
delegate_ = delegate;
+}
+
+- (void) setProgressDelegate:(NSObject<ProgressDelegate> *)delegate {
+ progress_ = delegate;
status_.setDelegate(delegate);
}
+- (NSObject<ProgressDelegate> *) progressDelegate {
+ return progress_;
+}
+
- (Source *) getSource:(pkgCache::PkgFileIterator)file {
SourceMap::const_iterator i(sourceMap_.find(file->ID));
return i == sourceMap_.end() ? nil : i->second;
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(addCydiaHost:))
+ return @"addCydiaHost";
else if (selector == @selector(addTrivialSource:))
return @"addTrivialSource";
else if (selector == @selector(close))
return @"localize";
else if (selector == @selector(refreshSources))
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(setAllowsNavigationAction:))
+ return @"setAllowsNavigationAction";
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:))
return [NSString stringWithCString:value];
}
+- (void) addCydiaHost:(NSString *)host {
+ [delegate_ performSelectorOnMainThread:@selector(addCydiaHost:) withObject:host waitUntilDone:NO];
+}
+
- (void) addTrivialSource:(NSString *)href {
[delegate_ performSelectorOnMainThread:@selector(addTrivialSource:) withObject:href waitUntilDone:NO];
}
} }
- (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];
+}
+
- (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {
[indirect_ setButtonImage:button withStyle:style toFunction:function];
}
[indirect_ setButtonTitle:button withStyle:style toFunction:function];
}
+- (void) setAllowsNavigationAction:(NSString *)value {
+ [indirect_ performSelectorOnMainThread:@selector(setAllowsNavigationActionByNumber:) withObject:value waitUntilDone:NO];
+}
+
+- (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;
}
[indirect_ setPopupHook:function];
}
+- (void) scrollToBottom:(NSNumber *)animated {
+ [indirect_ performSelectorOnMainThread:@selector(scrollToBottomAnimated:) withObject:animated waitUntilDone:NO];
+}
+
- (void) setViewportWidth:(float)width {
[indirect_ setViewportWidthOnMainThread:width];
}
/* @ Loading... Indicator {{{ */
@interface CYLoadingIndicator : UIView {
- UIActivityIndicatorView *spinner_;
- UILabel *label_;
- UIView *container_;
+ _H<UIActivityIndicatorView> spinner_;
+ _H<UILabel> label_;
+ _H<UIView> container_;
}
@property (readonly, nonatomic) UILabel *label;
@end
/* }}} */
/* Emulated Loading Controller {{{ */
-@interface CYEmulatedLoadingController : CYViewController <
- ProgressDelegate,
- ConfigurationDelegate
-> {
+@interface CYEmulatedLoadingController : CYViewController {
_transient Database *database_;
- CYLoadingIndicator *indicator_;
- UITabBar *tabbar_;
- UINavigationBar *navbar_;
+ _H<CYLoadingIndicator> indicator_;
+ _H<UITabBar> tabbar_;
+ _H<UINavigationBar> navbar_;
}
@end
@implementation CYEmulatedLoadingController
-- (void) dealloc {
- [self releaseSubviews];
- [database_ setDelegate:nil];
-
- [super dealloc];
-}
-
-- (void) setProgressError:(NSString *)error withTitle:(NSString *)title {
- CYAlertView *sheet([[[CYAlertView alloc]
- initWithTitle:title
- buttons:[NSArray arrayWithObjects:UCLocalize("OKAY"), nil]
- defaultButtonIndex:0
- ] autorelease]);
-
- [sheet setMessage:error];
- [sheet yieldToPopupAlertAnimated:YES];
- [sheet dismiss];
-}
-
-- (void) setProgressTitle:(NSString *)title { }
-- (void) setProgressPercent:(NSNumber *)percent { }
-- (void) startProgress { }
-- (void) addProgressOutput:(NSString *)output { }
-- (bool) isCancelling:(size_t)received { return NO; }
-- (void) setConfigurationData:(NSString *)data { }
-
-- (void) repairWithSelector:(SEL)selector {
- [[indicator_ label] performSelectorOnMainThread:@selector(setText:) withObject:[NSString stringWithFormat:Elision_, UCLocalize("REPAIRING"), nil] waitUntilDone:YES];
- [database_ performSelector:selector];
- sleep(10);
- [[indicator_ label] performSelectorOnMainThread:@selector(setText:) withObject:[NSString stringWithFormat:Elision_, UCLocalize("LOADING"), nil] waitUntilDone:YES];
-}
-
- (id) initWithDatabase:(Database *)database {
if ((self = [super init]) != nil) {
database_ = database;
- [database_ setDelegate:self];
} 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]];
+ indicator_ = [[[CYLoadingIndicator alloc] initWithFrame:[[self view] bounds]] autorelease];
[indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
[[self view] addSubview:indicator_];
- tabbar_ = [[UITabBar alloc] initWithFrame:CGRectMake(0, 0, 0, 49.0f)];
+ tabbar_ = [[[UITabBar alloc] initWithFrame:CGRectMake(0, 0, 0, 49.0f)] autorelease];
[tabbar_ setFrame:CGRectMake(0.0f, [[self view] bounds].size.height - [tabbar_ bounds].size.height, [[self view] bounds].size.width, [tabbar_ bounds].size.height)];
[tabbar_ setAutoresizingMask:UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth];
[[self view] addSubview:tabbar_];
- navbar_ = [[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, 0, 44.0f)];
+ navbar_ = [[[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, 0, 44.0f)] autorelease];
[navbar_ setFrame:CGRectMake(0.0f, 0.0f, [[self view] bounds].size.width, [navbar_ bounds].size.height)];
[navbar_ setAutoresizingMask:UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleWidth];
[[self view] addSubview:navbar_];
}
- (void) releaseSubviews {
- [indicator_ release];
indicator_ = nil;
-
- [tabbar_ release];
tabbar_ = nil;
-
- [navbar_ release];
navbar_ = nil;
}
NSURLResponse *response([source response]);
NSURL *url([response URL]);
- NSString *scheme([url scheme]);
+ //NSString *scheme([url scheme]);
NSString *host([url host]);
if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
[self setHeaders:headers forHost:host];
}
- if (
- [host isEqualToString:@"cydia.saurik.com"] ||
- [host hasSuffix:@".cydia.saurik.com"] ||
- [scheme isEqualToString:@"file"]
- )
+ if ([CydiaHosts_ containsObject:host])
[window setValue:cydia_ forKey:@"cydia"];
}
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")
/* }}} */
/* Progress Data {{{ */
-@interface ProgressData : NSObject {
- SEL selector_;
- // XXX: should these really both be _transient?
- _transient id target_;
- _transient id object_;
-}
+@interface CydiaProgressData : NSObject {
+ _transient id delegate_;
+
+ bool running_;
+ float percent_;
-- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object;
+ float current_;
+ float total_;
+ float speed_;
-- (SEL) selector;
-- (id) target;
-- (id) object;
+ _H<NSMutableArray> events_;
+ _H<NSString> title_;
+
+ _H<NSString> status_;
+ _H<NSString> finish_;
+}
@end
-@implementation ProgressData
+@implementation CydiaProgressData
+
++ (NSArray *) _attributeKeys {
+ return [NSArray arrayWithObjects:
+ @"current",
+ @"events",
+ @"finish",
+ @"percent",
+ @"running",
+ @"speed",
+ @"title",
+ @"total",
+ nil];
+}
+
+- (NSArray *) attributeKeys {
+ return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+ return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
-- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object {
+- (id) init {
if ((self = [super init]) != nil) {
- selector_ = selector;
- target_ = target;
- object_ = object;
+ events_ = [NSMutableArray arrayWithCapacity:32];
} return self;
}
-- (SEL) selector {
- return selector_;
+- (void) setDelegate:(id)delegate {
+ delegate_ = delegate;
+}
+
+- (void) setPercent:(float)value {
+ percent_ = value;
+}
+
+- (NSNumber *) percent {
+ return [NSNumber numberWithFloat:percent_];
+}
+
+- (void) setCurrent:(float)value {
+ current_ = value;
+}
+
+- (NSNumber *) current {
+ return [NSNumber numberWithFloat:current_];
}
-- (id) target {
- return target_;
+- (void) setTotal:(float)value {
+ total_ = value;
}
-- (id) object {
- return object_;
+- (NSNumber *) total {
+ return [NSNumber numberWithFloat:total_];
+}
+
+- (void) setSpeed:(float)value {
+ speed_ = value;
+}
+
+- (NSNumber *) speed {
+ return [NSNumber numberWithFloat:speed_];
+}
+
+- (NSArray *) events {
+ return events_;
+}
+
+- (void) removeAllEvents {
+ [events_ removeAllObjects];
+}
+
+- (void) addEvent:(CydiaProgressEvent *)event {
+ [events_ addObject:event];
+}
+
+- (void) setTitle:(NSString *)text {
+ title_ = text;
+}
+
+- (NSString *) title {
+ return title_;
+}
+
+- (void) setFinish:(NSString *)text {
+ finish_ = text;
+}
+
+- (NSString *) finish {
+ return (id) finish_ ?: [NSNull null];
+}
+
+- (void) setRunning:(bool)running {
+ running_ = running;
+}
+
+- (NSNumber *) running {
+ return running_ ? (NSNumber *) kCFBooleanTrue : (NSNumber *) kCFBooleanFalse;
}
@end
/* }}} */
/* Progress Controller {{{ */
-@interface ProgressController : CYViewController <
- ConfigurationDelegate,
+@interface ProgressController : CYBrowserController <
ProgressDelegate
> {
_transient Database *database_;
- UIProgressBar *progress_;
- UITextView *output_;
- UITextLabel *status_;
- UIPushButton *close_;
- BOOL running_;
- SHA1SumValue springlist_;
- SHA1SumValue notifyconf_;
- NSString *title_;
+ _H<CydiaProgressData> progress_;
+ unsigned cancel_;
}
- (id) initWithDatabase:(Database *)database delegate:(id)delegate;
-- (void) _retachThread;
-- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title;
-
-- (BOOL) isRunning;
+- (void) invoke:(NSInvocation *)invocation withTitle:(NSString *)title;
-@end
+- (void) setTitle:(NSString *)title;
+- (void) setCancellable:(bool)cancellable;
-@protocol ProgressControllerDelegate
-- (void) progressControllerIsComplete:(ProgressController *)sender;
@end
@implementation ProgressController
- (void) dealloc {
- [database_ setDelegate:nil];
- [progress_ release];
- [output_ release];
- [status_ release];
- [close_ release];
- if (title_ != nil)
- [title_ release];
+ [database_ setProgressDelegate:nil];
+ [progress_ setDelegate:nil];
[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;
- [database_ setDelegate:self];
delegate_ = delegate;
- [[self view] setBackgroundColor:[UIColor colorWithRed:0.0f green:0.0f blue:0.0f alpha:1.0f]];
+ [database_ setProgressDelegate:self];
- progress_ = [[UIProgressBar alloc] init];
- [progress_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)];
- [progress_ setStyle:0];
+ progress_ = [[[CydiaProgressData alloc] init] autorelease];
+ [progress_ setDelegate:self];
- status_ = [[UITextLabel alloc] init];
- [status_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)];
- [status_ setColor:[UIColor whiteColor]];
- [status_ setBackgroundColor:[UIColor clearColor]];
- [status_ setCentersHorizontally:YES];
- //[status_ setFont:font];
-
- output_ = [[UITextView alloc] init];
- [output_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- //[output_ setTextFont:@"Courier New"];
- [output_ setFont:[[output_ font] fontWithSize:12]];
- [output_ setTextColor:[UIColor whiteColor]];
- [output_ setBackgroundColor:[UIColor clearColor]];
- [output_ setMarginTop:0];
- [output_ setAllowsRubberBanding:YES];
- [output_ setEditable:NO];
- [[self view] addSubview:output_];
-
- close_ = [[UIPushButton alloc] init];
- [close_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)];
- [close_ setAutosizesToFit:NO];
- [close_ setDrawsShadow:YES];
- [close_ setStretchBackground:YES];
- [close_ setEnabled:YES];
- [close_ setTitleFont:[UIFont boldSystemFontOfSize:22]];
- [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:UIControlEventTouchUpInside];
- [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];
- [close_ setBackground:[UIImage applicationImageNamed:@"green-dn.png"] forState:1];
- } return self;
-}
+ [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/progress/", UI_]]];
-- (void) positionViews {
- CGRect bounds = [[self view] bounds];
- CGSize prgsize = [UIProgressBar defaultSize];
-
- CGRect prgrect = {{
- (bounds.size.width - prgsize.width) / 2,
- bounds.size.height - prgsize.height - 20
- }, prgsize};
+ [scroller_ setBackgroundColor:[UIColor blackColor]];
- float closewidth = std::min(bounds.size.width - 20, 300.0f);
+ [[self navigationItem] setHidesBackButton:YES];
- [progress_ setFrame:prgrect];
- [status_ setFrame:CGRectMake(
- 10,
- bounds.size.height - prgsize.height - 50,
- bounds.size.width - 20,
- 24
- )];
- [output_ setFrame:CGRectMake(
- 10,
- 20,
- bounds.size.width - 20,
- bounds.size.height - 96
- )];
- [close_ setFrame:CGRectMake(
- (bounds.size.width - closewidth) / 2,
- bounds.size.height - prgsize.height - 50,
- closewidth,
- 32 + prgsize.height
- )];
+ [self updateCancel];
+ } return self;
}
-- (void) viewWillAppear:(BOOL)animated {
- [super viewDidAppear:animated];
- [[self navigationItem] setHidesBackButton:YES];
- [[[self navigationController] navigationBar] setBarStyle:UIBarStyleBlack];
-
- [self positionViews];
+- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+ [super webView:view didClearWindowObject:window forFrame:frame];
+ [window setValue:progress_ forKey:@"cydiaProgress"];
}
-- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
- [self positionViews];
+- (void) updateProgress {
+ [self dispatchEvent:@"CydiaProgressUpdate"];
}
-- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
- NSString *context([alert context]);
-
- if ([context isEqualToString:@"conffile"]) {
- FILE *input = [database_ input];
- if (button == [alert cancelButtonIndex])
- fprintf(input, "N\n");
- else if (button == [alert firstOtherButtonIndex])
- fprintf(input, "Y\n");
- fflush(input);
+- (void) viewWillAppear:(BOOL)animated {
+ if (![self hasLoaded])
+ [[[self navigationController] navigationBar] setBarStyle:UIBarStyleBlack];
- [alert dismissWithClickedButtonIndex:-1 animated:YES];
- }
+ [super viewWillAppear:animated];
}
-- (void) closeButtonPushed {
- running_ = NO;
-
+- (void) close {
UpdateExternalStatus(0);
switch (Finish_) {
case 0:
- [self dismissModalViewControllerAnimated:YES];
break;
case 1:
reboot2(RB_AUTOBOOT);
break;
}
+
+ [super close];
+}
+
+- (void) setTitle:(NSString *)title {
+ [progress_ setTitle:title];
+ [self updateProgress];
}
-- (void) _retachThread {
- [[self navigationItem] setTitle:UCLocalize("COMPLETE")];
+- (UIBarButtonItem *) rightButton {
+ return [[progress_ running] boolValue] ? nil : [[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("CLOSE")
+ style:UIBarButtonItemStylePlain
+ target:self
+ action:@selector(close)
+ ] autorelease];
+}
- [[self view] addSubview:close_];
- [progress_ removeFromSuperview];
- [status_ removeFromSuperview];
+- (void) invoke:(NSInvocation *)invocation withTitle:(NSString *)title {
+ UpdateExternalStatus(1);
- [database_ popErrorWithTitle:title_];
- [delegate_ progressControllerIsComplete:self];
+ [progress_ setRunning:true];
+ [self setTitle:title];
+ // implicit updateProgress
- if (Finish_ < 4) {
+ SHA1SumValue notifyconf; {
FileFd file;
if (!file.Open(NotifyConfig_, FileFd::ReadOnly))
_error->Discard();
MMap mmap(file, MMap::ReadOnly);
SHA1Summation sha1;
sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
- if (!(notifyconf_ == sha1.Result()))
- Finish_ = 4;
+ notifyconf = sha1.Result();
}
}
- if (Finish_ < 3) {
+ SHA1SumValue springlist; {
FileFd file;
- if (!file.Open(SpringBoard_, FileFd::ReadOnly))
- _error->Discard();
- else {
- MMap mmap(file, MMap::ReadOnly);
- SHA1Summation sha1;
- sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
- if (!(springlist_ == sha1.Result()))
- Finish_ = 3;
- }
- }
-
- if (Finish_ < 2) {
- if (RestartSubstrate_)
- Finish_ = 2;
- }
-
- RestartSubstrate_ = false;
-
- switch (Finish_) {
- case 0: [close_ setTitle:UCLocalize("RETURN_TO_CYDIA")]; break; /* XXX: Maybe UCLocalize("DONE")? */
- case 1: [close_ setTitle:UCLocalize("CLOSE_CYDIA")]; break;
- case 2: [close_ setTitle:UCLocalize("RESTART_SPRINGBOARD")]; break;
- case 3: [close_ setTitle:UCLocalize("RELOAD_SPRINGBOARD")]; break;
- case 4: [close_ setTitle:UCLocalize("REBOOT_DEVICE")]; break;
- }
-
- _trace();
- system("su -c /usr/bin/uicache mobile");
- _trace();
-
- UpdateExternalStatus(Finish_ == 0 ? 2 : 0);
-
- [delegate_ setStatusBarShowsProgress:NO];
-}
-
-- (void) _detachNewThreadInvocation:(NSInvocation *)invocation { _pooled
- [invocation invoke];
- [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];
-}
-
-- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title {
- UpdateExternalStatus(1);
-
- if (title_ != nil)
- [title_ release];
- if (title == nil)
- title_ = nil;
- else
- title_ = [title retain];
-
- [[self navigationItem] setTitle:title_];
-
- [status_ setText:nil];
- [output_ setText:@""];
- [progress_ setProgress:0];
-
- [close_ removeFromSuperview];
- [[self view] addSubview:progress_];
- [[self view] addSubview:status_];
+ if (!file.Open(SpringBoard_, FileFd::ReadOnly))
+ _error->Discard();
+ else {
+ MMap mmap(file, MMap::ReadOnly);
+ SHA1Summation sha1;
+ sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+ springlist = sha1.Result();
+ }
+ }
- [delegate_ setStatusBarShowsProgress:YES];
- running_ = YES;
+ if (invocation != nil) {
+ [invocation yieldToSelector:@selector(invoke)];
+ [self setTitle:@"COMPLETE"];
+ }
- {
+ if (Finish_ < 4) {
FileFd file;
if (!file.Open(NotifyConfig_, FileFd::ReadOnly))
_error->Discard();
MMap mmap(file, MMap::ReadOnly);
SHA1Summation sha1;
sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
- notifyconf_ = sha1.Result();
+ if (!(notifyconf == sha1.Result()))
+ Finish_ = 4;
}
}
- {
+ if (Finish_ < 3) {
FileFd file;
if (!file.Open(SpringBoard_, FileFd::ReadOnly))
_error->Discard();
MMap mmap(file, MMap::ReadOnly);
SHA1Summation sha1;
sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
- springlist_ = sha1.Result();
+ if (!(springlist == sha1.Result()))
+ Finish_ = 3;
}
}
- NSInvocation *invocation([NSInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]]);
- [invocation setTarget:target];
- [invocation setSelector:selector];
- _assert(object == nil);
+ if (Finish_ < 2) {
+ if (RestartSubstrate_)
+ Finish_ = 2;
+ }
- [NSThread detachNewThreadSelector:@selector(_detachNewThreadInvocation:) toTarget:self withObject:invocation];
-}
+ RestartSubstrate_ = false;
-- (void) repairWithSelector:(SEL)selector {
- [self
- detachNewThreadSelector:selector
- toTarget:database_
- withObject:nil
- title:UCLocalize("REPAIRING")
- ];
-}
+ switch (Finish_) {
+ case 0: [progress_ setFinish:UCLocalize("RETURN_TO_CYDIA")]; break; /* XXX: Maybe UCLocalize("DONE")? */
+ case 1: [progress_ setFinish:UCLocalize("CLOSE_CYDIA")]; break;
+ case 2: [progress_ setFinish:UCLocalize("RESTART_SPRINGBOARD")]; break;
+ case 3: [progress_ setFinish:UCLocalize("RELOAD_SPRINGBOARD")]; break;
+ case 4: [progress_ setFinish:UCLocalize("REBOOT_DEVICE")]; break;
+ }
-- (void) setProgressError:(NSString *)error withTitle:(NSString *)title {
- CYAlertView *sheet([[[CYAlertView alloc]
- initWithTitle:title
- buttons:[NSArray arrayWithObjects:UCLocalize("OKAY"), nil]
- defaultButtonIndex:0
- ] autorelease]);
+ _trace();
+ system("su -c /usr/bin/uicache mobile");
+ _trace();
- [sheet setMessage:error];
- [sheet yieldToPopupAlertAnimated:YES];
- [sheet dismiss];
-}
+ UpdateExternalStatus(Finish_ == 0 ? 0 : 2);
+
+ [progress_ setRunning:false];
+ [self updateProgress];
-- (void) startProgress {
+ [self applyRightButton];
}
-- (bool) isCancelling:(size_t)received {
- return false;
+- (void) addProgressEvent:(CydiaProgressEvent *)event {
+ [progress_ addEvent:event];
+ [self updateProgress];
}
-- (void) setConfigurationData:(NSString *)data {
- static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
+- (bool) isProgressCancelled {
+ return cancel_ == 2;
+}
- if (!conffile_r(data)) {
- lprintf("E:invalid conffile\n");
- return;
- }
+- (void) cancel {
+ cancel_ = 2;
+ [self updateCancel];
+}
- NSString *ofile = conffile_r[1];
- //NSString *nfile = conffile_r[2];
+- (void) setCancellable:(bool)cancellable {
+ unsigned cancel(cancel_);
- UIAlertView *alert = [[[UIAlertView alloc]
- initWithTitle:UCLocalize("CONFIGURATION_UPGRADE")
- 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"),
- nil
- ] autorelease];
+ if (!cancellable)
+ cancel_ = 0;
+ else if (cancel_ == 0)
+ cancel_ = 1;
- [alert setContext:@"conffile"];
- [alert show];
+ if (cancel != cancel_)
+ [self updateCancel];
}
-- (void) setProgressTitle:(NSString *)title {
- NSMutableArray *words([[title componentsSeparatedByString:@" "] mutableCopy]);
- for (size_t i(0), e([words count]); i != e; ++i) {
- NSString *word([words objectAtIndex:i]);
- if (Package *package = [database_ packageWithName:word])
- [words replaceObjectAtIndex:i withObject:[package name]];
- }
-
- [status_ setText:[words componentsJoinedByString:@" "]];
+- (void) setProgressCancellable:(NSNumber *)cancellable {
+ [self setCancellable:[cancellable boolValue]];
}
- (void) setProgressPercent:(NSNumber *)percent {
- [progress_ setProgress:[percent floatValue]];
+ [progress_ setPercent:[percent floatValue]];
+ [self updateProgress];
}
-- (void) addProgressOutput:(NSString *)output {
- [output_ setText:[NSString stringWithFormat:@"%@\n%@", [output_ text], output]];
- CGSize size = [output_ contentSize];
- CGPoint offset = [output_ contentOffset];
- if (size.height - offset.y < [output_ frame].size.height + 20.f) {
- CGRect rect = {{0, size.height-1}, {size.width, 1}};
- [output_ scrollRectToVisible:rect animated:YES];
+- (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]];
}
-}
-- (BOOL) isRunning {
- return running_;
+ [self updateProgress];
}
@end
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/%@", name_]];
+ return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@", (id) name_]];
}
/* 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 {
} return self;
}
-- (void) cancel {
- [cancel_ removeFromSuperview];
+- (void) setCancellable:(bool)cancellable {
+ if (cancellable)
+ [self addSubview:cancel_];
+ else
+ [cancel_ removeFromSuperview];
}
- (void) start {
[prompt_ setText:UCLocalize("UPDATING_DATABASE")];
[progress_ setProgress:0];
- [self addSubview:cancel_];
}
- (void) stop {
- [cancel_ removeFromSuperview];
+ [self setCancellable:NO];
}
- (void) setPrompt:(NSString *)prompt {
return updating_;
}
-- (void) setProgressError:(NSString *)error withTitle:(NSString *)title {
- [refreshbar_ setPrompt:[NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), UCLocalize("ERROR"), error]];
+- (void) addProgressEvent:(CydiaProgressEvent *)event {
+ [refreshbar_ setPrompt:[event compoundMessage]];
}
-- (void) startProgress {
-}
-
-- (bool) isCancelling:(size_t)received {
+- (bool) isProgressCancelled {
return !updating_;
}
-- (void) setProgressTitle:(NSString *)title {
- [refreshbar_ setPrompt:title];
+- (void) setProgressCancellable:(NSNumber *)cancellable {
+ [refreshbar_ setCancellable:(updating_ && [cancellable boolValue])];
}
- (void) setProgressPercent:(NSNumber *)percent {
[refreshbar_ setProgress:[percent floatValue]];
}
-- (void) addProgressOutput:(NSString *)output {
+- (void) setProgressStatus:(NSDictionary *)status {
+ if (status != nil)
+ [self setProgressPercent:[status objectForKey:@"Percent"]];
}
- (void) setUpdateDelegate:(id)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];
}
[alert show];
}
- [delegate_ setStatusBarShowsProgress:NO];
- [delegate_ removeProgressHUD:hud_];
+ [delegate_ releaseNetworkActivityIndicator];
+ [delegate_ removeProgressHUD:hud_];
[hud_ autorelease];
hud_ = nil;
// XXX: this is stupid
hud_ = [[delegate_ addProgressHUD] retain];
[hud_ setText:UCLocalize("VERIFYING_URL")];
+ [delegate_ retainNetworkActivityIndicator];
} break;
case 0:
[super reloadData];
pkgSourceList list;
- if (!list.ReadMainList())
+ if ([database_ popErrorWithTitle:UCLocalize("SOURCES") forOperation:list.ReadMainList()])
return;
[sources_ removeAllObjects];
@interface Cydia : UIApplication <
ConfirmationControllerDelegate,
- ProgressControllerDelegate,
+ DatabaseDelegate,
CydiaDelegate,
UINavigationControllerDelegate,
UITabBarControllerDelegate
UIWindow *window_;
CYTabBarController *tabbar_;
+ CYEmulatedLoadingController *emulated_;
NSMutableArray *essential_;
NSMutableArray *broken_;
] autorelease];
[alert setContext:@"fixhalf"];
+ [alert setNumberOfRows:2];
[alert show];
} else if (!Ignored_ && [essential_ count] != 0) {
int count = [essential_ count];
[database_ update];
}
+- (void) complete {
+ @synchronized (self) {
+ [self _reloadDataWithInvocation:nil];
+ }
+}
+
+- (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 *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 {
+ ProgressController *progress([[[ProgressController alloc] initWithDatabase:database_ delegate:self] autorelease]);
+
+ if (navigation != nil)
+ [navigation pushViewController:progress animated:YES];
+ else
+ [self presentModalViewController:progress force:YES];
+
+ [progress invoke:invocation withTitle:title];
+ return progress;
+}
+
+- (void) detachNewProgressSelector:(SEL)selector toTarget:(id)target forController:(UINavigationController *)navigation title:(NSString *)title {
+ [self invokeNewProgress:[NSInvocation invocationWithSelector:selector forTarget:target] forController:navigation withTitle:title];
+}
+
+- (void) repairWithInvocation:(NSInvocation *)invocation {
+ _trace();
+ [self invokeNewProgress:invocation forController:nil withTitle:@"REPAIRING"];
+ _trace();
+}
+
+- (void) repairWithSelector:(SEL)selector {
+ [self performSelectorOnMainThread:@selector(repairWithInvocation:) withObject:[NSInvocation invocationWithSelector:selector forTarget:database_] waitUntilDone:YES];
+}
+
- (void) syncData {
[self _saveConfig];
fclose(file);
- ProgressController *progress = [[[ProgressController alloc] initWithDatabase:database_ delegate:self] autorelease];
- CYNavigationController *navigation = [[[CYNavigationController alloc] initWithRootViewController:progress] autorelease];
- if (IsWildcat_)
- [navigation setModalPresentationStyle:UIModalPresentationFormSheet];
- [tabbar_ presentModalViewController:navigation animated:YES];
+ [self detachNewProgressSelector:@selector(update_) toTarget:self forController:nil title:@"UPDATING_SOURCES"];
- [progress
- detachNewThreadSelector:@selector(update_)
- toTarget:self
- withObject:nil
- title:UCLocalize("UPDATING_SOURCES")
- ];
+ [self complete];
}
- (void) addTrivialSource:(NSString *)href {
}
}
-- (void) complete {
- @synchronized (self) {
- [self _reloadDataWithInvocation:nil];
- }
-}
-
- (void) confirmWithNavigationController:(UINavigationController *)navigation {
Queuing_ = false;
-
- ProgressController *progress = [[[ProgressController alloc] initWithDatabase:database_ delegate:self] autorelease];
-
- if (navigation != nil) {
- [navigation pushViewController:progress animated:YES];
- } else {
- navigation = [[[CYNavigationController alloc] initWithRootViewController:progress] autorelease];
- if (IsWildcat_)
- [navigation setModalPresentationStyle:UIModalPresentationFormSheet];
- [tabbar_ presentModalViewController:navigation animated:YES];
- }
-
- [progress
- detachNewThreadSelector:@selector(perform)
- toTarget:database_
- withObject:nil
- title:UCLocalize("RUNNING")
- ];
-
++locked_;
-}
-
-- (void) progressControllerIsComplete:(ProgressController *)progress {
+ [self detachNewProgressSelector:@selector(perform) toTarget:database_ forController:navigation title:@"RUNNING"];
--locked_;
[self complete];
}
- (void) retainNetworkActivityIndicator {
if (activity_++ == 0)
[self setNetworkActivityIndicatorVisible:YES];
+
+#if TraceLogging
+ NSLog(@"retainNetworkActivityIndicator->%d", activity_);
+#endif
}
- (void) releaseNetworkActivityIndicator {
if (--activity_ == 0)
[self setNetworkActivityIndicatorVisible:NO];
+
+#if TraceLogging
+ NSLog(@"releaseNetworkActivityIndicator->%d", activity_);
+#endif
+
}
- (void) cancelAndClear:(bool)clear {
- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
NSString *context([alert context]);
- if ([context isEqualToString:@"fixhalf"]) {
+ if ([context isEqualToString:@"conffile"]) {
+ FILE *input = [database_ input];
+ if (button == [alert cancelButtonIndex])
+ fprintf(input, "N\n");
+ else if (button == [alert firstOtherButtonIndex])
+ fprintf(input, "Y\n");
+ fflush(input);
+
+ [alert dismissWithClickedButtonIndex:-1 animated:YES];
+ } else if ([context isEqualToString:@"fixhalf"]) {
if (button == [alert cancelButtonIndex]) {
@synchronized (self) {
for (Package *broken in broken_) {
[self _saveConfig];
}
+- (void) setConfigurationData:(NSString *)data {
+ static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
+
+ if (!conffile_r(data)) {
+ lprintf("E:invalid conffile\n");
+ return;
+ }
+
+ NSString *ofile = conffile_r[1];
+ //NSString *nfile = conffile_r[2];
+
+ UIAlertView *alert = [[[UIAlertView alloc]
+ initWithTitle:UCLocalize("CONFIGURATION_UPGRADE")
+ 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"),
+ nil
+ ] autorelease];
+
+ [alert setContext:@"conffile"];
+ [alert setNumberOfRows:2];
+ [alert show];
+}
+
- (void) addStashController {
++locked_;
stash_ = [[StashController alloc] init];
[self setIdleTimerDisabled:YES];
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackOpaque];
- [self setStatusBarShowsProgress:YES];
UpdateExternalStatus(1);
-
[self yieldToSelector:@selector(system:) withObject:@"/usr/libexec/cydia/free.sh"];
-
UpdateExternalStatus(0);
- [self setStatusBarShowsProgress:NO];
[self removeStashController];
[tabbar_ setUpdateDelegate:self];
}
-- (CYEmulatedLoadingController *) showEmulatedLoadingControllerInView:(UIView *)view {
- static CYEmulatedLoadingController *fake = nil;
-
- if (view != nil) {
- if (fake == nil)
- fake = [[CYEmulatedLoadingController alloc] initWithDatabase:database_];
- [view addSubview:[fake view]];
- } else {
- [[fake view] removeFromSuperview];
- [fake release];
- fake = nil;
- }
-
- return fake;
+- (void) addCydiaHost:(NSString *)host {
+ [CydiaHosts_ addObject:host];
}
- (void) applicationDidFinishLaunching:(id)unused {
_trace();
- CydiaApp = self;
-
if ([self respondsToSelector:@selector(setApplicationSupportsShakeToEdit:)])
[self setApplicationSupportsShakeToEdit:NO];
+ [self addCydiaHost:[[NSURL URLWithString:CydiaURL(@"")] host]];
+
[NSURLCache setSharedURLCache:[[[SDURLCache alloc]
initWithMemoryCapacity:524288
diskCapacity:10485760
}
database_ = [Database sharedInstance];
+ [database_ setDelegate:self];
[window_ setUserInteractionEnabled:NO];
[self setupViewControllers];
- [self showEmulatedLoadingControllerInView:window_];
+
+ emulated_ = [[CYEmulatedLoadingController alloc] initWithDatabase:database_];
+ [window_ addSubview:[emulated_ view]];
[self performSelector:@selector(loadData) withObject:nil afterDelay:0];
_trace();
_trace();
if (Role_ == nil) {
[window_ setUserInteractionEnabled:YES];
-
- SettingsController *role = [[[SettingsController alloc] initWithDatabase:database_ delegate:self] autorelease];
- CYNavigationController *nav = [[[CYNavigationController alloc] initWithRootViewController:role] autorelease];
- if (IsWildcat_)
- [nav setModalPresentationStyle:UIModalPresentationFormSheet];
- [[self showEmulatedLoadingControllerInView:window_] presentModalViewController:nav animated:YES];
-
+ [self presentModalViewController:[[[SettingsController alloc] initWithDatabase:database_ delegate:self] autorelease] force:NO];
return;
} else {
- if ([[self showEmulatedLoadingControllerInView:window_] modalViewController] != nil)
- [[self showEmulatedLoadingControllerInView:window_] dismissModalViewControllerAnimated:YES];
+ if ([emulated_ modalViewController] != nil)
+ [emulated_ dismissModalViewControllerAnimated:YES];
[window_ setUserInteractionEnabled:NO];
}
[self reloadData];
PrintTimes();
- [window_ addSubview:[tabbar_ view]];
- [self showEmulatedLoadingControllerInView:nil];
- [window_ setUserInteractionEnabled:YES];
+ [self disemulate];
int selectedIndex = 0;
NSMutableArray *items = nil;
}
}
+- (void) addProgressEvent:(CydiaProgressEvent *)event forTask:(NSString *)task {
+ id<ProgressDelegate> progress([database_ progressDelegate] ?: [self invokeNewProgress:nil forController:nil withTitle:task]);
+ [progress setTitle:task];
+ [progress addProgressEvent:event];
+}
+
+- (void) addProgressEventForTask:(NSArray *)data {
+ CydiaProgressEvent *event([data objectAtIndex:0]);
+ NSString *task([data count] < 2 ? nil : [data objectAtIndex:1]);
+ [self addProgressEvent:event forTask:task];
+}
+
+- (void) addProgressEventOnMainThread:(CydiaProgressEvent *)event forTask:(NSString *)task {
+ [self performSelectorOnMainThread:@selector(addProgressEventForTask:) withObject:[NSArray arrayWithObjects:event, task, nil] waitUntilDone:YES];
+}
+
@end
/*IMP alloc_;
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!");
+ }
+
+ CydiaHosts_ = [NSMutableSet setWithCapacity:2];
+
+ 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)
if (access("/tmp/.cydia.fw", F_OK) == 0) {
unlink("/tmp/.cydia.fw");
goto firmware;
- } else if (access("/User", F_OK) != 0 || version < 2) {
+ } else if (access("/User", F_OK) != 0 || version < 4) {
firmware:
_trace();
system("/usr/libexec/cydia/firmware.sh");
projects / cydia.git / blobdiff