#include <sys/sysctl.h>
#include <sys/param.h>
#include <sys/mount.h>
+#include <sys/reboot.h>
#include <fcntl.h>
#include <notify.h>
#include <errno.h>
#include <pcre.h>
+#include <Cytore.hpp>
+
#include "UICaboodle/BrowserView.h"
+#include "SDURLCache/SDURLCache.h"
#include "substrate.h"
/* }}} */
while (false); \
[_pool release];
+// Hash Functions/Structures {{{
+extern "C" uint32_t hashlittle(const void *key, size_t length, uint32_t initval = 0);
+
+union SplitHash {
+ uint32_t u32;
+ uint16_t u16[2];
+};
+// }}}
+
static const NSUInteger UIViewAutoresizingFlexibleBoth(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
void NSLogPoint(const char *fix, const CGPoint &point) {
}
- (id) yieldToSelector:(SEL)selector withObject:(id)object {
- /*return [self performSelector:selector withObject:object];*/
-
volatile bool stopped(false);
NSMutableArray *context([NSMutableArray arrayWithObjects:
cache_ = reinterpret_cast<CFStringRef>(CFRetain(rhs.cache_));
}
+ void copy(apr_pool_t *pool) {
+ char *temp(reinterpret_cast<char *>(apr_palloc(pool, size_ + 1)));
+ memcpy(temp, data_, size_);
+ temp[size_] = '\0';
+ data_ = temp;
+ }
+
void set(apr_pool_t *pool, const char *data, size_t size) {
if (size == 0)
clear();
else {
clear_();
- char *temp(reinterpret_cast<char *>(apr_palloc(pool, size + 1)));
- memcpy(temp, data, size);
- temp[size] = '\0';
- data_ = temp;
+ data_ = const_cast<char *>(data);
size_ = size;
+
+ if (pool != NULL)
+ copy(pool);
}
}
_finline operator id() {
return (NSString *) static_cast<CFStringRef>(*this);
}
+
+ _finline operator const char *() {
+ return reinterpret_cast<const char *>(data_);
+ }
};
/* }}} */
/* C++ NSString Algorithm Adapters {{{ */
/* Random Global Variables {{{ */
static const int PulseInterval_ = 50000;
-static const int ButtonBarWidth_ = 60;
-static const int ButtonBarHeight_ = 48;
-static const float KeyboardTime_ = 0.3f;
static int Finish_;
static NSArray *Finishes_;
static _transient NSMutableDictionary *Sections_;
static _transient NSMutableDictionary *Sources_;
static bool Changed_;
-static NSDate *now_;
+static time_t now_;
static bool IsWildcat_;
/* }}} */
static _finline const char *StripVersion_(const char *version) {
const char *colon(strchr(version, ':'));
- if (colon != NULL)
- version = colon + 1;
- return version;
+ return colon == NULL ? version : colon + 1;
}
NSString *LocalizeSection(NSString *section) {
@class PackageController;
@protocol CydiaDelegate
+- (void) retainNetworkActivityIndicator;
+- (void) releaseNetworkActivityIndicator;
- (void) setPackageController:(PackageController *)view;
- (void) clearPackage:(Package *)package;
- (void) installPackage:(Package *)package;
- (void) syncData;
- (void) showSettings;
- (UIProgressHUD *) addProgressHUD;
-- (BOOL) hudIsShowing;
- (void) removeProgressHUD:(UIProgressHUD *)hud;
- (CYViewController *) pageForPackage:(NSString *)name;
- (PackageController *) packageController;
- (void) showActionSheet:(UIActionSheet *)sheet fromItem:(UIBarButtonItem *)item;
@end
+
+static id<CydiaDelegate> CydiaApp;
/* }}} */
/* Status Delegation {{{ */
int cydiafd_;
int statusfd_;
FILE *input_;
+
+ std::map<const char *, _H<NSString> > sections_;
}
+ (Database *) sharedInstance;
- (void) setDelegate:(id)delegate;
- (Source *) getSource:(pkgCache::PkgFileIterator)file;
+
+- (NSString *) mappedSectionForPointer:(const char *)pointer;
+
@end
/* }}} */
/* Delegate Helpers {{{ */
@end
/* }}} */
+// Cytore Definitions {{{
+struct PackageValue :
+ Cytore::Block
+{
+ Cytore::Offset<PackageValue> next_;
+
+ uint32_t index_ : 23;
+ uint32_t subscribed_ : 1;
+ uint32_t : 8;
+
+ int32_t first_;
+ int32_t last_;
+
+ uint16_t vhash_;
+ uint16_t nhash_;
+
+ char version_[8];
+ char name_[];
+};
+
+struct MetaValue :
+ Cytore::Block
+{
+ uint32_t active_;
+ Cytore::Offset<PackageValue> packages_[1 << 16];
+};
+
+static Cytore::File<MetaValue> MetaFile_;
+// }}}
+// Cytore Helper Functions {{{
+static PackageValue *PackageFind(const char *name, size_t length) {
+ SplitHash nhash = { hashlittle(name, length) };
+
+ PackageValue *metadata;
+
+ Cytore::Offset<PackageValue> *offset(&MetaFile_->packages_[nhash.u16[0]]);
+ offset: if (offset->IsNull()) {
+ *offset = MetaFile_.New<PackageValue>(length + 1);
+ metadata = &MetaFile_.Get(*offset);
+
+ memcpy(metadata->name_, name, length + 1);
+ metadata->nhash_ = nhash.u16[1];
+ } else {
+ metadata = &MetaFile_.Get(*offset);
+
+ if (metadata->nhash_ != nhash.u16[1] || strncmp(metadata->name_, name, length + 1) != 0) {
+ offset = &metadata->next_;
+ goto offset;
+ }
+ }
+
+ return metadata;
+}
+
+static void PackageImport(const void *key, const void *value, void *context) {
+ char buffer[1024];
+ if (!CFStringGetCString((CFStringRef) key, buffer, sizeof(buffer), kCFStringEncodingUTF8)) {
+ NSLog(@"failed to import package %@", key);
+ return;
+ }
+
+ PackageValue *metadata(PackageFind(buffer, strlen(buffer)));
+ NSDictionary *package((NSDictionary *) value);
+
+ if (NSNumber *subscribed = [package objectForKey:@"IsSubscribed"])
+ if ([subscribed boolValue] && !metadata->subscribed_)
+ metadata->subscribed_ = true;
+
+ if (NSDate *date = [package objectForKey:@"FirstSeen"]) {
+ time_t time([date timeIntervalSince1970]);
+ if (metadata->first_ > time || metadata->first_ == 0)
+ metadata->first_ = time;
+ }
+
+ NSDate *date([package objectForKey:@"LastSeen"]);
+ NSString *version([package objectForKey:@"LastVersion"]);
+
+ if (date != nil && version != nil) {
+ time_t time([date timeIntervalSince1970]);
+ if (metadata->last_ < time || metadata->last_ == 0)
+ if (CFStringGetCString((CFStringRef) version, buffer, sizeof(buffer), kCFStringEncodingUTF8)) {
+ size_t length(strlen(buffer));
+ uint16_t vhash(hashlittle(buffer, length));
+
+ size_t capped(std::min<size_t>(8, length));
+ char *latest(buffer + length - capped);
+
+ strncpy(metadata->version_, latest, sizeof(metadata->version_));
+ metadata->vhash_ = vhash;
+
+ metadata->last_ = time;
+ }
+ }
+}
+// }}}
+
/* Source Class {{{ */
@interface Source : NSObject {
CYString depiction_;
@end
/* }}} */
/* Package Class {{{ */
+struct ParsedPackage {
+ CYString tagline_;
+
+ CYString icon_;
+
+ CYString depiction_;
+ CYString homepage_;
+
+ CYString sponsor_;
+ CYString author_;
+
+ CYString bugs_;
+ CYString support_;
+};
+
@interface Package : NSObject {
- unsigned era_;
+ uint32_t era_ : 26;
+ uint32_t role_ : 3;
+ uint32_t essential_ : 1;
+ uint32_t obsolete_ : 1;
+ uint32_t ignored_ : 1;
+
apr_pool_t *pool_;
+ _transient Database *database_;
+
pkgCache::VerIterator version_;
pkgCache::PkgIterator iterator_;
- _transient Database *database_;
pkgCache::VerFileIterator file_;
- Source *source_;
- bool parsed_;
-
- CYString section_;
- _transient NSString *section$_;
- bool essential_;
- bool obsolete_;
+ CYString id_;
+ CYString name_;
- NSString *latest_;
+ CYString latest_;
CYString installed_;
- CYString id_;
- CYString name_;
- CYString tagline_;
- CYString icon_;
- CYString depiction_;
- CYString homepage_;
+ const char *section_;
+ _transient NSString *section$_;
- CYString sponsor_;
- Address *sponsor$_;
+ Source *source_;
- CYString author_;
- Address *author$_;
+ PackageValue *metadata_;
+ ParsedPackage *parsed_;
- CYString bugs_;
- CYString support_;
NSMutableArray *tags_;
- NSString *role_;
-
- NSMutableDictionary *metadata_;
- _transient NSDate *firstSeen_;
- _transient NSDate *lastSeen_;
- bool subscribed_;
}
- (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;
- (NSString *) shortDescription;
- (unichar) index;
-- (NSMutableDictionary *) metadata;
-- (NSDate *) seen;
-- (BOOL) subscribed;
+- (PackageValue *) metadata;
+- (time_t) seen;
+
+- (bool) subscribed;
+- (bool) setSubscribed:(bool)subscribed;
+
- (BOOL) ignored;
- (NSString *) latest;
- (NSArray *) applications;
- (Source *) source;
-- (NSString *) role;
- (BOOL) matches:(NSString *)text;
- (NSArray *) purposes;
- (bool) isCommercial;
+- (void) setIndex:(size_t)index;
+
- (CYString &) cyname;
- (uint32_t) compareBySection:(NSArray *)sections;
value.bits.ignored = [self ignored] ? 0 : 1;
value.bits.upgradable = 1;
} else {
- value.bits.timestamp = static_cast<uint32_t>([[self seen] timeIntervalSince1970]) >> 2;
+ value.bits.timestamp = [self seen] >> 2;
value.bits.ignored = 0;
value.bits.upgradable = 0;
}
return _not(uint32_t) - value.key;
}
-_finline static void Stifle(uint8_t &value) {
-}
-
uint32_t PackagePrefixRadix(Package *self, void *context) {
size_t offset(reinterpret_cast<size_t>(context));
CYString &name([self cyname]);
uint8_t data[4];
- // 0.607997
-
if (offset == 0 && zeros != 0) {
memset(data, '0', zeros);
memcpy(data + zeros, text, 4 - zeros);
}
- (void) dealloc {
+ if (parsed_ != NULL)
+ delete parsed_;
if (source_ != nil)
[source_ release];
-
- if (latest_ != nil)
- [latest_ release];
-
- if (sponsor$_ != nil)
- [sponsor$_ release];
- if (author$_ != nil)
- [author$_ release];
if (tags_ != nil)
[tags_ release];
- if (role_ != nil)
- [role_ release];
-
- if (metadata_ != nil)
- [metadata_ release];
-
[super dealloc];
}
}
- (void) parse {
- if (parsed_)
+ if (parsed_ != NULL)
return;
- parsed_ = true;
- if (file_.end())
+@synchronized (database_) {
+ if ([database_ era] != era_ || file_.end())
return;
+ ParsedPackage *parsed(new ParsedPackage);
+ parsed_ = parsed;
+
_profile(Package$parse)
pkgRecords::Parser *parser;
const char *name_;
CYString *value_;
} names[] = {
- {"icon", &icon_},
- {"depiction", &depiction_},
- {"homepage", &homepage_},
+ {"icon", &parsed->icon_},
+ {"depiction", &parsed->depiction_},
+ {"homepage", &parsed->homepage_},
{"website", &website},
- {"bugs", &bugs_},
- {"support", &support_},
- {"sponsor", &sponsor_},
- {"author", &author_},
+ {"bugs", &parsed->bugs_},
+ {"support", &parsed->support_},
+ {"sponsor", &parsed->sponsor_},
+ {"author", &parsed->author_},
};
for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i) {
stop = end;
while (stop != start && stop[-1] == '\r')
--stop;
- tagline_.set(pool_, start, stop - start);
+ parsed->tagline_.set(pool_, start, stop - start);
}
_end
_profile(Package$parse$Retain)
- if (homepage_.empty())
- homepage_ = website;
- if (homepage_ == depiction_)
- homepage_.clear();
+ if (parsed->homepage_.empty())
+ parsed->homepage_ = website;
+ if (parsed->homepage_ == parsed->depiction_)
+ parsed->homepage_.clear();
_end
_end
-}
+} }
- (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database {
if ((self = [super init]) != nil) {
_profile(Package$initWithVersion)
- era_ = [database era];
pool_ = pool;
- version_ = version;
-
- _profile(Package$initWithVersion$ParentPkg)
- iterator_ = version.ParentPkg();
- _end
-
database_ = database;
+ era_ = [database era];
- _profile(Package$initWithVersion$Latest)
- const char *latest(StripVersion_(version_.VerStr()));
- latest_ = (NSString *) CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const uint8_t *>(latest), strlen(latest), kCFStringEncodingASCII, NO);
- _end
+ version_ = version;
- pkgCache::VerIterator current;
- _profile(Package$initWithVersion$Versions)
- current = iterator_.CurrentVer();
- if (!current.end())
- installed_.set(pool_, StripVersion_(current.VerStr()));
+ pkgCache::PkgIterator iterator(version.ParentPkg());
+ iterator_ = iterator;
+ _profile(Package$initWithVersion$Version)
if (!version_.end())
file_ = version_.FileList();
else {
}
_end
- _profile(Package$initWithVersion$Name)
- id_.set(pool_, iterator_.Name());
- name_.set(pool, iterator_.Display());
- _end
+ _profile(Package$initWithVersion$Cache)
+ name_.set(NULL, iterator.Display());
- _profile(Package$initWithVersion$lowercaseString)
- char *data(id_.data());
- for (size_t i(0), e(id_.size()); i != e; ++i)
- // XXX: do not use tolower() as this is not locale-specific? :(
- data[i] |= 0x20;
+ latest_.set(NULL, StripVersion_(version_.VerStr()));
+
+ pkgCache::VerIterator current(iterator.CurrentVer());
+ if (!current.end())
+ installed_.set(NULL, StripVersion_(current.VerStr()));
_end
_profile(Package$initWithVersion$Tags)
- pkgCache::TagIterator tag(iterator_.TagList());
+ pkgCache::TagIterator tag(iterator.TagList());
if (!tag.end()) {
tags_ = [[NSMutableArray alloc] initWithCapacity:8];
do {
const char *name(tag.Name());
[tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]];
- if (role_ == nil && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/)
- role_ = (NSString *) CYStringCreate(name + 6);
+
+ if (role_ == 0 && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/) {
+ if (strcmp(name + 6, "enduser") == 0)
+ role_ = 1;
+ else if (strcmp(name + 6, "hacker") == 0)
+ role_ = 2;
+ else if (strcmp(name + 6, "developer") == 0)
+ role_ = 3;
+ else if (strcmp(name + 6, "cydia") == 0)
+ role_ = 7;
+ else
+ role_ = 4;
+ }
+
+ if (strncmp(name, "cydia::", 7) == 0) {
+ if (strcmp(name + 7, "essential") == 0)
+ essential_ = true;
+ else if (strcmp(name + 7, "obsolete") == 0)
+ obsolete_ = true;
+ }
+
++tag;
} while (!tag.end());
}
_end
- bool changed(false);
-
_profile(Package$initWithVersion$Metadata)
- metadata_ = [Packages_ objectForKey:id_];
-
- if (metadata_ == nil) {
- firstSeen_ = now_;
+ const char *mixed(iterator.Name());
+ size_t size(strlen(mixed));
+ char lower[size + 1];
- metadata_ = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
- firstSeen_, @"FirstSeen",
- latest_, @"LastVersion",
- nil] mutableCopy];
+ for (size_t i(0); i != size; ++i)
+ lower[i] = mixed[i] | 0x20;
+ lower[size] = '\0';
- changed = true;
- } else {
- firstSeen_ = [metadata_ objectForKey:@"FirstSeen"];
- lastSeen_ = [metadata_ objectForKey:@"LastSeen"];
+ PackageValue *metadata(PackageFind(lower, size));
+ metadata_ = metadata;
- if (NSNumber *subscribed = [metadata_ objectForKey:@"IsSubscribed"])
- subscribed_ = [subscribed boolValue];
+ id_.set(NULL, metadata->name_, size);
- NSString *version([metadata_ objectForKey:@"LastVersion"]);
+ const char *latest(version_.VerStr());
+ size_t length(strlen(latest));
- if (firstSeen_ == nil) {
- firstSeen_ = lastSeen_ == nil ? now_ : lastSeen_;
- [metadata_ setObject:firstSeen_ forKey:@"FirstSeen"];
- changed = true;
- }
+ uint16_t vhash(hashlittle(latest, length));
- if (version == nil) {
- [metadata_ setObject:latest_ forKey:@"LastVersion"];
- changed = true;
- } else if (![version isEqualToString:latest_]) {
- [metadata_ setObject:latest_ forKey:@"LastVersion"];
- lastSeen_ = now_;
- [metadata_ setObject:lastSeen_ forKey:@"LastSeen"];
- changed = true;
- }
- }
+ size_t capped(std::min<size_t>(8, length));
+ latest = latest + length - capped;
- metadata_ = [metadata_ retain];
+ if (metadata->first_ == 0)
+ metadata->first_ = now_;
- if (changed) {
- [Packages_ setObject:metadata_ forKey:id_];
- Changed_ = true;
- }
+ if (metadata->vhash_ != vhash || strncmp(metadata->version_, latest, sizeof(metadata->version_)) != 0) {
+ strncpy(metadata->version_, latest, sizeof(metadata->version_));
+ metadata->vhash_ = vhash;
+ metadata->last_ = now_;
+ } else if (metadata->last_ == 0)
+ metadata->last_ = metadata->first_;
_end
_profile(Package$initWithVersion$Section)
- section_.set(pool_, iterator_.Section());
+ section_ = iterator.Section();
_end
- _profile(Package$initWithVersion$hasTag)
- obsolete_ = [self hasTag:@"cydia::obsolete"];
- essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"];
+ _profile(Package$initWithVersion$Flags)
+ essential_ |= ((iterator->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES);
+ ignored_ = iterator->SelectedState == pkgCache::State::Hold;
_end
_end } return self;
}
if (version.end())
return nil;
- return [[[Package alloc]
- initWithVersion:version
- withZone:zone
- inPool:pool
- database:database
- ] autorelease];
+ Package *package;
+
+ _profile(Package$packageWithIterator$Allocate)
+ package = [Package allocWithZone:zone];
+ _end
+
+ _profile(Package$packageWithIterator$Initialize)
+ package = [package
+ initWithVersion:version
+ withZone:zone
+ inPool:pool
+ database:database
+ ];
+ _end
+
+ _profile(Package$packageWithIterator$Autorelease)
+ package = [package autorelease];
+ _end
+
+ return package;
}
- (pkgCache::PkgIterator) iterator {
- (NSString *) section {
if (section$_ == nil) {
- if (section_.empty())
+ if (section_ == NULL)
return nil;
- _profile(Package$section)
- std::replace(section_.data(), section_.data() + section_.size(), '_', ' ');
- NSString *name(section_);
- section$_ = [SectionMap_ objectForKey:name] ?: name;
+ _profile(Package$section$mappedSectionForPointer)
+ section$_ = [database_ mappedSectionForPointer:section_];
_end
} return section$_;
}
} }
- (NSString *) shortDescription {
- return tagline_;
+ return parsed_ == NULL ? nil : static_cast<NSString *>(parsed_->tagline_);
}
- (unichar) index {
_end
}
-- (NSMutableDictionary *) metadata {
+- (PackageValue *) metadata {
return metadata_;
}
-- (NSDate *) seen {
- if (subscribed_ && lastSeen_ != nil)
- return lastSeen_;
- return firstSeen_;
+- (time_t) seen {
+ PackageValue *metadata([self metadata]);
+ return metadata->subscribed_ ? metadata->last_ : metadata->first_;
}
-- (BOOL) subscribed {
- return subscribed_;
+- (bool) subscribed {
+ return [self metadata]->subscribed_;
}
-- (BOOL) ignored {
- NSDictionary *metadata([self metadata]);
- if (NSNumber *ignored = [metadata objectForKey:@"IsIgnored"])
- return [ignored boolValue];
- else
+- (bool) setSubscribed:(bool)subscribed {
+ PackageValue *metadata([self metadata]);
+ if (metadata->subscribed_ == subscribed)
return false;
+ metadata->subscribed_ = subscribed;
+ return true;
+}
+
+- (BOOL) ignored {
+ return ignored_;
}
- (NSString *) latest {
- (BOOL) unfiltered {
_profile(Package$unfiltered$obsolete)
- if (obsolete_)
+ if (_unlikely(obsolete_))
return false;
_end
_profile(Package$unfiltered$hasSupportingRole)
- if (![self hasSupportingRole])
+ if (_unlikely(![self hasSupportingRole]))
return false;
_end
if (![self unfiltered])
return false;
- NSString *section([self section]);
+ NSString *section;
+
+ _profile(Package$visible$section)
+ section = [self section];
+ _end
_profile(Package$visible$isSectionVisible)
if (section != nil && !isSectionVisible(section))
NSString *section = [self simpleSection];
UIImage *icon(nil);
- if (!icon_.empty())
- if ([static_cast<id>(icon_) hasPrefix:@"file:///"])
- // XXX: correct escaping
- icon = [UIImage imageAtPath:[static_cast<id>(icon_) substringFromIndex:7]];
+ if (parsed_ != NULL)
+ if (NSString *href = parsed_->icon_)
+ if ([href hasPrefix:@"file:///"])
+ // XXX: correct escaping
+ icon = [UIImage imageAtPath:[href substringFromIndex:7]];
if (icon == nil) if (section != nil)
icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]];
if (icon == nil) if (Source *source = [self source]) if (NSString *dicon = [source defaultIcon])
}
- (NSString *) homepage {
- return homepage_;
+ return parsed_ == NULL ? nil : static_cast<NSString *>(parsed_->homepage_);
}
- (NSString *) depiction {
- return !depiction_.empty() ? depiction_ : [[self source] depictionForPackage:id_];
+ return parsed_ != NULL && !parsed_->depiction_.empty() ? parsed_->depiction_ : [[self source] depictionForPackage:id_];
}
- (Address *) sponsor {
- if (sponsor$_ == nil) {
- if (sponsor_.empty())
- return nil;
- sponsor$_ = [[Address addressWithString:sponsor_] retain];
- } return sponsor$_;
+ return parsed_ == NULL || parsed_->sponsor_.empty() ? nil : [Address addressWithString:parsed_->sponsor_];
}
- (Address *) author {
- if (author$_ == nil) {
- if (author_.empty())
- return nil;
- author$_ = [[Address addressWithString:author_] retain];
- } return author$_;
+ return parsed_ == NULL || parsed_->author_.empty() ? nil : [Address addressWithString:parsed_->author_];
}
- (NSString *) support {
- return !bugs_.empty() ? bugs_ : [[self source] supportForPackage:id_];
+ return parsed_ != NULL && !parsed_->bugs_.empty() ? parsed_->bugs_ : [[self source] supportForPackage:id_];
}
- (NSArray *) files {
return source_ == (Source *) [NSNull null] ? nil : source_;
}
-- (NSString *) role {
- return role_;
-}
-
- (BOOL) matches:(NSString *)text {
if (text == nil)
return NO;
}
- (bool) hasSupportingRole {
- if (role_ == nil)
+ if (role_ == 0)
return true;
- if ([role_ isEqualToString:@"enduser"])
+ if (role_ == 1)
return true;
if ([Role_ isEqualToString:@"User"])
return false;
- if ([role_ isEqualToString:@"hacker"])
+ if (role_ == 2)
return true;
if ([Role_ isEqualToString:@"Hacker"])
return false;
- if ([role_ isEqualToString:@"developer"])
+ if (role_ == 3)
return true;
if ([Role_ isEqualToString:@"Developer"])
return false;
return [self hasTag:@"cydia::commercial"];
}
+- (void) setIndex:(size_t)index {
+ if (metadata_->index_ != index)
+ metadata_->index_ = index;
+}
+
- (CYString &) cyname {
return name_.empty() ? id_ : name_;
}
}
- (bool) isInstalledAndUnfiltered:(NSNumber *)number {
- return ![self uninstalled] && (![number boolValue] && ![role_ isEqualToString:@"cydia"] || [self unfiltered]);
+ return ![self uninstalled] && (![number boolValue] && role_ != 7 || [self unfiltered]);
}
- (bool) isVisibleInSection:(NSString *)name {
zone_ = NSCreateZone(1024 * 1024, 256 * 1024, NO);
apr_pool_create(&pool_, NULL);
- packages_ = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
+ size_t capacity(MetaFile_->active_);
+ if (capacity == 0)
+ capacity = 16384;
+ else
+ capacity += 1024;
+
+ packages_ = CFArrayCreateMutable(kCFAllocatorDefault, capacity, NULL);
int fds[2];
delete policy_;
policy_ = NULL;
- if (now_ != nil) {
- [now_ release];
- now_ = nil;
- }
-
cache_.Close();
apr_pool_clear(pool_);
+
NSRecycleZone(zone_);
+ zone_ = NSCreateZone(1024 * 1024, 256 * 1024, NO);
int chk(creat("/tmp/cydia.chk", 0644));
if (chk != -1)
unlink("/tmp/cydia.chk");
- now_ = [[NSDate date] retain];
+ now_ = [[NSDate date] timeIntervalSince1970];
policy_ = new pkgDepCache::Policy();
records_ = new pkgRecords(cache_);
//[packages_ sortUsingFunction:reinterpret_cast<NSComparisonResult (*)(id, id, void *)>(&PackageNameCompare) context:NULL];
_trace();
+
+ size_t count(CFArrayGetCount(packages_));
+ MetaFile_->active_ = count;
+
+ for (size_t index(0); index != count; ++index)
+ [(Package *) CFArrayGetValueAtIndex(packages_, index) setIndex:index];
+
+ _trace();
}
} } CYPoolEnd() _trace(); }
- (void) configure {
NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_];
+ _trace();
system([dpkg UTF8String]);
+ _trace();
}
- (bool) clean {
return;
}
+ [CydiaApp retainNetworkActivityIndicator];
+
bool failed = false;
for (pkgAcquire::ItemIterator item = fetcher_->ItemsBegin(); item != fetcher_->ItemsEnd(); item++) {
if ((*item)->Status == pkgAcquire::Item::StatDone && (*item)->Complete)
];
}
+ [CydiaApp releaseNetworkActivityIndicator];
+
if (failed) {
_trace();
return;
return i == sources_.end() ? nil : i->second;
}
+- (NSString *) mappedSectionForPointer:(const char *)section {
+ _H<NSString> *mapped;
+
+ _profile(Database$mappedSectionForPointer$Cache)
+ mapped = §ions_[section];
+ _end
+
+ if (*mapped == NULL) {
+ size_t length(strlen(section));
+ char spaced[length + 1];
+
+ _profile(Database$mappedSectionForPointer$Replace)
+ for (size_t index(0); index != length; ++index)
+ spaced[index] = section[index] == '_' ? ' ' : section[index];
+ spaced[length] = '\0';
+ _end
+
+ NSString *string;
+
+ _profile(Database$mappedSectionForPointer$stringWithUTF8String)
+ string = [NSString stringWithUTF8String:spaced];
+ _end
+
+ _profile(Database$mappedSectionForPointer$Map)
+ string = [SectionMap_ objectForKey:string] ?: string;
+ _end
+
+ *mapped = string;
+ } return *mapped;
+}
+
@end
/* }}} */
@end
/* }}} */
+/* @ Loading... Indicator {{{ */
+@interface CYLoadingIndicator : UIView {
+ UIActivityIndicatorView *spinner_;
+ UILabel *label_;
+ UIView *container_;
+}
+
+@property (readonly, nonatomic) UILabel *label;
+@property (readonly, nonatomic) UIActivityIndicatorView *activityIndicatorView;
+
+@end
+
+@implementation CYLoadingIndicator
+
+- (id)initWithFrame:(CGRect)frame {
+ if ((self = [super initWithFrame:frame])) {
+ container_ = [[[UIView alloc] init] autorelease];
+ [container_ setAutoresizingMask:UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin];
+
+ spinner_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray] autorelease];
+ [spinner_ startAnimating];
+ [container_ addSubview:spinner_];
+
+ label_ = [[[UILabel alloc] init] autorelease];
+ [label_ setFont:[UIFont boldSystemFontOfSize:15.0f]];
+ [label_ setBackgroundColor:[UIColor clearColor]];
+ [label_ setTextColor:[UIColor blackColor]];
+ [label_ setShadowColor:[UIColor whiteColor]];
+ [label_ setShadowOffset:CGSizeMake(0, 1)];
+ [label_ setText:[NSString stringWithFormat:Elision_, UCLocalize("LOADING"), nil]];
+ [container_ addSubview:label_];
+
+ CGSize viewsize = frame.size;
+ CGSize spinnersize = [spinner_ bounds].size;
+ CGSize textsize = [[label_ text] sizeWithFont:[label_ font]];
+ float bothwidth = spinnersize.width + textsize.width + 5.0f;
+
+ CGRect containrect = {
+ CGPointMake(floorf((viewsize.width / 2) - (bothwidth / 2)), floorf((viewsize.height / 2) - (spinnersize.height / 2))),
+ CGSizeMake(bothwidth, spinnersize.height)
+ };
+ CGRect textrect = {
+ CGPointMake(spinnersize.width + 5.0f, floorf((spinnersize.height / 2) - (textsize.height / 2))),
+ textsize
+ };
+ CGRect spinrect = {
+ CGPointZero,
+ spinnersize
+ };
+
+ [container_ setFrame:containrect];
+ [spinner_ setFrame:spinrect];
+ [label_ setFrame:textrect];
+ [self addSubview:container_];
+ }
+
+ return self;
+}
+
+- (UILabel *)label { return label_; }
+- (UIActivityIndicatorView *)activityIndicatorView { return spinner_; }
+
+@end
+/* }}} */
+
/* Cydia Browser Controller {{{ */
@interface CYBrowserController : BrowserController {
CydiaObject *cydia_;
break;
case 2:
- system("launchctl stop com.apple.SpringBoard");
- break;
+ _trace();
+ goto reload;
case 3:
- system("launchctl unload "SpringBoard_"; launchctl load "SpringBoard_);
+ _trace();
+ goto reload;
+
+ reload:
+ system("/usr/bin/sbreload");
+ _trace();
break;
case 4:
- system("reboot");
+ _trace();
+ if (void (*SBReboot)(mach_port_t) = reinterpret_cast<void (*)(mach_port_t)>(dlsym(RTLD_DEFAULT, "SBReboot")))
+ SBReboot(SBSSpringBoardServerPort());
+ else
+ reboot2(RB_AUTOBOOT);
break;
}
}
case 4: [close_ setTitle:UCLocalize("REBOOT_DEVICE")]; break;
}
+ _trace();
system("su -c /usr/bin/uicache mobile");
+ _trace();
UpdateExternalStatus(Finish_ == 0 ? 2 : 0);
- (void) _addProgressOutput:(NSString *)output {
[output_ setText:[NSString stringWithFormat:@"%@\n%@", [output_ text], output]];
CGSize size = [output_ contentSize];
- CGRect rect = {{0, size.height}, {size.width, 0}};
- [output_ scrollRectToVisible:rect animated:YES];
+ CGPoint offset = [output_ contentOffset];
+ if (size.height - offset.y < [output_ frame].size.height + 20.f) {
+ CGRect rect = {{0, size.height-1}, {size.width, 1}};
+ [output_ scrollRectToVisible:rect animated:YES];
+ }
}
- (BOOL) isRunning {
}
if (badge_ != nil) {
- CGSize size = [badge_ size];
+ CGRect rect;
+ rect.size = [badge_ size];
- [badge_ drawAtPoint:CGPointMake(
- 36 - size.width / 2,
- 36 - size.height / 2
- )];
+ rect.size.width /= 2;
+ rect.size.height /= 2;
+
+ rect.origin.x = 36 - rect.size.width / 2;
+ rect.origin.y = 36 - rect.size.height / 2;
+
+ [badge_ drawInRect:rect];
}
if (highlighted)
}
- (void) onSwitch:(id)sender {
- NSMutableDictionary *metadata = [Sections_ objectForKey:basic_];
+ NSMutableDictionary *metadata([Sections_ objectForKey:basic_]);
if (metadata == nil) {
metadata = [NSMutableDictionary dictionaryWithCapacity:2];
[Sections_ setObject:metadata forKey:basic_];
}
- Changed_ = true;
[metadata setObject:[NSNumber numberWithBool:([switch_ isOn] == NO)] forKey:@"Hidden"];
+ Changed_ = true;
}
- (void) setSection:(Section *)section editing:(BOOL)editing {
}
- (void) drawContentRect:(CGRect)rect {
- bool highlighted(highlighted_);
+ bool highlighted(highlighted_ && !editing_);
[icon_ drawInRect:CGRectMake(8, 7, 32, 32)];
}
- (void) reloadButtonClicked {
- // Don't reload a package view by clicking the button.
+ // Don't reload a commerical package by tapping the loading button,
+ // but if it's not an Install button, we should forward it on.
+ if (![package_ uninstalled])
+ [self _customButtonClicked];
}
- (void) applyLoadingTitle {
UITableViewDelegate
> {
_transient Database *database_;
+ unsigned era_;
NSMutableArray *packages_;
NSMutableArray *sections_;
UITableView *list_;
[super dealloc];
}
++ (BOOL) hasIndexedCollation {
+ return NO; // XXX: objc_getClass("UILocalizedIndexedCollation") != nil;
+}
+
- (NSInteger) numberOfSectionsInTableView:(UITableView *)list {
NSInteger count([sections_ count]);
return count == 0 ? 1 : count;
}
- (NSString *) tableView:(UITableView *)list titleForHeaderInSection:(NSInteger)section {
- if ([sections_ count] == 0)
+ if ([sections_ count] == 0 || [[sections_ objectAtIndex:section] count] == 0)
return nil;
return [[sections_ objectAtIndex:section] name];
}
}
- (Package *) packageAtIndexPath:(NSIndexPath *)path {
+@synchronized (database_) {
+ if ([database_ era] != era_)
+ return nil;
+
Section *section([sections_ objectAtIndex:[path section]]);
NSInteger row([path row]);
Package *package([packages_ objectAtIndex:([section row] + row)]);
- return package;
-}
+ return [[package retain] autorelease];
+} }
- (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {
PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);
}
- (NSArray *) sectionIndexTitlesForTableView:(UITableView *)tableView {
+ // XXX: is 20 the most optimal number here?
return [packages_ count] > 20 ? index_ : nil;
}
-- (NSInteger)tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index {
+- (NSInteger) tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index {
+ if ([[self class] hasIndexedCollation]) {
+ return [[objc_getClass("UILocalizedIndexedCollation") currentCollation] sectionForSectionIndexTitleAtIndex:index];
+ }
+
return index;
}
target_ = target;
action_ = action;
- index_ = [[NSMutableArray alloc] initWithCapacity:32];
+ index_ = [[self class] hasIndexedCollation]
+ ? [[[objc_getClass("UILocalizedIndexedCollation") currentCollation] sectionIndexTitles] retain]
+ : [[NSMutableArray alloc] initWithCapacity:32];
indices_ = [[NSMutableDictionary alloc] initWithCapacity:32];
packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
}
- (void) reloadData {
+ era_ = [database_ era];
NSArray *packages = [database_ packages];
[packages_ removeAllObjects];
[packages_ addObject:package];
_end
- [index_ removeAllObjects];
[indices_ removeAllObjects];
Section *section = nil;
- _profile(PackageTable$reloadData$Section)
- for (size_t offset(0), end([packages_ count]); offset != end; ++offset) {
- Package *package;
- unichar index;
+ if ([[self class] hasIndexedCollation]) {
+ id collation = [objc_getClass("UILocalizedIndexedCollation") currentCollation];
+ NSArray *titles = [collation sectionIndexTitles];
+ int secidx = -1;
- _profile(PackageTable$reloadData$Section$Package)
- package = [packages_ objectAtIndex:offset];
- index = [package index];
- _end
+ _profile(PackageTable$reloadData$Section)
+ for (size_t offset(0), end([packages_ count]); offset != end; ++offset) {
+ Package *package;
+ int index;
- if (section == nil || [section index] != index) {
- _profile(PackageTable$reloadData$Section$Allocate)
- section = [[[Section alloc] initWithIndex:index row:offset] autorelease];
+ _profile(PackageTable$reloadData$Section$Package)
+ package = [packages_ objectAtIndex:offset];
+ index = [collation sectionForObject:package collationStringSelector:@selector(name)];
_end
- [index_ addObject:[section name]];
- //[indices_ setObject:[NSNumber numberForInt:[sections_ count]] forKey:index];
+ while (secidx < index) {
+ secidx += 1;
- _profile(PackageTable$reloadData$Section$Add)
- [sections_ addObject:section];
- _end
+ _profile(PackageTable$reloadData$Section$Allocate)
+ section = [[[Section alloc] initWithName:[titles objectAtIndex:secidx] row:offset localize:NO] autorelease];
+ _end
+
+ _profile(PackageTable$reloadData$Section$Add)
+ [sections_ addObject:section];
+ _end
+ }
+
+ [section addToCount];
}
+ _end
+ } else {
+ [index_ removeAllObjects];
- [section addToCount];
- }
- _end
+ _profile(PackageTable$reloadData$Section)
+ for (size_t offset(0), end([packages_ count]); offset != end; ++offset) {
+ Package *package;
+ unichar index;
+
+ _profile(PackageTable$reloadData$Section$Package)
+ package = [packages_ objectAtIndex:offset];
+ index = [package index];
+ _end
+
+ if (section == nil || [section index] != index) {
+ _profile(PackageTable$reloadData$Section$Allocate)
+ section = [[[Section alloc] initWithIndex:index row:offset] autorelease];
+ _end
+
+ [index_ addObject:[section name]];
+ //[indices_ setObject:[NSNumber numberForInt:[sections_ count]] forKey:index];
+
+ _profile(PackageTable$reloadData$Section$Add)
+ [sections_ addObject:section];
+ _end
+ }
+
+ [section addToCount];
+ }
+ _end
+ }
_profile(PackageTable$reloadData$List)
[list_ reloadData];
/* }}} */
-/* Add Source Controller {{{ */
-@interface AddSourceController : CYViewController {
- _transient Database *database_;
-}
-
-- (id) initWithDatabase:(Database *)database;
-
-@end
-
-@implementation AddSourceController
-
-- (id) initWithDatabase:(Database *)database {
- if ((self = [super init]) != nil) {
- database_ = database;
- } return self;
-}
-
-@end
-/* }}} */
/* Source Cell {{{ */
@interface SourceCell : CYTableViewCell <
ContentDelegate
@end
/* }}} */
/* Source Table {{{ */
-@interface SourceTable : CYViewController <
+@interface SourceController : CYViewController <
UITableViewDataSource,
UITableViewDelegate
> {
@end
-@implementation SourceTable
+@implementation SourceController
- (void) _releaseConnection:(NSURLConnection *)connection {
if (connection != nil) {
@implementation HomeController
++ (BOOL)shouldHideNavigationBar {
+ return NO;
+}
+
- (void) _setMoreHeaders:(NSMutableURLRequest *)request {
[super _setMoreHeaders:request];
- (void) viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
- //[[self navigationController] setNavigationBarHidden:YES animated:animated];
+
+ if ([[self class] shouldHideNavigationBar])
+ [[self navigationController] setNavigationBarHidden:YES animated:animated];
}
- (void) viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
- //[[self navigationController] setNavigationBarHidden:NO animated:animated];
+
+ if ([[self class] shouldHideNavigationBar])
+ [[self navigationController] setNavigationBarHidden:NO animated:animated];
}
- (id) init {
- (void) positionViews {
CGRect frame = [cancel_ frame];
+ frame.size = [cancel_ sizeThatFits:frame.size];
frame.origin.x = [self frame].size.width - frame.size.width - 5;
frame.origin.y = ([self frame].size.height - frame.size.height) / 2;
[cancel_ setFrame:frame];
if ((self = [super initWithFrame:frame])) {
[self setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
- [self setTintColor:[UIColor colorWithRed:0.23 green:0.23 blue:0.23 alpha:1]];
[self setBarStyle:UIBarStyleBlack];
UIBarStyle barstyle([self _barStyle:NO]);
@class CYNavigationController;
/* Cydia Tab Bar Controller {{{ */
-@interface CYTabBarController : UITabBarController {
+@interface CYTabBarController : UITabBarController <
+ ProgressDelegate
+> {
_transient Database *database_;
+ RefreshBar *refreshbar_;
+
+ bool dropped_;
+ bool updating_;
+ // XXX: ok, "updatedelegate_"?...
+ _transient NSObject<CydiaDelegate> *updatedelegate_;
+
+ id root_;
}
+- (void) dropBar:(BOOL)animated;
+- (void) beginUpdate;
+- (void) raiseBar:(BOOL)animated;
+- (BOOL) updating;
+
@end
@implementation CYTabBarController
- (id) initWithDatabase:(Database *)database {
if ((self = [super init]) != nil) {
database_ = database;
+
+ [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarFrameChanged:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil];
+
+ refreshbar_ = [[RefreshBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, [UINavigationBar defaultSize].height) delegate:self];
} return self;
}
+- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientation {
+ return IsWildcat_ || orientation == UIInterfaceOrientationPortrait;
+}
+
+- (void) setUpdate:(NSDate *)date {
+ [self beginUpdate];
+}
+
+- (void) beginUpdate {
+ [refreshbar_ start];
+ [self dropBar:YES];
+
+ [updatedelegate_ retainNetworkActivityIndicator];
+ updating_ = true;
+
+ [NSThread
+ detachNewThreadSelector:@selector(performUpdate)
+ toTarget:self
+ withObject:nil
+ ];
+}
+
+- (void) performUpdate { _pooled
+ Status status;
+ status.setDelegate(self);
+ [database_ updateWithStatus:status];
+
+ [self
+ performSelectorOnMainThread:@selector(completeUpdate)
+ withObject:nil
+ waitUntilDone:NO
+ ];
+}
+
+- (void) stopUpdateWithSelector:(SEL)selector {
+ updating_ = false;
+ [updatedelegate_ releaseNetworkActivityIndicator];
+
+ [self raiseBar:YES];
+ [refreshbar_ stop];
+
+ [updatedelegate_ performSelector:selector withObject:nil afterDelay:0];
+}
+
+- (void) completeUpdate {
+ if (!updating_)
+ return;
+ [self stopUpdateWithSelector:@selector(reloadData)];
+}
+
+- (void) cancelUpdate {
+ [self stopUpdateWithSelector:@selector(updateData)];
+}
+
+- (void) cancelPressed {
+ [self cancelUpdate];
+}
+
+- (BOOL) updating {
+ return updating_;
+}
+
+- (void) setProgressError:(NSString *)error withTitle:(NSString *)title {
+ [refreshbar_ setPrompt:[NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), UCLocalize("ERROR"), error]];
+}
+
+- (void) startProgress {
+}
+
+- (void) setProgressTitle:(NSString *)title {
+ [self
+ performSelectorOnMainThread:@selector(_setProgressTitle:)
+ withObject:title
+ waitUntilDone:YES
+ ];
+}
+
+- (bool) isCancelling:(size_t)received {
+ return !updating_;
+}
+
+- (void) setProgressPercent:(float)percent {
+ [self
+ performSelectorOnMainThread:@selector(_setProgressPercent:)
+ withObject:[NSNumber numberWithFloat:percent]
+ waitUntilDone:YES
+ ];
+}
+
+- (void) addProgressOutput:(NSString *)output {
+ [self
+ performSelectorOnMainThread:@selector(_addProgressOutput:)
+ withObject:output
+ waitUntilDone:YES
+ ];
+}
+
+- (void) _setProgressTitle:(NSString *)title {
+ [refreshbar_ setPrompt:title];
+}
+
+- (void) _setProgressPercent:(NSNumber *)percent {
+ [refreshbar_ setProgress:[percent floatValue]];
+}
+
+- (void) _addProgressOutput:(NSString *)output {
+}
+
+- (void) setUpdateDelegate:(id)delegate {
+ updatedelegate_ = delegate;
+}
+
+- (CGFloat) statusBarHeight {
+ if (UIInterfaceOrientationIsPortrait([self interfaceOrientation])) {
+ return [[UIApplication sharedApplication] statusBarFrame].size.height;
+ } else {
+ return [[UIApplication sharedApplication] statusBarFrame].size.width;
+ }
+}
+
+- (UIView *) transitionView {
+ if ([self respondsToSelector:@selector(_transitionView)])
+ return [self _transitionView];
+ else
+ return MSHookIvar<id>(self, "_viewControllerTransitionView");
+}
+
+- (void) dropBar:(BOOL)animated {
+ if (dropped_)
+ return;
+ dropped_ = true;
+
+ UIView *transition([self transitionView]);
+ [[self view] addSubview:refreshbar_];
+
+ CGRect barframe([refreshbar_ frame]);
+
+ if (false) // XXX: _UIApplicationLinkedOnOrAfter(4)
+ barframe.origin.y = [self statusBarHeight];
+ else
+ barframe.origin.y = 0;
+
+ [refreshbar_ setFrame:barframe];
+
+ if (animated)
+ [UIView beginAnimations:nil context:NULL];
+
+ CGRect viewframe = [transition frame];
+ viewframe.origin.y += barframe.size.height;
+ viewframe.size.height -= barframe.size.height;
+ [transition setFrame:viewframe];
+
+ if (animated)
+ [UIView commitAnimations];
+
+ // Ensure bar has the proper width for our view, it might have changed
+ barframe.size.width = viewframe.size.width;
+ [refreshbar_ setFrame:barframe];
+
+ // XXX: fix Apple's layout bug
+ [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
+}
+
+- (void) raiseBar:(BOOL)animated {
+ if (!dropped_)
+ return;
+ dropped_ = false;
+
+ UIView *transition([self transitionView]);
+ [refreshbar_ removeFromSuperview];
+
+ CGRect barframe([refreshbar_ frame]);
+
+ if (animated)
+ [UIView beginAnimations:nil context:NULL];
+
+ CGRect viewframe = [transition frame];
+ viewframe.origin.y -= barframe.size.height;
+ viewframe.size.height += barframe.size.height;
+ [transition setFrame:viewframe];
+
+ if (animated)
+ [UIView commitAnimations];
+
+ // XXX: fix Apple's layout bug
+ // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
+}
+
+#if 0
+- (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration {
+ // XXX: fix Apple's layout bug
+ // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
+}
+#endif
+
+- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+ bool dropped(dropped_);
+
+ if (dropped)
+ [self raiseBar:NO];
+
+ [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+
+ if (dropped)
+ [self dropBar:NO];
+
+ // XXX: fix Apple's layout bug
+ // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
+}
+
+- (void) statusBarFrameChanged:(NSNotification *)notification {
+ if (dropped_) {
+ [self raiseBar:NO];
+ [self dropBar:NO];
+ }
+}
+
+- (void) dealloc {
+ [refreshbar_ release];
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [super dealloc];
+}
+
@end
/* }}} */
// Inherit autorotation settings for modal parents.
if ([self parentViewController] && [[self parentViewController] modalViewController] == self) {
return [[self parentViewController] shouldAutorotateToInterfaceOrientation:orientation];
+ } else if ([self parentViewController]) {
+ return [[self parentViewController] shouldAutorotateToInterfaceOrientation:orientation];
} else {
return [super shouldAutorotateToInterfaceOrientation:orientation];
}
/* }}} */
/* Sections Controller {{{ */
-@interface SectionsController : CYViewController <
+@interface CYSectionsController : CYViewController <
UITableViewDataSource,
UITableViewDelegate
> {
@end
-@implementation SectionsController
+@implementation CYSectionsController
- (void) dealloc {
[list_ setDataSource:nil];
[super dealloc];
}
+- (void) setEditing:(BOOL)editing {
+ if ((editing_ = editing))
+ [list_ reloadData];
+ else
+ [delegate_ updateData];
+
+ [[self navigationItem] setTitle:editing_ ? UCLocalize("SECTION_VISIBILITY") : UCLocalize("SECTIONS")];
+ [[[self navigationItem] rightBarButtonItem] setTitle:[sections_ count] == 0 ? nil : editing_ ? UCLocalize("DONE") : UCLocalize("EDIT")];
+ [[[self navigationItem] rightBarButtonItem] setStyle:editing_ ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain];
+}
+
- (void) viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
[list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated];
}
+- (void) viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+ if (editing_) [self setEditing:NO];
+}
+
- (Section *) sectionAtIndexPath:(NSIndexPath *)indexPath {
Section *section = (editing_ ? [sections_ objectAtIndex:[indexPath row]] : ([indexPath row] == 0 ? nil : [filtered_ objectAtIndex:([indexPath row] - 1)]));
return section;
[self editButtonClicked];
}
-- (void) editButtonClicked {
- if ((editing_ = !editing_))
- [list_ reloadData];
- else
- [delegate_ updateData];
-
- [[self navigationItem] setTitle:editing_ ? UCLocalize("SECTION_VISIBILITY") : UCLocalize("SECTIONS")];
- [[[self navigationItem] rightBarButtonItem] setTitle:[sections_ count] == 0 ? nil : editing_ ? UCLocalize("DONE") : UCLocalize("EDIT")];
- [[[self navigationItem] rightBarButtonItem] setStyle:editing_ ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain];
+- (void)editButtonClicked {
+ [self setEditing:!editing_];
}
- (UIView *) accessoryView {
UITableViewDelegate
> {
_transient Database *database_;
+ unsigned era_;
CFMutableArrayRef packages_;
NSMutableArray *sections_;
UITableView *list_;
}
- (Package *) packageAtIndexPath:(NSIndexPath *)path {
+@synchronized (database_) {
+ if ([database_ era] != era_)
+ return nil;
+
Section *section([sections_ objectAtIndex:[path section]]);
NSInteger row([path row]);
- return [self packageAtIndex:([section row] + row)];
-}
+ return [[[self packageAtIndex:([section row] + row)] retain] autorelease];
+} }
- (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {
PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);
}
- (void) reloadData {
+ era_ = [database_ era];
NSArray *packages = [database_ packages];
CFArrayRemoveAllValues(packages_);
#endif
Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease];
- Section *ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") localize:NO] autorelease];
+ Section *ignored = nil;
Section *section = nil;
- NSDate *last = nil;
+ time_t last = 0;
upgrades_ = 0;
bool unseens = false;
if (!uae) {
unseens = true;
- NSDate *seen;
-
- _profile(ChangesController$reloadData$Remember)
- seen = [package seen];
- _end
+ time_t seen([package seen]);
- if (section == nil || last != seen && (seen == nil || [seen compare:last] != NSOrderedSame)) {
+ if (section == nil || last != seen) {
last = seen;
NSString *name;
- if (seen == nil)
- name = UCLocalize("UNKNOWN");
- else {
- name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
- [name autorelease];
- }
+ name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) [NSDate dateWithTimeIntervalSince1970:seen]);
+ [name autorelease];
_profile(ChangesController$reloadData$Allocate)
name = [NSString stringWithFormat:UCLocalize("NEW_AT"), name];
}
[section addToCount];
- } else if ([package ignored])
+ } else if ([package ignored]) {
+ if (ignored == nil) {
+ ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") row:offset localize:NO] autorelease];
+ }
[ignored addToCount];
- else {
+ } else {
++upgrades_;
[upgradable addToCount];
}
search_ = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] bounds].size.width, 44.0f)];
[search_ layoutSubviews];
[search_ setPlaceholder:UCLocalize("SEARCH_EX")];
- UITextField *textField = [search_ searchField];
+
+ UITextField *textField;
+ if ([search_ respondsToSelector:@selector(searchField)])
+ textField = [search_ searchField];
+ else
+ textField = MSHookIvar<UITextField *>(search_, "_searchField");
+
[textField setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
[search_ setDelegate:self];
[textField setEnablesReturnKeyAutomatically:NO];
@end
/* }}} */
/* Settings Controller {{{ */
-@interface SettingsController : CYViewController <
+@interface CYPackageSettingsController : CYViewController <
UITableViewDataSource,
UITableViewDelegate
> {
@end
-@implementation SettingsController
+@implementation CYPackageSettingsController
- (void) dealloc {
[name_ release];
if (package_ == nil)
return 0;
- return 1;
+ return 2;
}
- (NSString *) tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section {
return UCLocalize("SHOW_ALL_CHANGES_EX");
}
-- (void) onSomething:(BOOL)value withKey:(NSString *)key {
+- (void) onSubscribed:(id)control {
+ bool value([control isOn]);
if (package_ == nil)
return;
-
- NSMutableDictionary *metadata([package_ metadata]);
-
- BOOL before;
- if (NSNumber *number = [metadata objectForKey:key])
- before = [number boolValue];
- else
- before = NO;
-
- if (value != before) {
- [metadata setObject:[NSNumber numberWithBool:value] forKey:key];
- Changed_ = true;
+ if ([package_ setSubscribed:value])
[delegate_ updateData];
- }
-}
-
-- (void) onSubscribed:(id)control {
- [self onSomething:(int) [control isOn] withKey:@"IsSubscribed"];
}
- (void) onIgnored:(id)control {
- [self onSomething:(int) [control isOn] withKey:@"IsIgnored"];
+ // TODO: set Held state - possibly call out to dpkg, etc.
}
- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
/* }}} */
/* Role Controller {{{ */
-@interface RoleController : CYViewController <
+@interface CYSettingsController : CYViewController <
UITableViewDataSource,
UITableViewDelegate
> {
@end
-@implementation RoleController
+@implementation CYSettingsController
- (void) dealloc {
[table_ release];
[segment_ release];
nil];
[Metadata_ setObject:Settings_ forKey:@"Settings"];
-
Changed_ = true;
if (rolling)
captrect.origin.x = 0;
captrect.origin.y = ([[self view] frame].size.height / 2) - (captrect.size.height * 2);
caption_ = [[[UILabel alloc] initWithFrame:captrect] autorelease];
- [caption_ setText:@"Initializing Filesystem"];
+ [caption_ setText:UCLocalize("PREPARING_FILESYSTEM")];
[caption_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
[caption_ setFont:[UIFont boldSystemFontOfSize:28.0f]];
[caption_ setTextColor:[UIColor whiteColor]];
statusrect.origin.y = ([[self view] frame].size.height / 2) - statusrect.size.height;
status_ = [[[UILabel alloc] initWithFrame:statusrect] autorelease];
[status_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
- [status_ setText:@"(Cydia will exit when complete.)"];
+ [status_ setText:UCLocalize("EXIT_WHEN_COMPLETE")];
[status_ setFont:[UIFont systemFontOfSize:16.0f]];
[status_ setTextColor:[UIColor whiteColor]];
[status_ setBackgroundColor:[UIColor clearColor]];
@end
/* }}} */
-/* Cydia Container {{{ */
-@interface CYContainer : UIViewController <ProgressDelegate> {
- _transient Database *database_;
- RefreshBar *refreshbar_;
-
- bool dropped_;
- bool updating_;
- // XXX: ok, "updatedelegate_"?...
- _transient NSObject<CydiaDelegate> *updatedelegate_;
- // XXX: can't we query for this variable when we need it?
- _transient UITabBarController *root_;
-}
-
-- (void) setTabBarController:(UITabBarController *)controller;
-
-- (void) dropBar:(BOOL)animated;
-- (void) beginUpdate;
-- (void) raiseBar:(BOOL)animated;
-- (BOOL) updating;
-
-@end
-
-@implementation CYContainer
-
-- (BOOL) _reallyWantsFullScreenLayout {
- return YES;
-}
-
-// NOTE: UIWindow only sends the top controller these messages,
-// So we have to forward them on.
-
-- (void) viewDidAppear:(BOOL)animated {
- [super viewDidAppear:animated];
- [root_ viewDidAppear:animated];
-}
-
-- (void) viewWillAppear:(BOOL)animated {
- [super viewWillAppear:animated];
- [root_ viewWillAppear:animated];
-}
-
-- (void) viewDidDisappear:(BOOL)animated {
- [super viewDidDisappear:animated];
- [root_ viewDidDisappear:animated];
-}
-
-- (void) viewWillDisappear:(BOOL)animated {
- [super viewWillDisappear:animated];
- [root_ viewWillDisappear:animated];
-}
-
-- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientation {
- return ![updatedelegate_ hudIsShowing] && (IsWildcat_ || orientation == UIInterfaceOrientationPortrait);
-}
-
-- (void) setTabBarController:(UITabBarController *)controller {
- root_ = controller;
- [[self view] addSubview:[root_ view]];
-}
-
-- (void) setUpdate:(NSDate *)date {
- [self beginUpdate];
-}
-
-- (void) beginUpdate {
- [self dropBar:YES];
- [refreshbar_ start];
-
- updating_ = true;
-
- [NSThread
- detachNewThreadSelector:@selector(performUpdate)
- toTarget:self
- withObject:nil
- ];
-}
-
-- (void) performUpdate { _pooled
- Status status;
- status.setDelegate(self);
- [database_ updateWithStatus:status];
-
- [self
- performSelectorOnMainThread:@selector(completeUpdate)
- withObject:nil
- waitUntilDone:NO
- ];
-}
-
-- (void) completeUpdate {
- if (!updating_)
- return;
- updating_ = false;
-
- [self raiseBar:YES];
- [refreshbar_ stop];
- [updatedelegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0];
-}
-
-- (void) cancelUpdate {
- updating_ = false;
- [self raiseBar:YES];
- [refreshbar_ stop];
- [updatedelegate_ performSelector:@selector(updateData) withObject:nil afterDelay:0];
-}
-
-- (void) cancelPressed {
- [self cancelUpdate];
-}
-
-- (BOOL) updating {
- return updating_;
-}
-
-- (void) setProgressError:(NSString *)error withTitle:(NSString *)title {
- [refreshbar_ setPrompt:[NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), UCLocalize("ERROR"), error]];
-}
-
-- (void) startProgress {
-}
-
-- (void) setProgressTitle:(NSString *)title {
- [self
- performSelectorOnMainThread:@selector(_setProgressTitle:)
- withObject:title
- waitUntilDone:YES
- ];
-}
-
-- (bool) isCancelling:(size_t)received {
- return !updating_;
-}
-
-- (void) setProgressPercent:(float)percent {
- [self
- performSelectorOnMainThread:@selector(_setProgressPercent:)
- withObject:[NSNumber numberWithFloat:percent]
- waitUntilDone:YES
- ];
-}
-
-- (void) addProgressOutput:(NSString *)output {
- [self
- performSelectorOnMainThread:@selector(_addProgressOutput:)
- withObject:output
- waitUntilDone:YES
- ];
-}
-
-- (void) _setProgressTitle:(NSString *)title {
- [refreshbar_ setPrompt:title];
-}
-
-- (void) _setProgressPercent:(NSNumber *)percent {
- [refreshbar_ setProgress:[percent floatValue]];
-}
-
-- (void) _addProgressOutput:(NSString *)output {
-}
-
-- (void) setUpdateDelegate:(id)delegate {
- updatedelegate_ = delegate;
-}
-
-- (CGFloat) statusBarHeight {
- if (UIInterfaceOrientationIsPortrait([self interfaceOrientation])) {
- return [[UIApplication sharedApplication] statusBarFrame].size.height;
- } else {
- return [[UIApplication sharedApplication] statusBarFrame].size.width;
- }
-}
-
-- (void) dropBar:(BOOL)animated {
- if (dropped_)
- return;
- dropped_ = true;
-
- [[self view] addSubview:refreshbar_];
-
- CGFloat sboffset = [self statusBarHeight];
-
- CGRect barframe = [refreshbar_ frame];
- barframe.origin.y = sboffset;
- [refreshbar_ setFrame:barframe];
-
- if (animated)
- [UIView beginAnimations:nil context:NULL];
- CGRect viewframe = [[root_ view] frame];
- viewframe.origin.y += barframe.size.height + sboffset;
- viewframe.size.height -= barframe.size.height + sboffset;
- [[root_ view] setFrame:viewframe];
- if (animated)
- [UIView commitAnimations];
-
- // Ensure bar has the proper width for our view, it might have changed
- barframe.size.width = viewframe.size.width;
- [refreshbar_ setFrame:barframe];
-
- // XXX: fix Apple's layout bug
- [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
-}
-
-- (void) raiseBar:(BOOL)animated {
- if (!dropped_)
- return;
- dropped_ = false;
-
- [refreshbar_ removeFromSuperview];
-
- CGFloat sboffset = [self statusBarHeight];
-
- if (animated)
- [UIView beginAnimations:nil context:NULL];
- CGRect barframe = [refreshbar_ frame];
- CGRect viewframe = [[root_ view] frame];
- viewframe.origin.y -= barframe.size.height + sboffset;
- viewframe.size.height += barframe.size.height + sboffset;
- [[root_ view] setFrame:viewframe];
- if (animated)
- [UIView commitAnimations];
-
- // XXX: fix Apple's layout bug
- [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
-}
-
-- (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration {
- // XXX: fix Apple's layout bug
- [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
-}
-
-- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
- if (dropped_) {
- [self raiseBar:NO];
- [self dropBar:NO];
- }
-
- // XXX: fix Apple's layout bug
- [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
-}
-
-- (void) statusBarFrameChanged:(NSNotification *)notification {
- if (dropped_) {
- [self raiseBar:NO];
- [self dropBar:NO];
- }
-}
-
-- (void) dealloc {
- [refreshbar_ release];
- [[NSNotificationCenter defaultCenter] removeObserver:self];
- [super dealloc];
-}
-
-- (id) initWithDatabase:(Database *)database {
- if ((self = [super init]) != nil) {
- database_ = database;
-
- [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarFrameChanged:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil];
-
- refreshbar_ = [[RefreshBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, [UINavigationBar defaultSize].height) delegate:self];
- } return self;
-}
-
-@end
-/* }}} */
-
typedef enum {
kCydiaTag = 0,
kSectionsTag = 1,
// XXX: evaluate all fields for _transient
UIWindow *window_;
- CYContainer *container_;
CYTabBarController *tabbar_;
NSMutableArray *essential_;
Database *database_;
+ NSURL *starturl_;
int tag_;
- UIKeyboard *keyboard_;
- int huds_;
+ unsigned locked_;
+ unsigned activity_;
- SectionsController *sections_;
+ CYSectionsController *sections_;
ChangesController *changes_;
ManageController *manage_;
SearchController *search_;
- SourceTable *sources_;
+ SourceController *sources_;
InstalledController *installed_;
id queueDelegate_;
- (void) setPage:(CYViewController *)page;
- (void) loadData;
+// XXX: I hate prototypes
+- (id) queueBadgeController;
+
@end
static _finline void _setHomePage(Cydia *self) {
@implementation Cydia
- (void) beginUpdate {
- [container_ beginUpdate];
+ [tabbar_ beginUpdate];
}
- (BOOL) updating {
- return [container_ updating];
-}
-
-- (UIView *) rotatingContentViewForWindow:(UIWindow *)window {
- return window_;
+ return [tabbar_ updating];
}
- (void) _loaded {
}
- (void) _saveConfig {
+ _trace();
+ MetaFile_.Sync();
+ _trace();
+
if (Changed_) {
- _trace();
NSString *error(nil);
+
if (NSData *data = [NSPropertyListSerialization dataFromPropertyList:Metadata_ format:NSPropertyListBinaryFormat_v1_0 errorDescription:&error]) {
_trace();
NSError *error(nil);
if (![data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error])
NSLog(@"failure to save metadata data: %@", error);
_trace();
+
+ Changed_ = false;
} else {
NSLog(@"failure to serialize metadata: %@", error);
- return;
}
-
- Changed_ = false;
}
}
- (void) _updateData {
[self _saveConfig];
- /* XXX: this is just stupid */
- if (tag_ != 1 && sections_ != nil)
- [sections_ reloadData];
- if (tag_ != 2 && changes_ != nil)
- [changes_ reloadData];
- if (tag_ != 4 && search_ != nil)
- [search_ reloadData];
+ NSMutableSet *tabs([[[NSMutableSet alloc] initWithCapacity:10] autorelease]);
- [(CYNavigationController *)[tabbar_ selectedViewController] reloadData];
+ [tabs addObject:[tabbar_ selectedViewController]];
+
+ if (sections_ != nil)
+ [tabs addObject:sections_];
+ if (changes_ != nil)
+ [tabs addObject:changes_];
+ if (manage_ != nil)
+ [tabs addObject:manage_];
+ if (search_ != nil)
+ [tabs addObject:search_];
+ if (sources_ != nil)
+ [tabs addObject:sources_];
+ if (installed_ != nil)
+ [tabs addObject:installed_];
+
+ for (CYNavigationController *tab in tabs)
+ [tab reloadData];
+
+ [queueDelegate_ queueStatusDidChange];
+ [[[self queueBadgeController] tabBarItem] setBadgeValue:(Queuing_ ? UCLocalize("Q_D") : nil)];
}
- (int)indexOfTabWithTag:(int)tag {
// If we can reach the server, auto-refresh!
if (reachable)
- [container_ performSelectorOnMainThread:@selector(setUpdate:) withObject:update waitUntilDone:NO];
+ [tabbar_ performSelectorOnMainThread:@selector(setUpdate:) withObject:update waitUntilDone:NO];
[pool release];
}
}
}
+ NSLog(@"changes:#%u", changes);
+
UITabBarItem *changesItem = [[[tabbar_ viewControllers] objectAtIndex:[self indexOfTabWithTag:kChangesTag]] tabBarItem];
if (changes != 0) {
+ _trace();
NSString *badge([[NSNumber numberWithInt:changes] stringValue]);
[changesItem setBadgeValue:badge];
[changesItem setAnimatedBadge:([essential_ count] > 0)];
-
- if ([self respondsToSelector:@selector(setApplicationBadge:)])
- [self setApplicationBadge:badge];
- else
- [self setApplicationBadgeString:badge];
+ [self setApplicationIconBadgeNumber:changes];
} else {
+ _trace();
[changesItem setBadgeValue:nil];
[changesItem setAnimatedBadge:NO];
-
- if ([self respondsToSelector:@selector(removeApplicationBadge)])
- [self removeApplicationBadge];
- else // XXX: maybe use setApplicationBadgeString also?
- [self setApplicationIconBadgeNumber:0];
+ [self setApplicationIconBadgeNumber:0];
}
[self _updateData];
CYNavigationController *navigation = [[[CYNavigationController alloc] initWithRootViewController:progress] autorelease];
if (IsWildcat_)
[navigation setModalPresentationStyle:UIModalPresentationFormSheet];
- [container_ presentModalViewController:navigation animated:YES];
+ [tabbar_ presentModalViewController:navigation animated:YES];
[progress
detachNewThreadSelector:@selector(update_)
_error->Discard();
}
-- (CGRect) popUpBounds {
- return [[tabbar_ view] bounds];
-}
-
- (bool) perform {
if (![database_ prepare])
return false;
if (IsWildcat_)
[confirm_ setModalPresentationStyle:UIModalPresentationFormSheet];
- [container_ presentModalViewController:confirm_ animated:YES];
+ [tabbar_ presentModalViewController:confirm_ animated:YES];
return true;
}
}
- (void) confirmWithNavigationController:(UINavigationController *)navigation {
+ Queuing_ = false;
+
ProgressController *progress = [[[ProgressController alloc] initWithDatabase:database_ delegate:self] autorelease];
if (navigation != nil) {
navigation = [[[CYNavigationController alloc] initWithRootViewController:progress] autorelease];
if (IsWildcat_)
[navigation setModalPresentationStyle:UIModalPresentationFormSheet];
- [container_ presentModalViewController:navigation animated:YES];
+ [tabbar_ presentModalViewController:navigation animated:YES];
}
[progress
withObject:nil
title:UCLocalize("RUNNING")
];
+
+ ++locked_;
}
- (void) progressControllerIsComplete:(ProgressController *)progress {
+ --locked_;
[self complete];
}
return browser;
}
-- (SectionsController *) sectionsController {
+- (CYSectionsController *) sectionsController {
if (sections_ == nil)
- sections_ = [[SectionsController alloc] initWithDatabase:database_];
+ sections_ = [[CYSectionsController alloc] initWithDatabase:database_];
return sections_;
}
return search_;
}
-- (SourceTable *) sourcesController {
+- (SourceController *) sourcesController {
if (sources_ == nil)
- sources_ = [[SourceTable alloc] initWithDatabase:database_];
+ sources_ = [[SourceController alloc] initWithDatabase:database_];
return sources_;
}
}
- (void) showSettings {
- RoleController *role = [[[RoleController alloc] initWithDatabase:database_ delegate:self] autorelease];
+ CYSettingsController *role = [[[CYSettingsController alloc] initWithDatabase:database_ delegate:self] autorelease];
CYNavigationController *nav = [[[CYNavigationController alloc] initWithRootViewController:role] autorelease];
if (IsWildcat_)
[nav setModalPresentationStyle:UIModalPresentationFormSheet];
- [container_ presentModalViewController:nav animated:YES];
+ [tabbar_ presentModalViewController:nav animated:YES];
+}
+
+- (void) retainNetworkActivityIndicator {
+ if (activity_++ == 0)
+ [self setNetworkActivityIndicatorVisible:YES];
+}
+
+- (void) releaseNetworkActivityIndicator {
+ if (--activity_ == 0)
+ [self setNetworkActivityIndicatorVisible:NO];
}
- (void) setPackageController:(PackageController *)view {
@synchronized (self) {
if (clear) {
[database_ clear];
-
- // Stop queuing.
Queuing_ = false;
- [[[self queueBadgeController] tabBarItem] setBadgeValue:nil];
} else {
- // Start queuing.
Queuing_ = true;
- [[[self queueBadgeController] tabBarItem] setBadgeValue:UCLocalize("Q_D")];
}
[self _updateData];
- [queueDelegate_ queueStatusDidChange];
}
}
}
- (void) system:(NSString *)command { _pooled
+ _trace();
system([command UTF8String]);
+ _trace();
}
- (void) applicationWillSuspend {
[super applicationWillSuspend];
}
-- (BOOL) hudIsShowing {
- return (huds_ > 0);
-}
-
-- (void) applicationSuspend:(__GSEvent *)event {
+- (BOOL) isSafeToSuspend {
// Use external process status API internally.
// This is probably a really bad idea.
+ // XXX: what is the point of this? does this solve anything at all?
uint64_t status = 0;
int notify_token;
if (notify_register_check("com.saurik.Cydia.status", ¬ify_token) == NOTIFY_STATUS_OK) {
notify_cancel(notify_token);
}
- if (![self hudIsShowing] && status == 0)
+ return locked_ == 0 && status == 0;
+}
+
+- (void) applicationSuspend:(__GSEvent *)event {
+ if ([self isSafeToSuspend])
[super applicationSuspend:event];
}
- (void) _animateSuspension:(BOOL)arg0 duration:(double)arg1 startTime:(double)arg2 scale:(float)arg3 {
- if (![self hudIsShowing])
+ if ([self isSafeToSuspend])
[super _animateSuspension:arg0 duration:arg1 startTime:arg2 scale:arg3];
}
- (void) _setSuspended:(BOOL)value {
- if (![self hudIsShowing])
+ if ([self isSafeToSuspend])
[super _setSuspended:value];
}
[window_ setUserInteractionEnabled:NO];
[hud show:YES];
- UIViewController *target = container_;
+ UIViewController *target = tabbar_;
while ([target modalViewController] != nil) target = [target modalViewController];
[[target view] addSubview:hud];
- huds_++;
+ ++locked_;
return hud;
}
[hud show:NO];
[hud removeFromSuperview];
[window_ setUserInteractionEnabled:YES];
- huds_--;
+ --locked_;
}
- (CYViewController *) pageForPackage:(NSString *)name {
if (![path hasPrefix:@"/"])
path = [@"/" stringByAppendingString:path];
- if ([path isEqualToString:@"/add-source"])
- return [[[AddSourceController alloc] initWithDatabase:database_] autorelease];
- else if ([path isEqualToString:@"/storage"])
+ if ([path isEqualToString:@"/storage"])
return [self _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"storage" ofType:@"html"]] withClass:[CYBrowserController class]];
+ /*else if ([path isEqualToString:@"/add-source"])
+ return [[[AddSourceController alloc] initWithDatabase:database_] autorelease];*/
else if ([path isEqualToString:@"/sources"])
- return [[[SourceTable alloc] initWithDatabase:database_] autorelease];
+ return [[[SourceController alloc] initWithDatabase:database_] autorelease];
else if ([path isEqualToString:@"/packages"])
return [[[InstalledController alloc] initWithDatabase:database_] autorelease];
else if ([path hasPrefix:@"/url/"])
else if ([path hasPrefix:@"/launch/"])
[self launchApplicationWithIdentifier:[path substringFromIndex:8] suspended:NO];
else if ([path hasPrefix:@"/package-settings/"])
- return [[[SettingsController alloc] initWithDatabase:database_ package:[path substringFromIndex:18]] autorelease];
+ return [[[CYPackageSettingsController alloc] initWithDatabase:database_ package:[path substringFromIndex:18]] autorelease];
else if ([path hasPrefix:@"/package-signature/"])
return [[[SignatureController alloc] initWithDatabase:database_ package:[path substringFromIndex:19]] autorelease];
else if ([path hasPrefix:@"/package/"])
return nil;
}
-- (void) applicationOpenURL:(NSURL *)url {
- [super applicationOpenURL:url];
- int tag;
- if (CYViewController *page = [self pageForURL:url hasTag:&tag]) {
+- (BOOL) openCydiaURL:(NSURL *)url {
+ CYViewController *page = nil;
+ int tag = 0;
+
+ if ((page = [self pageForURL:url hasTag:&tag])) {
[self setPage:page];
tag_ = tag;
[tabbar_ setSelectedViewController:(tag_ == -1 ? nil : [[tabbar_ viewControllers] objectAtIndex:tag_])];
}
+
+ return !!page;
+}
+
+- (void) applicationOpenURL:(NSURL *)url {
+ [super applicationOpenURL:url];
+
+ if (!loaded_) starturl_ = [url retain];
+ else [self openCydiaURL:url];
}
- (void) applicationWillResignActive:(UIApplication *)application {
// Stop refreshing if you get a phone call or lock the device.
- if ([container_ updating])
- [container_ cancelUpdate];
+ if ([tabbar_ updating])
+ [tabbar_ cancelUpdate];
if ([[self superclass] instancesRespondToSelector:@selector(applicationWillResignActive:)])
[super applicationWillResignActive:application];
}
- (void) addStashController {
+ ++locked_;
stash_ = [[CYStashController alloc] init];
[window_ addSubview:[stash_ view]];
}
- (void) removeStashController {
[[stash_ view] removeFromSuperview];
[stash_ release];
+ --locked_;
}
- (void) stash {
[tabbar_ setViewControllers:controllers];
}
+- (void)showFakeTabBarInView:(UIView *)view {
+ static UITabBar *fake = [[UITabBar alloc] initWithFrame:CGRectMake(0, 0, 0, 49.0f)];
+ if (view != nil) {
+ CGRect frame = [fake frame];
+ frame.origin.y = [view frame].size.height - frame.size.height;
+ frame.size.width = [view frame].size.width;
+ [fake setFrame:frame];
+ [fake setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin];
+ [view addSubview:fake];
+ } else {
+ [fake removeFromSuperview];
+ }
+}
+
- (void) applicationDidFinishLaunching:(id)unused {
+_trace();
+ CydiaApp = self;
+
+ [NSURLCache setSharedURLCache:[[[SDURLCache alloc]
+ initWithMemoryCapacity:524288
+ diskCapacity:10485760
+ diskPath:[NSString stringWithFormat:@"%@/Library/Caches/com.saurik.Cydia/SDURLCache", @"/var/root"]
+ ] autorelease]];
+
[CYBrowserController _initialize];
[NSURLProtocol registerClass:[CydiaURLProtocol class]];
essential_ = [[NSMutableArray alloc] initWithCapacity:4];
broken_ = [[NSMutableArray alloc] initWithCapacity:4];
- UIScreen *screen([UIScreen mainScreen]);
-
- window_ = [[UIWindow alloc] initWithFrame:[screen bounds]];
+ window_ = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
[window_ orderFront:self];
[window_ makeKey:self];
[window_ setHidden:NO];
database_ = [Database sharedInstance];
[self setupTabBarController];
-
- container_ = [[CYContainer alloc] initWithDatabase:database_];
- [container_ setUpdateDelegate:self];
- [container_ setTabBarController:tabbar_];
- [window_ addSubview:[container_ view]];
+ [tabbar_ setUpdateDelegate:self];
+ [window_ addSubview:[tabbar_ view]];
// Show pinstripes while loading data.
- [[container_ view] setBackgroundColor:[UIColor pinStripeColor]];
+ [[tabbar_ view] setBackgroundColor:[UIColor pinStripeColor]];
+ [self showFakeTabBarInView:[tabbar_ tabBar]];
[self performSelector:@selector(loadData) withObject:nil afterDelay:0];
_trace();
return;
}
+ CGRect fixframe = [[tabbar_ view] frame];
+ if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]))
+ fixframe.size = CGSizeMake(fixframe.size.height, fixframe.size.width);
+ CYLoadingIndicator *loading = [[[CYLoadingIndicator alloc] initWithFrame:fixframe] autorelease];
+ [loading setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
+ [[tabbar_ view] addSubview:loading];
[window_ setUserInteractionEnabled:NO];
- UIView *container = [[[UIView alloc] init] autorelease];
- [container setAutoresizingMask:UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin];
-
- UIActivityIndicatorView *spinner = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray] autorelease];
- [spinner startAnimating];
- [container addSubview:spinner];
-
- UILabel *label = [[[UILabel alloc] init] autorelease];
- [label setFont:[UIFont boldSystemFontOfSize:15.0f]];
- [label setBackgroundColor:[UIColor clearColor]];
- [label setTextColor:[UIColor blackColor]];
- [label setShadowColor:[UIColor whiteColor]];
- [label setShadowOffset:CGSizeMake(0, 1)];
- [label setText:[NSString stringWithFormat:Elision_, UCLocalize("LOADING"), nil]];
- [container addSubview:label];
-
- CGSize viewsize = [[tabbar_ view] frame].size;
- CGSize spinnersize = [spinner bounds].size;
- CGSize textsize = [[label text] sizeWithFont:[label font]];
- float bothwidth = spinnersize.width + textsize.width + 5.0f;
-
- CGRect containrect = {
- CGPointMake(floorf((viewsize.width / 2) - (bothwidth / 2)), floorf((viewsize.height / 2) - (spinnersize.height / 2))),
- CGSizeMake(bothwidth, spinnersize.height)
- };
- CGRect textrect = {
- CGPointMake(spinnersize.width + 5.0f, floorf((spinnersize.height / 2) - (textsize.height / 2))),
- textsize
- };
- CGRect spinrect = {
- CGPointZero,
- spinnersize
- };
-
- [container setFrame:containrect];
- [spinner setFrame:spinrect];
- [label setFrame:textrect];
- [[container_ view] addSubview:container];
-
[self reloadData];
PrintTimes();
- // Show the home page
- [tabbar_ setSelectedIndex:0];
- _setHomePage(self);
+ // Show the initial page
+ if (starturl_ == nil || ![self openCydiaURL:starturl_]) {
+ [tabbar_ setSelectedIndex:0];
+ _setHomePage(self);
+ }
+
+ [self showFakeTabBarInView:nil];
+
+ [starturl_ release];
+ starturl_ = nil;
+
[window_ setUserInteractionEnabled:YES];
// XXX: does this actually slow anything down?
- [[container_ view] setBackgroundColor:[UIColor clearColor]];
- [container removeFromSuperview];
+ [[tabbar_ view] setBackgroundColor:[UIColor clearColor]];
+ [loading removeFromSuperview];
}
- (void) showActionSheet:(UIActionSheet *)sheet fromItem:(UIBarButtonItem *)item {
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"];
}
/* }}} */
+ _trace();
+ MetaFile_.Open("/var/lib/cydia/metadata.cb0");
+ _trace();
+
+ if (Packages_ != nil) {
+ CFDictionaryApplyFunction((CFDictionaryRef) Packages_, &PackageImport, NULL);
+ _trace();
+ [Metadata_ removeObjectForKey:@"Packages"];
+ Packages_ = nil;
+ Changed_ = true;
+ }
+
Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
if (substrate && access("/Library/MobileSubstrate/DynamicLibraries/SimulatedKeyEvents.dylib", F_OK) == 0)
projects / cydia.git / blobdiff