#include <CoreGraphics/CoreGraphics.h>
#include <GraphicsServices/GraphicsServices.h>
#include <Foundation/Foundation.h>
-#include <UIKit/UIKit.h>
+
#include <WebCore/DOMHTML.h>
+#import <QuartzCore/CALayer.h>
-#import "BrowserView.h"
-#import "ResetView.h"
-#import "UICaboodle.h"
+#import <UIKit/UIKit.h>
+
+// XXX: remove
+#import <UIKit/UIActionSheet-Private.h>
+#import <UIKit/UIControl-UIControlPrivate.h>
+#import <UIKit/UIImage-UIImageDeprecated.h>
+#import <UIKit/UIImage-UIImagePrivate.h>
+#import <UIKit/UINavigationBar-Static.h>
+#import <UIKit/UIProgressHUD-Deprecated.h>
+#import <UIKit/UIToolbar-UIButtonBarPrivate.h>
+#import <UIKit/UIView-Deprecated.h>
+#import <UIKit/UIWindow-Static.h>
+
+// XXX: remove
+#import <UIKit/NSString-UIStringDrawingDeprecated.h>
#include <WebKit/WebFrame.h>
#include <WebKit/WebView.h>
#include <apt-pkg/debmetaindex.h>
#include <apt-pkg/error.h>
#include <apt-pkg/init.h>
+#include <apt-pkg/mmap.h>
#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/sha1.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/sptr.h>
#include <sys/sysctl.h>
#include <notify.h>
+#include <dlfcn.h>
extern "C" {
#include <mach-o/nlist.h>
#include <errno.h>
#include <pcre.h>
+
+#import "BrowserView.h"
+#import "ResetView.h"
+#import "UICaboodle.h"
/* }}} */
+static const NSStringCompareOptions CompareOptions_ = NSCaseInsensitiveSearch | NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSForcedOrderingSearch;
+
+@interface WebView (Cydia)
+- (void) _setLayoutInterval:(float)interval;
+@end
+
/* iPhoneOS 2.0 Compatibility {{{ */
#ifdef __OBJC2__
@interface UICGColor : NSObject {
- (id) initWithCGColor:(CGColorRef)color;
@end
-@interface UIFont {
-}
-
-- (UIFont *) fontWithSize:(CGFloat)size;
-@end
-
@interface NSObject (iPhoneOS)
- (CGColorRef) cgColor;
- (CGColorRef) CGColor;
#endif
/* }}} */
-#ifdef __OBJC2__
+@interface UIApplication (IdleTimer)
+- (void) setIdleTimerDisabled:(char)arg0;
+@end
+
+extern "C" int UIApplicationMain(int argc, char *argv[], NSString *principalClassName, NSString *delegateClassName);
+
+extern NSString *kUIButtonBarButtonAction;
+extern NSString *kUIButtonBarButtonInfo;
+extern NSString *kUIButtonBarButtonInfoOffset;
+extern NSString *kUIButtonBarButtonSelectedInfo;
+extern NSString *kUIButtonBarButtonStyle;
+extern NSString *kUIButtonBarButtonTag;
+extern NSString *kUIButtonBarButtonTarget;
+extern NSString *kUIButtonBarButtonTitle;
+extern NSString *kUIButtonBarButtonTitleVerticalHeight;
+extern NSString *kUIButtonBarButtonTitleWidth;
+extern NSString *kUIButtonBarButtonType;
+
typedef enum {
+ kUIProgressIndicatorStyleLargeWhite = 0,
kUIProgressIndicatorStyleMediumWhite = 1,
- kUIProgressIndicatorStyleSmallWhite = 0,
- kUIProgressIndicatorStyleSmallBlack = 4
-} UIProgressIndicatorStyle;
-#else
-typedef enum {
- kUIProgressIndicatorStyleMediumWhite = 0,
- kUIProgressIndicatorStyleSmallWhite = 2,
- kUIProgressIndicatorStyleSmallBlack = 3
+ kUIProgressIndicatorStyleMediumBrown = 2,
+ kUIProgressIndicatorStyleSmallWhite = 3,
+ kUIProgressIndicatorStyleSmallBlack = 4,
+ kUIProgressIndicatorStyleTinyWhite = 5,
} UIProgressIndicatorStyle;
-#endif
typedef enum {
kUIControlEventMouseDown = 1 << 0,
};
/* }}} */
/* Mime Addresses {{{ */
-Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
-
@interface Address : NSObject {
NSString *name_;
- NSString *email_;
+ NSString *address_;
}
- (NSString *) name;
-- (NSString *) email;
+- (NSString *) address;
+ (Address *) addressWithString:(NSString *)string;
- (Address *) initWithString:(NSString *)string;
- (void) dealloc {
[name_ release];
- if (email_ != nil)
- [email_ release];
+ if (address_ != nil)
+ [address_ release];
[super dealloc];
}
return name_;
}
-- (NSString *) email {
- return email_;
+- (NSString *) address {
+ return address_;
}
+ (Address *) addressWithString:(NSString *)string {
return [[[Address alloc] initWithString:string] autorelease];
}
++ (NSArray *) _attributeKeys {
+ return [NSArray arrayWithObjects:@"address", @"name", nil];
+}
+
+- (NSArray *) attributeKeys {
+ return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+ return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
- (Address *) initWithString:(NSString *)string {
if ((self = [super init]) != nil) {
const char *data = [string UTF8String];
size_t size = [string length];
- if (email_r(data, size)) {
- name_ = [email_r[1] retain];
- email_ = [email_r[2] retain];
+ static Pcre address_r("^\"?(.*)\"? <([^>]*)>$");
+
+ if (address_r(data, size)) {
+ name_ = [address_r[1] retain];
+ address_ = [address_r[2] retain];
} else {
name_ = [[NSString alloc]
initWithBytes:data
encoding:kCFStringEncodingUTF8
];
- email_ = nil;
+ address_ = nil;
}
} return self;
}
}
};
/* }}} */
-/* Right Alignment {{{ */
-@interface UIRightTextLabel : UITextLabel {
- float _savedRightEdgeX;
- BOOL _sizedtofit_flag;
-}
-
-- (void) setFrame:(CGRect)frame;
-- (void) setText:(NSString *)text;
-- (void) realignText;
-@end
-
-@implementation UIRightTextLabel
-
-- (void) setFrame:(CGRect)frame {
- [super setFrame:frame];
- if (_sizedtofit_flag == NO) {
- _savedRightEdgeX = frame.origin.x;
- [self realignText];
- }
-}
-- (void) setText:(NSString *)text {
- [super setText:text];
- [self realignText];
-}
-
-- (void) realignText {
- CGRect oldFrame = [self frame];
-
- _sizedtofit_flag = YES;
- [self sizeToFit]; // shrink down size so I can right align it
-
- CGRect newFrame = [self frame];
-
- oldFrame.origin.x = _savedRightEdgeX - newFrame.size.width;
- oldFrame.size.width = newFrame.size.width;
- [super setFrame:oldFrame];
- _sizedtofit_flag = NO;
-}
-
-@end
-/* }}} */
+extern "C" void UISetColor(CGColorRef color);
/* Random Global Variables {{{ */
static const int PulseInterval_ = 50000;
static const int ButtonBarHeight_ = 48;
-static const float KeyboardTime_ = 0.4f;
+static const float KeyboardTime_ = 0.3f;
static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist";
-#ifndef Cydia_
-#define Cydia_ ""
-#endif
-
+static CGColor Blue_;
static CGColor Blueish_;
static CGColor Black_;
-static CGColor Clear_;
+static CGColor Off_;
static CGColor Red_;
static CGColor White_;
+static CGColor Gray_;
+static NSString *App_;
static NSString *Home_;
static BOOL Sounds_Keyboard_;
static BOOL Loaded_;
static BOOL Ignored_;
+static UIFont *Font12_;
+static UIFont *Font12Bold_;
+static UIFont *Font14_;
+static UIFont *Font18Bold_;
+static UIFont *Font22Bold_;
+
const char *Firmware_ = NULL;
const char *Machine_ = NULL;
const char *SerialNumber_ = NULL;
bool bootstrap_;
bool reload_;
+static NSDictionary *SectionMap_;
static NSMutableDictionary *Metadata_;
-static NSMutableDictionary *Packages_;
+static _transient NSMutableDictionary *Settings_;
+static _transient NSString *Role_;
+static _transient NSMutableDictionary *Packages_;
+static _transient NSMutableDictionary *Sections_;
+static _transient NSMutableDictionary *Sources_;
+static _transient NSMutableArray *Documents_;
static bool Changed_;
static NSDate *now_;
[text setText:value];
[text setEnabled:NO];
- [text setBackgroundColor:Clear_];
+ [text setBackgroundColor:[UIColor clearColor]];
CGRect frame = [text frame];
[text setFrame:frame];
const char *data = [title UTF8String];
size_t size = [title length];
- Pcre title_r("^(.*?)( \\(.*\\))?$");
+ static Pcre square_r("^\\[(.*)\\]$");
+ if (square_r(data, size))
+ return Simplify(square_r[1]);
+
+ static Pcre paren_r("^\\((.*)\\)$");
+ if (paren_r(data, size))
+ return Simplify(paren_r[1]);
+
+ static Pcre title_r("^(.*?) \\(.*\\)$");
if (title_r(data, size))
- return title_r[1];
- else
- return title;
+ return Simplify(title_r[1]);
+
+ return title;
}
/* }}} */
+bool isSectionVisible(NSString *section) {
+ NSDictionary *metadata = [Sections_ objectForKey:section];
+ NSNumber *hidden = metadata == nil ? nil : [metadata objectForKey:@"Hidden"];
+ return hidden == nil || ![hidden boolValue];
+}
+
/* Delegate Prototypes {{{ */
@class Package;
@class Source;
- (void) setProgressError:(NSString *)error forPackage:(NSString *)id;
- (void) setProgressTitle:(NSString *)title;
- (void) setProgressPercent:(float)percent;
+- (void) startProgress;
- (void) addProgressOutput:(NSString *)output;
+- (bool) isCancelling:(size_t)received;
@end
@protocol ConfigurationDelegate
@protocol CydiaDelegate
- (void) installPackage:(Package *)package;
- (void) removePackage:(Package *)package;
-- (void) slideUp:(UIAlertSheet *)alert;
+- (void) slideUp:(UIActionSheet *)alert;
- (void) distUpgrade;
+- (void) updateData;
+- (void) syncData;
+- (void) askForSettings;
+- (UIProgressHUD *) addProgressHUD;
@end
/* }}} */
);
[delegate_ setProgressPercent:percent];
- return value;
+ return [delegate_ isCancelling:CurrentBytes] ? false : value;
}
virtual void Start() {
+ [delegate_ startProgress];
}
virtual void Stop() {
- (pkgProblemResolver *) resolver;
- (pkgAcquire &) fetcher;
- (NSArray *) packages;
+- (NSArray *) sources;
- (void) reloadData;
- (void) configure;
NSString *defaultIcon_;
+ NSDictionary *record_;
BOOL trusted_;
}
- (Source *) initWithMetaIndex:(metaIndex *)index;
+- (NSComparisonResult) compareByNameAndType:(Source *)source;
+
+- (NSDictionary *) record;
- (BOOL) trusted;
- (NSString *) uri;
- (NSString *) distribution;
- (NSString *) type;
+- (NSString *) key;
+- (NSString *) host;
+- (NSString *) name;
- (NSString *) description;
- (NSString *) label;
- (NSString *) origin;
- (NSString *) version;
- (NSString *) defaultIcon;
+
@end
@implementation Source
[version_ release];
if (defaultIcon_ != nil)
[defaultIcon_ release];
+ if (record_ != nil)
+ [record_ release];
[super dealloc];
}
++ (NSArray *) _attributeKeys {
+ return [NSArray arrayWithObjects:@"description", @"distribution", @"host", @"key", @"label", @"name", @"origin", @"trusted", @"type", @"uri", @"version", nil];
+}
+
+- (NSArray *) attributeKeys {
+ return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+ return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
- (Source *) initWithMetaIndex:(metaIndex *)index {
if ((self = [super init]) != nil) {
trusted_ = index->IsTrusted();
distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain];
type_ = [[NSString stringWithUTF8String:index->GetType()] retain];
- description_ = nil;
- label_ = nil;
- origin_ = nil;
- version_ = nil;
- defaultIcon_ = nil;
-
debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
if (dindex != NULL) {
std::ifstream release(dindex->MetaIndexFile("Release").c_str());
version_ = [[NSString stringWithUTF8String:value.c_str()] retain];
}
}
+
+ record_ = [Sources_ objectForKey:[self key]];
+ if (record_ != nil)
+ record_ = [record_ retain];
} return self;
}
+- (NSComparisonResult) compareByNameAndType:(Source *)source {
+ NSDictionary *lhr = [self record];
+ NSDictionary *rhr = [source record];
+
+ if (lhr != rhr)
+ return lhr == nil ? NSOrderedDescending : NSOrderedAscending;
+
+ NSString *lhs = [self name];
+ NSString *rhs = [source name];
+
+ if ([lhs length] != 0 && [rhs length] != 0) {
+ unichar lhc = [lhs characterAtIndex:0];
+ unichar rhc = [rhs characterAtIndex:0];
+
+ if (isalpha(lhc) && !isalpha(rhc))
+ return NSOrderedAscending;
+ else if (!isalpha(lhc) && isalpha(rhc))
+ return NSOrderedDescending;
+ }
+
+ return [lhs compare:rhs options:CompareOptions_];
+}
+
+- (NSDictionary *) record {
+ return record_;
+}
+
- (BOOL) trusted {
return trusted_;
}
return type_;
}
+- (NSString *) key {
+ return [NSString stringWithFormat:@"%@:%@:%@", type_, uri_, distribution_];
+}
+
+- (NSString *) host {
+ return [[[NSURL URLWithString:[self uri]] host] lowercaseString];
+}
+
+- (NSString *) name {
+ return origin_ == nil ? [self host] : origin_;
+}
+
- (NSString *) description {
return description_;
}
- (NSString *) label {
- return label_;
+ return label_ == nil ? [self host] : label_;
}
- (NSString *) origin {
NSString *name_;
NSString *tagline_;
NSString *icon_;
- NSString *website_;
+ NSString *depiction_;
+ NSString *homepage_;
Address *sponsor_;
Address *author_;
+ NSArray *tags_;
+ NSString *role_;
NSArray *relationships_;
}
- (BOOL) upgradableAndEssential:(BOOL)essential;
- (BOOL) essential;
- (BOOL) broken;
+- (BOOL) unfiltered;
+- (BOOL) visible;
- (BOOL) half;
- (BOOL) halfConfigured;
- (NSString *) name;
- (NSString *) tagline;
- (NSString *) icon;
-- (NSString *) website;
+- (NSString *) homepage;
+- (NSString *) depiction;
- (Address *) author;
- (NSArray *) relationships;
- (Source *) source;
+- (NSString *) role;
- (BOOL) matches:(NSString *)text;
+- (bool) hasSupportingRole;
+- (BOOL) hasTag:(NSString *)tag;
+
- (NSComparisonResult) compareByName:(Package *)package;
- (NSComparisonResult) compareBySection:(Package *)package;
- (NSComparisonResult) compareBySectionAndName:(Package *)package;
- (void) install;
- (void) remove;
-- (NSNumber *) isSearchedForBy:(NSString *)search;
-- (NSNumber *) isInstalledInSection:(NSString *)section;
-- (NSNumber *) isUninstalledInSection:(NSString *)section;
+- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search;
+- (NSNumber *) isInstalledAndVisible:(NSNumber *)number;
+- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)section;
+- (NSNumber *) isVisibleInSource:(Source *)source;
@end
[tagline_ release];
if (icon_ != nil)
[icon_ release];
- if (website_ != nil)
- [website_ release];
+ if (depiction_ != nil)
+ [depiction_ release];
+ if (homepage_ != nil)
+ [homepage_ release];
if (sponsor_ != nil)
[sponsor_ release];
if (author_ != nil)
[author_ release];
+ if (tags_ != nil)
+ [tags_ release];
+ if (role_ != nil)
+ [role_ release];
if (relationships_ != nil)
[relationships_ release];
[super dealloc];
}
++ (NSArray *) _attributeKeys {
+ return [NSArray arrayWithObjects:@"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"maintainer", @"name", @"section", @"size", @"source", @"sponsor", @"tagline", nil];
+}
+
+- (NSArray *) attributeKeys {
+ return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+ return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
if ((self = [super init]) != nil) {
iterator_ = iterator;
icon_ = Scour("Icon", begin, end);
if (icon_ != nil)
icon_ = [icon_ retain];
- website_ = Scour("Homepage", begin, end);
- if (website_ == nil)
- website_ = Scour("Website", begin, end);
- if (website_ != nil)
- website_ = [website_ retain];
+ depiction_ = Scour("Depiction", begin, end);
+ if (depiction_ != nil)
+ depiction_ = [depiction_ retain];
+ homepage_ = Scour("Homepage", begin, end);
+ if (homepage_ == nil)
+ homepage_ = Scour("Website", begin, end);
+ if ([homepage_ isEqualToString:depiction_])
+ homepage_ = nil;
+ if (homepage_ != nil)
+ homepage_ = [homepage_ retain];
NSString *sponsor = Scour("Sponsor", begin, end);
if (sponsor != nil)
sponsor_ = [[Address addressWithString:sponsor] retain];
NSString *author = Scour("Author", begin, end);
if (author != nil)
author_ = [[Address addressWithString:author] retain];
+ NSString *tags = Scour("Tag", begin, end);
+ if (tags != nil)
+ tags_ = [[tags componentsSeparatedByString:@", "] retain];
}
+ if (tags_ != nil)
+ for (int i(0), e([tags_ count]); i != e; ++i) {
+ NSString *tag = [tags_ objectAtIndex:i];
+ if ([tag hasPrefix:@"role::"]) {
+ role_ = [[tag substringFromIndex:6] retain];
+ break;
+ }
+ }
+
NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
if (metadata == nil || [metadata count] == 0) {
metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys:
- (NSString *) section {
const char *section = iterator_.Section();
- return section == NULL ? nil : [[NSString stringWithUTF8String:section] stringByReplacingCharacter:'_' withCharacter:' '];
+ if (section == NULL)
+ return nil;
+
+ NSString *name = [[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_'];
+
+ lookup:
+ if (NSDictionary *value = [SectionMap_ objectForKey:name])
+ if (NSString *rename = [value objectForKey:@"Rename"]) {
+ name = rename;
+ goto lookup;
+ }
+
+ return [name stringByReplacingCharacter:'_' withCharacter:' '];
}
- (Address *) maintainer {
return [database_ cache][iterator_].InstBroken();
}
+- (BOOL) unfiltered {
+ NSString *section = [self section];
+ return section == nil || isSectionVisible(section);
+}
+
+- (BOOL) visible {
+ return [self hasSupportingRole] && [self unfiltered];
+}
+
- (BOOL) half {
unsigned char current = iterator_->CurrentState;
return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled;
return icon_;
}
-- (NSString *) website {
- return website_;
+- (NSString *) homepage {
+ return homepage_;
+}
+
+- (NSString *) depiction {
+ return depiction_;
}
- (Address *) sponsor {
return source_;
}
+- (NSString *) role {
+ return role_;
+}
+
- (BOOL) matches:(NSString *)text {
if (text == nil)
return NO;
return NO;
}
+- (bool) hasSupportingRole {
+ if (role_ == nil)
+ return true;
+ if ([role_ isEqualToString:@"enduser"])
+ return true;
+ if ([Role_ isEqualToString:@"User"])
+ return false;
+ if ([role_ isEqualToString:@"hacker"])
+ return true;
+ if ([Role_ isEqualToString:@"Hacker"])
+ return false;
+ if ([role_ isEqualToString:@"developer"])
+ return true;
+ if ([Role_ isEqualToString:@"Developer"])
+ return false;
+ _assert(false);
+}
+
+- (BOOL) hasTag:(NSString *)tag {
+ return tags_ == nil ? NO : [tags_ containsObject:tag];
+}
+
- (NSComparisonResult) compareByName:(Package *)package {
NSString *lhs = [self name];
NSString *rhs = [package name];
return NSOrderedDescending;
}
- return [lhs caseInsensitiveCompare:rhs];
+ return [lhs compare:rhs options:CompareOptions_];
}
- (NSComparisonResult) compareBySection:(Package *)package {
else if (lhs != NULL && rhs == NULL)
return NSOrderedDescending;
else if (lhs != NULL && rhs != NULL) {
- NSComparisonResult result = [lhs caseInsensitiveCompare:rhs];
+ NSComparisonResult result = [lhs compare:rhs options:CompareOptions_];
if (result != NSOrderedSame)
return result;
}
[database_ cache]->MarkDelete(iterator_, true);
}
-- (NSNumber *) isSearchedForBy:(NSString *)search {
- return [NSNumber numberWithBool:([self valid] && [self matches:search])];
+- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search {
+ return [NSNumber numberWithBool:(
+ [self unfiltered] && [self matches:search]
+ )];
}
-- (NSNumber *) isInstalledInSection:(NSString *)section {
- return [NSNumber numberWithBool:([self installed] != nil && (section == nil || [section isEqualToString:[self section]]))];
+- (NSNumber *) isInstalledAndVisible:(NSNumber *)number {
+ return [NSNumber numberWithBool:(
+ (![number boolValue] || [self visible]) && [self installed] != nil
+ )];
}
-- (NSNumber *) isUninstalledInSection:(NSString *)name {
+- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)name {
NSString *section = [self section];
- return [NSNumber numberWithBool:([self valid] && [self installed] == nil && (
- (name == nil ||
- section == nil && [name length] == 0 ||
- [name isEqualToString:section])
- ))];
+ return [NSNumber numberWithBool:(
+ [self visible] &&
+ [self installed] == nil && (
+ name == nil ||
+ section == nil && [name length] == 0 ||
+ [name isEqualToString:section]
+ )
+ )];
+}
+
+- (NSNumber *) isVisibleInSource:(Source *)source {
+ return [NSNumber numberWithBool:([self source] == source && [self visible])];
}
@end
size_t count_;
}
+- (NSComparisonResult) compareByName:(Section *)section;
+- (Section *) initWithName:(NSString *)name;
- (Section *) initWithName:(NSString *)name row:(size_t)row;
- (NSString *) name;
- (size_t) row;
[super dealloc];
}
+- (NSComparisonResult) compareByName:(Section *)section {
+ NSString *lhs = [self name];
+ NSString *rhs = [section name];
+
+ if ([lhs length] != 0 && [rhs length] != 0) {
+ unichar lhc = [lhs characterAtIndex:0];
+ unichar rhc = [rhs characterAtIndex:0];
+
+ if (isalpha(lhc) && !isalpha(rhc))
+ return NSOrderedAscending;
+ else if (!isalpha(lhc) && isalpha(rhc))
+ return NSOrderedDescending;
+ }
+
+ return [lhs compare:rhs options:CompareOptions_];
+}
+
+- (Section *) initWithName:(NSString *)name {
+ return [self initWithName:name row:0];
+}
+
- (Section *) initWithName:(NSString *)name row:(size_t)row {
if ((self = [super init]) != nil) {
name_ = [name retain];
@end
/* }}} */
+int Finish_;
+NSArray *Finishes_;
+
/* Database Implementation {{{ */
@implementation Database
std::istream is(&ib);
std::string line;
+ static Pcre finish_r("^finish:([^:]*)$");
+
while (std::getline(is, line)) {
const char *data(line.c_str());
- //size_t size = line.size();
+ size_t size = line.size();
fprintf(stderr, "C:%s\n", data);
+
+ if (finish_r(data, size)) {
+ NSString *finish = finish_r[1];
+ int index = [Finishes_ indexOfObject:finish];
+ if (index != INT_MAX && index > Finish_)
+ Finish_ = index;
+ }
}
[pool release];
std::istream is(&ib);
std::string line;
- Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$");
- Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");
+ static Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$");
+ static Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");
while (std::getline(is, line)) {
const char *data(line.c_str());
cydiafd_ = fds[1];
_config->Set("APT::Keep-Fds::", cydiafd_);
- setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 0"] UTF8String], _not(int));
+ setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 1"] UTF8String], _not(int));
[NSThread
detachNewThreadSelector:@selector(_readCydia:)
return packages_;
}
+- (NSArray *) sources {
+ return [sources_ allValues];
+}
+
- (void) reloadData {
_error->Discard();
[before addObject:[NSString stringWithUTF8String:(*source)->GetURI().c_str()]];
}
- if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue)
+ if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue) {
+ _trace();
+ return;
+ }
+
+ bool failed = false;
+ for (pkgAcquire::ItemIterator item = fetcher_->ItemsBegin(); item != fetcher_->ItemsEnd(); item++) {
+ if ((*item)->Status == pkgAcquire::Item::StatDone && (*item)->Complete)
+ continue;
+
+ std::string uri = (*item)->DescURI();
+ std::string error = (*item)->ErrorText;
+
+ fprintf(stderr, "pAf:%s:%s\n", uri.c_str(), error.c_str());
+ failed = true;
+
+ [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+ withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:error.c_str()], nil]
+ waitUntilDone:YES
+ ];
+ }
+
+ if (failed) {
+ _trace();
return;
+ }
_system->UnLock();
pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
- if (result == pkgPackageManager::Failed)
+ if (_error->PendingError()) {
+ _trace();
return;
- if (_error->PendingError())
+ }
+
+ if (result == pkgPackageManager::Failed) {
+ _trace();
return;
- if (result != pkgPackageManager::Completed)
+ }
+
+ if (result != pkgPackageManager::Completed) {
+ _trace();
return;
+ }
NSMutableArray *after = [NSMutableArray arrayWithCapacity:16]; {
pkgSourceList list;
[fields setObject:text forKey:key];
CGColor blue(space_, 0, 0, 0.4, 1);
- [text setTextColor:blue];
+ [text setTextColor:[UIColor colorWithCGColor:blue]];
+}
+
+bool DepSubstrate(const pkgCache::VerIterator &iterator) {
+ if (!iterator.end())
+ for (pkgCache::DepIterator dep(iterator.DependsList()); !dep.end(); ++dep) {
+ if (dep->Type != pkgCache::Dep::Depends && dep->Type != pkgCache::Dep::PreDepends)
+ continue;
+ pkgCache::PkgIterator package(dep.TargetPkg());
+ if (package.end())
+ continue;
+ if (strcmp(package.Name(), "mobilesubstrate") == 0)
+ return true;
+ }
+
+ return false;
}
@protocol ConfirmationViewDelegate
UINavigationBar *navbar_;
UIPreferencesTable *table_;
NSMutableDictionary *fields_;
- UIAlertSheet *essential_;
+ UIActionSheet *essential_;
+ BOOL substrate_;
}
- (void) cancel;
case 0:
if (essential_ != nil)
[essential_ popupAlertAnimated:YES];
- else
+ else {
+ if (substrate_)
+ Finish_ = 2;
[delegate_ confirm];
+ }
break;
case 1:
}
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
NSString *context = [sheet context];
if ([context isEqualToString:@"remove"])
[self cancel];
break;
case 2:
+ if (substrate_)
+ Finish_ = 2;
[delegate_ confirm];
break;
default:
CGRect bounds = [overlay_ bounds];
navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
- if (Advanced_)
- [navbar_ setBarStyle:1];
[navbar_ setDelegate:self];
UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];
bool remove(false);
+ pkgDepCache::Policy *policy([database_ policy]);
+
pkgCacheFile &cache([database_ cache]);
NSArray *packages = [database_ packages];
for (size_t i(0), e = [packages count]; i != e; ++i) {
if ([package essential])
remove = true;
[removing addObject:name];
- }
+ } else continue;
+
+ substrate_ |= DepSubstrate(policy->GetCandidateVer(iterator));
+ substrate_ |= DepSubstrate(iterator.CurrentVer());
}
if (!remove)
essential_ = nil;
else if (Advanced_ || true) {
- essential_ = [[UIAlertSheet alloc]
+ essential_ = [[UIActionSheet alloc]
initWithTitle:@"Removing Essentials"
buttons:[NSArray arrayWithObjects:
@"Cancel Operation (Safe)",
#endif
[essential_ setBodyText:@"This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. If you continue, you may not be able to use Cydia to repair any damage."];
} else {
- essential_ = [[UIAlertSheet alloc]
+ essential_ = [[UIActionSheet alloc]
initWithTitle:@"Unable to Comply"
buttons:[NSArray arrayWithObjects:@"Okay", nil]
defaultButtonIndex:0
0, navsize.height, bounds.size.width, bounds.size.height - navsize.height
)];
- [table_ setReusesTableCells:YES];
[table_ setDataSource:self];
[table_ reloadData];
@end
/* }}} */
/* Progress View {{{ */
-Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
-
@interface ProgressView : UIView <
ConfigurationDelegate,
ProgressDelegate
UIPushButton *close_;
id delegate_;
BOOL running_;
+ SHA1SumValue springlist_;
+ size_t received_;
+ NSTimeInterval last_;
}
- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
if (bootstrap_)
- [overlay_ setBackgroundColor:Black_];
+ [overlay_ setBackgroundColor:[UIColor blackColor]];
else {
background_ = [[UIView alloc] initWithFrame:[self bounds]];
- [background_ setBackgroundColor:Black_];
+ [background_ setBackgroundColor:[UIColor blackColor]];
[self addSubview:background_];
}
24
)];
- [status_ setColor:White_];
- [status_ setBackgroundColor:Clear_];
+ [status_ setColor:[UIColor whiteColor]];
+ [status_ setBackgroundColor:[UIColor clearColor]];
[status_ setCentersHorizontally:YES];
//[status_ setFont:font];
//[output_ setTextFont:@"Courier New"];
[output_ setTextSize:12];
- [output_ setTextColor:White_];
- [output_ setBackgroundColor:Clear_];
+ [output_ setTextColor:[UIColor whiteColor]];
+ [output_ setBackgroundColor:[UIColor clearColor]];
[output_ setMarginTop:0];
[output_ setAllowsRubberBanding:YES];
[close_ setAutosizesToFit:NO];
[close_ setDrawsShadow:YES];
[close_ setStretchBackground:YES];
- [close_ setTitle:@"Close Window"];
[close_ setEnabled:YES];
- GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+ UIFont *bold = [UIFont boldSystemFontOfSize:22];
[close_ setTitleFont:bold];
- CFRelease(bold);
[close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside];
[close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];
[transition_ transition:6 toView:view_];
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
NSString *context = [sheet context];
if ([context isEqualToString:@"conffile"]) {
FILE *input = [database_ input];
}
- (void) closeButtonPushed {
- [delegate_ progressViewIsComplete:self];
- [self resetView];
+ switch (Finish_) {
+ case 0:
+ [delegate_ progressViewIsComplete:self];
+ [self resetView];
+ break;
+
+ case 1:
+ [delegate_ suspendWithAnimation:YES];
+ break;
+
+ case 2:
+ system("launchctl stop com.apple.SpringBoard");
+ break;
+
+ case 3:
+ system("launchctl unload /System/Library/LaunchDaemons/com.apple.SpringBoard.plist; launchctl load /System/Library/LaunchDaemons/com.apple.SpringBoard.plist");
+ break;
+
+ case 4:
+ system("reboot");
+ break;
+ }
}
- (void) _retachThread {
[progress_ removeFromSuperview];
[status_ removeFromSuperview];
+ {
+ FileFd file("/System/Library/LaunchDaemons/com.apple.SpringBoard.plist", FileFd::ReadOnly);
+ MMap mmap(file, MMap::ReadOnly);
+ SHA1Summation sha1;
+ sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+ if (!(springlist_ == sha1.Result()))
+ Finish_ = 3;
+ }
+
+ switch (Finish_) {
+ case 0: [close_ setTitle:@"Return to Cydia"]; break;
+ case 1: [close_ setTitle:@"Close Cydia (Restart)"]; break;
+ case 2: [close_ setTitle:@"Restart SpringBoard"]; break;
+ case 3: [close_ setTitle:@"Reload SpringBoard"]; break;
+ case 4: [close_ setTitle:@"Reboot Device"]; break;
+ }
+
+#ifdef __OBJC2__
+ notify_post("com.apple.mobile.application_installed");
+#endif
+
[delegate_ setStatusBarShowsProgress:NO];
+
running_ = NO;
}
[output_ setText:@""];
[progress_ setProgress:0];
+ received_ = 0;
+ last_ = 0;//[NSDate timeIntervalSinceReferenceDate];
+
[close_ removeFromSuperview];
[overlay_ addSubview:progress_];
[overlay_ addSubview:status_];
[delegate_ setStatusBarShowsProgress:YES];
running_ = YES;
+ {
+ FileFd file("/System/Library/LaunchDaemons/com.apple.SpringBoard.plist", FileFd::ReadOnly);
+ MMap mmap(file, MMap::ReadOnly);
+ SHA1Summation sha1;
+ sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+ springlist_ = sha1.Result();
+ }
+
[transition_ transition:6 toView:overlay_];
[NSThread
detachNewThreadSelector:selector
toTarget:database_
withObject:nil
- title:@"Repairing..."
+ title:@"Repairing"
];
}
- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
Package *package = id == nil ? nil : [database_ packageWithName:id];
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
initWithTitle:(package == nil ? @"Source Error" : [package name])
buttons:[NSArray arrayWithObjects:@"Okay", nil]
defaultButtonIndex:0
];
}
+- (void) startProgress {
+ last_ = [NSDate timeIntervalSinceReferenceDate];
+}
+
- (void) addProgressOutput:(NSString *)output {
[self
performSelectorOnMainThread:@selector(_addProgressOutput:)
];
}
+- (bool) isCancelling:(size_t)received {
+ if (last_ != 0) {
+ NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
+ if (received_ != received) {
+ received_ = received;
+ last_ = now;
+ } else if (now - last_ > 30)
+ return true;
+ }
+
+ return false;
+}
+
- (void) _setConfigurationData:(NSString *)data {
+ static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
+
_assert(conffile_r(data));
NSString *ofile = conffile_r[1];
//NSString *nfile = conffile_r[2];
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
initWithTitle:@"Configuration Upgrade"
buttons:[NSArray arrayWithObjects:
@"Keep My Old Copy",
}
- (void) _setProgressTitle:(NSString *)title {
- [status_ setText:[title stringByAppendingString:@"..."]];
+ [status_ setText:title];
}
- (void) _setProgressPercent:(NSNumber *)percent {
}
- (BOOL) isRunning {
- return NO;
+ return running_;
}
@end
/* }}} */
/* Package Cell {{{ */
-@interface PackageCell : UITableCell {
- UIImageView *icon_;
- UITextLabel *name_;
- UITextLabel *description_;
- UITextLabel *source_;
+@interface PackageCell : UISimpleTableCell {
+ UIImage *icon_;
+ NSString *name_;
+ NSString *description_;
+ NSString *source_;
//UIImageView *trusted_;
#ifdef USE_BADGES
UIImageView *badge_;
UITextLabel *status_;
#endif
- BOOL setup_;
}
- (PackageCell *) init;
- (void) setPackage:(Package *)package;
-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
-
+ (int) heightForPackage:(Package *)package;
@end
@implementation PackageCell
+- (void) clearPackage {
+ if (icon_ != nil) {
+ [icon_ release];
+ icon_ = nil;
+ }
+
+ if (name_ != nil) {
+ [name_ release];
+ name_ = nil;
+ }
+
+ if (description_ != nil) {
+ [description_ release];
+ description_ = nil;
+ }
+
+ if (source_ != nil) {
+ [source_ release];
+ source_ = nil;
+ }
+}
+
- (void) dealloc {
- [icon_ release];
- [name_ release];
- [description_ release];
- [source_ release];
+ [self clearPackage];
#ifdef USE_BADGES
[badge_ release];
[status_ release];
- (PackageCell *) init {
if ((self = [super init]) != nil) {
- GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 20);
- GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12);
- GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14);
-
- icon_ = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 30, 30)];
-
- name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 8, 240, 25)];
- [name_ setBackgroundColor:Clear_];
- [name_ setFont:bold];
-
- source_ = [[UITextLabel alloc] initWithFrame:CGRectMake(58, 28, 225, 20)];
- [source_ setBackgroundColor:Clear_];
- [source_ setFont:large];
-
- description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 46, 280, 20)];
- [description_ setBackgroundColor:Clear_];
- [description_ setFont:small];
-
- /*trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
- [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];*/
-
#ifdef USE_BADGES
badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
- [status_ setBackgroundColor:Clear_];
+ [status_ setBackgroundColor:[UIColor clearColor]];
[status_ setFont:small];
#endif
-
- /*[icon_ setImage:[UIImage applicationImageNamed:@"unknown.png"]];
- [icon_ zoomToScale:0.5];
- [icon_ setFrame:CGRectMake(10, 10, 30, 30)];*/
-
- [self addSubview:icon_];
- [self addSubview:name_];
- [self addSubview:description_];
- [self addSubview:source_];
-
- CFRelease(small);
- CFRelease(large);
- CFRelease(bold);
} return self;
}
- (void) setPackage:(Package *)package {
- /*if (setup_)
- return;
- else
- setup_ = YES;*/
+ [self clearPackage];
Source *source = [package source];
- UIImage *image = nil;
+ icon_ = nil;
if (NSString *icon = [package icon])
- image = [UIImage imageAtPath:[icon substringFromIndex:6]];
- if (image == nil) if (NSString *icon = [source defaultIcon])
- image = [UIImage imageAtPath:[icon substringFromIndex:6]];
- if (image == nil)
- image = [UIImage applicationImageNamed:@"unknown.png"];
- [icon_ setImage:image];
+ icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];
+ if (icon_ == nil) if (NSString *section = [package section])
+ icon_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, Simplify(section)]];
+ /*if (icon_ == nil) if (NSString *icon = [source defaultIcon])
+ icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];*/
+ if (icon_ == nil)
+ icon_ = [UIImage applicationImageNamed:@"unknown.png"];
- /*if (image != nil) {
- CGSize size = [image size];
- float scale = 30 / std::max(size.width, size.height);
- [icon_ zoomToScale:scale];
- }*/
+ icon_ = [icon_ retain];
- [icon_ setFrame:CGRectMake(10, 10, 30, 30)];
-
- [name_ setText:[package name]];
- [description_ setText:[package tagline]];
+ name_ = [[package name] retain];
+ description_ = [[package tagline] retain];
NSString *label = nil;
bool trusted = false;
trusted = [source trusted];
} else if ([[package id] isEqualToString:@"firmware"])
label = @"Apple";
-
- if (label == nil)
+ else
label = @"Unknown/Local";
NSString *from = [NSString stringWithFormat:@"from %@", label];
if (section != nil && ![section isEqualToString:label])
from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]];
- [source_ setText:from];
+ source_ = [from retain];
#ifdef USE_BADGES
[badge_ removeFromSuperview];
} else if ([package half]) {
[badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
[status_ setText:@"Package Damaged"];
- [status_ setColor:Red_];
+ [status_ setColor:[UIColor redColor]];
} else {
[badge_ setImage:nil];
[status_ setText:nil];
#endif
}
-- (void) _setSelected:(float)fraction {
- CGColor black(space_,
- Interpolate(0.0, 1.0, fraction),
- Interpolate(0.0, 1.0, fraction),
- Interpolate(0.0, 1.0, fraction),
- 1.0);
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+ if (icon_ != nil) {
+ CGRect rect;
+ rect.size = [icon_ size];
- CGColor gray(space_,
- Interpolate(0.4, 1.0, fraction),
- Interpolate(0.4, 1.0, fraction),
- Interpolate(0.4, 1.0, fraction),
- 1.0);
+ rect.size.width /= 2;
+ rect.size.height /= 2;
- [name_ setColor:black];
- [description_ setColor:gray];
- [source_ setColor:black];
-}
+ rect.origin.x = 25 - rect.size.width / 2;
+ rect.origin.y = 25 - rect.size.height / 2;
-- (void) setSelected:(BOOL)selected {
- [self _setSelected:(selected ? 1.0 : 0.0)];
- [super setSelected:selected];
-}
+ [icon_ drawInRect:rect];
+ }
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
- if (!fade)
- [self _setSelected:(selected ? 1.0 : 0.0)];
- [super setSelected:selected withFade:fade];
-}
+ if (selected)
+ UISetColor(White_);
+
+ if (!selected)
+ UISetColor(Black_);
+ [name_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
+ [source_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
-- (void) _setSelectionFadeFraction:(float)fraction {
- [self _setSelected:fraction];
- [super _setSelectionFadeFraction:fraction];
+ if (!selected)
+ UISetColor(Gray_);
+ [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
+
+ [super drawContentInRect:rect selected:selected];
}
+ (int) heightForPackage:(Package *)package {
+ NSString *tagline([package tagline]);
+ int height = tagline == nil || [tagline length] == 0 ? -17 : 0;
#ifdef USE_BADGES
if ([package hasMode] || [package half])
- return 96;
+ return height + 96;
else
#endif
- return 73;
+ return height + 73;
}
@end
/* }}} */
/* Section Cell {{{ */
-@interface SectionCell : UITableCell {
- UITextLabel *name_;
- UITextLabel *count_;
+@interface SectionCell : UISimpleTableCell {
+ NSString *section_;
+ NSString *name_;
+ NSString *count_;
+ UIImage *icon_;
+ _UISwitchSlider *switch_;
+ BOOL editing_;
}
- (id) init;
-- (void) setSection:(Section *)section;
-
-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
+- (void) setSection:(Section *)section editing:(BOOL)editing;
@end
@implementation SectionCell
+- (void) clearSection {
+ if (section_ != nil) {
+ [section_ release];
+ section_ = nil;
+ }
+
+ if (name_ != nil) {
+ [name_ release];
+ name_ = nil;
+ }
+
+ if (count_ != nil) {
+ [count_ release];
+ count_ = nil;
+ }
+}
+
- (void) dealloc {
- [name_ release];
- [count_ release];
+ [self clearSection];
+ [icon_ release];
+ [switch_ release];
[super dealloc];
}
- (id) init {
if ((self = [super init]) != nil) {
- GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
- GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 12);
-
- name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 9, 250, 25)];
- [name_ setBackgroundColor:Clear_];
- [name_ setFont:bold];
+ icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain];
- count_ = [[UITextLabel alloc] initWithFrame:CGRectMake(11, 7, 29, 32)];
- [count_ setCentersHorizontally:YES];
- [count_ setBackgroundColor:Clear_];
- [count_ setFont:small];
- [count_ setColor:White_];
+ switch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(218, 9, 60, 25)];
+ [switch_ addTarget:self action:@selector(onSwitch:) forEvents:kUIControlEventMouseUpInside];
+ } return self;
+}
- UIImageView *folder = [[[UIImageView alloc] initWithFrame:CGRectMake(8, 7, 32, 32)] autorelease];
- [folder setImage:[UIImage applicationImageNamed:@"folder.png"]];
+- (void) onSwitch:(id)sender {
+ NSMutableDictionary *metadata = [Sections_ objectForKey:section_];
+ if (metadata == nil) {
+ metadata = [NSMutableDictionary dictionaryWithCapacity:2];
+ [Sections_ setObject:metadata forKey:section_];
+ }
- [self addSubview:folder];
- [self addSubview:name_];
- [self addSubview:count_];
+ Changed_ = true;
+ [metadata setObject:[NSNumber numberWithBool:([switch_ value] == 0)] forKey:@"Hidden"];
+}
- [self _setSelected:0];
+- (void) setSection:(Section *)section editing:(BOOL)editing {
+ if (editing != editing_) {
+ if (editing_)
+ [switch_ removeFromSuperview];
+ else
+ [self addSubview:switch_];
+ editing_ = editing;
+ }
- CFRelease(small);
- CFRelease(bold);
- } return self;
-}
+ [self clearSection];
-- (void) setSection:(Section *)section {
if (section == nil) {
- [name_ setText:@"All Packages"];
- [count_ setText:nil];
+ name_ = [@"All Packages" retain];
+ count_ = nil;
} else {
- NSString *name = [section name];
- [name_ setText:(name == nil ? @"(No Section)" : name)];
- [count_ setText:[NSString stringWithFormat:@"%d", [section count]]];
+ section_ = [section name];
+ if (section_ != nil)
+ section_ = [section_ retain];
+ name_ = [(section_ == nil ? @"(No Section)" : section_) retain];
+ count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
+
+ if (editing_)
+ [switch_ setValue:isSectionVisible(section_) animated:NO];
}
}
-- (void) _setSelected:(float)fraction {
- CGColor black(space_,
- Interpolate(0.0, 1.0, fraction),
- Interpolate(0.0, 1.0, fraction),
- Interpolate(0.0, 1.0, fraction),
- 1.0);
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+ [icon_ drawInRect:CGRectMake(8, 7, 32, 32)];
- [name_ setColor:black];
-}
+ if (selected)
+ UISetColor(White_);
-- (void) setSelected:(BOOL)selected {
- [self _setSelected:(selected ? 1.0 : 0.0)];
- [super setSelected:selected];
-}
+ if (!selected)
+ UISetColor(Black_);
+ [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(editing_ ? 164 : 250) withFont:Font22Bold_ ellipsis:2];
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
- if (!fade)
- [self _setSelected:(selected ? 1.0 : 0.0)];
- [super setSelected:selected withFade:fade];
-}
+ CGSize size = [count_ sizeWithFont:Font14_];
+
+ UISetColor(White_);
+ if (count_ != nil)
+ [count_ drawAtPoint:CGPointMake(12 + (29 - size.width) / 2, 15) withFont:Font12Bold_];
-- (void) _setSelectionFadeFraction:(float)fraction {
- [self _setSelected:fraction];
- [super _setSelectionFadeFraction:fraction];
+ [super drawContentInRect:rect selected:selected];
}
@end
- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
if (reusing == nil) {
reusing = [[[UIImageAndTextTableCell alloc] init] autorelease];
- GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+ UIFont *font = [UIFont systemFontOfSize:16];
[[(UIImageAndTextTableCell *)reusing titleTextLabel] setFont:font];
- CFRelease(font);
}
[(UIImageAndTextTableCell *)reusing setTitle:[files_ objectAtIndex:row]];
return reusing;
@end
/* }}} */
/* Package View {{{ */
-@protocol PackageViewDelegate
-- (void) performPackage:(Package *)package;
-@end
-
-@interface PackageView : RVPage {
- _transient Database *database_;
- UIPreferencesTable *table_;
+@interface PackageView : BrowserView {
Package *package_;
NSString *name_;
- UITextView *description_;
NSMutableArray *buttons_;
}
@implementation PackageView
- (void) dealloc {
- [table_ setDataSource:nil];
- [table_ setDelegate:nil];
-
if (package_ != nil)
[package_ release];
if (name_ != nil)
[name_ release];
- if (description_ != nil)
- [description_ release];
- [table_ release];
[buttons_ release];
[super dealloc];
}
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
- int number = 2;
- if ([package_ installed] != nil)
- ++number;
- if ([package_ source] != nil)
- ++number;
- return number;
-}
-
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
- if (group-- == 0)
- return nil;
- else if ([package_ installed] != nil && group-- == 0)
- return @"Installed Package";
- else if (group-- == 0)
- return @"Package Details";
- else if ([package_ source] != nil && group-- == 0)
- return @"Source Information";
- else _assert(false);
-}
-
-- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
- if (description_ == nil || group != 0 || row != 1)
- return proposed;
- else
- return [description_ visibleTextRect].size.height + TextViewOffset_;
-}
-
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
- if (group-- == 0) {
- int number = 1;
- if ([package_ author] != nil)
- ++number;
- if (description_ != nil)
- ++number;
- if ([package_ website] != nil)
- ++number;
- return number;
- } else if ([package_ installed] != nil && group-- == 0)
- return 2;
- else if (group-- == 0) {
- int number = 2;
- if ([package_ size] != 0)
- ++number;
- if ([package_ maintainer] != nil)
- ++number;
- if ([package_ sponsor] != nil)
- ++number;
- if ([package_ relationships] != nil)
- ++number;
- if ([[package_ source] trusted])
- ++number;
- return number;
- } else if ([package_ source] != nil && group-- == 0) {
- Source *source = [package_ source];
- NSString *description = [source description];
- int number = 1;
- if (description != nil && ![description isEqualToString:[source label]])
- ++number;
- if ([source origin] != nil)
- ++number;
- return number;
- } else _assert(false);
-}
-
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
- UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
- [cell setShowSelection:NO];
-
- if (group-- == 0) {
- if (false) {
- } else if (row-- == 0) {
- [cell setTitle:[package_ name]];
- [cell setValue:[package_ latest]];
- } else if ([package_ author] != nil && row-- == 0) {
- [cell setTitle:@"Author"];
- [cell setValue:[[package_ author] name]];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- } else if (description_ != nil && row-- == 0) {
- [cell addSubview:description_];
- } else if ([package_ website] != nil && row-- == 0) {
- [cell setTitle:@"More Information"];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- } else _assert(false);
- } else if ([package_ installed] != nil && group-- == 0) {
- if (false) {
- } else if (row-- == 0) {
- [cell setTitle:@"Version"];
- NSString *installed([package_ installed]);
- [cell setValue:(installed == nil ? @"n/a" : installed)];
- } else if (row-- == 0) {
- [cell setTitle:@"Filesystem Content"];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- } else _assert(false);
- } else if (group-- == 0) {
- if (false) {
- } else if (row-- == 0) {
- [cell setTitle:@"Identifier"];
- [cell setValue:[package_ id]];
- } else if (row-- == 0) {
- [cell setTitle:@"Section"];
- NSString *section([package_ section]);
- [cell setValue:(section == nil ? @"n/a" : section)];
- } else if ([package_ size] != 0 && row-- == 0) {
- [cell setTitle:@"Expanded Size"];
- [cell setValue:SizeString([package_ size])];
- } else if ([package_ maintainer] != nil && row-- == 0) {
- [cell setTitle:@"Maintainer"];
- [cell setValue:[[package_ maintainer] name]];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- } else if ([package_ sponsor] != nil && row-- == 0) {
- [cell setTitle:@"Sponsor"];
- [cell setValue:[[package_ sponsor] name]];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- } else if ([package_ relationships] != nil && row-- == 0) {
- [cell setTitle:@"Package Relationships"];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- } else if ([[package_ source] trusted] && row-- == 0) {
- [cell setIcon:[UIImage applicationImageNamed:@"trusted.png"]];
- [cell setValue:@"This package has been signed."];
- } else _assert(false);
- } else if ([package_ source] != nil && group-- == 0) {
- Source *source = [package_ source];
- NSString *description = [source description];
-
- if (false) {
- } else if (row-- == 0) {
- NSString *label = [source label];
- if (label == nil)
- label = [source uri];
- [cell setTitle:label];
- [cell setValue:[source version]];
- } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
- [cell setValue:description];
- } else if ([source origin] != nil && row-- == 0) {
- [cell setTitle:@"Origin"];
- [cell setValue:[source origin]];
- } else _assert(false);
- } else _assert(false);
-
- return cell;
-}
-
-- (BOOL) canSelectRow:(int)row {
- return YES;
-}
-
-- (void) tableRowSelected:(NSNotification *)notification {
- int row = [table_ selectedRow];
- if (row == INT_MAX)
- return;
-
- #define _else else goto _label; return; } _label:
-
- if (true) {
- if (row-- == 0) {
- } else if (row-- == 0) {
- } else if ([package_ author] != nil && row-- == 0) {
- [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
- [[package_ author] email],
- [[NSString stringWithFormat:@"regarding apt package \"%@\"",
- [package_ name]
- ] stringByAddingPercentEscapes]
- ]]];
- } else if (description_ != nil && row-- == 0) {
- } else if ([package_ website] != nil && row-- == 0) {
- NSURL *url = [NSURL URLWithString:[package_ website]];
- BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
- [browser setDelegate:delegate_];
- [book_ pushPage:browser];
- [browser loadURL:url];
- } _else if ([package_ installed] != nil) {
- if (row-- == 0) {
- } else if (row-- == 0) {
- } else if (row-- == 0) {
- FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
- [files setDelegate:delegate_];
- [files setPackage:package_];
- [book_ pushPage:files];
- } _else if (true) {
- if (row-- == 0) {
- } else if (row-- == 0) {
- } else if (row-- == 0) {
- } else if ([package_ size] != 0 && row-- == 0) {
- } else if ([package_ maintainer] != nil && row-- == 0) {
- [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
- [[package_ maintainer] email],
- [[NSString stringWithFormat:@"regarding apt package \"%@\"",
- [package_ name]
- ] stringByAddingPercentEscapes]
- ]]];
- } else if ([package_ sponsor] != nil && row-- == 0) {
- NSURL *url = [NSURL URLWithString:[[package_ sponsor] email]];
- BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
- [browser setDelegate:delegate_];
- [book_ pushPage:browser];
- [browser loadURL:url];
- } else if ([package_ relationships] != nil && row-- == 0) {
- } else if ([[package_ source] trusted] && row-- == 0) {
- } _else if ([package_ source] != nil) {
- Source *source = [package_ source];
- NSString *description = [source description];
-
- if (row-- == 0) {
- } else if (row-- == 0) {
- } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
- } else if ([source origin] != nil && row-- == 0) {
- } _else _assert(false);
-
- #undef _else
-}
-
- (void) _clickButtonWithName:(NSString *)name {
if ([name isEqualToString:@"Install"])
[delegate_ installPackage:package_];
else _assert(false);
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
int count = [buttons_ count];
_assert(count != 0);
_assert(button <= count + 1);
[sheet dismiss];
}
+#include "internals.h"
+
+- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
+ [[frame windowObject] evaluateWebScript:@"document.base.target = '_top'"];
+ return [super webView:sender didFinishLoadForFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+ [window setValue:package_ forKey:@"package"];
+}
+
- (void) _rightButtonClicked {
+ /*[super _rightButtonClicked];
+ return;*/
+
int count = [buttons_ count];
_assert(count != 0);
[buttons addObjectsFromArray:buttons_];
[buttons addObject:@"Cancel"];
- [delegate_ slideUp:[[[UIAlertSheet alloc]
+ [delegate_ slideUp:[[[UIActionSheet alloc]
initWithTitle:nil
buttons:buttons
defaultButtonIndex:2
}
}
-- (NSString *) rightButtonTitle {
+- (NSString *) _rightButtonTitle {
int count = [buttons_ count];
return count == 0 ? nil : count != 1 ? @"Modify" : [buttons_ objectAtIndex:0];
}
}
- (id) initWithBook:(RVBook *)book database:(Database *)database {
- if ((self = [super initWithBook:book]) != nil) {
+ if ((self = [super initWithBook:book database:database]) != nil) {
database_ = database;
-
- table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]];
- [self addSubview:table_];
-
- [table_ setDataSource:self];
- [table_ setDelegate:self];
-
buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
} return self;
}
name_ = nil;
}
- if (description_ != nil) {
- [description_ release];
- description_ = nil;
- }
-
[buttons_ removeAllObjects];
if (package != nil) {
package_ = [package retain];
name_ = [[package id] retain];
- NSString *description([package description]);
- if (description == nil)
- description = [package tagline];
- if (description != nil) {
- description_ = [GetTextView(description, 12, true) retain];
- [description_ setTextColor:Black_];
- }
-
- [table_ reloadData];
+ [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]];
if ([package_ source] == nil);
else if ([package_ upgradableAndEssential:NO])
}
}
-- (void) resetViewAnimated:(BOOL)animated {
- [table_ resetViewAnimated:animated];
-}
-
- (void) reloadData {
[self setPackage:[database_ packageWithName:name_]];
[self reloadButtons];
[self addSubview:list_];
[self reloadData];
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
for (size_t i(0); i != [packages count]; ++i) {
Package *package([packages objectAtIndex:i]);
- if ([[package performSelector:filter_ withObject:object_] boolValue])
+ if ([package valid] && [[package performSelector:filter_ withObject:object_] boolValue])
[packages_ addObject:package];
}
@end
/* }}} */
-/* Browser Implementation {{{ */
-@implementation BrowserView
-
-- (void) dealloc {
- WebView *webview = [webview_ webView];
- [webview setFrameLoadDelegate:nil];
- [webview setResourceLoadDelegate:nil];
- [webview setUIDelegate:nil];
+/* Add Source View {{{ */
+@interface AddSourceView : RVPage {
+ _transient Database *database_;
+}
- [scroller_ setDelegate:nil];
- [webview_ setDelegate:nil];
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
- [scroller_ release];
- [webview_ release];
- [urls_ release];
- [indicator_ release];
- if (title_ != nil)
- [title_ release];
- [super dealloc];
-}
+@end
-- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
- NSMutableURLRequest *request = [NSMutableURLRequest
- requestWithURL:url
- cachePolicy:policy
- timeoutInterval:30.0
- ];
+@implementation AddSourceView
- [request addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"];
- [request addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
- [request addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+ if ((self = [super initWithBook:book]) != nil) {
+ database_ = database;
+ } return self;
+}
- [self loadRequest:request];
+@end
+/* }}} */
+/* Source Cell {{{ */
+@interface SourceCell : UITableCell {
+ UIImage *icon_;
+ NSString *origin_;
+ NSString *description_;
+ NSString *label_;
}
+- (void) dealloc;
-- (void) loadURL:(NSURL *)url {
- [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
-}
+- (SourceCell *) initWithSource:(Source *)source;
-// XXX: this needs to add the headers
-- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request {
- return request;
-}
+@end
-- (void) loadRequest:(NSURLRequest *)request {
- pushed_ = true;
- [webview_ loadRequest:request];
-}
+@implementation SourceCell
-- (void) reloadURL {
- NSURL *url = [[[urls_ lastObject] retain] autorelease];
- [urls_ removeLastObject];
- [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData];
+- (void) dealloc {
+ [icon_ release];
+ [origin_ release];
+ [description_ release];
+ [label_ release];
+ [super dealloc];
}
-- (WebView *) webView {
- return [webview_ webView];
+- (SourceCell *) initWithSource:(Source *)source {
+ if ((self = [super init]) != nil) {
+ if (icon_ == nil)
+ icon_ = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sources/%@.png", [source host]]];
+ if (icon_ == nil)
+ icon_ = [UIImage applicationImageNamed:@"unknown.png"];
+ icon_ = [icon_ retain];
+
+ origin_ = [[source name] retain];
+ label_ = [[source uri] retain];
+ description_ = [[source description] retain];
+ } return self;
}
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
- [scroller_ setContentSize:frame.size];
-}
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+ if (icon_ != nil)
+ [icon_ drawInRect:CGRectMake(10, 10, 30, 30)];
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
- [self view:sender didSetFrame:frame];
-}
+ if (selected)
+ UISetColor(White_);
-- (void) getAppTapp:(NSString *)href {
- if ([href hasPrefix:@"apptapp://package/"]) {
- NSString *name = [href substringFromIndex:18];
- Package *package = [database_ packageWithName:name];
- if (package == nil) {
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
- initWithTitle:@"Cannot Locate Package"
- buttons:[NSArray arrayWithObjects:@"Close", nil]
- defaultButtonIndex:0
- delegate:self
- context:@"missing"
- ] autorelease];
+ if (!selected)
+ UISetColor(Black_);
+ [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
- [sheet setBodyText:[NSString stringWithFormat:
- @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
- , name]];
+ if (!selected)
+ UISetColor(Blue_);
+ [label_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
- [sheet popupAlertAnimated:YES];
- } else {
- [self setBackButtonTitle:title_];
- PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
- [view setDelegate:delegate_];
- [view setPackage:package];
- [book_ pushPage:view];
- }
- }
-}
+ if (!selected)
+ UISetColor(Gray_);
+ [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
-- (void) webView:(WebView *)sender willClickElement:(id)element {
- if (![element respondsToSelector:@selector(href)])
- return;
- NSString *href = [element href];
- if (href == nil)
- return;
- if ([href hasPrefix:@"apptapp://package/"])
- [self getAppTapp:href];
+ [super drawContentInRect:rect selected:selected];
}
-- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
- if ([[[request URL] scheme] isEqualToString:@"apptapp"]) {
- [self getAppTapp:[[request URL] absoluteString]];
- return nil;
- }
+@end
+/* }}} */
+/* Source Table {{{ */
+@interface SourceTable : RVPage {
+ _transient Database *database_;
+ UISectionList *list_;
+ NSMutableArray *sources_;
+ UIActionSheet *alert_;
+ int offset_;
- if (!pushed_) {
- pushed_ = true;
- [book_ pushPage:self];
- }
+ NSString *href_;
+ UIProgressHUD *hud_;
+ NSError *error_;
- return [self _addHeadersToRequest:request];
+ //NSURLConnection *installer_;
+ NSURLConnection *trivial_bz2_;
+ NSURLConnection *trivial_gz_;
+ //NSURLConnection *automatic_;
+
+ BOOL trivial_;
}
-- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
- if (request != nil && [[[request URL] scheme] isEqualToString:@"apptapp"])
- return nil;
- else {
- [self setBackButtonTitle:title_];
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
- BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
- [browser setDelegate:delegate_];
+@end
- if (request != nil) {
- [browser loadRequest:[self _addHeadersToRequest:request]];
- [book_ pushPage:browser];
- }
+@implementation SourceTable
- return [browser webView];
+- (void) _deallocConnection:(NSURLConnection *)connection {
+ if (connection != nil) {
+ [connection cancel];
+ //[connection setDelegate:nil];
+ [connection release];
}
}
-- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
- title_ = [title retain];
- [self setTitle:title];
-}
+- (void) dealloc {
+ [[list_ table] setDelegate:nil];
+ [list_ setDataSource:nil];
-- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
- if ([frame parentFrame] != nil)
- return;
+ if (href_ != nil)
+ [href_ release];
+ if (hud_ != nil)
+ [hud_ release];
+ if (error_ != nil)
+ [error_ release];
- reloading_ = false;
- loading_ = true;
- [indicator_ startAnimation];
- [self reloadButtons];
+ //[self _deallocConnection:installer_];
+ [self _deallocConnection:trivial_gz_];
+ [self _deallocConnection:trivial_bz2_];
+ //[self _deallocConnection:automatic_];
- if (title_ != nil) {
- [title_ release];
- title_ = nil;
- }
+ [sources_ release];
+ [list_ release];
+ [super dealloc];
+}
- [self setTitle:@"Loading..."];
+- (int) numberOfSectionsInSectionList:(UISectionList *)list {
+ return offset_ == 0 ? 1 : 2;
+}
- WebView *webview = [webview_ webView];
- NSString *href = [webview mainFrameURL];
- [urls_ addObject:[NSURL URLWithString:href]];
+- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
+ switch (section + (offset_ == 0 ? 1 : 0)) {
+ case 0: return @"Entered by User";
+ case 1: return @"Installed by Packages";
- CGRect webrect = [scroller_ frame];
- webrect.size.height = 0;
- [webview_ setFrame:webrect];
+ default:
+ _assert(false);
+ return nil;
+ }
}
-- (void) _finishLoading {
- if (!reloading_) {
- loading_ = false;
- [indicator_ stopAnimation];
- [self reloadButtons];
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
+ switch (section + (offset_ == 0 ? 1 : 0)) {
+ case 0: return 0;
+ case 1: return offset_;
+
+ default:
+ _assert(false);
+ return -1;
}
}
-- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
- if ([frame parentFrame] != nil)
- return;
- [self _finishLoading];
+- (int) numberOfRowsInTable:(UITable *)table {
+ return [sources_ count];
}
-- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
- if ([frame parentFrame] != nil)
+- (float) table:(UITable *)table heightForRow:(int)row {
+ Source *source = [sources_ objectAtIndex:row];
+ return [source description] == nil ? 56 : 73;
+}
+
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col {
+ Source *source = [sources_ objectAtIndex:row];
+ // XXX: weird warning, stupid selectors ;P
+ return [[[SourceCell alloc] initWithSource:(id)source] autorelease];
+}
+
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
+ return YES;
+}
+
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+ return YES;
+}
+
+- (void) tableRowSelected:(NSNotification*)notification {
+ UITable *table([list_ table]);
+ int row([table selectedRow]);
+ if (row == INT_MAX)
return;
- [self setTitle:[error localizedDescription]];
- [self _finishLoading];
+
+ Source *source = [sources_ objectAtIndex:row];
+
+ PackageTable *packages = [[[PackageTable alloc]
+ initWithBook:book_
+ database:database_
+ title:[source label]
+ filter:@selector(isVisibleInSource:)
+ with:source
+ ] autorelease];
+
+ [packages setDelegate:delegate_];
+
+ [book_ pushPage:packages];
+}
+
+- (BOOL) table:(UITable *)table canDeleteRow:(int)row {
+ Source *source = [sources_ objectAtIndex:row];
+ return [source record] != nil;
+}
+
+- (void) table:(UITable *)table willSwipeToDeleteRow:(int)row {
+ [[list_ table] setDeleteConfirmationRow:row];
+}
+
+- (void) table:(UITable *)table deleteRow:(int)row {
+ Source *source = [sources_ objectAtIndex:row];
+ [Sources_ removeObjectForKey:[source key]];
+ [delegate_ syncData];
+}
+
+- (void) _endConnection:(NSURLConnection *)connection {
+ NSURLConnection **field = NULL;
+ if (connection == trivial_bz2_)
+ field = &trivial_bz2_;
+ else if (connection == trivial_gz_)
+ field = &trivial_gz_;
+ _assert(field != NULL);
+ [connection release];
+ *field = nil;
+
+ if (
+ trivial_bz2_ == nil &&
+ trivial_gz_ == nil
+ ) {
+ [delegate_ setStatusBarShowsProgress:NO];
+
+ [hud_ show:NO];
+ [hud_ removeFromSuperview];
+ [hud_ autorelease];
+ hud_ = nil;
+
+ if (trivial_) {
+ [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
+ @"deb", @"Type",
+ href_, @"URI",
+ @"./", @"Distribution",
+ nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]];
+
+ [delegate_ syncData];
+ } else if (error_ != nil) {
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:@"Verification Error"
+ buttons:[NSArray arrayWithObjects:@"OK", nil]
+ defaultButtonIndex:0
+ delegate:self
+ context:@"urlerror"
+ ] autorelease];
+
+ [sheet setBodyText:[error_ localizedDescription]];
+ [sheet popupAlertAnimated:YES];
+ } else {
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:@"Did not Find Repository"
+ buttons:[NSArray arrayWithObjects:@"OK", nil]
+ defaultButtonIndex:0
+ delegate:self
+ context:@"trivial"
+ ] autorelease];
+
+ [sheet setBodyText:@"The indicated repository could not be found. This could be because you are trying to add a legacy Installer repository (these are not supported). Also, this interface is only capable of working with exact repository URLs. If you host a repository and are having issues please contact the author of Cydia with any questions you have."];
+ [sheet popupAlertAnimated:YES];
+ }
+
+ [href_ release];
+ href_ = nil;
+
+ if (error_ != nil) {
+ [error_ release];
+ error_ = nil;
+ }
+ }
+}
+
+- (void) connection:(NSURLConnection *)connection didReceiveResponse:(NSHTTPURLResponse *)response {
+ switch ([response statusCode]) {
+ case 200:
+ trivial_ = YES;
+ }
+}
+
+- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+ fprintf(stderr, "connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]);
+ if (error_ != nil)
+ error_ = [error retain];
+ [self _endConnection:connection];
+}
+
+- (void) connectionDidFinishLoading:(NSURLConnection *)connection {
+ [self _endConnection:connection];
+}
+
+- (NSURLConnection *) _requestHRef:(NSString *)href method:(NSString *)method {
+ NSMutableURLRequest *request = [NSMutableURLRequest
+ requestWithURL:[NSURL URLWithString:href]
+ cachePolicy:NSURLRequestUseProtocolCachePolicy
+ timeoutInterval:20.0
+ ];
+
+ [request setHTTPMethod:method];
+
+ return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
+}
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+ NSString *context = [sheet context];
+ if ([context isEqualToString:@"source"])
+ switch (button) {
+ case 1: {
+ NSString *href = [[sheet textField] text];
+
+ //installer_ = [[self _requestHRef:href method:@"GET"] retain];
+
+ if (![href hasSuffix:@"/"])
+ href_ = [href stringByAppendingString:@"/"];
+ else
+ href_ = href;
+ href_ = [href_ retain];
+
+ trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain];
+ trivial_gz_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.gz"] method:@"HEAD"] retain];
+ //trivial_bz2_ = [[self _requestHRef:[href stringByAppendingString:@"dists/Release"] method:@"HEAD"] retain];
+
+ trivial_ = false;
+
+ hud_ = [delegate_ addProgressHUD];
+ [hud_ setText:@"Verifying URL"];
+ } break;
+
+ case 2:
+ break;
+
+ default:
+ _assert(false);
+ }
+
+ [sheet dismiss];
}
- (id) initWithBook:(RVBook *)book database:(Database *)database {
if ((self = [super initWithBook:book]) != nil) {
database_ = database;
- loading_ = false;
+ sources_ = [[NSMutableArray arrayWithCapacity:16] retain];
- struct CGRect bounds = [self bounds];
+ //list_ = [[UITable alloc] initWithFrame:[self bounds]];
+ list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO];
+ [list_ setShouldHideHeaderInShortLists:NO];
- UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease];
- [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
- [self addSubview:pinstripe];
+ [self addSubview:list_];
+ [list_ setDataSource:self];
- scroller_ = [[UIScroller alloc] initWithFrame:bounds];
- [self addSubview:scroller_];
+ UITableColumn *column = [[UITableColumn alloc]
+ initWithTitle:@"Name"
+ identifier:@"name"
+ width:[self frame].size.width
+ ];
- [scroller_ setScrollingEnabled:YES];
- [scroller_ setAdjustForContentSizeChange:YES];
- [scroller_ setClipsSubviews:YES];
- [scroller_ setAllowsRubberBanding:YES];
- [scroller_ setScrollDecelerationFactor:0.99];
- [scroller_ setDelegate:self];
+ UITable *table = [list_ table];
+ [table setSeparatorStyle:1];
+ [table addTableColumn:column];
+ [table setDelegate:self];
- CGRect webrect = [scroller_ bounds];
- webrect.size.height = 0;
+ [self reloadData];
- webview_ = [[UIWebView alloc] initWithFrame:webrect];
- [scroller_ addSubview:webview_];
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ } return self;
+}
- [webview_ setTilingEnabled:YES];
- [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
- [webview_ setAutoresizes:YES];
- [webview_ setDelegate:self];
- //[webview_ setEnabledGestures:2];
+- (void) reloadData {
+ pkgSourceList list;
+ _assert(list.ReadMainList());
- CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];
- indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)];
- [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];
+ [sources_ removeAllObjects];
+ [sources_ addObjectsFromArray:[database_ sources]];
+ [sources_ sortUsingSelector:@selector(compareByNameAndType:)];
- Package *package([database_ packageWithName:@"cydia"]);
- NSString *application = package == nil ? @"Cydia" : [NSString
- stringWithFormat:@"Cydia/%@",
- [package installed]
+ int count = [sources_ count];
+ for (offset_ = 0; offset_ != count; ++offset_) {
+ Source *source = [sources_ objectAtIndex:offset_];
+ if ([source record] == nil)
+ break;
+ }
+
+ [list_ reloadData];
+}
+
+- (void) resetViewAnimated:(BOOL)animated {
+ [list_ resetViewAnimated:animated];
+}
+
+- (void) _leftButtonClicked {
+ /*[book_ pushPage:[[[AddSourceView alloc]
+ initWithBook:book_
+ database:database_
+ ] autorelease]];*/
+
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:@"Enter Cydia/APT URL"
+ buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil]
+ defaultButtonIndex:0
+ delegate:self
+ context:@"source"
+ ] autorelease];
+
+ [sheet addTextFieldWithValue:@"http://" label:@""];
+
+ UITextInputTraits *traits = [[sheet textField] textInputTraits];
+ [traits setAutocapitalizationType:0];
+ [traits setKeyboardType:3];
+ [traits setAutocorrectionType:1];
+
+ [sheet popupAlertAnimated:YES];
+}
+
+- (void) _rightButtonClicked {
+ UITable *table = [list_ table];
+ BOOL editing = [table isRowDeletionEnabled];
+ [table enableRowDeletion:!editing animated:YES];
+ [book_ reloadButtonsForPage:self];
+}
+
+- (NSString *) title {
+ return @"Sources";
+}
+
+- (NSString *) backButtonTitle {
+ return @"Sources";
+}
+
+- (NSString *) leftButtonTitle {
+ return [[list_ table] isRowDeletionEnabled] ? @"Add" : nil;
+}
+
+- (NSString *) rightButtonTitle {
+ return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit";
+}
+
+- (UINavigationButtonStyle) rightButtonStyle {
+ return [[list_ table] isRowDeletionEnabled] ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
+}
+
+@end
+/* }}} */
+
+/* Installed View {{{ */
+@interface InstalledView : RVPage {
+ _transient Database *database_;
+ PackageTable *packages_;
+ BOOL expert_;
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+
+@end
+
+@implementation InstalledView
+
+- (void) dealloc {
+ [packages_ release];
+ [super dealloc];
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+ if ((self = [super initWithBook:book]) != nil) {
+ database_ = database;
+
+ packages_ = [[PackageTable alloc]
+ initWithBook:book
+ database:database
+ title:nil
+ filter:@selector(isInstalledAndVisible:)
+ with:[NSNumber numberWithBool:YES]
];
- WebView *webview = [webview_ webView];
- [webview setApplicationNameForUserAgent:application];
- [webview setFrameLoadDelegate:self];
- [webview setResourceLoadDelegate:self];
- [webview setUIDelegate:self];
+ [self addSubview:packages_];
- urls_ = [[NSMutableArray alloc] initWithCapacity:16];
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+- (void) resetViewAnimated:(BOOL)animated {
+ [packages_ resetViewAnimated:animated];
+}
+
+- (void) reloadData {
+ [packages_ reloadData];
+}
+
+- (void) _rightButtonClicked {
+ [packages_ setObject:[NSNumber numberWithBool:expert_]];
+ [packages_ reloadData];
+ expert_ = !expert_;
+ [book_ reloadButtonsForPage:self];
+}
+
+- (NSString *) title {
+ return @"Installed";
+}
+
+- (NSString *) backButtonTitle {
+ return @"Packages";
+}
+
+- (NSString *) rightButtonTitle {
+ return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? @"Expert" : @"Simple";
+}
+
+- (UINavigationButtonStyle) rightButtonStyle {
+ return expert_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
+}
+
+- (void) setDelegate:(id)delegate {
+ [super setDelegate:delegate];
+ [packages_ setDelegate:delegate];
+}
+
+@end
+/* }}} */
+
+/* Home View {{{ */
+@interface HomeView : BrowserView {
+}
+
+@end
+
+@implementation HomeView
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
[sheet dismiss];
}
- (void) _leftButtonClicked {
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
initWithTitle:@"About Cydia Installer"
buttons:[NSArray arrayWithObjects:@"Close", nil]
defaultButtonIndex:0
[sheet popupAlertAnimated:YES];
}
-- (void) _rightButtonClicked {
- reloading_ = true;
- [self reloadURL];
-}
-
- (NSString *) leftButtonTitle {
return @"About";
}
-- (NSString *) rightButtonTitle {
- return loading_ ? @"" : @"Reload";
+@end
+/* }}} */
+/* Manage View {{{ */
+@interface ManageView : BrowserView {
}
-- (NSString *) title {
- return nil;
-}
+@end
-- (NSString *) backButtonTitle {
- return @"Browser";
+@implementation ManageView
+
+- (NSString *) title {
+ return @"Manage";
}
-- (void) setPageActive:(BOOL)active {
- if (active)
- [book_ addSubview:indicator_];
- else
- [indicator_ removeFromSuperview];
+- (void) _leftButtonClicked {
+ [delegate_ askForSettings];
}
-- (void) resetViewAnimated:(BOOL)animated {
+- (NSString *) leftButtonTitle {
+ return @"Settings";
}
-- (void) setPushed:(bool)pushed {
- pushed_ = pushed;
+- (NSString *) _rightButtonTitle {
+ return nil;
}
@end
/* }}} */
-@interface CYBook : RVBook <
- ProgressDelegate
-> {
- _transient Database *database_;
- UIView *overlay_;
- UIProgressIndicator *indicator_;
- UITextLabel *prompt_;
- UIProgressBar *progress_;
- bool updating_;
+/* Indirect Delegate {{{ */
+@interface IndirectDelegate : NSProxy {
+ _transient id delegate_;
}
-- (id) initWithFrame:(CGRect)frame database:(Database *)database;
-- (void) update;
-- (BOOL) updating;
-
+- (void) setDelegate:(id)delegate;
+- (id) initWithDelegate:(id)delegate;
@end
-/* Source Cell {{{ */
-@interface SourceCell : UITableCell {
- UITextLabel *description_;
- UIRightTextLabel *label_;
- UITextLabel *origin_;
+@implementation IndirectDelegate
+
+- (void) setDelegate:(id)delegate {
+ delegate_ = delegate;
}
-- (void) dealloc;
+- (id) initWithDelegate:(id)delegate {
+ delegate_ = delegate;
+ return self;
+}
-- (SourceCell *) initWithSource:(Source *)source;
+- (NSMethodSignature*) methodSignatureForSelector:(SEL)sel {
+ if (delegate_ != nil)
+ if (NSMethodSignature *sig = [delegate_ methodSignatureForSelector:sel])
+ return sig;
+ return nil;
+}
-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
+- (void) forwardInvocation:(NSInvocation*)inv {
+ SEL sel = [inv selector];
+ if (delegate_ != nil && [delegate_ respondsToSelector:sel])
+ [inv invokeWithTarget:delegate_];
+}
@end
-
-@implementation SourceCell
+/* }}} */
+/* Browser Implementation {{{ */
+@implementation BrowserView
- (void) dealloc {
- [description_ release];
- [label_ release];
- [origin_ release];
+ WebView *webview = [webview_ webView];
+ [webview setFrameLoadDelegate:nil];
+ [webview setResourceLoadDelegate:nil];
+ [webview setUIDelegate:nil];
+
+ [webview_ setDelegate:nil];
+ [webview_ setGestureDelegate:nil];
+
+ /*WebFrame *frame = [webview mainFrame];
+ [frame loadHTMLString:@"" baseURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]];*/
+
+ //[webview_ removeFromSuperview];
+ //[Documents_ addObject:[webview_ autorelease]];
+ [webview_ release];
+
+ [indirect_ setDelegate:nil];
+ [indirect_ release];
+
+ [scroller_ setDelegate:nil];
+
+ [scroller_ release];
+ [urls_ release];
+ [indicator_ release];
+ if (title_ != nil)
+ [title_ release];
[super dealloc];
}
-- (SourceCell *) initWithSource:(Source *)source {
- if ((self = [super init]) != nil) {
- GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 20);
- GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14);
+- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
+ [self loadRequest:[NSURLRequest
+ requestWithURL:url
+ cachePolicy:policy
+ timeoutInterval:30.0
+ ]];
+}
- CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
- float clear[] = {0, 0, 0, 0};
+- (void) loadURL:(NSURL *)url {
+ [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
+}
- NSString *description = [source description];
- if (description == nil)
- description = [source uri];
+- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request {
+ NSMutableURLRequest *copy = [request mutableCopy];
- description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 7, 270, 25)];
- [description_ setBackgroundColor:CGColorCreate(space, clear)];
- [description_ setFont:bold];
- [description_ setText:description];
+ [copy addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"];
+ [copy addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
+ [copy addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
- NSString *label = [source label];
- if (label == nil)
- label = [source type];
+ if (Role_ != nil)
+ [copy addValue:Role_ forHTTPHeaderField:@"X-Role"];
- label_ = [[UIRightTextLabel alloc] initWithFrame:CGRectMake(290, 32, 90, 25)];
- [label_ setBackgroundColor:CGColorCreate(space, clear)];
- [label_ setFont:small];
- [label_ setText:label];
+ return copy;
+}
- NSString *origin = [source origin];
- if (origin == nil)
- origin = [source distribution];
+- (void) loadRequest:(NSURLRequest *)request {
+ pushed_ = true;
+ [webview_ loadRequest:request];
+}
- origin_ = [[UITextLabel alloc] initWithFrame:CGRectMake(13, 35, 315, 20)];
- [origin_ setBackgroundColor:CGColorCreate(space, clear)];
- [origin_ setFont:small];
- [origin_ setText:origin];
+- (void) reloadURL {
+ NSURL *url = [[[urls_ lastObject] retain] autorelease];
+ [urls_ removeLastObject];
+ [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData];
+}
- [self addSubview:description_];
- [self addSubview:label_];
- [self addSubview:origin_];
+- (WebView *) webView {
+ return [webview_ webView];
+}
- CFRelease(small);
- CFRelease(bold);
- } return self;
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
+ [scroller_ setContentSize:frame.size];
}
-- (void) _setSelected:(float)fraction {
- CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
+ [self view:sender didSetFrame:frame];
+}
- float black[] = {
- Interpolate(0.0, 1.0, fraction),
- Interpolate(0.0, 1.0, fraction),
- Interpolate(0.0, 1.0, fraction),
- 1.0};
+- (void) pushPage:(RVPage *)page {
+ [self setBackButtonTitle:title_];
+ [page setDelegate:delegate_];
+ [book_ pushPage:page];
+}
- float blue[] = {
- Interpolate(0.2, 1.0, fraction),
- Interpolate(0.2, 1.0, fraction),
- Interpolate(1.0, 1.0, fraction),
- 1.0};
+- (RVPage *) _pageForPackage:(NSString *)name {
+ if (Package *package = [database_ packageWithName:name]) {
+ PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+ [view setPackage:package];
+ return view;
+ } else {
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
+ initWithTitle:@"Cannot Locate Package"
+ buttons:[NSArray arrayWithObjects:@"Close", nil]
+ defaultButtonIndex:0
+ delegate:self
+ context:@"missing"
+ ] autorelease];
- float gray[] = {
- Interpolate(0.4, 1.0, fraction),
- Interpolate(0.4, 1.0, fraction),
- Interpolate(0.4, 1.0, fraction),
- 1.0};
+ [sheet setBodyText:[NSString stringWithFormat:
+ @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
+ , name]];
- [description_ setColor:CGColorCreate(space, black)];
- [label_ setColor:CGColorCreate(space, blue)];
- [origin_ setColor:CGColorCreate(space, gray)];
+ [sheet popupAlertAnimated:YES];
+ return nil;
+ }
}
-- (void) setSelected:(BOOL)selected {
- [self _setSelected:(selected ? 1.0 : 0.0)];
- [super setSelected:selected];
+- (BOOL) getSpecial:(NSString *)href {
+ RVPage *page = nil;
+
+ if (
+ [href hasPrefix:@"http://ax.phobos.apple.com/"] ||
+ [href hasPrefix:@"http://phobos.apple.com/"] ||
+ [href hasPrefix:@"http://www.youtube.com/watch?"] ||
+ [href hasPrefix:@"mailto:"] ||
+ [href hasPrefix:@"tel:"]
+ )
+ [delegate_ openURL:[NSURL URLWithString:href]];
+ else if ([href isEqualToString:@"cydia://add-source"])
+ page = [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease];
+ else if ([href isEqualToString:@"cydia://sources"])
+ page = [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease];
+ else if ([href isEqualToString:@"cydia://packages"])
+ page = [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease];
+ else if ([href hasPrefix:@"cydia://files/"]) {
+ NSString *name = [href substringFromIndex:14];
+
+ if (Package *package = [database_ packageWithName:name]) {
+ FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
+ [files setPackage:package];
+ page = files;
+ }
+ } else if ([href hasPrefix:@"apptapp://package/"])
+ page = [self _pageForPackage:[href substringFromIndex:18]];
+ else if ([href hasPrefix:@"cydia://package/"])
+ page = [self _pageForPackage:[href substringFromIndex:16]];
+ else if (![href hasPrefix:@"apptapp:"] && ![href hasPrefix:@"cydia:"])
+ return false;
+
+ if (page != nil)
+ [self pushPage:page];
+ return true;
}
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
- if (!fade)
- [self _setSelected:(selected ? 1.0 : 0.0)];
- [super setSelected:selected withFade:fade];
+- (void) webView:(WebView *)sender willClickElement:(id)element {
+ if ([[element localName] isEqualToString:@"img"])
+ do if ((element = [element parentNode]) == nil)
+ return;
+ while (![[element localName] isEqualToString:@"a"]);
+ if (![element respondsToSelector:@selector(href)])
+ return;
+ NSString *href = [element href];
+ if (href == nil)
+ return;
+ [self getSpecial:href];
}
-- (void) _setSelectionFadeFraction:(float)fraction {
- [self _setSelected:fraction];
- [super _setSelectionFadeFraction:fraction];
+- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
+ NSURL *url = [request URL];
+ if ([self getSpecial:[url absoluteString]])
+ return nil;
+
+ if (!pushed_) {
+ pushed_ = true;
+ [book_ pushPage:self];
+ }
+
+ return [self _addHeadersToRequest:request];
}
-@end
-/* }}} */
-/* Source Table {{{ */
-@interface SourceTable : RVPage {
- _transient Database *database_;
- UISectionList *list_;
- NSMutableArray *sources_;
- UIAlertSheet *alert_;
+- (BOOL) isSpecialScheme:(NSString *)scheme {
+ return
+ [scheme isEqualToString:@"apptapp"] ||
+ [scheme isEqualToString:@"cydia"] ||
+ [scheme isEqualToString:@"mailto"] ||
+ [scheme isEqualToString:@"tel"];
}
-- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
+ if (request != nil) {
+ NSURL *url = [request URL];
+ NSString *scheme = [url scheme];
+ NSString *absolute = [url absoluteString];
+ if (
+ [self isSpecialScheme:scheme] ||
+ [absolute hasPrefix:@"http://ax.phobos.apple.com/"] ||
+ [absolute hasPrefix:@"http://phobos.apple.com/"] ||
+ [absolute hasPrefix:@"http://www.yahoo.com/watch?"]
+ )
+ return nil;
+ }
+
+ [self setBackButtonTitle:title_];
+
+ BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+ [browser setDelegate:delegate_];
+
+ if (request != nil) {
+ [browser loadRequest:[self _addHeadersToRequest:request]];
+ [book_ pushPage:browser];
+ }
+
+ return [browser webView];
+}
+
+- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
+ if ([frame parentFrame] != nil)
+ return;
+
+ title_ = [title retain];
+ [self setTitle:title];
+}
+
+- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
+ if ([frame parentFrame] != nil)
+ return;
+
+ reloading_ = false;
+ loading_ = true;
+ [indicator_ startAnimation];
+ [self reloadButtons];
+
+ if (title_ != nil) {
+ [title_ release];
+ title_ = nil;
+ }
-@end
+ [self setTitle:@"Loading"];
-@implementation SourceTable
+ WebView *webview = [webview_ webView];
+ NSString *href = [webview mainFrameURL];
+ [urls_ addObject:[NSURL URLWithString:href]];
-- (void) dealloc {
- [list_ setDataSource:nil];
+ [scroller_ scrollPointVisibleAtTopLeft:CGPointZero];
- if (sources_ != nil)
- [sources_ release];
- [list_ release];
- [super dealloc];
+ CGRect webrect = [scroller_ bounds];
+ webrect.size.height = 0;
+ [webview_ setFrame:webrect];
}
-- (int) numberOfSectionsInSectionList:(UISectionList *)list {
- return 1;
+- (void) _finishLoading {
+ if (!reloading_) {
+ loading_ = false;
+ [indicator_ stopAnimation];
+ [self reloadButtons];
+ }
}
-- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
- return @"Sources";
+- (BOOL) webView:(WebView *)sender shouldScrollToPoint:(struct CGPoint)point forFrame:(WebFrame *)frame {
+ _trace();
+ return [webview_ webView:sender shouldScrollToPoint:point forFrame:frame];
}
-- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
- return 0;
+- (void) webView:(WebView *)sender didReceiveViewportArguments:(id)arguments forFrame:(WebFrame *)frame {
+ return [webview_ webView:sender didReceiveViewportArguments:arguments forFrame:frame];
}
-- (int) numberOfRowsInTable:(UITable *)table {
- return [sources_ count];
+- (void) webView:(WebView *)sender needsScrollNotifications:(id)notifications forFrame:(WebFrame *)frame {
+ return [webview_ webView:sender needsScrollNotifications:notifications forFrame:frame];
}
-- (float) table:(UITable *)table heightForRow:(int)row {
- return 64;
+- (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame {
+ return [webview_ webView:sender didCommitLoadForFrame:frame];
}
-- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col {
- return [[[SourceCell alloc] initWithSource:[sources_ objectAtIndex:row]] autorelease];
+- (void) webView:(WebView *)sender didReceiveDocTypeForFrame:(WebFrame *)frame {
+ return [webview_ webView:sender didReceiveDocTypeForFrame:frame];
}
-- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
- return NO;
+- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
+ if ([frame parentFrame] == nil)
+ [self _finishLoading];
+ return [webview_ webView:sender didFinishLoadForFrame:frame];
}
-- (void) tableRowSelected:(NSNotification*)notification {
- UITable *table([list_ table]);
- int row([table selectedRow]);
- if (row == INT_MAX)
+- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
+ if ([frame parentFrame] != nil)
return;
+ [self _finishLoading];
- [table selectRow:-1 byExtendingSelection:NO withFade:YES];
+ [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
+ [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString],
+ [[error localizedDescription] stringByAddingPercentEscapes]
+ ]]];
}
- (id) initWithBook:(RVBook *)book database:(Database *)database {
if ((self = [super initWithBook:book]) != nil) {
database_ = database;
- sources_ = nil;
+ loading_ = false;
- list_ = [[UISectionList alloc] initWithFrame:[self bounds]];
+ struct CGRect bounds = [self bounds];
- [self addSubview:list_];
+ UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease];
+ [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
+ [self addSubview:pinstripe];
- [list_ setDataSource:self];
- [list_ setShouldHideHeaderInShortLists:NO];
+ scroller_ = [[UIScroller alloc] initWithFrame:bounds];
+ [self addSubview:scroller_];
- UITableColumn *column = [[UITableColumn alloc]
- initWithTitle:@"Name"
- identifier:@"name"
- width:[self frame].size.width
+ [scroller_ setScrollingEnabled:YES];
+ [scroller_ setAdjustForContentSizeChange:YES];
+ [scroller_ setClipsSubviews:YES];
+ [scroller_ setAllowsRubberBanding:YES];
+ [scroller_ setScrollDecelerationFactor:0.99];
+ [scroller_ setDelegate:self];
+
+ CGRect webrect = [scroller_ bounds];
+ webrect.size.height = 0;
+
+ webview_ = [Documents_ lastObject];
+ if (webview_ != nil) {
+ webview_ = [webview_ retain];
+ [Documents_ removeLastObject];
+ [webview_ setFrame:webrect];
+ } else {
+ webview_ = [[UIWebDocumentView alloc] initWithFrame:webrect];
+
+ [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
+
+ [webview_ setTilingEnabled:YES];
+ [webview_ setTileMinificationFilter:kCAFilterNearest];
+ [webview_ setAutoresizes:YES];
+
+ [webview_ setViewportSize:CGSizeMake(980, -1) forDocumentTypes:0x10];
+ [webview_ setViewportSize:CGSizeMake(320, -1) forDocumentTypes:0x2];
+ [webview_ setViewportSize:CGSizeMake(320, -1) forDocumentTypes:0x8];
+
+ [webview_ _setDocumentType:0x4];
+
+ [webview_ setZoomsFocusedFormControl:YES];
+ [webview_ setContentsPosition:7];
+ [webview_ setEnabledGestures:0xa];
+ [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:0x4];
+ [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:0x7];
+ [webview_ setSmoothsFonts:YES];
+ }
+
+ [webview_ setDelegate:self];
+ [webview_ setGestureDelegate:self];
+ [scroller_ addSubview:webview_];
+
+ CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];
+ indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 12, indsize.width, indsize.height)];
+ [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];
+
+ Package *package([database_ packageWithName:@"cydia"]);
+ NSString *application = package == nil ? @"Cydia" : [NSString
+ stringWithFormat:@"Cydia/%@",
+ [package installed]
];
- UITable *table = [list_ table];
- [table setSeparatorStyle:1];
- [table addTableColumn:column];
- [table setDelegate:self];
+ indirect_ = [[IndirectDelegate alloc] initWithDelegate:self];
+
+ WebView *webview = [webview_ webView];
+ [webview setApplicationNameForUserAgent:application];
+ [webview setFrameLoadDelegate:self];
+ [webview setResourceLoadDelegate:indirect_];
+ [webview setUIDelegate:self];
+
+ //[webview _setLayoutInterval:0.5];
+
+ urls_ = [[NSMutableArray alloc] initWithCapacity:16];
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [scroller_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [pinstripe setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
-- (void) reloadData {
- pkgSourceList list;
- _assert(list.ReadMainList());
+- (void) didFinishGesturesInView:(UIView *)view forEvent:(id)event {
+ [webview_ redrawScaledDocument];
+}
+
+- (void) _rightButtonClicked {
+ reloading_ = true;
+ [self reloadURL];
+}
- if (sources_ != nil)
- [sources_ release];
+- (NSString *) _rightButtonTitle {
+ return @"Reload";
+}
- sources_ = [[NSMutableArray arrayWithCapacity:16] retain];
- for (pkgSourceList::const_iterator source = list.begin(); source != list.end(); ++source)
- [sources_ addObject:[[[Source alloc] initWithMetaIndex:*source] autorelease]];
+- (NSString *) rightButtonTitle {
+ return loading_ ? @"" : [self _rightButtonTitle];
+}
- [list_ reloadData];
+- (NSString *) title {
+ return nil;
}
-- (void) resetViewAnimated:(BOOL)animated {
- [list_ resetViewAnimated:animated];
+- (NSString *) backButtonTitle {
+ return @"Browser";
+}
+
+- (void) setPageActive:(BOOL)active {
+ if (!active)
+ [indicator_ removeFromSuperview];
+ else
+ [[book_ navigationBar] addSubview:indicator_];
}
-- (NSString *) leftTitle {
- return @"Refresh All";
+- (void) resetViewAnimated:(BOOL)animated {
}
-- (NSString *) rightTitle {
- return @"Edit";
+- (void) setPushed:(bool)pushed {
+ pushed_ = pushed;
}
@end
/* }}} */
+@interface CYBook : RVBook <
+ ProgressDelegate
+> {
+ _transient Database *database_;
+ UINavigationBar *overlay_;
+ UIProgressIndicator *indicator_;
+ UITextLabel *prompt_;
+ UIProgressBar *progress_;
+ UINavigationButton *cancel_;
+ bool updating_;
+ size_t received_;
+ NSTimeInterval last_;
+}
+
+- (id) initWithFrame:(CGRect)frame database:(Database *)database;
+- (void) update;
+- (BOOL) updating;
+
+@end
+
/* Install View {{{ */
@interface InstallView : RVPage {
_transient Database *database_;
- NSMutableArray *packages_;
NSMutableArray *sections_;
+ NSMutableArray *filtered_;
+ UITransitionView *transition_;
UITable *list_;
UIView *accessory_;
+ BOOL editing_;
}
- (id) initWithBook:(RVBook *)book database:(Database *)database;
- (void) reloadData;
+- (void) resetView;
@end
[list_ setDataSource:nil];
[list_ setDelegate:nil];
- [packages_ release];
[sections_ release];
+ [filtered_ release];
+ [transition_ release];
[list_ release];
[accessory_ release];
[super dealloc];
}
- (int) numberOfRowsInTable:(UITable *)table {
- return [sections_ count] + 1;
+ return editing_ ? [sections_ count] : [filtered_ count] + 1;
}
- (float) table:(UITable *)table heightForRow:(int)row {
- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
if (reusing == nil)
reusing = [[[SectionCell alloc] init] autorelease];
- [(SectionCell *)reusing setSection:(row == 0 ? nil : [sections_ objectAtIndex:(row - 1)])];
+ [(SectionCell *)reusing setSection:(editing_ ?
+ [sections_ objectAtIndex:row] :
+ (row == 0 ? nil : [filtered_ objectAtIndex:(row - 1)])
+ ) editing:editing_];
return reusing;
}
- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
- return YES;
+ return !editing_;
+}
+
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+ return !editing_;
}
- (void) tableRowSelected:(NSNotification *)notification {
name = nil;
title = @"All Packages";
} else {
- section = [sections_ objectAtIndex:(row - 1)];
+ section = [filtered_ objectAtIndex:(row - 1)];
name = [section name];
if (name != nil)
initWithBook:book_
database:database_
title:title
- filter:@selector(isUninstalledInSection:)
+ filter:@selector(isVisiblyUninstalledInSection:)
with:name
] autorelease];
if ((self = [super initWithBook:book]) != nil) {
database_ = database;
- packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+ filtered_ = [[NSMutableArray arrayWithCapacity:16] retain];
- list_ = [[UITable alloc] initWithFrame:[self bounds]];
- [self addSubview:list_];
+ transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
+ [self addSubview:transition_];
+
+ list_ = [[UITable alloc] initWithFrame:[transition_ bounds]];
+ [transition_ transition:0 toView:list_];
UITableColumn *column = [[[UITableColumn alloc]
initWithTitle:@"Name"
[list_ setReusesTableCells:YES];
[self reloadData];
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
- (void) reloadData {
NSArray *packages = [database_ packages];
- [packages_ removeAllObjects];
[sections_ removeAllObjects];
+ [filtered_ removeAllObjects];
+
+ NSMutableArray *filtered = [NSMutableArray arrayWithCapacity:[packages count]];
+ NSMutableDictionary *sections = [NSMutableDictionary dictionaryWithCapacity:32];
for (size_t i(0); i != [packages count]; ++i) {
Package *package([packages objectAtIndex:i]);
- if ([package valid] && [package installed] == nil)
- [packages_ addObject:package];
+ NSString *name([package section]);
+
+ if (name != nil) {
+ Section *section([sections objectForKey:name]);
+ if (section == nil) {
+ section = [[[Section alloc] initWithName:name] autorelease];
+ [sections setObject:section forKey:name];
+ }
+ }
+
+ if ([package valid] && [package installed] == nil && [package visible])
+ [filtered addObject:package];
}
- [packages_ sortUsingSelector:@selector(compareBySection:)];
+ [sections_ addObjectsFromArray:[sections allValues]];
+ [sections_ sortUsingSelector:@selector(compareByName:)];
+
+ [filtered sortUsingSelector:@selector(compareBySection:)];
Section *section = nil;
- for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
- Package *package = [packages_ objectAtIndex:offset];
+ for (size_t offset = 0, count = [filtered count]; offset != count; ++offset) {
+ Package *package = [filtered objectAtIndex:offset];
NSString *name = [package section];
if (section == nil || name != nil && ![[section name] isEqualToString:name]) {
- section = [[[Section alloc] initWithName:name row:offset] autorelease];
- [sections_ addObject:section];
+ section = name == nil ?
+ [[[Section alloc] initWithName:nil] autorelease] :
+ [sections objectForKey:name];
+ [filtered_ addObject:section];
}
[section addToCount];
[list_ reloadData];
}
+- (void) resetView {
+ if (editing_)
+ [self _rightButtonClicked];
+}
+
- (void) resetViewAnimated:(BOOL)animated {
[list_ resetViewAnimated:animated];
}
+- (void) _rightButtonClicked {
+ if ((editing_ = !editing_))
+ [list_ reloadData];
+ else {
+ [delegate_ updateData];
+ }
+
+ [book_ setTitle:[self title] forPage:self];
+ [book_ reloadButtonsForPage:self];
+}
+
- (NSString *) title {
- return @"Install";
+ return editing_ ? @"Section Visibility" : @"Install by Section";
}
- (NSString *) backButtonTitle {
return @"Sections";
}
+- (NSString *) rightButtonTitle {
+ return [sections_ count] == 0 ? nil : editing_ ? @"Done" : @"Edit";
+}
+
+- (UINavigationButtonStyle) rightButtonStyle {
+ return editing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
+}
+
- (UIView *) accessoryView {
return accessory_;
}
[table setReusesTableCells:YES];
[self reloadData];
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
for (size_t i(0); i != [packages count]; ++i) {
Package *package([packages objectAtIndex:i]);
- if ([package installed] == nil && [package valid] || [package upgradableAndEssential:NO])
+
+ if (
+ [package installed] == nil && [package valid] && [package visible] ||
+ [package upgradableAndEssential:NO]
+ )
[packages_ addObject:package];
}
[packages_ sortUsingSelector:@selector(compareForChanges:)];
- Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades" row:0] autorelease];
+ Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades"] autorelease];
Section *section = nil;
upgrades_ = 0;
}
- (NSString *) rightButtonTitle {
- return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade All (%u)", upgrades_];
+ return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade (%u)", upgrades_];
}
- (NSString *) title {
return @"Changes";
}
-@end
-/* }}} */
-/* Manage View {{{ */
-@interface ManageView : RVPage {
- _transient Database *database_;
- PackageTable *packages_;
- SourceTable *sources_;
-}
-
-- (id) initWithBook:(RVBook *)book database:(Database *)database;
-
-@end
-
-@implementation ManageView
-
-- (void) dealloc {
- [packages_ release];
- [sources_ release];
- [super dealloc];
-}
-
-- (id) initWithBook:(RVBook *)book database:(Database *)database {
- if ((self = [super initWithBook:book]) != nil) {
- database_ = database;
-
- packages_ = [[PackageTable alloc]
- initWithBook:book
- database:database
- title:nil
- filter:@selector(isInstalledInSection:)
- with:nil
- ];
-
- sources_ = [[SourceTable alloc]
- initWithBook:book
- database:database
- ];
-
- [self addSubview:packages_];
- } return self;
-}
-
-- (void) resetViewAnimated:(BOOL)animated {
- [packages_ resetViewAnimated:animated];
- [sources_ resetViewAnimated:animated];
-}
-
-- (void) reloadData {
- [packages_ reloadData];
- [sources_ reloadData];
-}
-
-- (NSString *) title {
- return @"Installed Packages";
-}
-
-- (NSString *) backButtonTitle {
- return @"Packages";
-}
-
-- (void) setDelegate:(id)delegate {
- [super setDelegate:delegate];
- [packages_ setDelegate:delegate];
- [sources_ setDelegate:delegate];
-}
-
@end
/* }}} */
/* Search View {{{ */
dimmed_ = [[UIView alloc] initWithFrame:pageBounds];
CGColor dimmed(space_, 0, 0, 0, 0.5);
- [dimmed_ setBackgroundColor:dimmed];
+ [dimmed_ setBackgroundColor:[UIColor colorWithCGColor:dimmed]];
table_ = [[PackageTable alloc]
initWithBook:book
database:database
title:nil
- filter:@selector(isSearchedForBy:)
+ filter:@selector(isUnfilteredAndSearchedForBy:)
with:nil
];
1, 38}, {17, 18}};
CGRect area;
- area.origin.x = cnfrect.origin.x + cnfrect.size.width + 14;
- area.origin.y = 30;
+ area.origin.x = /*cnfrect.origin.x + cnfrect.size.width + 4 +*/ 10;
+ area.origin.y = 1;
area.size.width =
#ifdef __OBJC2__
field_ = [[UISearchField alloc] initWithFrame:area];
- GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+ UIFont *font = [UIFont systemFontOfSize:16];
[field_ setFont:font];
- CFRelease(font);
[field_ setPlaceholder:@"Package Names & Descriptions"];
[field_ setDelegate:self];
-#ifdef __OBJC2__
[field_ setPaddingTop:3];
-#else
- [field_ setPaddingTop:5];
-#endif
-#ifndef __OBJC2__
- UITextTraits *traits = [field_ textTraits];
- [traits setEditingDelegate:self];
+ UITextInputTraits *traits = [field_ textInputTraits];
+ [traits setAutocapitalizationType:0];
+ [traits setAutocorrectionType:1];
[traits setReturnKeyType:6];
- [traits setAutoCapsType:0];
- [traits setAutoCorrectionType:1];
-#endif
- CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height + 30}};
+ CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height}};
accessory_ = [[UIView alloc] initWithFrame:accrect];
[accessory_ addSubview:field_];
- UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease];
+ /*UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease];
[configure setShowPressFeedback:YES];
[configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
[configure addTarget:self action:@selector(configurePushed) forEvents:1];
- [accessory_ addSubview:configure];
+ [accessory_ addSubview:configure];*/
+
+ [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+ [table_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
} return self;
}
[indicator_ release];
[prompt_ release];
[progress_ release];
+ [cancel_ release];
[super dealloc];
}
return Simplify([super getTitleForPage:page]);
}
-- (BOOL) updating {
- return updating_;
-}
+- (BOOL) updating {
+ return updating_;
+}
+
+- (void) update {
+ [UIView beginAnimations:nil context:NULL];
+
+ CGRect ovrframe = [overlay_ frame];
+ ovrframe.origin.y = 0;
+ [overlay_ setFrame:ovrframe];
+
+ CGRect barframe = [navbar_ frame];
+ barframe.origin.y += ovrframe.size.height;
+ [navbar_ setFrame:barframe];
+
+ CGRect trnframe = [transition_ frame];
+ trnframe.origin.y += ovrframe.size.height;
+ trnframe.size.height -= ovrframe.size.height;
+ [transition_ setFrame:trnframe];
+
+ [UIView endAnimations];
-- (void) update {
- [navbar_ setPrompt:@""];
- [navbar_ addSubview:overlay_];
[indicator_ startAnimation];
- [prompt_ setText:@"Updating Database..."];
+ [prompt_ setText:@"Updating Database"];
[progress_ setProgress:0];
+ received_ = 0;
+ last_ = [NSDate timeIntervalSinceReferenceDate];
updating_ = true;
+ [overlay_ addSubview:cancel_];
[NSThread
detachNewThreadSelector:@selector(_update)
- (void) _update_ {
updating_ = false;
- [overlay_ removeFromSuperview];
[indicator_ stopAnimation];
- [delegate_ reloadData];
- [self setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
+ [UIView beginAnimations:nil context:NULL];
+
+ CGRect ovrframe = [overlay_ frame];
+ ovrframe.origin.y = -ovrframe.size.height;
+ [overlay_ setFrame:ovrframe];
+
+ CGRect barframe = [navbar_ frame];
+ barframe.origin.y -= ovrframe.size.height;
+ [navbar_ setFrame:barframe];
+
+ CGRect trnframe = [transition_ frame];
+ trnframe.origin.y -= ovrframe.size.height;
+ trnframe.size.height += ovrframe.size.height;
+ [transition_ setFrame:trnframe];
+
+ [UIView commitAnimations];
+
+ [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0];
}
- (id) initWithFrame:(CGRect)frame database:(Database *)database {
if ((self = [super initWithFrame:frame]) != nil) {
database_ = database;
- if (Advanced_)
- [navbar_ setBarStyle:1];
-
CGRect ovrrect = [navbar_ bounds];
- ovrrect.size.height = ([UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height);
+ ovrrect.size.height = [UINavigationBar defaultSize].height;
+ ovrrect.origin.y = -ovrrect.size.height;
+
+ overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect];
+ [self addSubview:overlay_];
- overlay_ = [[UIView alloc] initWithFrame:ovrrect];
+ [overlay_ setBarStyle:1];
+ int barstyle = [overlay_ _barStyle:NO];
+ bool ugly = barstyle == 0;
- UIProgressIndicatorStyle style = Advanced_ ?
- kUIProgressIndicatorStyleSmallWhite :
- kUIProgressIndicatorStyleSmallBlack;
+ UIProgressIndicatorStyle style = ugly ?
+ kUIProgressIndicatorStyleMediumBrown :
+ kUIProgressIndicatorStyleMediumWhite;
CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
[indicator_ setStyle:style];
[overlay_ addSubview:indicator_];
- CGSize prmsize = {200, indsize.width + 4};
+ CGSize prmsize = {215, indsize.height + 4};
CGRect prmrect = {{
indoffset * 2 + indsize.width,
#ifdef __OBJC2__
-1 +
#endif
- (ovrrect.size.height - prmsize.height) / 2
+ unsigned(ovrrect.size.height - prmsize.height) / 2
}, prmsize};
- GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12);
+ UIFont *font = [UIFont systemFontOfSize:15];
prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
- [prompt_ setColor:(Advanced_ ? White_ : Blueish_)];
- [prompt_ setBackgroundColor:Clear_];
+ [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
+ [prompt_ setBackgroundColor:[UIColor clearColor]];
[prompt_ setFont:font];
- CFRelease(font);
-
[overlay_ addSubview:prompt_];
CGSize prgsize = {75, 100};
progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
[progress_ setStyle:0];
[overlay_ addSubview:progress_];
+
+ cancel_ = [[UINavigationButton alloc] initWithTitle:@"Cancel" style:UINavigationButtonStyleHighlighted];
+ [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside];
+
+ CGRect frame = [cancel_ frame];
+ frame.size.width = 65;
+ frame.origin.x = ovrrect.size.width - frame.size.width - 5;
+ frame.origin.y = (ovrrect.size.height - frame.size.height) / 2;
+ [cancel_ setFrame:frame];
+
+ [cancel_ setBarStyle:barstyle];
} return self;
}
+- (void) _onCancel {
+ updating_ = false;
+ [cancel_ removeFromSuperview];
+}
+
- (void) _update {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
}
- (void) setProgressPercent:(float)percent {
+ [self
+ performSelectorOnMainThread:@selector(_setProgressPercent:)
+ withObject:[NSNumber numberWithFloat:percent]
+ waitUntilDone:YES
+ ];
+}
+
+- (void) startProgress {
}
- (void) addProgressOutput:(NSString *)output {
];
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+- (bool) isCancelling:(size_t)received {
+ NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
+ if (received_ != received) {
+ received_ = received;
+ last_ = now;
+ } else if (now - last_ > 15)
+ return true;
+ return !updating_;
+}
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
[sheet dismiss];
}
- (void) _setProgressTitle:(NSString *)title {
- [prompt_ setText:[title stringByAppendingString:@"..."]];
+ [prompt_ setText:title];
+}
+
+- (void) _setProgressPercent:(NSNumber *)percent {
+ [progress_ setProgress:[percent floatValue]];
}
- (void) _addProgressOutput:(NSString *)output {
UIView *underlay_;
UIView *overlay_;
CYBook *book_;
- UIButtonBar *buttonbar_;
+ UIToolbar *buttonbar_;
ConfirmationView *confirm_;
if ([broken_ count] != 0) {
int count = [broken_ count];
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
buttons:[NSArray arrayWithObjects:
@"Forcibly Clear",
} else if (!Ignored_ && [essential_ count] != 0) {
int count = [essential_ count];
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
defaultButtonIndex:0
[database_ reloadData];
- if (Packages_ == nil) {
- Packages_ = [[NSMutableDictionary alloc] initWithCapacity:128];
- [Metadata_ setObject:Packages_ forKey:@"Packages"];
- }
-
size_t changes(0);
[essential_ removeAllObjects];
[self removeApplicationBadge];
}
+ [self updateData];
+
+ if ([packages count] == 0);
+ else if (Loaded_)
+ [self _loaded];
+ else {
+ Loaded_ = YES;
+ [book_ update];
+ }
+
+ /*[hud show:NO];
+ [hud removeFromSuperview];*/
+}
+
+- (void) _saveConfig {
if (Changed_) {
_assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
Changed_ = false;
}
+}
+
+- (void) updateData {
+ [self _saveConfig];
/* XXX: this is just stupid */
if (tag_ != 2)
[install_ reloadData];
if (tag_ != 3)
[changes_ reloadData];
- if (tag_ != 4)
- [manage_ reloadData];
if (tag_ != 5)
[search_ reloadData];
[book_ reloadData];
+}
- if ([packages count] == 0);
- else if (Loaded_)
- [self _loaded];
- else {
- Loaded_ = YES;
- [book_ update];
+- (void) update_ {
+ [database_ update];
+}
+
+- (void) syncData {
+ FILE *file = fopen("/etc/apt/sources.list.d/cydia.list", "w");
+ _assert(file != NULL);
+
+ NSArray *keys = [Sources_ allKeys];
+
+ for (int i(0), e([keys count]); i != e; ++i) {
+ NSString *key = [keys objectAtIndex:i];
+ NSDictionary *source = [Sources_ objectForKey:key];
+
+ fprintf(file, "%s %s %s\n",
+ [[source objectForKey:@"Type"] UTF8String],
+ [[source objectForKey:@"URI"] UTF8String],
+ [[source objectForKey:@"Distribution"] UTF8String]
+ );
}
- /*[hud show:NO];
- [hud removeFromSuperview];*/
+ fclose(file);
+
+ [self _saveConfig];
+
+ [progress_
+ detachNewThreadSelector:@selector(update_)
+ toTarget:self
+ withObject:nil
+ title:@"Updating Sources"
+ ];
}
- (void) reloadData {
[broken addObject:[package name]];
}
- UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+ UIActionSheet *sheet = [[[UIActionSheet alloc]
initWithTitle:[NSString stringWithFormat:@"%d Broken Packages", [database_ cache]->BrokenCount()]
buttons:[NSArray arrayWithObjects:@"Okay", nil]
defaultButtonIndex:0
detachNewThreadSelector:@selector(perform)
toTarget:database_
withObject:nil
- title:@"Running..."
+ title:@"Running"
];
}
detachNewThreadSelector:@selector(bootstrap_)
toTarget:self
withObject:nil
- title:@"Bootstrap Install..."
+ title:@"Bootstrap Install"
];
}
}
}
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
- NSString *context = [sheet context];
- if ([context isEqualToString:@"fixhalf"])
- switch (button) {
- case 1:
- @synchronized (self) {
- for (int i = 0, e = [broken_ count]; i != e; ++i) {
- Package *broken = [broken_ objectAtIndex:i];
- [broken remove];
-
- NSString *id = [broken id];
- unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]);
- unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]);
- unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]);
- unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]);
- }
-
- [self resolve];
- [self perform];
- }
- break;
-
- case 2:
- [broken_ removeAllObjects];
- [self _loaded];
- break;
-
- default:
- _assert(false);
- }
- else if ([context isEqualToString:@"upgrade"])
- switch (button) {
- case 1:
- @synchronized (self) {
- for (int i = 0, e = [essential_ count]; i != e; ++i) {
- Package *essential = [essential_ objectAtIndex:i];
- [essential install];
- }
-
- [self resolve];
- [self perform];
- }
- break;
-
- case 2:
- Ignored_ = YES;
- break;
-
- default:
- _assert(false);
- }
-
- [sheet dismiss];
-}
-
- (void) setPage:(RVPage *)page {
[page resetViewAnimated:NO];
[page setDelegate:self];
[book_ setPage:page];
}
-- (RVPage *) _setHomePage {
- BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
- [self setPage:browser];
- [browser loadURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]];
+- (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class {
+ BrowserView *browser = [[[_class alloc] initWithBook:book_ database:database_] autorelease];
+ [browser loadURL:url];
return browser;
}
+- (void) _setHomePage {
+ [self setPage:[self _pageForURL:[NSURL URLWithString:@"http://cydia.saurik.com/"] withClass:[HomeView class]]];
+}
+
- (void) buttonBarItemTapped:(id)sender {
unsigned tag = [sender tag];
if (tag == tag_) {
[book_ resetViewAnimated:YES];
return;
- }
+ } else if (tag_ == 2 && tag != 2)
+ [install_ resetView];
switch (tag) {
case 1: [self _setHomePage]; break;
tag_ = tag;
}
-- (void) applicationWillSuspend {
- _trace();
- [super applicationWillSuspend];
+- (void) fixSpringBoard {
+ pid_t pid = ExecFork();
+ if (pid == 0) {
+ sleep(1);
+
+ if (pid_t child = fork()) {
+ waitpid(child, NULL, 0);
+ } else {
+ execlp("launchctl", "launchctl", "unload", SpringBoard_, NULL);
+ perror("launchctl unload");
+ exit(0);
+ }
+
+ execlp("launchctl", "launchctl", "load", SpringBoard_, NULL);
+ perror("launchctl load");
+ exit(0);
+ }
+}
+- (void) applicationWillSuspend {
[database_ clean];
if (reload_) {
- pid_t pid = ExecFork();
- if (pid == 0) {
#ifndef __OBJC2__
- sleep(1);
+ [self fixSpringBoard];
#endif
+}
- if (pid_t child = fork()) {
- waitpid(child, NULL, 0);
- } else {
- execlp("launchctl", "launchctl", "unload", SpringBoard_, NULL);
- perror("launchctl unload");
- exit(0);
- }
+ [super applicationWillSuspend];
+}
- execlp("launchctl", "launchctl", "load", SpringBoard_, NULL);
- perror("launchctl load");
- exit(0);
- }
- }
+- (void) askForSettings {
+ UIActionSheet *role = [[[UIActionSheet alloc]
+ initWithTitle:@"Who Are You?"
+ buttons:[NSArray arrayWithObjects:
+ @"User (Graphical Only)",
+ @"Hacker (+ Command Line)",
+ @"Developer (No Filters)",
+ nil]
+ defaultButtonIndex:-1
+ delegate:self
+ context:@"role"
+ ] autorelease];
+
+ [role setBodyText:@"Not all of the packages available via Cydia are designed to be used by all users. Please categorize yourself so that Cydia can apply helpful filters.\n\nThis choice can be changed from \"Settings\" under the \"Manage\" tab."];
+ [role popupAlertAnimated:YES];
}
- (void) finish {
[hud_ autorelease];
hud_ = nil;
- reload_ = true;
- [self suspendWithAnimation:YES];
+ pid_t pid = ExecFork();
+ if (pid == 0) {
+ execlp("launchctl", "launchctl", "stop", "com.apple.SpringBoard", NULL);
+ perror("launchctl stop");
+ }
+
+ return;
+ }
+
+ if (Role_ == nil) {
+ [self askForSettings];
return;
}
@"install-dn.png", kUIButtonBarButtonSelectedInfo,
[NSNumber numberWithInt:2], kUIButtonBarButtonTag,
self, kUIButtonBarButtonTarget,
- @"Install", kUIButtonBarButtonTitle,
+ @"Sections", kUIButtonBarButtonTitle,
@"0", kUIButtonBarButtonType,
nil],
nil],
nil];
- buttonbar_ = [[UIButtonBar alloc]
+ buttonbar_ = [[UIToolbar alloc]
initInView:overlay_
withFrame:CGRectMake(
0, screenrect.size.height - ButtonBarHeight_,
install_ = [[InstallView alloc] initWithBook:book_ database:database_];
changes_ = [[ChangesView alloc] initWithBook:book_ database:database_];
- manage_ = [[ManageView alloc] initWithBook:book_ database:database_];
search_ = [[SearchView alloc] initWithBook:book_ database:database_];
+ manage_ = (ManageView *) [[self
+ _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]]
+ withClass:[ManageView class]
+ ] retain];
+
if (!bootstrap_)
[underlay_ addSubview:overlay_];
[self _setHomePage];
}
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+ NSString *context = [sheet context];
+ if ([context isEqualToString:@"fixhalf"])
+ switch (button) {
+ case 1:
+ @synchronized (self) {
+ for (int i = 0, e = [broken_ count]; i != e; ++i) {
+ Package *broken = [broken_ objectAtIndex:i];
+ [broken remove];
+
+ NSString *id = [broken id];
+ unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]);
+ unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]);
+ unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]);
+ unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]);
+ }
+
+ [self resolve];
+ [self perform];
+ }
+ break;
+
+ case 2:
+ [broken_ removeAllObjects];
+ [self _loaded];
+ break;
+
+ default:
+ _assert(false);
+ }
+ else if ([context isEqualToString:@"role"]) {
+ switch (button) {
+ case 1: Role_ = @"User"; break;
+ case 2: Role_ = @"Hacker"; break;
+ case 3: Role_ = @"Developer"; break;
+
+ default:
+ Role_ = nil;
+ _assert(false);
+ }
+
+ bool reset = Settings_ != nil;
+
+ Settings_ = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+ Role_, @"Role",
+ nil];
+
+ [Metadata_ setObject:Settings_ forKey:@"Settings"];
+
+ Changed_ = true;
+
+ if (reset)
+ [self updateData];
+ else
+ [self finish];
+ } else if ([context isEqualToString:@"upgrade"])
+ switch (button) {
+ case 1:
+ @synchronized (self) {
+ for (int i = 0, e = [essential_ count]; i != e; ++i) {
+ Package *essential = [essential_ objectAtIndex:i];
+ [essential install];
+ }
+
+ [self resolve];
+ [self perform];
+ }
+ break;
+
+ case 2:
+ Ignored_ = YES;
+ break;
+
+ default:
+ _assert(false);
+ }
+
+ [sheet dismiss];
+}
+
- (void) reorganize {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
system("/usr/libexec/cydia/free.sh");
- (void) applicationSuspend:(__GSEvent *)event {
if (hud_ == nil && ![progress_ isRunning])
[super applicationSuspend:event];
- _trace();
+}
+
+- (void) _animateSuspension:(BOOL)arg0 duration:(double)arg1 startTime:(double)arg2 scale:(float)arg3 {
+ if (hud_ == nil)
+ [super _animateSuspension:arg0 duration:arg1 startTime:arg2 scale:arg3];
+}
+
+- (void) _setSuspended:(BOOL)value {
+ if (hud_ == nil)
+ [super _setSuspended:value];
+}
+
+- (UIProgressHUD *) addProgressHUD {
+ UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
+ [hud show:YES];
+ [underlay_ addSubview:hud];
+ return hud;
}
- (void) applicationDidFinishLaunching:(id)unused {
+ Font12_ = [[UIFont systemFontOfSize:12] retain];
+ Font12Bold_ = [[UIFont boldSystemFontOfSize:12] retain];
+ Font14_ = [[UIFont systemFontOfSize:14] retain];
+ Font18Bold_ = [[UIFont boldSystemFontOfSize:18] retain];
+ Font22Bold_ = [[UIFont boldSystemFontOfSize:22] retain];
+
_assert(pkgInitConfig(*_config));
_assert(pkgInitSystem(*_config, _system));
CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
window_ = [[UIWindow alloc] initWithContentRect:screenrect];
- [window_ orderFront: self];
- [window_ makeKey: self];
- [window_ _setHidden: NO];
+ [window_ orderFront:self];
+ [window_ makeKey:self];
+ [window_ _setHidden:NO];
database_ = [[Database alloc] init];
progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
if (
readlink("/Applications", NULL, 0) == -1 && errno == EINVAL ||
- readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL ||
readlink("/Library/Ringtones", NULL, 0) == -1 && errno == EINVAL ||
- readlink("/Library/Wallpapers", NULL, 0) == -1 && errno == EINVAL
+ readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL ||
+ readlink("/usr/include", NULL, 0) == -1 && errno == EINVAL ||
+ readlink("/usr/libexec", NULL, 0) == -1 && errno == EINVAL ||
+ readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL /*||
+ readlink("/var/lib", NULL, 0) == -1 && errno == EINVAL*/
) {
- hud_ = [[UIProgressHUD alloc] initWithWindow:window_];
- [hud_ setText:@"Reorganizing\nOne Minute!\nPlease Wait...\nDO NOT STOP"];
- [hud_ show:YES];
- [underlay_ addSubview:hud_];
+ [self setIdleTimerDisabled:YES];
+
+ hud_ = [self addProgressHUD];
+ [hud_ setText:@"Reorganizing\n\nWill Automatically\nRestart When Done"];
[self setStatusBarShowsProgress:YES];
];
}
-- (void) slideUp:(UIAlertSheet *)alert {
+- (void) slideUp:(UIActionSheet *)alert {
if (Advanced_)
[alert presentSheetFromButtonBar:buttonbar_];
else
bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
+ App_ = [[NSBundle mainBundle] bundlePath];
Home_ = NSHomeDirectory();
{
if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL)
Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2];
- else
+ else {
+ Settings_ = [Metadata_ objectForKey:@"Settings"];
+
Packages_ = [Metadata_ objectForKey:@"Packages"];
+ Sections_ = [Metadata_ objectForKey:@"Sections"];
+ Sources_ = [Metadata_ objectForKey:@"Sources"];
+ }
+
+ if (Settings_ != nil)
+ Role_ = [Settings_ objectForKey:@"Role"];
+
+ if (Packages_ == nil) {
+ Packages_ = [[[NSMutableDictionary alloc] initWithCapacity:128] autorelease];
+ [Metadata_ setObject:Packages_ forKey:@"Packages"];
+ }
+
+ if (Sections_ == nil) {
+ Sections_ = [[[NSMutableDictionary alloc] initWithCapacity:32] autorelease];
+ [Metadata_ setObject:Sections_ forKey:@"Sections"];
+ }
+
+ if (Sources_ == nil) {
+ Sources_ = [[[NSMutableDictionary alloc] initWithCapacity:0] autorelease];
+ [Metadata_ setObject:Sources_ forKey:@"Sources"];
+ }
+
+ Documents_ = [[[NSMutableArray alloc] initWithCapacity:4] autorelease];
+
+ if (access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0)
+ dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);
if (access("/User", F_OK) != 0)
system("/usr/libexec/cydia/firmware.sh");
Locale_ = CFLocaleCopyCurrent();
space_ = CGColorSpaceCreateDeviceRGB();
+ Blue_.Set(space_, 0.2, 0.2, 1.0, 1.0);
Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0);
Black_.Set(space_, 0.0, 0.0, 0.0, 1.0);
- Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0);
+ Off_.Set(space_, 0.9, 0.9, 0.9, 1.0);
Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
+ Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0);
+
+ Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
+
+ SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];
- int value = UIApplicationMain(argc, argv, [Cydia class]);
+ int value = UIApplicationMain(argc, argv, @"Cydia", @"Cydia");
CGColorSpaceRelease(space_);
CFRelease(Locale_);
projects / cydia.git / blobdiff