Remove dependency on Substrate to have its macros.

[cydia.git] / MobileCydia.mm

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 823d9bd11ac7787440d12cd3defe63f6ecb5f784..b95389ac2508d49fb527ae20a030711a7a0df2ce 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -109,7 +109,7 @@ extern "C" {
 #include <Cytore.hpp>
 #include "Sources.h"
 
 #include <Cytore.hpp>
 #include "Sources.h"
 

-#include <CydiaSubstrate/CydiaSubstrate.h>
+#include "Substrate.hpp"

 #include "Menes/Menes.h"
 
 #include "CyteKit/IndirectDelegate.h"
 #include "Menes/Menes.h"
 
 #include "CyteKit/IndirectDelegate.h"


@@ -709,6 +709,7 @@ static const NSString *UI_;
 
 static int Finish_;
 static bool RestartSubstrate_;
 
 static int Finish_;
 static bool RestartSubstrate_;

+static bool UpgradeCydia_;

 static NSArray *Finishes_;
 
 #define SpringBoard_ "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist"
 static NSArray *Finishes_;
 
 #define SpringBoard_ "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist"


@@ -819,7 +820,7 @@ bool Changed_;
 static time_t now_;
 
 bool IsWildcat_;
 static time_t now_;
 
 bool IsWildcat_;

-static CGFloat ScreenScale_;
+CGFloat ScreenScale_;

 static NSString *Idiom_;
 static _H<NSString> Firmware_;
 static NSString *Major_;
 static NSString *Idiom_;
 static _H<NSString> Firmware_;
 static NSString *Major_;


@@ -3132,6 +3133,10 @@ struct PackageNameOrdering :
 } }
 
 - (NSArray *) warnings {
 } }
 
 - (NSArray *) warnings {

+@synchronized (database_) {
+    if ([database_ era] != era_ || file_.end())
+        return nil;
+

     NSMutableArray *warnings([NSMutableArray arrayWithCapacity:4]);
     const char *name(iterator_.Name());
 
     NSMutableArray *warnings([NSMutableArray arrayWithCapacity:4]);
     const char *name(iterator_.Name());
 


@@ -3152,6 +3157,7 @@ struct PackageNameOrdering :
         bool user = false;
         bool _private = false;
         bool stash = false;
         bool user = false;
         bool _private = false;
         bool stash = false;

+        bool dbstash = false;

         bool dsstore = false;
 
         bool repository = [[self section] isEqualToString:@"Repositories"];
         bool dsstore = false;
 
         bool repository = [[self section] isEqualToString:@"Repositories"];


@@ -3166,6 +3172,8 @@ struct PackageNameOrdering :
                     _private = true;
                 else if (!stash && [file isEqualToString:@"/var/stash"])
                     stash = true;
                     _private = true;
                 else if (!stash && [file isEqualToString:@"/var/stash"])
                     stash = true;

+                else if (!dbstash && [file isEqualToString:@"/var/db/stash"])
+                    dbstash = true;

                 else if (!dsstore && [file hasSuffix:@"/.DS_Store"])
                     dsstore = true;
 
                 else if (!dsstore && [file hasSuffix:@"/.DS_Store"])
                     dsstore = true;
 


@@ -3178,12 +3186,14 @@ struct PackageNameOrdering :
             [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/private"]];
         if (stash)
             [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/var/stash"]];
             [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/private"]];
         if (stash)
             [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/var/stash"]];

+        if (dbstash)
+            [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/var/db/stash"]];

         if (dsstore)
             [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @".DS_Store"]];
     }
 
     return [warnings count] == 0 ? nil : warnings;
         if (dsstore)
             [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @".DS_Store"]];
     }
 
     return [warnings count] == 0 ? nil : warnings;

-}
+} }

 
 - (NSArray *) applications {
     NSString *me([[NSBundle mainBundle] bundleIdentifier]);
 
 - (NSArray *) applications {
     NSString *me([[NSBundle mainBundle] bundleIdentifier]);


@@ -4946,6 +4956,10 @@ static _H<NSMutableSet> Diversions_;
     return [CydiaWebViewController requestWithHeaders:[super webView:view resource:resource willSendRequest:request redirectResponse:response fromDataSource:source]];
 }
 
     return [CydiaWebViewController requestWithHeaders:[super webView:view resource:resource willSendRequest:request redirectResponse:response fromDataSource:source]];
 }
 

