static CGFloat ScreenScale_;
static NSString *Idiom_;
-static NSMutableSet *CydiaHosts_;
+static NSMutableDictionary *SessionData_;
+static NSObject *HostConfig_;
+static NSMutableSet *BridgedHosts_;
+static NSMutableSet *PipelinedHosts_;
static NSString *kCydiaProgressEventTypeError = @"Error";
static NSString *kCydiaProgressEventTypeInformation = @"Information";
- (CYViewController *) pageForPackage:(NSString *)name;
- (void) showActionSheet:(UIActionSheet *)sheet fromItem:(UIBarButtonItem *)item;
- (void) reloadDataWithInvocation:(NSInvocation *)invocation;
-- (void) addCydiaHost:(NSString *)host;
@end
/* }}} */
+ (NSString *) webScriptNameForSelector:(SEL)selector {
if (false);
- else if (selector == @selector(addCydiaHost:))
- return @"addCydiaHost";
+ 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 @"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 [NSString stringWithCString:value];
}
-- (void) addCydiaHost:(NSString *)host {
- [delegate_ performSelectorOnMainThread:@selector(addCydiaHost:) withObject:host waitUntilDone:NO];
+- (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 {
NSURLResponse *response([source response]);
NSURL *url([response URL]);
- if ([[[url scheme] lowercaseString] isEqualToString:@"https"])
- if ([CydiaHosts_ containsObject:[url host]])
- [window setValue:cydia_ forKey:@"cydia"];
+ @synchronized (HostConfig_) {
+ if ([[[url scheme] lowercaseString] isEqualToString:@"https"])
+ if ([BridgedHosts_ containsObject:[url host]])
+ [window setValue:cydia_ forKey:@"cydia"];
+ }
}
- (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
}
- (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 {
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];
- (void) reloadData {
[super reloadData];
+
[table_ reloadData];
}
[tabbar_ setUpdateDelegate:self];
}
-- (void) addCydiaHost:(NSString *)host {
- [CydiaHosts_ addObject:host];
-}
-
- (void) applicationDidFinishLaunching:(id)unused {
_trace();
if ([self respondsToSelector:@selector(setApplicationSupportsShakeToEdit:)])
[self setApplicationSupportsShakeToEdit:NO];
- [self addCydiaHost:[[NSURL URLWithString:CydiaURL(@"")] host]];
+ @synchronized (HostConfig_) {
+ [BridgedHosts_ addObject:[[NSURL URLWithString:CydiaURL(@"")] host]];
+ }
[NSURLCache setSharedURLCache:[[[SDURLCache alloc]
initWithMemoryCapacity:524288
_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!");
}
- CydiaHosts_ = [NSMutableSet setWithCapacity:2];
+ 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_]);
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