Swap awkward va_list hack for awkward switch hack.

[cydia.git] / CyteKit / WebViewController.mm

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 4f11b5d01c2b6050b7e8a217f65bb7214974414b..9d1866a66337cd7df1034698055763762a2823ec 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -8,6 +8,7 @@
 #include "CyteKit/WebViewController.h"
 
 #include "iPhonePrivate.h"
 #include "CyteKit/WebViewController.h"
 
 #include "iPhonePrivate.h"

+#include <Menes/ObjectHandle.h>

 
 //#include <QuartzCore/CALayer.h>
 // XXX: fix the minimum requirement
 
 //#include <QuartzCore/CALayer.h>
 // XXX: fix the minimum requirement


@@ -18,6 +19,8 @@ extern NSString * const kCAFilterNearest;
 #include <dlfcn.h>
 #include <objc/runtime.h>
 
 #include <dlfcn.h>
 #include <objc/runtime.h>
 

+#include "Substrate.hpp"
+

 #define ForSaurik 0
 #define DefaultTimeout_ 120.0
 
 #define ForSaurik 0
 #define DefaultTimeout_ 120.0
 


@@ -54,6 +57,57 @@ float CYScrollViewDecelerationRateNormal;
 
 @end
 
 
 @end
 

+// Diversion {{{
+static _H<NSMutableSet> Diversions_;
+
+@implementation Diversion {
+    RegEx pattern_;
+    _H<NSString> key_;
+    _H<NSString> format_;
+}
+
+- (id) initWithFrom:(NSString *)from to:(NSString *)to {
+    if ((self = [super init]) != nil) {
+        pattern_ = [from UTF8String];
+        key_ = from;
+        format_ = to;
+    } return self;
+}
+
+- (NSString *) divert:(NSString *)url {
+    return !pattern_(url) ? nil : pattern_->*format_;
+}
+
++ (NSURL *) divertURL:(NSURL *)url {
+  divert:
+    NSString *href([url absoluteString]);
+
+    for (Diversion *diversion in (id) Diversions_)
+        if (NSString *diverted = [diversion divert:href]) {
+#if !ForRelease
+            NSLog(@"div: %@", diverted);
+#endif
+            url = [NSURL URLWithString:diverted];
+            goto divert;
+        }
+
+    return url;
+}
+
+- (NSString *) key {
+    return key_;
+}
+
+- (NSUInteger) hash {
+    return [key_ hash];
+}
+
+- (BOOL) isEqual:(Diversion *)object {
+    return self == object || [self class] == [object class] && [key_ isEqual:[object key]];
+}
+
+@end
+// }}}

 /* Indirect Delegate {{{ */
 @implementation IndirectDelegate
 
 /* Indirect Delegate {{{ */
 @implementation IndirectDelegate
 


@@ -115,7 +169,43 @@ float CYScrollViewDecelerationRateNormal;
 @end
 /* }}} */
 
 @end
 /* }}} */
 

-@implementation CyteWebViewController
+@implementation CyteWebViewController {
+    _H<CyteWebView, 1> webview_;
+    _transient UIScrollView *scroller_;
+
+    _H<UIActivityIndicatorView> indicator_;
+    _H<IndirectDelegate, 1> indirect_;
+    _H<NSURLAuthenticationChallenge> challenge_;
+
+    bool error_;
+    _H<NSURLRequest> request_;
+    bool ready_;
+
+    _transient NSNumber *sensitive_;
+    _H<NSURL> appstore_;
+
+    _H<NSString> title_;
+    _H<NSMutableSet> loading_;
+
+    _H<NSMutableSet> registered_;
+    _H<NSTimer> timer_;
+
+    // XXX: NSString * or UIImage *
+    _H<NSObject> custom_;
+    _H<NSString> style_;
+
+    _H<WebScriptObject> function_;
+
+    float width_;
+    Class class_;
+
+    _H<UIBarButtonItem> reloaditem_;
+    _H<UIBarButtonItem> loadingitem_;
+
+    bool visible_;
+    bool hidesNavigationBar_;
+    bool allowsNavigationAction_;
+}

 
 #if ShowInternals
 #include "CyteKit/UCInternal.h"
 
 #if ShowInternals
 #include "CyteKit/UCInternal.h"


@@ -139,6 +229,8 @@ float CYScrollViewDecelerationRateNormal;
         CYScrollViewDecelerationRateNormal = *_UIScrollViewDecelerationRateNormal;
     else // XXX: this actually might be fast on some older systems: we should look into this
         CYScrollViewDecelerationRateNormal = 0.998;
         CYScrollViewDecelerationRateNormal = *_UIScrollViewDecelerationRateNormal;
     else // XXX: this actually might be fast on some older systems: we should look into this
         CYScrollViewDecelerationRateNormal = 0.998;