+- (NSURLRequest *) webThreadWebView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
+    return [CydiaWebViewController requestWithHeaders:[super webThreadWebView:view resource:resource willSendRequest:request redirectResponse:response fromDataSource:source]];
+}
+

 + (NSURLRequest *) requestWithHeaders:(NSURLRequest *)request {
     NSMutableURLRequest *copy([[request mutableCopy] autorelease]);
 
 + (NSURLRequest *) requestWithHeaders:(NSURLRequest *)request {
     NSMutableURLRequest *copy([[request mutableCopy] autorelease]);
 


@@ -5167,6 +5181,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
         issues_ = [NSMutableArray arrayWithCapacity:4];
 
 
         issues_ = [NSMutableArray arrayWithCapacity:4];
 

+        UpgradeCydia_ = false;
+

         for (Package *package in packages) {
             pkgCache::PkgIterator iterator([package iterator]);
             NSString *name([package id]);
         for (Package *package in packages) {
             pkgCache::PkgIterator iterator([package iterator]);
             NSString *name([package id]);


@@ -5278,6 +5294,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                 [removes addObject:name];
             }
 
                 [removes addObject:name];
             }
 

+            if ([name isEqualToString:@"cydia"])
+                UpgradeCydia_ = true;
+

             substrate_ |= DepSubstrate(policy->GetCandidateVer(iterator));
             substrate_ |= DepSubstrate(iterator.CurrentVer());
         }
             substrate_ |= DepSubstrate(policy->GetCandidateVer(iterator));
             substrate_ |= DepSubstrate(iterator.CurrentVer());
         }


@@ -6299,10 +6318,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     if ([context isEqualToString:@"modify"]) {
         if (button != [sheet cancelButtonIndex]) {
 
     if ([context isEqualToString:@"modify"]) {
         if (button != [sheet cancelButtonIndex]) {

-            [self performSelector:@selector(_clickButtonWithName:) withObject:buttons_[button].first afterDelay:0];
+            if (IsWildcat_)
+                [self performSelector:@selector(_clickButtonWithName:) withObject:buttons_[button].first afterDelay:0];
+            else
+                [self _clickButtonWithName:buttons_[button].first];

         }
 
         }
 

-        [sheet dismissWithClickedButtonIndex:-1 animated:YES];
+        [sheet dismissWithClickedButtonIndex:button animated:YES];

     }
 }
 
     }
 }
 


@@ -7106,9 +7128,11 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 
     // on the iPad, this view controller is ALSO visible. :(
     if (IsWildcat_)
 
     // on the iPad, this view controller is ALSO visible. :(
     if (IsWildcat_)

