X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/7c80833fdddd3df49d6b083bdca0996bfb0990a6..51807490b9d639cc4bad27817134e597743e6336:/MobileCydia.mm
diff --git a/MobileCydia.mm b/MobileCydia.mm
index bdc5b7ae..787a78e6 100644
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -1,40 +1,22 @@
/* Cydia - iPhone UIKit Front-End for Debian APT
- * Copyright (C) 2008-2012 Jay Freeman (saurik)
+ * Copyright (C) 2008-2013 Jay Freeman (saurik)
*/
-/* Modified BSD License {{{ */
+/* GNU General Public License, Version 3 {{{ */
/*
- * Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * Cydia is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
*
- * 1. Redistributions of source code must retain the
- * above copyright notice, this list of conditions
- * and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions
- * and the following disclaimer in the documentation
- * and/or other materials provided with the
- * distribution.
- * 3. The name of the author may not be used to endorse
- * or promote products derived from this software
- * without specific prior written permission.
+ * Cydia is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU General Public License
+ * along with Cydia. If not, see .
+**/
/* }}} */
// XXX: wtf/FastMalloc.h... wtf?
@@ -73,6 +55,7 @@
#include
#include
+#include
#include
#include
@@ -130,6 +113,7 @@ extern "C" {
#include "CyteKit/IndirectDelegate.h"
#include "CyteKit/PerlCompatibleRegEx.hpp"
#include "CyteKit/TableViewCell.h"
+#include "CyteKit/TabBarController.h"
#include "CyteKit/WebScriptObject-Cyte.h"
#include "CyteKit/WebViewController.h"
#include "CyteKit/WebViewTableViewCell.h"
@@ -254,8 +238,6 @@ union SplitHash {
};
// }}}
-static bool ShowPromoted_;
-
static NSString *Colon_;
NSString *Elision_;
static NSString *Error_;
@@ -263,8 +245,6 @@ static NSString *Warning_;
static NSString *Cache_;
-static bool AprilFools_;
-
static void (*$SBSSetInterceptsMenuButtonForever)(bool);
static CFStringRef (*$MGCopyAnswer)(CFStringRef);
@@ -707,6 +687,7 @@ static bool Queuing_;
static CYColor Blue_;
static CYColor Blueish_;
static CYColor Black_;
+static CYColor Folder_;
static CYColor Off_;
static CYColor White_;
static CYColor Gray_;
@@ -725,6 +706,7 @@ static BOOL Ignored_;
static _H Font12_;
static _H Font12Bold_;
static _H Font14_;
+static _H Font18_;
static _H Font18Bold_;
static _H Font22Bold_;
@@ -746,7 +728,6 @@ static CGColorSpaceRef space_;
static NSDictionary *SectionMap_;
static NSMutableDictionary *Metadata_;
static _transient NSMutableDictionary *Settings_;
-static _transient NSString *Role_;
static _transient NSMutableDictionary *Packages_;
static _transient NSMutableDictionary *Values_;
static _transient NSMutableDictionary *Sections_;
@@ -883,6 +864,16 @@ static NSString *CYHex(NSData *data, bool reverse = false) {
@class CYPackageController;
+@protocol SourceDelegate
+- (void) setFetch:(NSNumber *)fetch;
+@end
+
+@protocol FetchDelegate
+- (bool) isSourceCancelled;
+- (void) startSourceFetch:(NSString *)uri;
+- (void) stopSourceFetch:(NSString *)uri;
+@end
+
@protocol CydiaDelegate
- (void) returnToCydia;
- (void) saveState;
@@ -894,6 +885,7 @@ static NSString *CYHex(NSData *data, bool reverse = false) {
- (void) removePackage:(Package *)package;
- (void) beginUpdate;
- (BOOL) updating;
+- (bool) requestUpdate;
- (void) distUpgrade;
- (void) loadData;
- (void) updateData;
@@ -901,7 +893,6 @@ static NSString *CYHex(NSData *data, bool reverse = false) {
- (void) syncData;
- (void) addSource:(NSDictionary *)source;
- (void) addTrivialSource:(NSString *)href;
-- (void) showSettings;
- (UIProgressHUD *) addProgressHUD;
- (void) removeProgressHUD:(UIProgressHUD *)hud;
- (void) showActionSheet:(UIActionSheet *)sheet fromItem:(UIBarButtonItem *)item;
@@ -909,29 +900,19 @@ static NSString *CYHex(NSData *data, bool reverse = false) {
@end
/* }}} */
-/* Status Delegation {{{ */
-class Status :
+/* CancelStatus {{{ */
+class CancelStatus :
public pkgAcquireStatus
{
private:
- _transient NSObject *delegate_;
bool cancelled_;
public:
- Status() :
- delegate_(nil),
+ CancelStatus() :
cancelled_(false)
{
}
- void setDelegate(NSObject *delegate) {
- delegate_ = delegate;
- }
-
- NSObject *getDelegate() const {
- return delegate_;
- }
-
virtual bool MediaChange(std::string media, std::string drive) {
return false;
}
@@ -940,6 +921,39 @@ class Status :
Done(item);
}
+ virtual bool Pulse_(pkgAcquire *Owner) = 0;
+
+ virtual bool Pulse(pkgAcquire *Owner) {
+ if (pkgAcquireStatus::Pulse(Owner) && Pulse_(Owner))
+ return true;
+ else {
+ cancelled_ = true;
+ return false;
+ }
+ }
+
+ _finline bool WasCancelled() const {
+ return cancelled_;
+ }
+};
+/* }}} */
+/* DelegateStatus {{{ */
+class CydiaStatus :
+ public CancelStatus
+{
+ private:
+ _transient NSObject *delegate_;
+
+ public:
+ CydiaStatus() :
+ delegate_(nil)
+ {
+ }
+
+ void setDelegate(NSObject *delegate) {
+ delegate_ = delegate;
+ }
+
virtual void Fetch(pkgAcquire::ItemDesc &item) {
NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]);
CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:UCLocalize("DOWNLOADING_"), name] ofType:kCydiaProgressEventTypeStatus forItem:item]);
@@ -967,9 +981,7 @@ class Status :
[delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
- virtual bool Pulse(pkgAcquire *Owner) {
- bool value = pkgAcquireStatus::Pulse(Owner);
-
+ virtual bool Pulse_(pkgAcquire *Owner) {
double percent(
double(CurrentBytes + CurrentItems) /
double(TotalBytes + TotalItems)
@@ -983,16 +995,7 @@ class Status :
[NSNumber numberWithDouble:CurrentCPS], @"Speed",
nil] waitUntilDone:YES];
- if (value && ![delegate_ isProgressCancelled])
- return true;
- else {
- cancelled_ = true;
- return false;
- }
- }
-
- _finline bool WasCancelled() const {
- return cancelled_;
+ return ![delegate_ isProgressCancelled];
}
virtual void Start() {
@@ -1033,7 +1036,7 @@ typedef std::map< unsigned long, _H > SourceMap;
_transient NSObject *delegate_;
_transient NSObject *progress_;
- Status status_;
+ CydiaStatus status_;
int cydiafd_;
int statusfd_;
@@ -1070,7 +1073,7 @@ typedef std::map< unsigned long, _H > SourceMap;
- (bool) upgrade;
- (void) update;
-- (void) updateWithStatus:(Status &)status;
+- (void) updateWithStatus:(CancelStatus &)status;
- (void) setDelegate:(NSObject *)delegate;
@@ -1078,11 +1081,61 @@ typedef std::map< unsigned long, _H > SourceMap;
- (NSObject *) progressDelegate;
- (Source *) getSource:(pkgCache::PkgFileIterator)file;
+- (void) setFetch:(bool)fetch forURI:(const char *)uri;
+- (void) resetFetch;
- (NSString *) mappedSectionForPointer:(const char *)pointer;
@end
/* }}} */
+/* SourceStatus {{{ */
+class SourceStatus :
+ public CancelStatus
+{
+ private:
+ _transient NSObject *delegate_;
+ _transient Database *database_;
+
+ public:
+ SourceStatus(NSObject *delegate, Database *database) :
+ delegate_(delegate),
+ database_(database)
+ {
+ }
+
+ void Set(bool fetch, pkgAcquire::ItemDesc &desc) {
+ desc.Owner->ID = 0;
+ [database_ setFetch:fetch forURI:desc.Owner->DescURI().c_str()];
+ }
+
+ virtual void Fetch(pkgAcquire::ItemDesc &desc) {
+ Set(true, desc);
+ }
+
+ virtual void Done(pkgAcquire::ItemDesc &desc) {
+ Set(false, desc);
+ }
+
+ virtual void Fail(pkgAcquire::ItemDesc &desc) {
+ Set(false, desc);
+ }
+
+ virtual bool Pulse_(pkgAcquire *Owner) {
+ for (pkgAcquire::ItemCIterator item = Owner->ItemsBegin(); item != Owner->ItemsEnd(); ++item)
+ if ((*item)->ID != 0);
+ else if ((*item)->Status == pkgAcquire::Item::StatIdle) {
+ (*item)->ID = 1;
+ [database_ setFetch:true forURI:(*item)->DescURI().c_str()];
+ } else (*item)->ID = 0;
+ return ![delegate_ isSourceCancelled];
+ }
+
+ virtual void Stop() {
+ pkgAcquireStatus::Stop();
+ [database_ resetFetch];
+ }
+};
+/* }}} */
/* ProgressEvent Implementation {{{ */
@implementation CydiaProgressEvent
@@ -1347,6 +1400,10 @@ static void PackageImport(const void *key, const void *value, void *context) {
_H record_;
BOOL trusted_;
+
+ std::set fetches_;
+ std::set files_;
+ _transient NSObject *delegate_;
}
- (Source *) initWithMetaIndex:(metaIndex *)index forDatabase:(Database *)database inPool:(apr_pool_t *)pool;
@@ -1376,30 +1433,13 @@ static void PackageImport(const void *key, const void *value, void *context) {
- (NSString *) defaultIcon;
- (NSURL *) iconURL;
+- (void) setFetch:(bool)fetch forURI:(const char *)uri;
+- (void) resetFetch;
+
@end
@implementation Source
-- (void) _clear {
- uri_.clear();
- distribution_.clear();
- type_.clear();
-
- base_.clear();
-
- description_.clear();
- label_.clear();
- origin_.clear();
- depiction_.clear();
- support_.clear();
- version_.clear();
- defaultIcon_.clear();
-
- record_ = nil;
- host_ = nil;
- authority_ = nil;
-}
-
+ (NSString *) webScriptNameForSelector:(SEL)selector {
if (false);
else if (selector == @selector(addSection:))
@@ -1450,8 +1490,6 @@ static void PackageImport(const void *key, const void *value, void *context) {
}
- (void) setMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool {
- [self _clear];
-
trusted_ = index->IsTrusted();
uri_.set(pool, index->GetURI());
@@ -1460,7 +1498,19 @@ static void PackageImport(const void *key, const void *value, void *context) {
debReleaseIndex *dindex(dynamic_cast(index));
if (dindex != NULL) {
- base_.set(pool, dindex->MetaIndexURI(""));
+ std::string file(dindex->MetaIndexURI(""));
+ files_.insert(file + "Release.gpg");
+ files_.insert(file + "Release");
+ base_.set(pool, file);
+
+ std::vector *targets(dindex->ComputeIndexTargets());
+ for (std::vector::const_iterator target(targets->begin()); target != targets->end(); ++target) {
+ std::string file((*target)->URI);
+ files_.insert(file);
+ files_.insert(file + ".gz");
+ files_.insert(file + ".bz2");
+ files_.insert(file + "Index");
+ } delete targets;
FileFd fd;
if (!fd.Open(dindex->MetaIndexFile("Release"), FileFd::ReadOnly))
@@ -1696,6 +1746,31 @@ static void PackageImport(const void *key, const void *value, void *context) {
return defaultIcon_;
}
+- (void) setDelegate:(NSObject *)delegate {
+ delegate_ = delegate;
+}
+
+- (bool) fetch {
+ return !fetches_.empty();
+}
+
+- (void) setFetch:(bool)fetch forURI:(const char *)uri {
+ if (!fetch) {
+ if (fetches_.erase(uri) == 0)
+ return;
+ } else if (files_.find(uri) == files_.end())
+ return;
+ else if (!fetches_.insert(uri).second)
+ return;
+
+ [delegate_ performSelectorOnMainThread:@selector(setFetch:) withObject:[NSNumber numberWithBool:[self fetch]] waitUntilDone:NO];
+}
+
+- (void) resetFetch {
+ fetches_.clear();
+ [delegate_ performSelectorOnMainThread:@selector(setFetch:) withObject:[NSNumber numberWithBool:NO] waitUntilDone:NO];
+}
+
@end
/* }}} */
/* CydiaOperation Class {{{ */
@@ -1864,11 +1939,8 @@ struct ParsedPackage {
CYString depiction_;
CYString homepage_;
-
- CYString sponsor_;
CYString author_;
- CYString bugs_;
CYString support_;
};
@@ -1970,7 +2042,6 @@ struct ParsedPackage {
- (uint32_t) rank;
- (BOOL) matches:(NSArray *)query;
-- (bool) hasSupportingRole;
- (BOOL) hasTag:(NSString *)tag;
- (NSString *) primaryPurpose;
- (NSArray *) purposes;
@@ -1988,7 +2059,7 @@ struct ParsedPackage {
- (bool) isUnfilteredAndSearchedForBy:(NSArray *)query;
- (bool) isUnfilteredAndSelectedForBy:(NSString *)search;
- (bool) isInstalledAndUnfiltered:(NSNumber *)number;
-- (bool) isVisibleInSection:(NSString *)section;
+- (bool) isVisibleInSection:(NSString *)section source:(Source *)source;
- (bool) isVisibleInSource:(Source *)source;
@end
@@ -2138,6 +2209,8 @@ struct PackageNameOrdering :
return @"clear";
else if (selector == @selector(getField:))
return @"getField";
+ else if (selector == @selector(getRecord))
+ return @"getRecord";
else if (selector == @selector(hasTag:))
return @"hasTag";
else if (selector == @selector(install))
@@ -2179,7 +2252,6 @@ struct PackageNameOrdering :
@"simpleSection",
@"size",
@"source",
- @"sponsor",
@"state",
@"support",
@"tags",
@@ -2223,6 +2295,19 @@ struct PackageNameOrdering :
return [NSString stringWithString:[(NSString *) CYStringCreate(start, end - start) autorelease]];
} }
+- (NSString *) getRecord {
+@synchronized (database_) {
+ if ([database_ era] != era_ || file_.end())
+ return nil;
+
+ pkgRecords::Parser &parser([database_ records]->Lookup(file_));
+
+ const char *start, *end;
+ parser.GetRec(start, end);
+
+ return [NSString stringWithString:[(NSString *) CYStringCreate(start, end - start) autorelease]];
+} }
+
- (void) parse {
if (parsed_ != NULL)
return;
@@ -2240,6 +2325,7 @@ struct PackageNameOrdering :
parser = &[database_ records]->Lookup(file_);
_end
+ CYString bugs;
CYString website;
_profile(Package$parse$Find)
@@ -2252,9 +2338,8 @@ struct PackageNameOrdering :
{"depiction", &parsed->depiction_},
{"homepage", &parsed->homepage_},
{"website", &website},
- {"bugs", &parsed->bugs_},
+ {"bugs", &bugs},
{"support", &parsed->support_},
- {"sponsor", &parsed->sponsor_},
{"author", &parsed->author_},
{"md5sum", &parsed->md5sum_},
};
@@ -2288,6 +2373,8 @@ struct PackageNameOrdering :
parsed->homepage_ = website;
if (parsed->homepage_ == parsed->depiction_)
parsed->homepage_.clear();
+ if (parsed->support_.empty())
+ parsed->support_ = bugs;
_end
_end
} }
@@ -2630,8 +2717,8 @@ struct PackageNameOrdering :
return false;
_end
- _profile(Package$unfiltered$hasSupportingRole)
- if (_unlikely(![self hasSupportingRole]))
+ _profile(Package$unfiltered$role)
+ if (_unlikely(role_ > 3))
return false;
_end
@@ -2750,16 +2837,12 @@ struct PackageNameOrdering :
return parsed_ != NULL && !parsed_->depiction_.empty() ? parsed_->depiction_ : [[self source] depictionForPackage:id_];
}
-- (MIMEAddress *) sponsor {
- return parsed_ == NULL || parsed_->sponsor_.empty() ? nil : [MIMEAddress addressWithString:parsed_->sponsor_];
-}
-
- (MIMEAddress *) author {
return parsed_ == NULL || parsed_->author_.empty() ? nil : [MIMEAddress addressWithString:parsed_->author_];
}
- (NSString *) support {
- return parsed_ != NULL && !parsed_->bugs_.empty() ? parsed_->bugs_ : [[self source] supportForPackage:id_];
+ return parsed_ != NULL && !parsed_->support_.empty() ? parsed_->support_ : [[self source] supportForPackage:id_];
}
- (NSArray *) files {
@@ -2971,24 +3054,6 @@ struct PackageNameOrdering :
return rank_ != 0;
}
-- (bool) hasSupportingRole {
- if (role_ == 0)
- return true;
- if (role_ == 1)
- return true;
- if ([Role_ isEqualToString:@"User"])
- return false;
- if (role_ == 2)
- return true;
- if ([Role_ isEqualToString:@"Hacker"])
- return false;
- if (role_ == 3)
- return true;
- if ([Role_ isEqualToString:@"Developer"])
- return false;
- _assert(false);
-}
-
- (NSArray *) tags {
return tags_;
}
@@ -3111,13 +3176,16 @@ struct PackageNameOrdering :
return ![self uninstalled] && (![number boolValue] && role_ != 7 || [self unfiltered]);
}
-- (bool) isVisibleInSection:(NSString *)name {
+- (bool) isVisibleInSection:(NSString *)name source:(Source *)source {
NSString *section([self section]);
return (
name == nil ||
section == nil && [name length] == 0 ||
[name isEqualToString:section]
+ ) && (
+ source == nil ||
+ [self source] == source
) && [self visible];
}
@@ -3859,7 +3927,7 @@ class CydiaLogCleaner :
[self updateWithStatus:status_];
}
-- (void) updateWithStatus:(Status &)status {
+- (void) updateWithStatus:(CancelStatus &)status {
NSString *title(UCLocalize("REFRESHING_DATA"));
pkgSourceList list;
@@ -3903,6 +3971,16 @@ class CydiaLogCleaner :
return i == sourceMap_.end() ? nil : i->second;
}
+- (void) setFetch:(bool)fetch forURI:(const char *)uri {
+ for (Source *source in (id) sourceList_)
+ [source setFetch:fetch forURI:uri];
+}
+
+- (void) resetFetch {
+ for (Source *source in (id) sourceList_)
+ [source resetFetch];
+}
+
- (NSString *) mappedSectionForPointer:(const char *)section {
_H *mapped;
@@ -4114,7 +4192,7 @@ static _H Diversions_;
}
- (NSString *) role {
- return (id) Role_ ?: [NSNull null];
+ return (id) [NSNull null];
}
- (NSString *) model {
@@ -4149,6 +4227,8 @@ static _H Diversions_;
return @"format";
else if (selector == @selector(getAllSources))
return @"getAllSources";
+ else if (selector == @selector(getApplicationInfo:value:))
+ return @"getApplicationInfoValue";
else if (selector == @selector(getKernelNumber:))
return @"getKernelNumber";
else if (selector == @selector(getKernelString:))
@@ -4189,8 +4269,6 @@ static _H Diversions_;
return @"setMetadataValue";
else if (selector == @selector(setSessionValue::))
return @"setSessionValue";
- else if (selector == @selector(setShowPromoted:))
- return @"setShowPromoted";
else if (selector == @selector(substitutePackageNames:))
return @"substitutePackageNames";
else if (selector == @selector(scrollToBottom:))
@@ -4257,6 +4335,16 @@ static _H Diversions_;
[CydiaWebViewController performSelectorOnMainThread:@selector(addDiversion:) withObject:[[[Diversion alloc] initWithFrom:from to:to] autorelease] waitUntilDone:NO];
}
+- (NSDictionary *) getApplicationInfo:(NSString *)display value:(NSString *)key {
+ char path[1024];
+ if (SBBundlePathForDisplayIdentifier(SBSSpringBoardServerPort(), [display UTF8String], path) != 0)
+ return (id) [NSNull null];
+ NSDictionary *info([NSDictionary dictionaryWithContentsOfFile:[[NSString stringWithUTF8String:path] stringByAppendingString:@"/Info.plist"]]);
+ if (info == nil)
+ return (id) [NSNull null];
+ return [info objectForKey:key];
+}
+
- (NSNumber *) getKernelNumber:(NSString *)name {
const char *string([name UTF8String]);
@@ -4311,15 +4399,6 @@ static _H Diversions_;
[indirect_ registerFrame:frame];
}
-- (void) _setShowPromoted:(NSNumber *)value {
- [Metadata_ setObject:value forKey:@"ShowPromoted"];
- Changed_ = true;
-}
-
-- (void) setShowPromoted:(NSNumber *)value {
- [self performSelectorOnMainThread:@selector(_setShowPromoted:) withObject:value waitUntilDone:NO];
-}
-
- (id) getMetadataValue:(NSString *)key {
@synchronized (Values_) {
return [Values_ objectForKey:key];
@@ -4461,27 +4540,25 @@ static _H Diversions_;
/* XXX: this should probably not use du */
execl("/usr/libexec/cydia/du", "du", "-s", [path UTF8String], NULL);
exit(1);
- _assert(false);
- }
-
- _assert(close(fds[1]) != -1);
+ } else {
+ _assert(close(fds[1]) != -1);
- if (FILE *du = fdopen(fds[0], "r")) {
- char line[1024];
- while (fgets(line, sizeof(line), du) != NULL) {
- size_t length(strlen(line));
- while (length != 0 && line[length - 1] == '\n')
- line[--length] = '\0';
- if (char *tab = strchr(line, '\t')) {
- *tab = '\0';
- value = [NSNumber numberWithUnsignedLong:strtoul(line, NULL, 0)];
+ if (FILE *du = fdopen(fds[0], "r")) {
+ char line[1024];
+ while (fgets(line, sizeof(line), du) != NULL) {
+ size_t length(strlen(line));
+ while (length != 0 && line[length - 1] == '\n')
+ line[--length] = '\0';
+ if (char *tab = strchr(line, '\t')) {
+ *tab = '\0';
+ value = [NSNumber numberWithUnsignedLong:strtoul(line, NULL, 0)];
+ }
}
- }
- fclose(du);
- } else _assert(close(fds[0]));
-
- ReapZombie(pid);
+ fclose(du);
+ } else
+ _assert(close(fds[0]) != -1);
+ } ReapZombie(pid);
return value;
}
@@ -5305,17 +5382,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
pid_t pid(ExecFork());
if (pid == 0) {
+ if (setsid() == -1)
+ perror("setsid");
+
pid_t pid(ExecFork());
if (pid == 0) {
execl("/usr/bin/sbreload", "sbreload", NULL);
perror("sbreload");
+
exit(0);
- }
+ } ReapZombie(pid);
exit(0);
- }
-
- ReapZombie(pid);
+ } ReapZombie(pid);
sleep(15);
system("/usr/bin/killall backboardd SpringBoard sbreload");
@@ -5584,14 +5663,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
if (NSString *name = [package name])
name_ = [NSString stringWithString:name];
- NSString *description(nil);
-
- if (description == nil && IsWildcat_)
- description = [package longDescription];
- if (description == nil)
- description = [package shortDescription];
-
- if (description != nil)
+ if (NSString *description = [package shortDescription])
description_ = [NSString stringWithString:description];
commercial_ = [package isCommercial];
@@ -5626,14 +5698,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
if (NSString *mode = [package mode]) {
if ([mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"]) {
color = RemovingColor_;
- //placard = @"removing";
+ placard = @"removing";
} else {
color = InstallingColor_;
- //placard = @"installing";
+ placard = @"installing";
}
-
- // XXX: the removing/installing placards are not @2x
- placard = nil;
} else {
color = [UIColor whiteColor];
@@ -5666,8 +5735,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
rect.size.height /= 2;
}
- rect.origin.x = 18 - rect.size.width / 2;
- rect.origin.y = 18 - rect.size.height / 2;
+ rect.origin.x = 19 - rect.size.width / 2;
+ rect.origin.y = 19 - rect.size.height / 2;
[icon_ drawInRect:rect];
}
@@ -5679,13 +5748,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
rect.size.width /= 4;
rect.size.height /= 4;
- rect.origin.x = 23 - rect.size.width / 2;
- rect.origin.y = 23 - rect.size.height / 2;
+ rect.origin.x = 25 - rect.size.width / 2;
+ rect.origin.y = 25 - rect.size.height / 2;
[badge_ drawInRect:rect];
}
- if (highlighted)
+ if (highlighted && kCFCoreFoundationVersionNumber < 800)
UISetColor(White_);
if (!highlighted)
@@ -5693,7 +5762,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
[name_ drawAtPoint:CGPointMake(36, 8) forWidth:(width - (placard_ == nil ? 68 : 94)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
if (placard_ != nil)
- [placard_ drawAtPoint:CGPointMake(width - 52, 9)];
+ [placard_ drawAtPoint:CGPointMake(width - 52, 11)];
}
- (void) drawNormalContentRect:(CGRect)rect {
@@ -5728,7 +5797,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
[badge_ drawInRect:rect];
}
- if (highlighted)
+ if (highlighted && kCFCoreFoundationVersionNumber < 800)
UISetColor(White_);
if (!highlighted)
@@ -5775,6 +5844,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
- (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
if ((self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) != nil) {
icon_ = [UIImage applicationImageNamed:@"folder.png"];
+ // XXX: this initial frame is wrong, but is fixed later
switch_ = [[[UISwitch alloc] initWithFrame:CGRectMake(218, 9, 60, 25)] autorelease];
[switch_ addTarget:self action:@selector(onSwitch:) forEvents:UIControlEventValueChanged];
@@ -5839,7 +5909,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
[super setFrame:frame];
CGRect rect([switch_ frame]);
- [switch_ setFrame:CGRectMake(frame.size.width - 102, 9, rect.size.width, rect.size.height)];
+ [switch_ setFrame:CGRectMake(frame.size.width - rect.size.width - 9, 9, rect.size.width, rect.size.height)];
}
- (NSString *) accessibilityLabel {
@@ -5849,24 +5919,24 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
- (void) drawContentRect:(CGRect)rect {
bool highlighted(highlighted_ && !editing_);
- [icon_ drawInRect:CGRectMake(8, 7, 32, 32)];
+ [icon_ drawInRect:CGRectMake(7, 7, 32, 32)];
- if (highlighted)
+ if (highlighted && kCFCoreFoundationVersionNumber < 800)
UISetColor(White_);
float width(rect.size.width);
if (editing_)
- width -= 87;
+ width -= 9 + [switch_ frame].size.width;
if (!highlighted)
UISetColor(Black_);
- [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 70) withFont:Font22Bold_ lineBreakMode:UILineBreakModeTailTruncation];
+ [name_ drawAtPoint:CGPointMake(48, 12) forWidth:(width - 58) withFont:Font18_ lineBreakMode:UILineBreakModeTailTruncation];
CGSize size = [count_ sizeWithFont:Font14_];
- UISetColor(White_);
+ UISetColor(Folder_);
if (count_ != nil)
- [count_ drawAtPoint:CGPointMake(13 + (29 - size.width) / 2, 16) withFont:Font12Bold_];
+ [count_ drawAtPoint:CGPointMake(10 + (30 - size.width) / 2, 18) withFont:Font12Bold_];
}
@end
@@ -6560,10 +6630,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
SEL filter_;
IMP imp_;
_H object_;
+ _H stuff_;
}
- (void) setObject:(id)object;
+- (void) setStuff:(id)object;
+- (void) setObject:(id)object andStuff:(id)stuff;
+
- (void) setObject:(id)object forFilter:(SEL)filter;
+- (void) setObject:(id)object andStuff:(id)stuff forFilter:(SEL)filter;
- (SEL) filter;
- (void) setFilter:(SEL)filter;
@@ -6594,10 +6669,28 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
object_ = object;
} }
+- (void) setStuff:(id)stuff {
+@synchronized (self) {
+ stuff_ = stuff;
+} }
+
+- (void) setObject:(id)object andStuff:(id)stuff {
+@synchronized (self) {
+ object_ = object;
+ stuff_ = stuff;
+} }
+
- (void) setObject:(id)object forFilter:(SEL)filter {
@synchronized (self) {
[self setFilter:filter];
- [self setObject:object];
+ object_ = object;
+} }
+
+- (void) setObject:(id)object andStuff:(id)stuff forFilter:(SEL)filter {
+@synchronized (self) {
+ [self setFilter:filter];
+ object_ = object;
+ stuff_ = stuff;
} }
- (NSMutableArray *) _reloadPackages {
@@ -6610,16 +6703,18 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
IMP imp;
SEL filter;
_H object;
+ _H stuff;
@synchronized (self) {
imp = imp_;
filter = filter_;
object = object_;
+ stuff = stuff_;
}
_profile(PackageTable$reloadData$Filter)
for (Package *package in packages)
- if ([package valid] && (*reinterpret_cast(imp))(package, filter, object))
+ if ([package valid] && (*reinterpret_cast(imp))(package, filter, object, stuff))
[filtered addObject:package];
_end
@@ -6629,7 +6724,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
if ((self = [super initWithDatabase:database title:title]) != nil) {
[self setFilter:filter];
- [self setObject:object];
+ object_ = object;
+ } return self;
+}
+
+- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object with:(id)stuff {
+ if ((self = [super initWithDatabase:database title:title]) != nil) {
+ [self setFilter:filter];
+ object_ = object;
+ stuff_ = stuff;
} return self;
}
@@ -6685,7 +6788,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
[alert setCancelButtonIndex:0];
[alert setMessage:
- @"Copyright \u00a9 2008-2012\n"
+ @"Copyright \u00a9 2008-2013\n"
"SaurikIT, LLC\n"
"\n"
"Jay Freeman (saurik)\n"
@@ -6707,350 +6810,111 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
@end
/* }}} */
-/* Manage Controller {{{ */
-@interface ManageController : CydiaWebViewController {
-}
-- (void) queueStatusDidChange;
+/* Cydia Navigation Controller Interface {{{ */
+@interface UINavigationController (Cydia)
+
+- (NSArray *) navigationURLCollection;
+- (void) unloadData;
@end
+/* }}} */
-@implementation ManageController
+/* Cydia Tab Bar Controller {{{ */
+@interface CydiaTabBarController : CyteTabBarController <
+ UITabBarControllerDelegate,
+ FetchDelegate
+> {
+ _transient Database *database_;
-- (id) init {
- if ((self = [super init]) != nil) {
- [self setURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]]];
- } return self;
-}
+ _H indicator_;
-- (NSURL *) navigationURL {
- return [NSURL URLWithString:@"cydia://manage"];
+ bool updating_;
+ // XXX: ok, "updatedelegate_"?...
+ _transient NSObject *updatedelegate_;
}
-- (UIBarButtonItem *) leftButton {
- return [[[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("SETTINGS")
- style:UIBarButtonItemStylePlain
- target:self
- action:@selector(settingsButtonClicked)
- ] autorelease];
-}
+- (NSArray *) navigationURLCollection;
+- (void) beginUpdate;
+- (BOOL) updating;
-- (void) settingsButtonClicked {
- [delegate_ showSettings];
-}
+@end
-- (void) queueButtonClicked {
- [delegate_ queue];
-}
+@implementation CydiaTabBarController
-- (UIBarButtonItem *) rightButton {
- return Queuing_ ? [[[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("QUEUE")
- style:UIBarButtonItemStyleDone
- target:self
- action:@selector(queueButtonClicked)
- ] autorelease] : nil;
-}
+- (NSArray *) navigationURLCollection {
+ NSMutableArray *items([NSMutableArray array]);
-- (void) queueStatusDidChange {
- [self applyRightButton];
-}
+ // XXX: Should this deal with transient view controllers?
+ for (id navigation in [self viewControllers]) {
+ NSArray *stack = [navigation performSelector:@selector(navigationURLCollection)];
+ if (stack != nil)
+ [items addObject:stack];
+ }
-- (bool) isLoading {
- return !Queuing_ && [super isLoading];
+ return items;
}
-@end
-/* }}} */
+- (id) initWithDatabase:(Database *)database {
+ if ((self = [super init]) != nil) {
+ database_ = database;
+ [self setDelegate:self];
-/* Refresh Bar {{{ */
-@interface RefreshBar : UINavigationBar {
- _H indicator_;
- _H prompt_;
- _H cancel_;
+ indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteTiny] autorelease];
+ [indicator_ setOrigin:CGPointMake(kCFCoreFoundationVersionNumber >= 800 ? 2 : 4, 2)];
+
+ [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
+ } return self;
}
-@end
+- (void) setUpdate:(NSDate *)date {
+ [self beginUpdate];
+}
-@implementation RefreshBar
+- (void) beginUpdate {
+ UIViewController *controller([[self viewControllers] objectAtIndex:1]);
+ UITabBarItem *item([controller tabBarItem]);
-- (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];
+ [item setBadgeValue:@""];
+ UIView *badge(MSHookIvar([item view], "_badge"));
- CGSize indsize([UIProgressIndicator defaultSizeForStyle:[indicator_ activityIndicatorViewStyle]]);
- unsigned indoffset = ([self frame].size.height - indsize.height) / 2;
- CGRect indrect = {{indoffset, indoffset}, indsize};
- [indicator_ setFrame:indrect];
+ [indicator_ startAnimating];
+ [badge addSubview:indicator_];
- CGSize prmsize = {215, indsize.height + 4};
- CGRect prmrect = {{
- indoffset * 2 + indsize.width,
- unsigned([self frame].size.height - prmsize.height) / 2 - 1
- }, prmsize};
- [prompt_ setFrame:prmrect];
-}
+ [updatedelegate_ retainNetworkActivityIndicator];
+ updating_ = true;
-- (void) setFrame:(CGRect)frame {
- [super setFrame:frame];
- [self positionViews];
+ [NSThread
+ detachNewThreadSelector:@selector(performUpdate)
+ toTarget:self
+ withObject:nil
+ ];
}
-- (id) initWithFrame:(CGRect)frame delegate:(id)delegate {
- if ((self = [super initWithFrame:frame]) != nil) {
- [self setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
+- (void) performUpdate {
+ NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
- [self setBarStyle:UIBarStyleBlack];
+ SourceStatus status(self, database_);
+ [database_ updateWithStatus:status];
- UIBarStyle barstyle([self _barStyle:NO]);
- bool ugly(barstyle == UIBarStyleDefault);
+ [self
+ performSelectorOnMainThread:@selector(completeUpdate)
+ withObject:nil
+ waitUntilDone:NO
+ ];
- UIProgressIndicatorStyle style = ugly ?
- UIProgressIndicatorStyleMediumBrown :
- UIProgressIndicatorStyleMediumWhite;
-
- indicator_ = [[[UIProgressIndicator alloc] initWithFrame:CGRectZero] autorelease];
- [(UIProgressIndicator *) indicator_ setStyle:style];
- [indicator_ startAnimation];
- [self addSubview:indicator_];
-
- prompt_ = [[[UITextLabel alloc] initWithFrame:CGRectZero] autorelease];
- [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
- [prompt_ setBackgroundColor:[UIColor clearColor]];
- [prompt_ setFont:[UIFont systemFontOfSize:15]];
- [self addSubview:prompt_];
-
- cancel_ = [[[UINavigationButton alloc] initWithTitle:UCLocalize("CANCEL") style:UINavigationButtonStyleHighlighted] autorelease];
- [cancel_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
- [cancel_ addTarget:delegate action:@selector(cancelPressed) forControlEvents:UIControlEventTouchUpInside];
- [cancel_ setBarStyle:barstyle];
-
- [self positionViews];
- } return self;
-}
-
-- (void) setCancellable:(bool)cancellable {
- if (cancellable)
- [self addSubview:cancel_];
- else
- [cancel_ removeFromSuperview];
-}
-
-- (void) start {
- [prompt_ setText:UCLocalize("UPDATING_DATABASE")];
-}
-
-- (void) stop {
- [self setCancellable:NO];
-}
-
-- (void) setPrompt:(NSString *)prompt {
- [prompt_ setText:prompt];
-}
-
-- (void) setProgress:(float)progress {
-}
-
-@end
-/* }}} */
-
-/* Cydia Navigation Controller Interface {{{ */
-@interface UINavigationController (Cydia)
-
-- (NSArray *) navigationURLCollection;
-- (void) unloadData;
-
-@end
-/* }}} */
-
-/* Cydia Tab Bar Controller {{{ */
-@interface CYTabBarController : UITabBarController <
- UITabBarControllerDelegate,
- ProgressDelegate
-> {
- _transient Database *database_;
- _H refreshbar_;
-
- bool dropped_;
- bool updating_;
- // XXX: ok, "updatedelegate_"?...
- _transient NSObject *updatedelegate_;
-
- _H remembered_;
- _transient UIViewController *transient_;
-}
-
-- (NSArray *) navigationURLCollection;
-- (void) dropBar:(BOOL)animated;
-- (void) beginUpdate;
-- (void) raiseBar:(BOOL)animated;
-- (BOOL) updating;
-- (void) unloadData;
-
-@end
-
-@implementation CYTabBarController
-
-- (void) didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
-
- // presenting a UINavigationController on 2.x does not update its transitionView
- // it thereby will not allow its topViewController to be unloaded by memory pressure
- if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) {
- UIViewController *selected([self selectedViewController]);
- for (UINavigationController *controller in [self viewControllers])
- if (controller != selected)
- if (UIViewController *top = [controller topViewController])
- [top unloadView];
- }
-}
-
-- (void) setUnselectedViewController:(UIViewController *)transient {
- if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) {
- if (transient != nil) {
- [[[self viewControllers] objectAtIndex:0] pushViewController:transient animated:YES];
- [self setSelectedIndex:0];
- } return;
- }
-
- NSMutableArray *controllers = [[[self viewControllers] mutableCopy] autorelease];
- if (transient != nil) {
- UINavigationController *navigation([[[UINavigationController alloc] init] autorelease]);
- [navigation setViewControllers:[NSArray arrayWithObject:transient]];
- transient = navigation;
-
- if (transient_ == nil)
- remembered_ = [controllers objectAtIndex:0];
- transient_ = transient;
- [transient_ setTabBarItem:[remembered_ tabBarItem]];
- [controllers replaceObjectAtIndex:0 withObject:transient_];
- [self setSelectedIndex:0];
- [self setViewControllers:controllers];
- [self concealTabBarSelection];
- } else if (remembered_ != nil) {
- [remembered_ setTabBarItem:[transient_ tabBarItem]];
- transient_ = transient;
- [controllers replaceObjectAtIndex:0 withObject:remembered_];
- remembered_ = nil;
- [self setViewControllers:controllers];
- [self revealTabBarSelection];
- }
-}
-
-- (UIViewController *) unselectedViewController {
- return transient_;
-}
-
-- (void) tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController {
- if ([self unselectedViewController])
- [self setUnselectedViewController:nil];
-
- // presenting a UINavigationController on 2.x does not update its transitionView
- // if this view was unloaded, the tranitionView may currently be presenting nothing
- if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) {
- UINavigationController *navigation((UINavigationController *) viewController);
- [navigation pushViewController:[[[UIViewController alloc] init] autorelease] animated:NO];
- [navigation popViewControllerAnimated:NO];
- }
-}
-
-- (NSArray *) navigationURLCollection {
- NSMutableArray *items([NSMutableArray array]);
-
- // XXX: Should this deal with transient view controllers?
- for (id navigation in [self viewControllers]) {
- NSArray *stack = [navigation performSelector:@selector(navigationURLCollection)];
- if (stack != nil)
- [items addObject:stack];
- }
-
- return items;
-}
-
-- (void) dismissModalViewControllerAnimated:(BOOL)animated {
- if ([self modalViewController] == nil && [self unselectedViewController] != nil)
- [self setUnselectedViewController:nil];
- else
- [super dismissModalViewControllerAnimated:YES];
-}
-
-- (void) unloadData {
- [super unloadData];
-
- for (UINavigationController *controller in [self viewControllers])
- [controller unloadData];
-
- if (UIViewController *selected = [self selectedViewController])
- [selected reloadData];
-
- if (UIViewController *unselected = [self unselectedViewController]) {
- [unselected unloadData];
- [unselected reloadData];
- }
-}
-
-- (void) dealloc {
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-
- [super dealloc];
-}
-
-- (id) initWithDatabase:(Database *)database {
- if ((self = [super init]) != nil) {
- database_ = database;
- [self setDelegate:self];
-
- [[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] autorelease];
- } return self;
-}
-
-- (void) setUpdate:(NSDate *)date {
- [self beginUpdate];
-}
-
-- (void) beginUpdate {
- [(RefreshBar *) refreshbar_ start];
- [self dropBar:YES];
-
- [updatedelegate_ retainNetworkActivityIndicator];
- updating_ = true;
-
- [NSThread
- detachNewThreadSelector:@selector(performUpdate)
- toTarget:self
- withObject:nil
- ];
-}
-
-- (void) performUpdate {
- NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
-
- Status status;
- status.setDelegate(self);
- [database_ updateWithStatus:status];
-
- [self
- performSelectorOnMainThread:@selector(completeUpdate)
- withObject:nil
- waitUntilDone:NO
- ];
-
- [pool release];
-}
+ [pool release];
+}
- (void) stopUpdateWithSelector:(SEL)selector {
updating_ = false;
[updatedelegate_ releaseNetworkActivityIndicator];
- [self raiseBar:YES];
- [refreshbar_ stop];
+ UIViewController *controller([[self viewControllers] objectAtIndex:1]);
+ [[controller tabBarItem] setBadgeValue:nil];
+
+ [indicator_ removeFromSuperview];
+ [indicator_ stopAnimating];
[updatedelegate_ performSelector:selector withObject:nil afterDelay:0];
}
@@ -7073,25 +6937,14 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
return updating_;
}
-- (void) addProgressEvent:(CydiaProgressEvent *)event {
- [refreshbar_ setPrompt:[event compoundMessage]];
-}
-
-- (bool) isProgressCancelled {
+- (bool) isSourceCancelled {
return !updating_;
}
-- (void) setProgressCancellable:(NSNumber *)cancellable {
- [refreshbar_ setCancellable:(updating_ && [cancellable boolValue])];
-}
-
-- (void) setProgressPercent:(NSNumber *)percent {
- [refreshbar_ setProgress:[percent floatValue]];
+- (void) startSourceFetch:(NSString *)uri {
}
-- (void) setProgressStatus:(NSDictionary *)status {
- if (status != nil)
- [self setProgressPercent:[status objectForKey:@"Percent"]];
+- (void) stopSourceFetch:(NSString *)uri {
}
- (void) setUpdateDelegate:(id)delegate {
@@ -7099,84 +6952,12 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
}
- (UIView *) transitionView {
- if ([self respondsToSelector:@selector(_transitionView)])
- return [self _transitionView];
- else
+ if (![self respondsToSelector:@selector(_transitionView)])
return MSHookIvar(self, "_viewControllerTransitionView");
-}
-
-- (void) dropBar:(BOOL)animated {
- if (dropped_)
- return;
- dropped_ = true;
-
- UIView *transition([self transitionView]);
- [[self view] addSubview:refreshbar_];
-
- CGRect barframe([refreshbar_ frame]);
-
- if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iPhoneOS_3_0) // XXX: _UIApplicationLinkedOnOrAfter(4)
- barframe.origin.y = CYStatusBarHeight();
+ else if (kCFCoreFoundationVersionNumber < 800)
+ return [self _transitionView];
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];
-}
-
-- (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];
-}
-
-- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
- bool dropped(dropped_);
-
- if (dropped)
- [self raiseBar:NO];
-
- [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
-
- if (dropped)
- [self dropBar:NO];
-}
-
-- (void) statusBarFrameChanged:(NSNotification *)notification {
- if (dropped_) {
- [self raiseBar:NO];
- [self dropBar:NO];
- }
+ return [[[self _transitionView] superview] superview];
}
@end
@@ -7327,146 +7108,50 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
/* Section Controller {{{ */
@interface SectionController : FilteredPackageListController {
- _H indirect_;
- _H cydia_;
+ _H key_;
_H section_;
- std::vector< _H > promoted_;
}
-- (id) initWithDatabase:(Database *)database section:(NSString *)section;
+- (id) initWithDatabase:(Database *)database source:(Source *)source section:(NSString *)section;
@end
@implementation SectionController
- (NSURL *) referrerURL {
- NSString *name = section_;
- if (name == nil)
- name = @"all";
-
- return [NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/sections/%@", UI_, [name stringByAddingPercentEscapesIncludingReserved]]];
+ NSString *name(section_);
+ name = name ?: @"*";
+ NSString *key(key_);
+ key = key ?: @"*";
+ return [NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/sections/%@/%@", UI_, [key stringByAddingPercentEscapesIncludingReserved], [name stringByAddingPercentEscapesIncludingReserved]]];
}
- (NSURL *) navigationURL {
- NSString *name = section_;
- if (name == nil)
- name = @"all";
-
- return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sections/%@", [name stringByAddingPercentEscapesIncludingReserved]]];
+ NSString *name(section_);
+ name = name ?: @"*";
+ NSString *key(key_);
+ key = key ?: @"*";
+ return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sections/%@/%@", [key stringByAddingPercentEscapesIncludingReserved], [name stringByAddingPercentEscapesIncludingReserved]]];
}
-- (id) initWithDatabase:(Database *)database section:(NSString *)name {
+- (id) initWithDatabase:(Database *)database source:(Source *)source section:(NSString *)section {
NSString *title;
- if (name == nil)
+ if (section == nil)
title = UCLocalize("ALL_PACKAGES");
- else if (![name isEqual:@""])
- title = [[NSBundle mainBundle] localizedStringForKey:Simplify(name) value:nil table:@"Sections"];
+ else if (![section isEqual:@""])
+ title = [[NSBundle mainBundle] localizedStringForKey:Simplify(section) value:nil table:@"Sections"];
else
title = UCLocalize("NO_SECTION");
- if ((self = [super initWithDatabase:database title:title filter:@selector(isVisibleInSection:) with:name]) != nil) {
- indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease];
- cydia_ = [[[CydiaObject alloc] initWithDelegate:indirect_] autorelease];
- section_ = name;
+ if ((self = [super initWithDatabase:database title:title filter:@selector(isVisibleInSection:source:) with:section with:source]) != nil) {
+ key_ = [source key];
+ section_ = section;
} return self;
}
-- (NSInteger) numberOfSectionsInTableView:(UITableView *)list {
- return [super numberOfSectionsInTableView:list] + 1;
-}
-
-- (NSString *) tableView:(UITableView *)list titleForHeaderInSection:(NSInteger)section {
- return section == 0 ? nil : [super tableView:list titleForHeaderInSection:(section - 1)];
-}
-
-- (NSInteger) tableView:(UITableView *)list numberOfRowsInSection:(NSInteger)section {
- return section == 0 ? promoted_.size() : [super tableView:list numberOfRowsInSection:(section - 1)];
-}
-
-+ (NSIndexPath *) adjustedIndexPath:(NSIndexPath *)path {
- return [NSIndexPath indexPathForRow:[path row] inSection:([path section] - 1)];
-}
-
-- (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {
- if ([path section] != 0)
- return [super tableView:table cellForRowAtIndexPath:[SectionController adjustedIndexPath:path]];
-
- return promoted_[[path row]];
-}
-
-- (void) tableView:(UITableView *)table didSelectRowAtIndexPath:(NSIndexPath *)path {
- if ([path section] != 0)
- return [super tableView:table didSelectRowAtIndexPath:[SectionController adjustedIndexPath:path]];
-}
-
-- (NSInteger) tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index {
- NSInteger section([super tableView:tableView sectionForSectionIndexTitle:title atIndex:index]);
- return section == 0 ? 0 : section + 1;
-}
-
-- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id)listener {
- NSURL *url([request URL]);
- if (url == nil)
- return;
-
- if ([frame isEqualToString:@"_open"])
- [delegate_ openURL:url];
- else {
- WebFrame *frame(nil);
- if (NSDictionary *WebActionElement = [action objectForKey:@"WebActionElementKey"])
- frame = [WebActionElement objectForKey:@"WebElementFrame"];
- if (frame == nil)
- frame = [view mainFrame];
-
- WebDataSource *source([frame provisionalDataSource] ?: [frame dataSource]);
-
- CyteViewController *controller([delegate_ pageForURL:url forExternal:NO withReferrer:([request valueForHTTPHeaderField:@"Referer"] ?: [[[source request] URL] absoluteString])] ?: [[[CydiaWebViewController alloc] initWithRequest:request] autorelease]);
- [controller setDelegate:delegate_];
- [[self navigationController] pushViewController:controller animated:YES];
- }
-
- [listener ignore];
-}
-
-- (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
- return [CydiaWebViewController requestWithHeaders:request];
-}
-
-- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
- [CydiaWebViewController didClearWindowObject:window forFrame:frame withCydia:cydia_];
-}
-
-- (void) loadView {
- [super loadView];
-
- // XXX: this code is horrible. I mean, wtf Jay?
- if (ShowPromoted_ && [[Metadata_ objectForKey:@"ShowPromoted"] boolValue]) {
- promoted_.resize(1);
-
- for (unsigned i(0); i != promoted_.size(); ++i) {
- CyteWebViewTableViewCell *promoted([CyteWebViewTableViewCell cellWithRequest:[NSURLRequest
- requestWithURL:[Diversion divertURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/sectionhead/%u/%@",
- UI_, i, section_ == nil ? @"" : [section_ stringByAddingPercentEscapesIncludingReserved]]
- ]]
-
- cachePolicy:NSURLRequestUseProtocolCachePolicy
- timeoutInterval:120
- ]]);
-
- [promoted setDelegate:self];
- promoted_[i] = promoted;
- }
- }
-}
-
-- (void) setDelegate:(id)delegate {
- [super setDelegate:delegate];
- [cydia_ setDelegate:delegate];
-}
-
-- (void) releaseSubviews {
- promoted_.clear();
- [super releaseSubviews];
+- (void) reloadData {
+ [super setStuff:[database_ sourceWithKey:key_]];
+ [super reloadData];
}
@end
@@ -7477,12 +7162,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
UITableViewDelegate
> {
_transient Database *database_;
+ _H key_;
_H sections_;
_H filtered_;
_H list_;
}
-- (id) initWithDatabase:(Database *)database;
+- (id) initWithDatabase:(Database *)database source:(Source *)source;
- (void) editButtonClicked;
@end
@@ -7490,7 +7176,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
@implementation SectionsController
- (NSURL *) navigationURL {
- return [NSURL URLWithString:@"cydia://sections"];
+ return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sources/%@", [key_ stringByAddingPercentEscapesIncludingReserved]]];
+}
+
+- (Source *) source {
+ if (key_ == nil)
+ return nil;
+ return [database_ sourceWithKey:key_];
}
- (void) updateNavigationItem {
@@ -7571,6 +7263,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
SectionController *controller = [[[SectionController alloc]
initWithDatabase:database_
+ source:[self source]
section:[section name]
] autorelease];
[controller setDelegate:delegate_];
@@ -7581,7 +7274,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
- (void) loadView {
list_ = [[[UITableView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease];
[list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- [list_ setRowHeight:45.0f];
+ [list_ setRowHeight:46];
[(UITableView *) list_ setDataSource:self];
[list_ setDelegate:self];
[self setView:list_];
@@ -7602,9 +7295,10 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
[super releaseSubviews];
}
-- (id) initWithDatabase:(Database *)database {
+- (id) initWithDatabase:(Database *)database source:(Source *)source {
if ((self = [super init]) != nil) {
database_ = database;
+ key_ = [source key];
} return self;
}
@@ -7618,8 +7312,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
NSMutableDictionary *sections([NSMutableDictionary dictionaryWithCapacity:32]);
+ Source *source([self source]);
+
_trace();
for (Package *package in packages) {
+ if (source != nil && [package source] != source)
+ continue;
+
NSString *name([package section]);
NSString *key(name == nil ? @"" : name);
@@ -7674,7 +7373,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
/* Changes Controller {{{ */
@interface ChangesController : CyteViewController <
- CyteWebViewDelegate,
UITableViewDataSource,
UITableViewDelegate
> {
@@ -7683,10 +7381,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
_H packages_;
_H sections_;
_H list_;
- _H dickbar_;
unsigned upgrades_;
- _H indirect_;
- _H cydia_;
}
- (id) initWithDatabase:(Database *)database;
@@ -7759,22 +7454,30 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
[alert dismissWithClickedButtonIndex:-1 animated:YES];
}
+- (void) setLeftBarButtonItem {
+ if ([delegate_ updating])
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("CANCEL")
+ style:UIBarButtonItemStyleDone
+ target:self
+ action:@selector(cancelButtonClicked)
+ ] autorelease] animated:YES];
+ else
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("REFRESH")
+ style:UIBarButtonItemStylePlain
+ target:self
+ action:@selector(refreshButtonClicked)
+ ] autorelease] animated:YES];
+}
+
- (void) refreshButtonClicked {
- if (IsReachable("cydia.saurik.com")) {
- [delegate_ beginUpdate];
- [[self navigationItem] setLeftBarButtonItem:nil animated:YES];
- } else {
- UIAlertView *alert = [[[UIAlertView alloc]
- initWithTitle:[NSString stringWithFormat:Colon_, Error_, UCLocalize("REFRESH")]
- message:@"Host Unreachable" // XXX: Localize
- delegate:self
- cancelButtonTitle:UCLocalize("OK")
- otherButtonTitles:nil
- ] autorelease];
+ if ([delegate_ requestUpdate])
+ [self setLeftBarButtonItem];
+}
- [alert setContext:@"norefresh"];
- [alert show];
- }
+- (void) cancelButtonClicked {
+ [delegate_ cancelUpdate];
}
- (void) upgradeButtonClicked {
@@ -7793,89 +7496,12 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
[(UITableView *) list_ setDataSource:self];
[list_ setDelegate:self];
[view addSubview:list_];
-
- if (AprilFools_ && kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iPhoneOS_3_0) {
- CGRect dickframe([view bounds]);
- dickframe.size.height = 44;
-
- dickbar_ = [[[CyteWebView alloc] initWithFrame:dickframe] autorelease];
- [dickbar_ setDelegate:self];
- [view addSubview:dickbar_];
-
- [dickbar_ setBackgroundColor:[UIColor clearColor]];
- [dickbar_ setScalesPageToFit:YES];
-
- UIWebDocumentView *document([dickbar_ _documentView]);
- [document setBackgroundColor:[UIColor clearColor]];
- [document setDrawsBackground:NO];
-
- WebView *webview([document webView]);
- [webview setShouldUpdateWhileOffscreen:NO];
-
- UIScrollView *scroller([dickbar_ scrollView]);
- [scroller setScrollingEnabled:NO];
- [scroller setFixedBackgroundPattern:YES];
- [scroller setBackgroundColor:[UIColor clearColor]];
-
- WebPreferences *preferences([webview preferences]);
- [preferences setCacheModel:WebCacheModelDocumentBrowser];
- [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
- [preferences setOfflineWebApplicationCacheEnabled:YES];
-
- [dickbar_ loadRequest:[NSURLRequest
- requestWithURL:[Diversion divertURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/dickbar/", UI_]]]
- cachePolicy:NSURLRequestUseProtocolCachePolicy
- timeoutInterval:120
- ]];
-
- UIEdgeInsets inset = {44, 0, 0, 0};
- [list_ setContentInset:inset];
-
- [dickbar_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
- }
-}
-
-- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id)listener {
- NSURL *url([request URL]);
- if (url == nil)
- return;
-
- if ([frame isEqualToString:@"_open"])
- [delegate_ openURL:url];
- else {
- WebFrame *frame(nil);
- if (NSDictionary *WebActionElement = [action objectForKey:@"WebActionElementKey"])
- frame = [WebActionElement objectForKey:@"WebElementFrame"];
- if (frame == nil)
- frame = [view mainFrame];
-
- WebDataSource *source([frame provisionalDataSource] ?: [frame dataSource]);
-
- CyteViewController *controller([delegate_ pageForURL:url forExternal:NO withReferrer:([request valueForHTTPHeaderField:@"Referer"] ?: [[[source request] URL] absoluteString])] ?: [[[CydiaWebViewController alloc] initWithRequest:request] autorelease]);
- [controller setDelegate:delegate_];
- [[self navigationController] pushViewController:controller animated:YES];
- }
-
- [listener ignore];
-}
-
-- (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
- return [CydiaWebViewController requestWithHeaders:request];
-}
-
-- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
- [CydiaWebViewController didClearWindowObject:window forFrame:frame withCydia:cydia_];
-}
-
-- (void) setDelegate:(id)delegate {
- [super setDelegate:delegate];
- [cydia_ setDelegate:delegate];
}
- (void) viewDidLoad {
[super viewDidLoad];
- [[self navigationItem] setTitle:(AprilFools_ ? @"Timeline" : UCLocalize("CHANGES"))];
+ [[self navigationItem] setTitle:UCLocalize("CHANGES")];
}
- (void) releaseSubviews {
@@ -7883,15 +7509,12 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
packages_ = nil;
sections_ = nil;
- dickbar_ = nil;
[super releaseSubviews];
}
- (id) initWithDatabase:(Database *)database {
if ((self = [super init]) != nil) {
- indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease];
- cydia_ = [[[CydiaObject alloc] initWithDelegate:indirect_] autorelease];
database_ = database;
} return self;
}
@@ -7919,6 +7542,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
} }
- (void) _reloadData {
+ [self setLeftBarButtonItem];
+
NSMutableArray *packages;
reload:
@@ -8008,13 +7633,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
action:@selector(upgradeButtonClicked)
] autorelease]) animated:YES];
- [[self navigationItem] setLeftBarButtonItem:([delegate_ updating] ? nil : [[[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("REFRESH")
- style:UIBarButtonItemStylePlain
- target:self
- action:@selector(refreshButtonClicked)
- ] autorelease]) animated:YES];
-
PrintTimes();
} }
@@ -8245,10 +7863,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
pclose(dpkg);
exit(0);
- _assert(false);
- }
-
- ReapZombie(pid);
+ } ReapZombie(pid);
}
- (void) onIgnored:(id)control {
@@ -8344,12 +7959,9 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
/* Installed Controller {{{ */
@interface InstalledController : FilteredPackageListController {
- BOOL expert_;
}
- (id) initWithDatabase:(Database *)database;
-
-- (void) updateRoleButton;
- (void) queueStatusDidChange;
@end
@@ -8366,7 +7978,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
- (id) initWithDatabase:(Database *)database {
if ((self = [super initWithDatabase:database title:UCLocalize("INSTALLED") filter:@selector(isInstalledAndUnfiltered:) with:[NSNumber numberWithBool:YES]]) != nil) {
- [self updateRoleButton];
+ UISegmentedControl *segmented([[[UISegmentedControl alloc] initWithItems:[NSArray arrayWithObjects:UCLocalize("SIMPLE"), UCLocalize("EXPERT"), nil]] autorelease]);
+ [segmented setSelectedSegmentIndex:0];
+ [segmented setSegmentedControlStyle:UISegmentedControlStyleBar];
+ [[self navigationItem] setTitleView:segmented];
+
+ [segmented addTarget:self action:@selector(modeChanged:) forEvents:UIControlEventValueChanged];
+
[self queueStatusDidChange];
} return self;
}
@@ -8379,37 +7997,23 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
- (void) queueStatusDidChange {
#if !AlwaysReload
- if (IsWildcat_) {
- if (Queuing_) {
- [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("QUEUE")
- style:UIBarButtonItemStyleDone
- target:self
- action:@selector(queueButtonClicked)
- ] autorelease]];
- } else {
- [[self navigationItem] setLeftBarButtonItem:nil];
- }
- }
-#endif
-}
-
-- (void) updateRoleButton {
- if (Role_ != nil && ![Role_ isEqualToString:@"Developer"])
- [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
- initWithTitle:(expert_ ? UCLocalize("EXPERT") : UCLocalize("SIMPLE"))
- style:(expert_ ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain)
+ if (Queuing_) {
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("QUEUE")
+ style:UIBarButtonItemStyleDone
target:self
- action:@selector(roleButtonClicked)
+ action:@selector(queueButtonClicked)
] autorelease]];
+ } else {
+ [[self navigationItem] setLeftBarButtonItem:nil];
+ }
+#endif
}
-- (void) roleButtonClicked {
- [self setObject:[NSNumber numberWithBool:expert_]];
+- (void) modeChanged:(UISegmentedControl *)segmented {
+ bool simple([segmented selectedSegmentIndex] == 0);
+ [self setObject:[NSNumber numberWithBool:simple]];
[self reloadData];
- expert_ = !expert_;
-
- [self updateRoleButton];
}
@end
@@ -8417,15 +8021,19 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
/* Source Cell {{{ */
@interface SourceCell : CyteTableViewCell <
- CyteTableViewCellDelegate
+ CyteTableViewCellDelegate,
+ SourceDelegate
> {
+ _H source_;
_H url_;
_H icon_;
_H origin_;
_H label_;
+ _H indicator_;
}
- (void) setSource:(Source *)source;
+- (void) setFetch:(NSNumber *)fetch;
@end
@@ -8458,15 +8066,30 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
}
- (void) setSource:(Source *)source {
+ source_ = source;
+ [source_ setDelegate:self];
+
+ [self setFetch:[NSNumber numberWithBool:[source_ fetch]]];
+
icon_ = [UIImage applicationImageNamed:@"unknown.png"];
origin_ = [source name];
label_ = [source rooturi];
[content_ setNeedsDisplay];
-
- url_ = [source iconURL];
- [NSThread detachNewThreadSelector:@selector(_setSource:) toTarget:self withObject:url_];
+
+ url_ = [source iconURL];
+ [NSThread detachNewThreadSelector:@selector(_setSource:) toTarget:self withObject:url_];
+}
+
+- (void) setAllSource {
+ source_ = nil;
+ [indicator_ stopAnimating];
+
+ icon_ = [UIImage applicationImageNamed:@"folder.png"];
+ origin_ = UCLocalize("ALL_SOURCES");
+ label_ = UCLocalize("ALL_SOURCES_EX");
+ [content_ setNeedsDisplay];
}
- (SourceCell *) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
@@ -8482,12 +8105,31 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
[content_ setDelegate:self];
[content_ setOpaque:YES];
+ indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGraySmall] autorelease];
+ [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin];// | UIViewAutoresizingFlexibleBottomMargin];
+ [content addSubview:indicator_];
+
[[content_ layer] setContentsGravity:kCAGravityTopLeft];
} return self;
}
+- (void) layoutSubviews {
+ [super layoutSubviews];
+
+ UIView *content([self contentView]);
+ CGRect bounds([content bounds]);
+
+ CGRect frame([indicator_ frame]);
+ frame.origin.x = bounds.size.width - frame.size.width;
+ frame.origin.y = (bounds.size.height - frame.size.height) / 2;
+
+ if (kCFCoreFoundationVersionNumber < 800)
+ frame.origin.x -= 8;
+ [indicator_ setFrame:frame];
+}
+
- (NSString *) accessibilityLabel {
- return label_;
+ return origin_;
}
- (void) drawContentRect:(CGRect)rect {
@@ -8503,61 +8145,29 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
rect.size.height /= 2;
}
- rect.origin.x = 25 - rect.size.width / 2;
- rect.origin.y = 25 - rect.size.height / 2;
+ rect.origin.x = 26 - rect.size.width / 2;
+ rect.origin.y = 26 - rect.size.height / 2;
[icon_ drawInRect:rect];
}
- if (highlighted)
+ if (highlighted && kCFCoreFoundationVersionNumber < 800)
UISetColor(White_);
if (!highlighted)
UISetColor(Black_);
- [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - 65) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
+ [origin_ drawAtPoint:CGPointMake(52, 8) forWidth:(width - 61) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
if (!highlighted)
UISetColor(Gray_);
- [label_ drawAtPoint:CGPointMake(48, 29) forWidth:(width - 65) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];
-}
-
-@end
-/* }}} */
-/* Source Controller {{{ */
-@interface SourceController : FilteredPackageListController {
- _transient Source *source_;
- _H key_;
-}
-
-- (id) initWithDatabase:(Database *)database source:(Source *)source;
-
-@end
-
-@implementation SourceController
-
-- (NSURL *) referrerURL {
- return [NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/sources/%@", UI_, [key_ stringByAddingPercentEscapesIncludingReserved]]];
-}
-
-- (NSURL *) navigationURL {
- return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sources/%@", [key_ stringByAddingPercentEscapesIncludingReserved]]];
-}
-
-- (id) initWithDatabase:(Database *)database source:(Source *)source {
- if ((self = [super initWithDatabase:database title:[source label] filter:@selector(isVisibleInSource:) with:source]) != nil) {
- source_ = source;
- key_ = [source key];
- } return self;
+ [label_ drawAtPoint:CGPointMake(52, 29) forWidth:(width - 61) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];
}
-- (void) reloadData {
- source_ = [database_ sourceWithKey:key_];
- key_ = [source_ key];
- [self setObject:source_];
-
- [[self navigationItem] setTitle:[source_ label]];
-
- [super reloadData];
+- (void) setFetch:(NSNumber *)fetch {
+ if ([fetch boolValue])
+ [indicator_ startAnimating];
+ else
+ [indicator_ stopAnimating];
}
@end
@@ -8578,10 +8188,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
_H hud_;
_H error_;
- //NSURLConnection *installer_;
NSURLConnection *trivial_bz2_;
NSURLConnection *trivial_gz_;
- //NSURLConnection *automatic_;
BOOL cydia_;
}
@@ -8602,10 +8210,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
}
- (void) dealloc {
- //[self _releaseConnection:installer_];
[self _releaseConnection:trivial_gz_];
[self _releaseConnection:trivial_bz2_];
- //[self _releaseConnection:automatic_];
[super dealloc];
}
@@ -8620,57 +8226,70 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
}
- (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
- return 1;
+ return 2;
}
- (NSString *) tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+ if (section == 1)
+ return UCLocalize("INDIVIDUAL_SOURCES");
return nil;
}
- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
- return [sources_ count];
+ switch (section) {
+ case 0: return 1;
+ case 1: return [sources_ count];
+ default: return 0;
+ }
}
- (Source *) sourceAtIndexPath:(NSIndexPath *)indexPath {
@synchronized (database_) {
if ([database_ era] != era_)
return nil;
-
+ if ([indexPath section] != 1)
+ return nil;
NSUInteger index([indexPath row]);
- return index < [sources_ count] ? [sources_ objectAtIndex:index] : nil;
+ if (index >= [sources_ count])
+ return nil;
+ return [sources_ objectAtIndex:index];
} }
- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
static NSString *cellIdentifier = @"SourceCell";
SourceCell *cell = (SourceCell *) [tableView dequeueReusableCellWithIdentifier:cellIdentifier];
- if(cell == nil) cell = [[[SourceCell alloc] initWithFrame:CGRectZero reuseIdentifier:cellIdentifier] autorelease];
- [cell setSource:[self sourceAtIndexPath:indexPath]];
+ if (cell == nil) cell = [[[SourceCell alloc] initWithFrame:CGRectZero reuseIdentifier:cellIdentifier] autorelease];
[cell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
+ Source *source([self sourceAtIndexPath:indexPath]);
+ if (source == nil)
+ [cell setAllSource];
+ else
+ [cell setSource:source];
+
return cell;
}
- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
- Source *source = [self sourceAtIndexPath:indexPath];
- if (source == nil) return;
-
- SourceController *controller = [[[SourceController alloc]
+ SectionsController *controller([[[SectionsController alloc]
initWithDatabase:database_
- source:source
- ] autorelease];
+ source:[self sourceAtIndexPath:indexPath]
+ ] autorelease]);
[controller setDelegate:delegate_];
-
[[self navigationController] pushViewController:controller animated:YES];
}
- (BOOL) tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+ if ([indexPath section] != 1)
+ return false;
Source *source = [self sourceAtIndexPath:indexPath];
return [source record] != nil;
}
- (void) tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
+ _assert([indexPath section] == 1);
if (editingStyle == UITableViewCellEditingStyleDelete) {
Source *source = [self sourceAtIndexPath:indexPath];
if (source == nil) return;
@@ -8683,6 +8302,10 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
}
}
+- (void) tableView:(UITableView *)tableView didEndEditingRowAtIndexPath:(NSIndexPath *)indexPath {
+ [self updateButtonsForEditingStatusAnimated:YES];
+}
+
- (void) complete {
[delegate_ addTrivialSource:href_];
href_ = nil;
@@ -8835,7 +8458,21 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
case 1: {
NSString *href = [[alert textField] text];
- //installer_ = [[self _requestHRef:href method:@"GET"] retain];
+ static Pcre href_r("^http(s?)://[^# ]*$");
+ if (!href_r(href)) {
+ UIAlertView *alert = [[[UIAlertView alloc]
+ initWithTitle:Error_
+ message:UCLocalize("INVALID_URL")
+ delegate:self
+ cancelButtonTitle:UCLocalize("OK")
+ otherButtonTitles:nil
+ ] autorelease];
+
+ [alert setContext:@"badurl"];
+ [alert show];
+
+ break;
+ }
if (![href hasSuffix:@"/"])
href_ = [href stringByAppendingString:@"/"];
@@ -8844,7 +8481,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
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];
cydia_ = false;
@@ -8881,6 +8517,39 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
}
}
+- (void) updateButtonsForEditingStatusAnimated:(BOOL)animated {
+ BOOL editing([list_ isEditing]);
+
+ if (editing)
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("ADD")
+ style:UIBarButtonItemStylePlain
+ target:self
+ action:@selector(addButtonClicked)
+ ] autorelease] animated:animated];
+ else if ([delegate_ updating])
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("CANCEL")
+ style:UIBarButtonItemStyleDone
+ target:self
+ action:@selector(cancelButtonClicked)
+ ] autorelease] animated:animated];
+ else
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("REFRESH")
+ style:UIBarButtonItemStylePlain
+ target:self
+ action:@selector(refreshButtonClicked)
+ ] autorelease] animated:animated];
+
+ [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:(editing ? UCLocalize("DONE") : UCLocalize("EDIT"))
+ style:(editing ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain)
+ target:self
+ action:@selector(editButtonClicked)
+ ] autorelease] animated:animated];
+}
+
- (void) loadView {
list_ = [[[UITableView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame] style:UITableViewStylePlain] autorelease];
[list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
@@ -8920,6 +8589,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
- (void) reloadData {
[super reloadData];
+ [self updateButtonsForEditingStatusAnimated:YES];
@synchronized (database_) {
era_ = [database_ era];
@@ -8971,34 +8641,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
[self showAddSourcePrompt];
}
-- (void) updateButtonsForEditingStatusAnimated:(BOOL)animated {
- BOOL editing([list_ isEditing]);
-
- [[self navigationItem] setLeftBarButtonItem:(editing ? [[[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("ADD")
- style:UIBarButtonItemStylePlain
- target:self
- action:@selector(addButtonClicked)
- ] autorelease] : [[self navigationItem] backBarButtonItem]) animated:animated];
-
- [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
- initWithTitle:(editing ? UCLocalize("DONE") : UCLocalize("EDIT"))
- style:(editing ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain)
- target:self
- action:@selector(editButtonClicked)
- ] autorelease] animated:animated];
-
- if (IsWildcat_ && !editing)
- [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("SETTINGS")
- style:UIBarButtonItemStylePlain
- target:self
- action:@selector(settingsButtonClicked)
- ] autorelease]];
+- (void) refreshButtonClicked {
+ if ([delegate_ requestUpdate])
+ [self updateButtonsForEditingStatusAnimated:YES];
}
-- (void) settingsButtonClicked {
- [delegate_ showSettings];
+- (void) cancelButtonClicked {
+ [delegate_ cancelUpdate];
}
- (void) editButtonClicked {
@@ -9009,200 +8658,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
@end
/* }}} */
-/* Settings Controller {{{ */
-@interface SettingsController : CyteViewController <
- UITableViewDataSource,
- UITableViewDelegate
-> {
- _transient Database *database_;
- // XXX: ok, "roledelegate_"?...
- _transient id roledelegate_;
- _H table_;
- _H segment_;
- _H container_;
-}
-
-- (void) showDoneButton;
-- (void) resizeSegmentedControl;
-
-@end
-
-@implementation SettingsController
-
-- (void) loadView {
- table_ = [[[UITableView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame] style:UITableViewStyleGrouped] autorelease];
- [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- [table_ setDelegate:self];
- [(UITableView *) table_ setDataSource:self];
- [self setView:table_];
-
- NSArray *items = [NSArray arrayWithObjects:
- UCLocalize("USER"),
- UCLocalize("HACKER"),
- UCLocalize("DEVELOPER"),
- nil];
- segment_ = [[[UISegmentedControl alloc] initWithItems:items] autorelease];
- container_ = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, 44.0f)] autorelease];
- [container_ addSubview:segment_];
-}
-
-- (void) viewDidLoad {
- [super viewDidLoad];
-
- [[self navigationItem] setTitle:UCLocalize("WHO_ARE_YOU")];
-
- int index = -1;
- if ([Role_ isEqualToString:@"User"]) index = 0;
- if ([Role_ isEqualToString:@"Hacker"]) index = 1;
- if ([Role_ isEqualToString:@"Developer"]) index = 2;
- if (index != -1) {
- [segment_ setSelectedSegmentIndex:index];
- [self showDoneButton];
- }
-
- [segment_ addTarget:self action:@selector(segmentChanged:) forControlEvents:UIControlEventValueChanged];
- [self resizeSegmentedControl];
-}
-
-- (void) releaseSubviews {
- table_ = nil;
- segment_ = nil;
- container_ = nil;
-
- [super releaseSubviews];
-}
-
-- (id) initWithDatabase:(Database *)database delegate:(id)delegate {
- if ((self = [super init]) != nil) {
- database_ = database;
- roledelegate_ = delegate;
- } return self;
-}
-
-- (void) resizeSegmentedControl {
- CGFloat width = [[self view] frame].size.width;
- [segment_ setFrame:CGRectMake(width / 32.0f, 0, width - (width / 32.0f * 2.0f), 44.0f)];
-}
-
-- (void) viewWillAppear:(BOOL)animated {
- [super viewWillAppear:animated];
- [self resizeSegmentedControl];
-}
-
-- (void) viewDidAppear:(BOOL)animated {
- [super viewDidAppear:animated];
- [segment_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleLeftMargin)];
- [self resizeSegmentedControl];
-}
-
-- (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration {
- [self resizeSegmentedControl];
-}
-
-- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
- [self resizeSegmentedControl];
-}
-
-- (void) save {
- NSString *role(nil);
-
- switch ([segment_ selectedSegmentIndex]) {
- case 0: role = @"User"; break;
- case 1: role = @"Hacker"; break;
- case 2: role = @"Developer"; break;
-
- _nodefault
- }
-
- if (![role isEqualToString:Role_]) {
- bool rolling(Role_ == nil);
- Role_ = role;
-
- Settings_ = [NSMutableDictionary dictionaryWithObjectsAndKeys:
- Role_, @"Role",
- nil];
-
- [Metadata_ setObject:Settings_ forKey:@"Settings"];
- Changed_ = true;
-
- if (rolling)
- [roledelegate_ loadData];
- else
- [roledelegate_ updateData];
- }
-}
-
-- (void) segmentChanged:(UISegmentedControl *)control {
- [self showDoneButton];
-}
-
-- (void) saveAndClose {
- [self save];
-
- [[self navigationItem] setRightBarButtonItem:nil];
- [[self navigationController] dismissModalViewControllerAnimated:YES];
-}
-
-- (void) doneButtonClicked {
- UIActivityIndicatorView *spinner = [[[UIActivityIndicatorView alloc] initWithFrame:CGRectMake(0, 0, 20.0f, 20.0f)] autorelease];
- [spinner startAnimating];
- UIBarButtonItem *spinItem = [[[UIBarButtonItem alloc] initWithCustomView:spinner] autorelease];
- [[self navigationItem] setRightBarButtonItem:spinItem];
-
- [self performSelector:@selector(saveAndClose) withObject:nil afterDelay:0];
-}
-
-- (void) showDoneButton {
- [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("DONE")
- style:UIBarButtonItemStyleDone
- target:self
- action:@selector(doneButtonClicked)
- ] autorelease] animated:([[self navigationItem] rightBarButtonItem] == nil)];
-}
-
-- (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
- // XXX: For not having a single cell in the table, this sure is a lot of sections.
- return 6;
-}
-
-- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
- return 0; // :(
-}
-
-- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
- return nil; // This method is required by the protocol.
-}
-
-- (NSString *) tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section {
- if (section == 1)
- return UCLocalize("ROLE_EX");
- if (section == 4)
- return [NSString stringWithFormat:
- @"%@: %@\n%@: %@\n%@: %@",
- UCLocalize("USER"), UCLocalize("USER_EX"),
- UCLocalize("HACKER"), UCLocalize("HACKER_EX"),
- UCLocalize("DEVELOPER"), UCLocalize("DEVELOPER_EX")
- ];
- else return nil;
-}
-
-- (CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
- return section == 3 ? 44.0f : 0;
-}
-
-- (UIView *) tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
- return section == 3 ? container_ : nil;
-}
-
-- (void) reloadData {
- [super reloadData];
-
- [table_ reloadData];
-}
-
-@end
-/* }}} */
/* Stash Controller {{{ */
@interface StashController : CyteViewController {
_H spinner_;
@@ -9327,7 +8782,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
UITabBarControllerDelegate
> {
_H window_;
- _H tabbar_;
+ _H tabbar_;
_H emulated_;
_H essential_;
@@ -9373,6 +8828,30 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
[tabbar_ beginUpdate];
}
+- (void) cancelUpdate {
+ [tabbar_ cancelUpdate];
+}
+
+- (bool) requestUpdate {
+ if (IsReachable("cydia.saurik.com")) {
+ [self beginUpdate];
+ return true;
+ } else {
+ UIAlertView *alert = [[[UIAlertView alloc]
+ initWithTitle:[NSString stringWithFormat:Colon_, Error_, UCLocalize("REFRESH")]
+ message:@"Host Unreachable" // XXX: Localize
+ delegate:self
+ cancelButtonTitle:UCLocalize("OK")
+ otherButtonTitles:nil
+ ] autorelease];
+
+ [alert setContext:@"norefresh"];
+ [alert show];
+
+ return false;
+ }
+}
+
- (BOOL) updating {
return [tabbar_ updating];
}
@@ -9565,6 +9044,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
return;
[window_ addSubview:[tabbar_ view]];
+ if ([window_ respondsToSelector:@selector(setRootViewController:)])
+ [window_ setRootViewController:tabbar_];
[[emulated_ view] removeFromSuperview];
emulated_ = nil;
[window_ setUserInteractionEnabled:YES];
@@ -9744,10 +9225,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
[self unlockSuspend];
}
-- (void) showSettings {
- [self presentModalViewController:[[[SettingsController alloc] initWithDatabase:database_ delegate:self] autorelease] force:NO];
-}
-
- (void) retainNetworkActivityIndicator {
if (activity_++ == 0)
[self setNetworkActivityIndicatorVisible:YES];
@@ -9947,14 +9424,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
NSString *destination = [[url absoluteString] substringFromIndex:([scheme length] + [@"://" length] + [base length] + [@"/" length])];
controller = [[[CydiaWebViewController alloc] initWithURL:[NSURL URLWithString:destination]] autorelease];
} else if (!external && [components count] == 1) {
- if ([base isEqualToString:@"manage"]) {
- controller = [[[ManageController alloc] init] autorelease];
- }
-
- if ([base isEqualToString:@"storage"]) {
- controller = [[[CydiaWebViewController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/storage/", UI_]]] autorelease];
- }
-
if ([base isEqualToString:@"sources"]) {
controller = [[[SourcesController alloc] initWithDatabase:database_] autorelease];
}
@@ -9964,7 +9433,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
}
if ([base isEqualToString:@"sections"]) {
- controller = [[[SectionsController alloc] initWithDatabase:database_] autorelease];
+ controller = [[[SectionsController alloc] initWithDatabase:database_ source:nil] autorelease];
}
if ([base isEqualToString:@"search"]) {
@@ -9979,20 +9448,20 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
controller = [[[InstalledController alloc] initWithDatabase:database_] autorelease];
}
} else if ([components count] == 2) {
- NSString *argument = [components objectAtIndex:1];
+ NSString *argument = [[components objectAtIndex:1] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
if ([base isEqualToString:@"package"]) {
controller = [self pageForPackage:argument withReferrer:referrer];
}
if (!external && [base isEqualToString:@"search"]) {
- controller = [[[SearchController alloc] initWithDatabase:database_ query:[argument stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]] autorelease];
+ controller = [[[SearchController alloc] initWithDatabase:database_ query:argument] autorelease];
}
if (!external && [base isEqualToString:@"sections"]) {
- if ([argument isEqualToString:@"all"])
+ if ([argument isEqualToString:@"all"] || [argument isEqualToString:@"*"])
argument = nil;
- controller = [[[SectionController alloc] initWithDatabase:database_ section:[argument stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]] autorelease];
+ controller = [[[SectionController alloc] initWithDatabase:database_ source:nil section:argument] autorelease];
}
if (!external && [base isEqualToString:@"sources"]) {
@@ -10000,8 +9469,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
controller = [[[SourcesController alloc] initWithDatabase:database_] autorelease];
[(SourcesController *)controller showAddSourcePrompt];
} else {
- Source *source = [database_ sourceWithKey:[argument stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
- controller = [[[SourceController alloc] initWithDatabase:database_ source:source] autorelease];
+ Source *source([database_ sourceWithKey:argument]);
+ controller = [[[SectionsController alloc] initWithDatabase:database_ source:source] autorelease];
}
}
@@ -10010,8 +9479,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
return nil;
}
} else if (!external && [components count] == 3) {
- NSString *arg1 = [components objectAtIndex:1];
- NSString *arg2 = [components objectAtIndex:2];
+ NSString *arg1 = [[components objectAtIndex:1] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+ NSString *arg2 = [[components objectAtIndex:2] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
if ([base isEqualToString:@"package"]) {
if ([arg2 isEqualToString:@"settings"]) {
@@ -10023,6 +9492,12 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
}
}
}
+
+ if ([base isEqualToString:@"sections"]) {
+ Source *source([arg1 isEqualToString:@"*"] ? nil : [database_ sourceWithKey:arg1]);
+ NSString *section([arg2 isEqualToString:@"*"] ? nil : arg2);
+ controller = [[[SectionController alloc] initWithDatabase:database_ source:source section:section] autorelease];
+ }
}
[controller setDelegate:self];
@@ -10120,27 +9595,31 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
if (pid == 0) {
execlp("launchctl", "launchctl", "stop", "com.apple.SpringBoard", NULL);
perror("launchctl stop");
- exit(0);
- }
- ReapZombie(pid);
+ exit(0);
+ } ReapZombie(pid);
}
- (void) setupViewControllers {
- tabbar_ = [[[CYTabBarController alloc] initWithDatabase:database_] autorelease];
-
- NSMutableArray *items([NSMutableArray arrayWithObjects:
- [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home.png"] tag:0] autorelease],
- [[[UITabBarItem alloc] initWithTitle:UCLocalize("SECTIONS") image:[UIImage applicationImageNamed:@"install.png"] tag:0] autorelease],
- [[[UITabBarItem alloc] initWithTitle:(AprilFools_ ? @"Timeline" : UCLocalize("CHANGES")) image:[UIImage applicationImageNamed:@"changes.png"] tag:0] autorelease],
- [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search.png"] tag:0] autorelease],
- nil]);
-
- if (IsWildcat_) {
- [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"source.png"] tag:0] autorelease] atIndex:3];
- [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage.png"] tag:0] autorelease] atIndex:3];
+ tabbar_ = [[[CydiaTabBarController alloc] initWithDatabase:database_] autorelease];
+
+ NSMutableArray *items;
+ if (kCFCoreFoundationVersionNumber < 800) {
+ items = [NSMutableArray arrayWithObjects:
+ [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home.png"] tag:0] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"install.png"] tag:0] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage applicationImageNamed:@"changes.png"] tag:0] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage.png"] tag:0] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search.png"] tag:0] autorelease],
+ nil];
} else {
- [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("MANAGE") image:[UIImage applicationImageNamed:@"manage.png"] tag:0] autorelease] atIndex:3];
+ items = [NSMutableArray arrayWithObjects:
+ [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home7.png"] selectedImage:[UIImage applicationImageNamed:@"home7s.png"]] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"install7.png"] selectedImage:[UIImage applicationImageNamed:@"install7s.png"]] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage applicationImageNamed:@"changes7.png"] selectedImage:[UIImage applicationImageNamed:@"changes7s.png"]] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage7.png"] selectedImage:[UIImage applicationImageNamed:@"manage7s.png"]] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search7.png"] selectedImage:[UIImage applicationImageNamed:@"search7s.png"]] autorelease],
+ nil];
}
NSMutableArray *controllers([NSMutableArray array]);
@@ -10201,6 +9680,7 @@ _trace();
Font12_ = [UIFont systemFontOfSize:12];
Font12Bold_ = [UIFont boldSystemFontOfSize:12];
Font14_ = [UIFont systemFontOfSize:14];
+ Font18_ = [UIFont systemFontOfSize:18];
Font18Bold_ = [UIFont boldSystemFontOfSize:18];
Font22Bold_ = [UIFont boldSystemFontOfSize:22];
@@ -10246,7 +9726,6 @@ _trace();
//Stash_("/usr/bin");
Stash_("/usr/include");
Stash_("/usr/lib/pam");
- Stash_("/usr/libexec");
Stash_("/usr/share");
//Stash_("/var/lib");
@@ -10258,6 +9737,8 @@ _trace();
emulated_ = [[[CydiaLoadingViewController alloc] init] autorelease];
[window_ addSubview:[emulated_ view]];
+ if ([window_ respondsToSelector:@selector(setRootViewController:)])
+ [window_ setRootViewController:emulated_];
[self performSelector:@selector(loadData) withObject:nil afterDelay:0];
_trace();
@@ -10266,29 +9747,18 @@ _trace();
- (NSArray *) defaultStartPages {
NSMutableArray *standard = [NSMutableArray array];
[standard addObject:[NSArray arrayWithObject:@"cydia://home"]];
- [standard addObject:[NSArray arrayWithObject:@"cydia://sections"]];
+ [standard addObject:[NSArray arrayWithObject:@"cydia://sources"]];
[standard addObject:[NSArray arrayWithObject:@"cydia://changes"]];
- if (!IsWildcat_) {
- [standard addObject:[NSArray arrayWithObject:@"cydia://manage"]];
- } else {
- [standard addObject:[NSArray arrayWithObject:@"cydia://installed"]];
- [standard addObject:[NSArray arrayWithObject:@"cydia://sources"]];
- }
+ [standard addObject:[NSArray arrayWithObject:@"cydia://installed"]];
[standard addObject:[NSArray arrayWithObject:@"cydia://search"]];
return standard;
}
- (void) loadData {
_trace();
- if (Role_ == nil) {
- [window_ setUserInteractionEnabled:YES];
- [self showSettings];
- return;
- } else {
- if ([emulated_ modalViewController] != nil)
- [emulated_ dismissModalViewControllerAnimated:YES];
- [window_ setUserInteractionEnabled:NO];
- }
+ if ([emulated_ modalViewController] != nil)
+ [emulated_ dismissModalViewControllerAnimated:YES];
+ [window_ setUserInteractionEnabled:NO];
[self reloadDataWithInvocation:nil];
[self refreshIfPossible];
@@ -10500,12 +9970,6 @@ int main(int argc, char *argv[]) {
UpdateExternalStatus(0);
- if (Class $UIDevice = objc_getClass("UIDevice")) {
- UIDevice *device([$UIDevice currentDevice]);
- IsWildcat_ = [device respondsToSelector:@selector(isWildcat)] && [device isWildcat];
- } else
- IsWildcat_ = false;
-
UIScreen *screen([UIScreen mainScreen]);
if ([screen respondsToSelector:@selector(scale)])
ScreenScale_ = [screen scale];
@@ -10513,18 +9977,14 @@ int main(int argc, char *argv[]) {
ScreenScale_ = 1;
UIDevice *device([UIDevice currentDevice]);
- if (![device respondsToSelector:@selector(userInterfaceIdiom)])
- Idiom_ = @"iphone";
- else {
+ if ([device respondsToSelector:@selector(userInterfaceIdiom)]) {
UIUserInterfaceIdiom idiom([device userInterfaceIdiom]);
- if (idiom == UIUserInterfaceIdiomPhone)
- Idiom_ = @"iphone";
- else if (idiom == UIUserInterfaceIdiomPad)
- Idiom_ = @"ipad";
- else
- NSLog(@"unknown UIUserInterfaceIdiom!");
+ if (idiom == UIUserInterfaceIdiomPad)
+ IsWildcat_ = true;
}
+ Idiom_ = IsWildcat_ ? @"ipad" : @"iphone";
+
Pcre pattern("^([0-9]+\\.[0-9]+)");
if (pattern([device systemVersion]))
@@ -10740,9 +10200,6 @@ int main(int argc, char *argv[]) {
Version_ = [Metadata_ objectForKey:@"Version"];
}
- if (Settings_ != nil)
- Role_ = [Settings_ objectForKey:@"Role"];
-
if (Values_ == nil) {
Values_ = [[[NSMutableDictionary alloc] initWithCapacity:4] autorelease];
[Metadata_ setObject:Values_ forKey:@"Values"];
@@ -10776,6 +10233,16 @@ int main(int argc, char *argv[]) {
Changed_ = true;
}
+
+ _H broken([NSMutableArray array]);
+ for (NSString *key in (id) Sources_)
+ if ([key rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@"# "]].location != NSNotFound)
+ [broken addObject:key];
+ if ([broken count] != 0) {
+ for (NSString *key in (id) broken)
+ [Sources_ removeObjectForKey:key];
+ Changed_ = true;
+ } broken = nil;
/* }}} */
CydiaWriteSources();
@@ -10853,6 +10320,7 @@ int main(int argc, char *argv[]) {
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);
+ Folder_.Set(space_, 0x8e/255.f, 0x8e/255.f, 0x93/255.f, 1.0);
Off_.Set(space_, 0.9, 0.9, 0.9, 1.0);
White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0);
@@ -10864,20 +10332,16 @@ int main(int argc, char *argv[]) {
RemovingColor_ = [UIColor colorWithRed:1.00f green:0.88f blue:0.88f alpha:1.00f];
/* }}}*/
/* UIKit Configuration {{{ */
- void (*$GSFontSetUseLegacyFontMetrics)(BOOL)(reinterpret_cast(dlsym(RTLD_DEFAULT, "GSFontSetUseLegacyFontMetrics")));
- if ($GSFontSetUseLegacyFontMetrics != NULL)
- $GSFontSetUseLegacyFontMetrics(YES);
-
// XXX: I have a feeling this was important
//UIKeyboardDisableAutomaticAppearance();
/* }}} */
$SBSSetInterceptsMenuButtonForever = reinterpret_cast(dlsym(RTLD_DEFAULT, "SBSSetInterceptsMenuButtonForever"));
- BOOL (*GSSystemHasCapability)(CFStringRef) = reinterpret_cast(dlsym(RTLD_DEFAULT, "GSSystemHasCapability"));
+ const char *symbol(kCFCoreFoundationVersionNumber >= 800 ? "MGGetBoolAnswer" : "GSSystemHasCapability");
+ BOOL (*GSSystemHasCapability)(CFStringRef) = reinterpret_cast(dlsym(RTLD_DEFAULT, symbol));
bool fast = GSSystemHasCapability != NULL && GSSystemHasCapability(CFSTR("armv7"));
- ShowPromoted_ = fast;
PulseInterval_ = fast ? 50000 : 500000;
Colon_ = UCLocalize("COLON_DELIMITED");
@@ -10885,8 +10349,6 @@ int main(int argc, char *argv[]) {
Error_ = UCLocalize("ERROR");
Warning_ = UCLocalize("WARNING");
- AprilFools_ = false;
-
_trace();
int value(UIApplicationMain(argc, argv, @"Cydia", @"Cydia"));