+
+    Diversions_ = [NSMutableSet setWithCapacity:0];

 }
 
 - (bool) retainsNetworkActivityIndicator {
 }
 
 - (bool) retainsNetworkActivityIndicator {


@@ -150,7 +242,7 @@ float CYScrollViewDecelerationRateNormal;
         [loading_ removeAllObjects];
 
         if ([self retainsNetworkActivityIndicator])
         [loading_ removeAllObjects];
 
         if ([self retainsNetworkActivityIndicator])

-            [delegate_ releaseNetworkActivityIndicator];
+            [self.delegate releaseNetworkActivityIndicator];

     }
 }
 
     }
 }
 


@@ -172,8 +264,16 @@ float CYScrollViewDecelerationRateNormal;
     return (CyteWebView *) [self view];
 }
 
     return (CyteWebView *) [self view];
 }
 

+- (CyteWebViewController *) indirect {
+    return (CyteWebViewController *) (IndirectDelegate *) indirect_;
+}
+
++ (void) addDiversion:(Diversion *)diversion {
+    [Diversions_ addObject:diversion];
+}
+

 - (NSURL *) URLWithURL:(NSURL *)url {
 - (NSURL *) URLWithURL:(NSURL *)url {

-    return url;
+    return [Diversion divertURL:url];

 }
 
 - (NSURLRequest *) requestWithURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy referrer:(NSString *)referrer {
 }
 
 - (NSURLRequest *) requestWithURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy referrer:(NSString *)referrer {


@@ -193,6 +293,10 @@ float CYScrollViewDecelerationRateNormal;
     request_ = request;
 }
 
     request_ = request;
 }
 

+- (NSURLRequest *) request {
+    return request_;
+}
+

 - (void) setURL:(NSURL *)url {
     [self setURL:url withReferrer:nil];
 }
 - (void) setURL:(NSURL *)url {
     [self setURL:url withReferrer:nil];
 }


@@ -398,7 +502,7 @@ float CYScrollViewDecelerationRateNormal;
     NSURL *url([request URL]);
 
     // XXX: filter to internal usage?
     NSURL *url([request URL]);
 
     // XXX: filter to internal usage?

-    CyteViewController *page([delegate_ pageForURL:url forExternal:NO withReferrer:referrer]);
+    CyteViewController *page([self.delegate pageForURL:url forExternal:NO withReferrer:referrer]);

 
     if (page == nil) {
         CyteWebViewController *browser([[[class_ alloc] init] autorelease]);
 
     if (page == nil) {
         CyteWebViewController *browser([[[class_ alloc] init] autorelease]);


@@ -406,8 +510,8 @@ float CYScrollViewDecelerationRateNormal;
         page = browser;
     }
 
         page = browser;
     }
 

-    [page setDelegate:delegate_];
-    [page setPageColor:color_];
+    [page setDelegate:self.delegate];
+    [page setPageColor:self.pageColor];

 
     if (!pop) {
         [[self navigationItem] setTitle:title_];
 
     if (!pop) {
         [[self navigationItem] setTitle:title_];


@@ -416,7 +520,7 @@ float CYScrollViewDecelerationRateNormal;
     } else {
         UINavigationController *navigation([[[UINavigationController alloc] initWithRootViewController:page] autorelease]);
 
     } else {
         UINavigationController *navigation([[[UINavigationController alloc] initWithRootViewController:page] autorelease]);
 

-        [navigation setDelegate:delegate_];
+        [navigation setDelegate:self.delegate];

 
         [[page navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
             initWithTitle:UCLocalize("CLOSE")
 
         [[page navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
             initWithTitle:UCLocalize("CLOSE")


@@ -525,7 +629,7 @@ float CYScrollViewDecelerationRateNormal;
         return;
 
     if ([name isEqualToString:@"_open"])
         return;
 
     if ([name isEqualToString:@"_open"])

-        [delegate_ openURL:url];
+        [self.delegate openURL:url];

     else {
         NSString *scheme([[url scheme] lowercaseString]);
         if ([scheme isEqualToString:@"mailto"])
     else {
         NSString *scheme([[url scheme] lowercaseString]);
         if ([scheme isEqualToString:@"mailto"])


@@ -549,7 +653,6 @@ float CYScrollViewDecelerationRateNormal;
 #endif
 
     if ([frame parentFrame] == nil) {
 #endif
 
     if ([frame parentFrame] == nil) {

-        loaded_ = true;

     }
 }
 
     }
 }
 


@@ -603,7 +706,7 @@ float CYScrollViewDecelerationRateNormal;
                     }
 
                     [super setPageColor:uic];
                     }
 
                     [super setPageColor:uic];

-                    [scroller_ setBackgroundColor:color_];
+                    [scroller_ setBackgroundColor:self.pageColor];

                     break;
                 }
     }
                     break;
                 }
     }