-        if (UIViewController *top = [self topViewController])
-            if (top != visible)
-                [top reloadData];
+        if (UIViewController *modal = [self modalViewController])
+            if ([modal modalPresentationStyle] == UIModalPresentationFormSheet)
+                if (UIViewController *top = [self topViewController])
+                    if (top != visible)
+                        [top reloadData];

 }
 
 - (void) unloadData {
 }
 
 - (void) unloadData {


@@ -8601,7 +8625,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
             case 1: {
                 NSString *href = [[alert textField] text];
 
             case 1: {
                 NSString *href = [[alert textField] text];
 

-                static Pcre href_r("^http(s?)://[^# ]*$");
+                static Pcre href_r("^(http(s?)://|file:///)[^# ]*$");

                 if (!href_r(href)) {
                     UIAlertView *alert = [[[UIAlertView alloc]
                         initWithTitle:[NSString stringWithFormat:Colon_, Error_, UCLocalize("INVALID_URL")]
                 if (!href_r(href)) {
                     UIAlertView *alert = [[[UIAlertView alloc]
                         initWithTitle:[NSString stringWithFormat:Colon_, Error_, UCLocalize("INVALID_URL")]


@@ -8930,6 +8954,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
     _H<UIWindow> window_;
     _H<CydiaTabBarController> tabbar_;
     _H<CyteTabBarController> emulated_;
     _H<UIWindow> window_;
     _H<CydiaTabBarController> tabbar_;
     _H<CyteTabBarController> emulated_;

+    _H<AppCacheController> appcache_;

 
     _H<NSMutableArray> essential_;
     _H<NSMutableArray> broken_;
 
     _H<NSMutableArray> essential_;
     _H<NSMutableArray> broken_;


@@ -9055,7 +9080,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
         if (NSData *data = [NSPropertyListSerialization dataFromPropertyList:Metadata_ format:NSPropertyListBinaryFormat_v1_0 errorDescription:&error]) {
             _trace();
             NSError *error(nil);
         if (NSData *data = [NSPropertyListSerialization dataFromPropertyList:Metadata_ format:NSPropertyListBinaryFormat_v1_0 errorDescription:&error]) {
             _trace();
             NSError *error(nil);

-            if (!_root([data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error]));
+            if (!_root([data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error]))

                 NSLog(@"failure to save metadata data: %@", error);
             _trace();
 
                 NSLog(@"failure to save metadata data: %@", error);
             _trace();
 


@@ -9098,7 +9123,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
     bool recently = false;
     if (update != nil) {
         NSTimeInterval interval([update timeIntervalSinceNow]);
     bool recently = false;
     if (update != nil) {
         NSTimeInterval interval([update timeIntervalSinceNow]);

-        if (interval <= 0 && interval > -(15*60))
+        if (interval > -(15*60))

             recently = true;
     }
 
             recently = true;
     }
 


@@ -9167,6 +9192,7 @@ _profile(reloadDataWithInvocation)
         [self setApplicationIconBadgeNumber:0];
     }
 
         [self setApplicationIconBadgeNumber:0];
     }
 

+    Queuing_ = false;

     [self _updateData];
 
     if (hud != nil)
     [self _updateData];
 
     if (hud != nil)


@@ -9209,8 +9235,6 @@ _end
 
 - (void) presentModalViewController:(UIViewController *)controller force:(BOOL)force {
     UINavigationController *navigation([[[UINavigationController alloc] initWithRootViewController:controller] autorelease]);
 
 - (void) presentModalViewController:(UIViewController *)controller force:(BOOL)force {
     UINavigationController *navigation([[[UINavigationController alloc] initWithRootViewController:controller] autorelease]);

-    if (IsWildcat_)
-        [navigation setModalPresentationStyle:UIModalPresentationFormSheet];

 
     UIViewController *parent;
     if (emulated_ == nil)
 
     UIViewController *parent;
     if (emulated_ == nil)


@@ -9222,6 +9246,8 @@ _end
         parent = tabbar_;
     }
 
         parent = tabbar_;
     }
 

+    if (IsWildcat_)
+        [navigation setModalPresentationStyle:UIModalPresentationFormSheet];

     [parent presentModalViewController:navigation animated:YES];
 }
 
     [parent presentModalViewController:navigation animated:YES];
 }
 


@@ -9357,7 +9383,14 @@ _end
 
 - (void) _uicache {
     _trace();
 
 - (void) _uicache {
     _trace();

-    system("/usr/bin/uicache");
+
+    if (UpgradeCydia_ && Finish_ > 0) {
+        setreugid(0, 0);
+        system("su -c /usr/bin/uicache mobile");
+    } else {
+        system("/usr/bin/uicache");
+    }
+

     _trace();
 }
 
     _trace();
 }
 


@@ -9721,6 +9754,8 @@ _end
 }
 
 - (void) applicationDidEnterBackground:(UIApplication *)application {
 }
 
 - (void) applicationDidEnterBackground:(UIApplication *)application {

+    if (kCFCoreFoundationVersionNumber < 1000 && [self isSafeToSuspend])
+        return [self terminateWithSuccess];

     [self saveState];
 }
 
     [self saveState];
 }
 


@@ -9730,14 +9765,18 @@ _end
         return;
 
     NSTimeInterval interval([closed timeIntervalSinceNow]);
         return;
 
     NSTimeInterval interval([closed timeIntervalSinceNow]);

-    // XXX: Is 10 minutes the optimal time here?
-    if (interval > -(10*60))
-        return;

 
 

-    if (!IsReachable("cydia.saurik.com"))
-        return;
+    if (interval <= -(30*60)) {
+        [tabbar_ setSelectedIndex:0];
+        [[[tabbar_ viewControllers] objectAtIndex:0] popToRootViewControllerAnimated:NO];
+    }

 
 

-    [tabbar_ beginUpdate];
+    if (interval <= -(15*60)) {
+        if (IsReachable("cydia.saurik.com")) {
+            [tabbar_ beginUpdate];
+            [appcache_ reloadURLWithCache:YES];
+        }
+    }

 }
 
 - (void) setConfigurationData:(NSString *)data {
 }
 
 - (void) setConfigurationData:(NSString *)data {


@@ -9884,7 +9923,8 @@ _trace();
     broken_ = [NSMutableArray arrayWithCapacity:4];
 
     // XXX: I really need this thing... like, seriously... I'm sorry
     broken_ = [NSMutableArray arrayWithCapacity:4];
 
     // XXX: I really need this thing... like, seriously... I'm sorry

-    [[[AppCacheController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/appcache/", UI_]]] reloadData];
+    appcache_ = [[[AppCacheController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/appcache/", UI_]]] autorelease];
+    [appcache_ reloadData];

 
     window_ = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
     [window_ orderFront:self];
 
     window_ = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
     [window_ orderFront:self];


@@ -9921,7 +9961,6 @@ _trace();
     Stash_("/Library/Wallpaper");
     //Stash_("/usr/bin");
     Stash_("/usr/include");
     Stash_("/Library/Wallpaper");
     //Stash_("/usr/bin");
     Stash_("/usr/include");

-    Stash_("/usr/lib/pam");

     Stash_("/usr/share");
     //Stash_("/var/lib");
 
     Stash_("/usr/share");
     //Stash_("/var/lib");
 


@@ -9984,7 +10023,6 @@ _trace();
     NSDate *closed = [Metadata_ objectForKey:@"LastClosed"];
     if (valid && closed != nil) {
         NSTimeInterval interval([closed timeIntervalSinceNow]);
     NSDate *closed = [Metadata_ objectForKey:@"LastClosed"];
     if (valid && closed != nil) {
         NSTimeInterval interval([closed timeIntervalSinceNow]);

-        // XXX: Is 30 minutes the optimal time here?

         if (interval <= -(30*60))
             valid = NO;
     }
         if (interval <= -(30*60))
             valid = NO;
     }


@@ -10448,7 +10486,8 @@ int main(int argc, char *argv[]) {
     _root(CydiaWriteSources());
 
     _trace();
     _root(CydiaWriteSources());
 
     _trace();

-    _root(MetaFile_.Open("/var/lib/cydia/metadata.cb0"));
+    mkdir("/var/mobile/Library/Cydia", 0755);
+    MetaFile_.Open("/var/mobile/Library/Cydia/metadata.cb0");

     _trace();
 
     if (Packages_ != nil) {
     _trace();
 
     if (Packages_ != nil) {


@@ -10480,6 +10519,9 @@ int main(int argc, char *argv[]) {
     /*if (substrate && access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0)
         dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);*/
 
     /*if (substrate && access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0)
         dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);*/
 

+    if (kCFCoreFoundationVersionNumber > 1000)
+        _root(system([[NSString stringWithFormat:@"/usr/libexec/cydia/setnsfpn /var/lib"] UTF8String]));
+

     int version([[NSString stringWithContentsOfFile:@"/var/lib/cydia/firmware.ver"] intValue]);
 
     if (access("/User", F_OK) != 0 || version != 6) {
     int version([[NSString stringWithContentsOfFile:@"/var/lib/cydia/firmware.ver"] intValue]);
 
     if (access("/User", F_OK) != 0 || version != 6) {