#include "SDURLCache/SDURLCache.h"
#include "substrate.h"
-
-#include "Version.h"
/* }}} */
/* Profiler {{{ */
while (false); \
[_pool release];
+#define Cydia_ CYDIA_VERSION
+
+#define lprintf(args...) fprintf(stderr, args)
+
+#define ForRelease 1
+#define TraceLogging (1 && !ForRelease)
+#define HistogramInsertionSort (!ForRelease ? 0 : 0)
+#define ProfileTimes (0 && !ForRelease)
+#define ForSaurik (0 && !ForRelease)
+#define LogBrowser (0 && !ForRelease)
+#define TrackResize (0 && !ForRelease)
+#define ManualRefresh (1 && !ForRelease)
+#define ShowInternals (0 && !ForRelease)
+#define AlwaysReload (0 && !ForRelease)
+#define TryIndexedCollation (0 && !ForRelease)
+
+#if !TraceLogging
+#undef _trace
+#define _trace(args...)
+#endif
+
+#if !ProfileTimes
+#undef _profile
+#define _profile(name) {
+#undef _end
+#define _end }
+#define PrintTimes() do {} while (false)
+#endif
+
// Hash Functions/Structures {{{
extern "C" uint32_t hashlittle(const void *key, size_t length, uint32_t initval = 0);
NSDate *future([NSDate distantFuture]);
NSString *mode([loop currentMode] ?: NSDefaultRunLoopMode);
+_trace();
while (!stopped && [loop runMode:mode beforeDate:future]);
+_trace();
return [context count] == 0 ? nil : [context objectAtIndex:0];
}
static const NSStringCompareOptions LaxCompareOptions_ = NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSCaseInsensitiveSearch;
static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | kCFCompareNonliteral | kCFCompareLocalized | kCFCompareNumerically | kCFCompareWidthInsensitive | kCFCompareForcedOrdering;
-#define lprintf(args...) fprintf(stderr, args)
-
-#define ForRelease 1
-#define TraceLogging (1 && !ForRelease)
-#define HistogramInsertionSort (!ForRelease ? 0 : 0)
-#define ProfileTimes (0 && !ForRelease)
-#define ForSaurik (0 && !ForRelease)
-#define LogBrowser (0 && !ForRelease)
-#define TrackResize (0 && !ForRelease)
-#define ManualRefresh (1 && !ForRelease)
-#define ShowInternals (0 && !ForRelease)
-#define AlwaysReload (0 && !ForRelease)
-#define TryIndexedCollation (0 && !ForRelease)
-
-#if !TraceLogging
-#undef _trace
-#define _trace(args...)
-#endif
-
-#if !ProfileTimes
-#undef _profile
-#define _profile(name) {
-#undef _end
-#define _end }
-#define PrintTimes() do {} while (false)
-#endif
-
/* Radix Sort {{{ */
typedef uint32_t (*SKRadixFunction)(id, void *);
const char *data_;
public:
+ Pcre() :
+ code_(NULL),
+ study_(NULL)
+ {
+ }
+
Pcre(const char *regex) :
+ code_(NULL),
study_(NULL)
{
+ this->operator =(regex);
+ }
+
+ void operator =(const char *regex) {
+ _assert(code_ == NULL);
+
const char *error;
int offset;
code_ = pcre_compile(regex, 0, &error, &offset, NULL);
data_ = data;
return pcre_exec(code_, study_, data, size, 0, 0, matches_, (capture_ + 1) * 3) >= 0;
}
+
+ _finline size_t size() const {
+ return capture_;
+ }
};
/* }}} */
/* Mime Addresses {{{ */
bool IsWildcat_;
static CGFloat ScreenScale_;
static NSString *Idiom_;
+
+static NSMutableDictionary *SessionData_;
+static NSObject *HostConfig_;
+static NSMutableSet *BridgedHosts_;
+static NSMutableSet *PipelinedHosts_;
+
+static NSString *kCydiaProgressEventTypeError = @"Error";
+static NSString *kCydiaProgressEventTypeInformation = @"Information";
+static NSString *kCydiaProgressEventTypeStatus = @"Status";
+static NSString *kCydiaProgressEventTypeWarning = @"Warning";
/* }}} */
/* Display Helpers {{{ */
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" forItem:item]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:UCLocalize("DOWNLOADING_"), name] ofType:kCydiaProgressEventTypeStatus forItem:item]);
[delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
if (error.empty())
return;
- CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:@"ERROR" forItem:item]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:kCydiaProgressEventTypeError forItem:item]);
[delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
if (value != nil) {
NSString *mode(nil); {
NSString *type([self type]);
- if ([type isEqualToString:@"ERROR"])
+ if ([type isEqualToString:kCydiaProgressEventTypeError])
mode = UCLocalize("ERROR");
- else if ([type isEqualToString:@"WARNING"])
+ else if ([type isEqualToString:kCydiaProgressEventTypeWarning])
mode = UCLocalize("WARNING");
}
[delegate_ performSelectorOnMainThread:@selector(setConfigurationData:) withObject:conffile_r[1] waitUntilDone:YES];
} else if (strncmp(data, "status: ", 8) == 0) {
// status: <package>: {unpacked,half-configured,installed}
- CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:(data + 8)] ofType:@"STATUS"]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:(data + 8)] ofType:kCydiaProgressEventTypeStatus]);
[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"]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:(data + 12)] ofType:kCydiaProgressEventTypeStatus]);
[progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
} else if (pmstatus_r(data, size)) {
std::string type([pmstatus_r[1] UTF8String]);
NSString *string = pmstatus_r[4];
if (type == "pmerror") {
- CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:string ofType:@"ERROR" forPackage:package]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:string ofType:kCydiaProgressEventTypeError forPackage:package]);
[progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
} else if (type == "pmstatus") {
- CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:string ofType:@"STATUS" forPackage:package]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:string ofType:kCydiaProgressEventTypeStatus forPackage:package]);
[progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
} else if (type == "pmconffile")
[delegate_ performSelectorOnMainThread:@selector(setConfigurationData:) withObject:string waitUntilDone:YES];
while (std::getline(is, line)) {
lprintf("O:%s\n", line.c_str());
- CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:line.c_str()] ofType:@"INFORMATION"]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:line.c_str()] ofType:kCydiaProgressEventTypeInformation]);
[progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
lprintf("%c:[%s]\n", warning ? 'W' : 'E', error.c_str());
- [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:(warning ? @"WARNING" : @"ERROR")] forTask:title];
+ [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:(warning ? kCydiaProgressEventTypeWarning : kCydiaProgressEventTypeError)] forTask:title];
}
return fatal;
// 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];
+ [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:(warning ? kCydiaProgressEventTypeWarning : kCydiaProgressEventTypeError)] forTask:title];
return;
}
return;
if (cache_->DelCount() != 0 || cache_->InstCount() != 0) {
- [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:UCLocalize("COUNTS_NONZERO_EX") ofType:@"ERROR"] forTask:title];
+ [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:UCLocalize("COUNTS_NONZERO_EX") ofType:kCydiaProgressEventTypeError] forTask:title];
return;
}
return;
if (cache_->BrokenCount() != 0) {
- [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:UCLocalize("STILL_BROKEN_EX") ofType:@"ERROR"] forTask:title];
+ [delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:UCLocalize("STILL_BROKEN_EX") ofType:kCydiaProgressEventTypeError] forTask:title];
return;
}
@end
/* }}} */
-/* Web Scripting {{{ */
+@interface Diversion : NSObject {
+ Pcre pattern_;
+ _H<NSString> key_;
+ _H<NSString> format_;
+}
+
+@end
+
+@implementation Diversion
+
+- (id) initWithFrom:(NSString *)from to:(NSString *)to {
+ if ((self = [super init]) != nil) {
+ pattern_ = [from UTF8String];
+ key_ = from;
+ format_ = to;
+ } return self;
+}
+
+- (NSString *) divert:(NSString *)url {
+ if (!pattern_(url))
+ return nil;
+
+ size_t count(pattern_.size());
+ id values[count];
+ for (size_t i(0); i != count; ++i)
+ values[i] = pattern_[i + 1];
+
+ return [[[NSString alloc] initWithFormat:format_ arguments:reinterpret_cast<va_list>(values)] autorelease];
+}
+
+- (NSString *) key {
+ return key_;
+}
+
+- (NSUInteger) hash {
+ return [key_ hash];
+}
+
+- (BOOL) isEqual:(Diversion *)object {
+ return self == object || [self class] == [object class] && [key_ isEqual:[object key]];
+}
+
+@end
+
@interface CydiaObject : NSObject {
id indirect_;
_transient id delegate_;
@end
+@interface CYBrowserController : BrowserController {
+ CydiaObject *cydia_;
+}
+
++ (void) addDiversion:(Diversion *)diversion;
+
+@end
+
+static NSMutableSet *Diversions_;
+
+/* Web Scripting {{{ */
@implementation CydiaObject
- (void) dealloc {
+ (NSString *) webScriptNameForSelector:(SEL)selector {
if (false);
+ else if (selector == @selector(addBridgedHost:))
+ return @"addBridgedHost";
+ else if (selector == @selector(addPipelinedHost:scheme:))
+ return @"addPipelinedHost";
else if (selector == @selector(addTrivialSource:))
return @"addTrivialSource";
else if (selector == @selector(close))
return @"close";
+ else if (selector == @selector(divert::))
+ return @"divert";
else if (selector == @selector(du:))
return @"du";
else if (selector == @selector(stringWithFormat:arguments:))
return @"getInstalledPackages";
else if (selector == @selector(getPackageById:))
return @"getPackageById";
+ else if (selector == @selector(getSessionValue:))
+ return @"getSessionValue";
else if (selector == @selector(installPackages:))
return @"installPackages";
else if (selector == @selector(localizedStringForKey:value:table:))
return @"localize";
+ else if (selector == @selector(popViewController:))
+ return @"popViewController";
else if (selector == @selector(refreshSources))
return @"refreshSources";
else if (selector == @selector(removeButton))
return @"removeButton";
+ else if (selector == @selector(setSessionValue::))
+ return @"setSessionValue";
else if (selector == @selector(substitutePackageNames:))
return @"substitutePackageNames";
else if (selector == @selector(scrollToBottom:))
return [feature isEqualToString:@"window.open"];
}
+- (void) divert:(NSString *)from :(NSString *)to {
+ [CYBrowserController performSelectorOnMainThread:@selector(addDiversion:) withObject:[[[Diversion alloc] initWithFrom:from to:to] autorelease] waitUntilDone:NO];
+}
+
- (NSNumber *) getKernelNumber:(NSString *)name {
const char *string([name UTF8String]);
return [NSString stringWithCString:value];
}
+- (id) getSessionValue:(NSString *)key {
+@synchronized (SessionData_) {
+ return [SessionData_ objectForKey:key];
+} }
+
+- (void) setSessionValue:(NSString *)key :(NSString *)value {
+@synchronized (SessionData_) {
+ if (value == (id) [WebUndefined undefined])
+ [SessionData_ removeObjectForKey:key];
+ else
+ [SessionData_ setObject:value forKey:key];
+} }
+
+- (void) addBridgedHost:(NSString *)host {
+@synchronized (HostConfig_) {
+ [BridgedHosts_ addObject:host];
+} }
+
+- (void) addPipelinedHost:(NSString *)host scheme:(NSString *)scheme {
+@synchronized (HostConfig_) {
+ if (scheme != (id) [WebUndefined undefined])
+ host = [NSString stringWithFormat:@"%@:%@", [scheme lowercaseString], host];
+
+ [PipelinedHosts_ addObject:host];
+} }
+
+- (void) popViewController:(NSNumber *)value {
+ if (value == (id) [WebUndefined undefined])
+ value = [NSNumber numberWithBool:YES];
+ [indirect_ performSelectorOnMainThread:@selector(popViewControllerWithNumber:) withObject:value waitUntilDone:NO];
+}
+
- (void) addTrivialSource:(NSString *)href {
[delegate_ performSelectorOnMainThread:@selector(addTrivialSource:) withObject:href waitUntilDone:NO];
}
} 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:[self groupTableViewBackgroundColor]];
+
+ UITableView *table([[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped] autorelease]);
+ [table setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
+ [[self view] addSubview:table];
indicator_ = [[[CYLoadingIndicator alloc] initWithFrame:[[self view] bounds]] autorelease];
[indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
/* }}} */
/* Cydia Browser Controller {{{ */
-@interface CYBrowserController : BrowserController {
- CydiaObject *cydia_;
-}
-
-@end
-
@implementation CYBrowserController
- (void) dealloc {
return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://url/%@", [[[webview_ request] URL] absoluteString]]];
}
-- (void) setHeaders:(NSDictionary *)headers forHost:(NSString *)host {
++ (void) initialize {
+ Diversions_ = [[NSMutableSet alloc] initWithCapacity:0];
+}
+
++ (void) addDiversion:(Diversion *)diversion {
+ [Diversions_ addObject:diversion];
}
- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
WebDataSource *source([frame dataSource]);
NSURLResponse *response([source response]);
-
NSURL *url([response URL]);
- NSString *scheme([url scheme]);
- NSString *host([url host]);
- if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
- NSHTTPURLResponse *http((NSHTTPURLResponse *) response);
- NSDictionary *headers([http allHeaderFields]);
- [self setHeaders:headers forHost:host];
+ @synchronized (HostConfig_) {
+ if ([[[url scheme] lowercaseString] isEqualToString:@"https"])
+ if ([BridgedHosts_ containsObject:[url host]])
+ [window setValue:cydia_ forKey:@"cydia"];
}
-
- if (
- [host isEqualToString:@"cydia.saurik.com"] ||
- [host hasSuffix:@".cydia.saurik.com"] ||
- [scheme isEqualToString:@"file"]
- )
- [window setValue:cydia_ forKey:@"cydia"];
}
-- (void) _setMoreHeaders:(NSMutableURLRequest *)request {
+- (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
+ NSMutableURLRequest *copy([[super webView:view resource:resource willSendRequest:request redirectResponse:response fromDataSource:source] mutableCopy]);
+
+ divert:
+ NSURL *url([copy URL]);
+ NSString *href([url absoluteString]);
+
+ for (Diversion *diversion in Diversions_)
+ if (NSString *diverted = [diversion divert:href]) {
+ [copy setURL:[NSURL URLWithString:diverted]];
+ goto divert;
+ }
+
if (System_ != NULL)
- [request setValue:System_ forHTTPHeaderField:@"X-System"];
+ [copy setValue:System_ forHTTPHeaderField:@"X-System"];
if (Machine_ != NULL)
- [request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
+ [copy setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
if (Token_ != nil)
- [request setValue:Token_ forHTTPHeaderField:@"X-Cydia-Token"];
- if (Role_ != nil)
- [request setValue:Role_ forHTTPHeaderField:@"X-Role"];
-}
+ [copy setValue:Token_ forHTTPHeaderField:@"X-Cydia-Token"];
-- (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
- NSMutableURLRequest *copy([[super webView:view resource:resource willSendRequest:request redirectResponse:response fromDataSource:source] mutableCopy]);
- [self _setMoreHeaders:copy];
return copy;
}
}
- (void) viewWillAppear:(BOOL)animated {
- if (![self hasLoaded])
- [[[self navigationController] navigationBar] setBarStyle:UIBarStyleBlack];
-
+ [[[self navigationController] navigationBar] setBarStyle:UIBarStyleBlack];
[super viewWillAppear:animated];
}
}
- (void) reloadData {
+ [super reloadData];
+
package_ = [database_ packageWithName:name_];
[buttons_ removeAllObjects];
target:self
action:@selector(customButtonClicked)
] autorelease];
-
- [super reloadData];
}
- (bool) isLoading {
return [NSURL URLWithString:@"cydia://home"];
}
-- (void) _setMoreHeaders:(NSMutableURLRequest *)request {
- [super _setMoreHeaders:request];
-
- if (ChipID_ != nil)
- [request setValue:ChipID_ forHTTPHeaderField:@"X-Chip-ID"];
- if (UniqueID_ != nil)
- [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
- if (PLMN_ != nil)
- [request setValue:PLMN_ forHTTPHeaderField:@"X-Carrier-ID"];
-}
-
- (void) aboutButtonClicked {
UIAlertView *alert([[[UIAlertView alloc] init] autorelease]);
NSMutableArray *sections_;
NSMutableArray *filtered_;
UITableView *list_;
- BOOL editing_;
}
- (id) initWithDatabase:(Database *)database;
}
- (void) updateNavigationItem {
- [[self navigationItem] setTitle:editing_ ? UCLocalize("SECTION_VISIBILITY") : UCLocalize("SECTIONS")];
+ [[self navigationItem] setTitle:[self isEditing] ? UCLocalize("SECTION_VISIBILITY") : UCLocalize("SECTIONS")];
if ([sections_ count] == 0) {
[[self navigationItem] setRightBarButtonItem:nil];
} else {
[[self navigationItem] setRightBarButtonItem:[[UIBarButtonItem alloc]
- initWithBarButtonSystemItem:(editing_ ? UIBarButtonSystemItemDone : UIBarButtonSystemItemEdit)
+ initWithBarButtonSystemItem:([self isEditing] ? UIBarButtonSystemItemDone : UIBarButtonSystemItemEdit)
target:self
action:@selector(editButtonClicked)
] animated:([[self navigationItem] rightBarButtonItem] != nil)];
}
}
-- (BOOL) isEditing {
- return editing_;
-}
+- (void) setEditing:(BOOL)editing animated:(BOOL)animated {
+ [super setEditing:editing animated:animated];
-- (void) setEditing:(BOOL)editing {
- if ((editing_ = editing))
+ if (editing)
[list_ reloadData];
else
[delegate_ updateData];
- (void) viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
- if (editing_) [self setEditing:NO];
+ if ([self isEditing]) [self setEditing:NO];
}
- (Section *) sectionAtIndexPath:(NSIndexPath *)indexPath {
- Section *section = (editing_ ? [sections_ objectAtIndex:[indexPath row]] : ([indexPath row] == 0 ? nil : [filtered_ objectAtIndex:([indexPath row] - 1)]));
+ Section *section = nil;
+ int index = [indexPath row];
+ if (![self isEditing]) {
+ index -= 1;
+ if (index >= 0)
+ section = [filtered_ objectAtIndex:index];
+ } else {
+ section = [sections_ objectAtIndex:index];
+ }
return section;
}
- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
- return editing_ ? [sections_ count] : [filtered_ count] + 1;
+ if ([self isEditing])
+ return [sections_ count];
+ else
+ return [filtered_ count] + 1;
}
/*- (CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
if (cell == nil)
cell = [[[SectionCell alloc] initWithFrame:CGRectZero reuseIdentifier:reuseIdentifier] autorelease];
- [cell setSection:[self sectionAtIndexPath:indexPath] editing:editing_];
+ [cell setSection:[self sectionAtIndexPath:indexPath] editing:[self isEditing]];
return cell;
}
- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
- if (editing_)
+ if ([self isEditing])
return;
Section *section = [self sectionAtIndexPath:indexPath];
}
- (void) editButtonClicked {
- [self setEditing:(!editing_)];
+ [self setEditing:![self isEditing] animated:YES];
}
@end
NSMutableArray *sections_;
UITableView *list_;
unsigned upgrades_;
- BOOL hasSentFirstLoad_;
}
- (id) initWithDatabase:(Database *)database;
return [NSURL URLWithString:@"cydia://changes"];
}
-- (void) viewWillAppear:(BOOL)animated {
- // Loads after it appears, so don't load beforehand.
- loaded_ = YES;
- [super viewWillAppear:animated];
-}
-
- (void) viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
-
- if (!hasSentFirstLoad_) {
- hasSentFirstLoad_ = YES;
- [self performSelector:@selector(reloadData) withObject:nil afterDelay:0.0];
- } else {
- [list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated];
- }
+ [list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated];
}
- (NSInteger) numberOfSectionsInTableView:(UITableView *)list {
_trace();
}
-- (void) reloadData {
+- (void) _reloadData {
@synchronized (database_) {
era_ = [database_ era];
NSArray *packages = [database_ packages];
PrintTimes();
} }
+- (void) reloadData {
+ [super reloadData];
+ [self performSelector:@selector(_reloadData) withObject:nil afterDelay:0];
+}
+
@end
/* }}} */
/* Search Controller {{{ */
- (void) reloadData {
[self setObject:[search_ text]];
- [super reloadData];
[self resetCursor];
+
+ [super reloadData];
}
- (void) didSelectPackage:(Package *)package {
[key_ release];
key_ = [[source_ key] retain];
[self setObject:source_];
+
[[self navigationItem] setTitle:[source_ label]];
[super reloadData];
[request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
if (UniqueID_ != nil)
[request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
- if (Role_ != nil)
- [request setValue:Role_ forHTTPHeaderField:@"X-Role"];
return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
}
- (void) reloadData {
[super reloadData];
+
[table_ reloadData];
}
- (void) repairWithInvocation:(NSInvocation *)invocation {
_trace();
- [self invokeNewProgress:invocation forController:nil withTitle:UCLocalize("REPAIRING")];
+ [self invokeNewProgress:invocation forController:nil withTitle:@"REPAIRING"];
_trace();
}
fclose(file);
- [self detachNewProgressSelector:@selector(update_) toTarget:self forController:nil title:UCLocalize("UPDATING_SOURCES")];
+ [self detachNewProgressSelector:@selector(update_) toTarget:self forController:nil title:@"UPDATING_SOURCES"];
[self complete];
}
- (void) confirmWithNavigationController:(UINavigationController *)navigation {
Queuing_ = false;
++locked_;
- [self detachNewProgressSelector:@selector(perform) toTarget:database_ forController:navigation title:UCLocalize("RUNNING")];
+ [self detachNewProgressSelector:@selector(perform) toTarget:database_ forController:navigation title:@"RUNNING"];
--locked_;
[self complete];
}
}
- (BOOL) isSafeToSuspend {
+ if (locked_ != 0) {
+#if !ForRelease
+ NSLog(@"isSafeToSuspend: locked_ != 0");
+#endif
+ return false;
+ }
+
// Use external process status API internally.
// This is probably a really bad idea.
// XXX: what is the point of this? does this solve anything at all?
notify_cancel(notify_token);
}
- return locked_ == 0 && status == 0;
+ if (status != 0) {
+#if !ForRelease
+ NSLog(@"isSafeToSuspend: status != 0");
+#endif
+ return false;
+ }
+
+#if !ForRelease
+ NSLog(@"isSafeToSuspend: -> true");
+#endif
+ return true;
}
- (void) applicationSuspend:(__GSEvent *)event {
if ([self respondsToSelector:@selector(setApplicationSupportsShakeToEdit:)])
[self setApplicationSupportsShakeToEdit:NO];
+ @synchronized (HostConfig_) {
+ [BridgedHosts_ addObject:[[NSURL URLWithString:CydiaURL(@"")] host]];
+ }
+
[NSURLCache setSharedURLCache:[[[SDURLCache alloc]
initWithMemoryCapacity:524288
diskCapacity:10485760
_trace();
}
+- (NSArray *) defaultStartPages {
+ NSMutableArray *standard = [NSMutableArray array];
+ [standard addObject:[NSArray arrayWithObject:@"cydia://home"]];
+ [standard addObject:[NSArray arrayWithObject:@"cydia://sections"]];
+ [standard addObject:[NSArray arrayWithObject:@"cydia://changes"]];
+ if (!IsWildcat_) {
+ [standard addObject:[NSArray arrayWithObject:@"cydia://manage"]];
+ } else {
+ [standard addObject:[NSArray arrayWithObject:@"cydia://installed"]];
+ [standard addObject:[NSArray arrayWithObject:@"cydia://sources"]];
+ }
+ [standard addObject:[NSArray arrayWithObject:@"cydia://search"]];
+ return standard;
+}
+
- (void) loadData {
_trace();
if (Role_ == nil) {
[self disemulate];
- int selectedIndex = 0;
- NSMutableArray *items = nil;
+ int savedIndex = [[Metadata_ objectForKey:@"InterfaceIndex"] intValue];
+ NSArray *saved = [[Metadata_ objectForKey:@"InterfaceState"] mutableCopy];
+ int standardIndex = 0;
+ NSArray *standard = [self defaultStartPages];
- bool recently = false;
- NSDate *closed([Metadata_ objectForKey:@"LastClosed"]);
- if (closed != nil) {
+ BOOL valid = YES;
+
+ if (saved == nil)
+ valid = NO;
+
+ NSDate *closed = [Metadata_ objectForKey:@"LastClosed"];
+ if (valid && closed != nil) {
NSTimeInterval interval([closed timeIntervalSinceNow]);
// XXX: Is 15 minutes the optimal time here?
- if (interval <= 0 && interval > -(15*60))
- recently = true;
+ if (interval > 0 && interval <= -(15*60))
+ valid = NO;
}
- items = [[Metadata_ objectForKey:@"InterfaceState"] mutableCopy];
- selectedIndex = [[Metadata_ objectForKey:@"InterfaceIndex"] intValue];
-
- BOOL enough = YES;
- for (NSArray *entry in items)
- if ([entry count] <= 0)
- enough = NO;
+ if (valid && [saved count] != [standard count])
+ valid = NO;
- if (!recently || !items || !enough) {
- selectedIndex = 0;
- items = [NSMutableArray array];
- [items addObject:[NSArray arrayWithObject:@"cydia://home"]];
- [items addObject:[NSArray arrayWithObject:@"cydia://sections"]];
- [items addObject:[NSArray arrayWithObject:@"cydia://changes"]];
- if (!IsWildcat_) {
- [items addObject:[NSArray arrayWithObject:@"cydia://manage"]];
- } else {
- [items addObject:[NSArray arrayWithObject:@"cydia://installed"]];
- [items addObject:[NSArray arrayWithObject:@"cydia://sources"]];
+ if (valid) {
+ for (unsigned int i = 0; i < [standard count]; i++) {
+ NSArray *std = [standard objectAtIndex:i], *sav = [saved objectAtIndex:i];
+ // XXX: The "hasPrefix" sanity check here could be, in theory, fooled,
+ // but it's good enough for now.
+ if ([sav count] == 0 || ![[sav objectAtIndex:0] hasPrefix:[std objectAtIndex:0]]) {
+ valid = NO;
+ break;
+ }
}
- [items addObject:[NSArray arrayWithObject:@"cydia://search"]];
}
- [tabbar_ setSelectedIndex:selectedIndex];
+ NSArray *items = nil;
+ if (valid) {
+ [tabbar_ setSelectedIndex:savedIndex];
+ items = saved;
+ } else {
+ [tabbar_ setSelectedIndex:standardIndex];
+ items = standard;
+ }
+
for (unsigned int tab = 0; tab < [[tabbar_ viewControllers] count]; tab++) {
NSArray *stack = [items objectAtIndex:tab];
CYNavigationController *navigation = [[tabbar_ viewControllers] objectAtIndex:tab];
}
}
+Class $NSURLConnection;
+
+MSHook(id, NSURLConnection$init$, NSURLConnection *self, SEL _cmd, NSURLRequest *request, id delegate, BOOL usesCache, int64_t maxContentLength, BOOL startImmediately, NSDictionary *connectionProperties) {
+ NSMutableURLRequest *copy([request mutableCopy]);
+
+ NSURL *url([copy URL]);
+ NSString *host([url host]);
+ NSString *scheme([[url scheme] lowercaseString]);
+
+ NSString *compound([NSString stringWithFormat:@"%@:%@", scheme, host]);
+
+ @synchronized (HostConfig_) {
+ if ([copy respondsToSelector:@selector(setHTTPShouldUsePipelining:)])
+ if ([PipelinedHosts_ containsObject:host] || [PipelinedHosts_ containsObject:compound])
+ [copy setHTTPShouldUsePipelining:YES];
+ }
+
+ if ((self = _NSURLConnection$init$(self, _cmd, copy, delegate, usesCache, maxContentLength, startImmediately, connectionProperties)) != nil) {
+ } return self;
+}
+
int main(int argc, char *argv[]) { _pooled
_trace();
NSLog(@"unknown UIUserInterfaceIdiom!");
}
+ SessionData_ = [[NSMutableDictionary alloc] initWithCapacity:4];
+
+ HostConfig_ = [[NSObject alloc] init];
+ @synchronized (HostConfig_) {
+ BridgedHosts_ = [NSMutableSet setWithCapacity:4];
+ PipelinedHosts_ = [NSMutableSet setWithCapacity:4];
+ }
+
UI_ = CydiaURL([NSString stringWithFormat:@"ui/ios~%@", Idiom_]);
PackageName = reinterpret_cast<CYString &(*)(Package *, SEL)>(method_getImplementation(class_getInstanceMethod([Package class], @selector(cyname))));
method_setImplementation(UIWebDocumentView$_setUIKitDelegate$, reinterpret_cast<IMP>(&$UIWebDocumentView$_setUIKitDelegate$));
}
+ $NSURLConnection = objc_getClass("NSURLConnection");
+ Method NSURLConnection$init$(class_getInstanceMethod($NSURLConnection, @selector(_initWithRequest:delegate:usesCache:maxContentLength:startImmediately:connectionProperties:)));
+ if (NSURLConnection$init$ != NULL) {
+ _NSURLConnection$init$ = reinterpret_cast<id (*)(NSURLConnection *, SEL, NSURLRequest *, id, BOOL, int64_t, BOOL, NSDictionary *)>(method_getImplementation(NSURLConnection$init$));
+ method_setImplementation(NSURLConnection$init$, reinterpret_cast<IMP>(&$NSURLConnection$init$));
+ }
+
$UIHardware = objc_getClass("UIHardware");
Method UIHardware$_playSystemSound$(class_getClassMethod($UIHardware, @selector(_playSystemSound:)));
if (UIHardware$_playSystemSound$ != NULL) {
/* Set Locale {{{ */
Locale_ = CFLocaleCopyCurrent();
Languages_ = [NSLocale preferredLanguages];
+
//CFStringRef locale(CFLocaleGetIdentifier(Locale_));
//NSLog(@"%@", [Languages_ description]);
const char *lang;
- if (Languages_ == nil || [Languages_ count] == 0)
+ if (Locale_ != NULL)
+ lang = [(NSString *) CFLocaleGetIdentifier(Locale_) UTF8String];
+ else if (Languages_ == nil || [Languages_ count] == 0)
// XXX: consider just setting to C and then falling through?
lang = NULL;
else {
projects / cydia.git / blobdiff