@@ -764,7 +867,7 @@ float CYScrollViewDecelerationRateNormal;
     } else if ([context isEqualToString:@"itmsappss"]) {
         if (button == [alert cancelButtonIndex]) {
         } else if (button == [alert firstOtherButtonIndex]) {
     } else if ([context isEqualToString:@"itmsappss"]) {
         if (button == [alert cancelButtonIndex]) {
         } else if (button == [alert firstOtherButtonIndex]) {

-            [delegate_ openURL:appstore_];
+            [self.delegate openURL:appstore_];

         }
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
         }
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];


@@ -863,7 +966,7 @@ float CYScrollViewDecelerationRateNormal;
         return;
 
     if ([self retainsNetworkActivityIndicator])
         return;
 
     if ([self retainsNetworkActivityIndicator])

-        [delegate_ retainNetworkActivityIndicator];
+        [self.delegate retainNetworkActivityIndicator];

 
     [self didStartLoading];
 }
 
     [self didStartLoading];
 }


@@ -880,7 +983,7 @@ float CYScrollViewDecelerationRateNormal;
     [[self navigationItem] setTitle:title_];
 
     if ([self retainsNetworkActivityIndicator])
     [[self navigationItem] setTitle:title_];
 
     if ([self retainsNetworkActivityIndicator])

-        [delegate_ releaseNetworkActivityIndicator];
+        [self.delegate releaseNetworkActivityIndicator];

 
     [self didFinishLoading];
 }
 
     [self didFinishLoading];
 }


@@ -935,8 +1038,13 @@ float CYScrollViewDecelerationRateNormal;
     } return self;
 }
 
     } return self;
 }
 

+static _H<NSString> UserAgent_;
++ (void) setApplicationNameForUserAgent:(NSString *)userAgent {
+    UserAgent_ = userAgent;
+}
+

 - (NSString *) applicationNameForUserAgent {
 - (NSString *) applicationNameForUserAgent {

-    return nil;
+    return UserAgent_;

 }
 
 - (void) loadView {
 }
 
 - (void) loadView {


@@ -1016,7 +1124,7 @@ float CYScrollViewDecelerationRateNormal;
     [webview_ setBackgroundColor:nil];
 
     [scroller_ setFixedBackgroundPattern:YES];
     [webview_ setBackgroundColor:nil];
 
     [scroller_ setFixedBackgroundPattern:YES];

-    [scroller_ setBackgroundColor:color_];
+    [scroller_ setBackgroundColor:self.pageColor];

     [scroller_ setClipsSubviews:YES];
 
     [scroller_ setBounces:YES];
     [scroller_ setClipsSubviews:YES];
 
     [scroller_ setBounces:YES];


@@ -1253,3 +1361,29 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 @end
 }
 
 @end

+
+MSClassHook(WAKWindow)
+
+static CGSize $WAKWindow$screenSize(WAKWindow *self, SEL _cmd) {
+    CGSize size([[UIScreen mainScreen] bounds].size);
+    /*if ([$WAKWindow respondsToSelector:@selector(hasLandscapeOrientation)])
+        if ([$WAKWindow hasLandscapeOrientation])
+            std::swap(size.width, size.height);*/
+    return size;
+}
+
+static struct WAKWindow$screenSize { WAKWindow$screenSize() {
+    if ($WAKWindow != NULL)
+        if (Method method = class_getInstanceMethod($WAKWindow, @selector(screenSize)))
+            method_setImplementation(method, (IMP) &$WAKWindow$screenSize);
+} } WAKWindow$screenSize;;
+
+MSClassHook(NSUserDefaults)
+
+MSHook(id, NSUserDefaults$objectForKey$, NSUserDefaults *self, SEL _cmd, NSString *key) {
+    if ([key respondsToSelector:@selector(isEqualToString:)] && [key isEqualToString:@"WebKitLocalStorageDatabasePathPreferenceKey"])
+        return [NSString stringWithFormat:@"%@/%@/%@", NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES).firstObject, NSBundle.mainBundle.bundleIdentifier, @"LocalStorage"];
+    return _NSUserDefaults$objectForKey$(self, _cmd, key);
+}
+
+CYHook(NSUserDefaults, objectForKey$, objectForKey:)