Move cyte diversions and user agents into CyteKit.

diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h
index 61c4c1af69cb199942635d5d5f61a9bdd4ecb031..477828cc1572104b6416d1055e53c15a6218df81 100644 (file)
--- a/CyteKit/WebViewController.h
+++ b/CyteKit/WebViewController.h
@@ -30,6 +30,10 @@
 
 @class IndirectDelegate;
 
+@interface Diversion : NSObject
+- (id) initWithFrom:(NSString *)from to:(NSString *)to;
+@end
+
 @protocol CyteWebViewControllerDelegate
 - (void) retainNetworkActivityIndicator;
 - (void) releaseNetworkActivityIndicator;
@@ -68,6 +72,9 @@
 - (id) initWithWidth:(float)width;
 - (id) initWithWidth:(float)width ofClass:(Class)_class;
 
++ (void) setApplicationNameForUserAgent:(NSString *)userAgent;
+- (NSString *) applicationNameForUserAgent;
+
 - (void) callFunction:(WebScriptObject *)function;
 - (void) reloadURLWithCache:(BOOL)cache;
 
@@ -107,6 +114,8 @@
 
 - (void) registerFrame:(WebFrame *)frame;
 
++ (void) addDiversion:(Diversion *)diversion;
+
 @end
 
 #endif//CyteKit_WebViewController_H

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 40b12001439dd9af3ce442dc7b89bbec7df87415..9d1866a66337cd7df1034698055763762a2823ec 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -57,6 +57,57 @@ float CYScrollViewDecelerationRateNormal;
 
 @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
 
@@ -178,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;
+
+    Diversions_ = [NSMutableSet setWithCapacity:0];
 }
 
 - (bool) retainsNetworkActivityIndicator {
@@ -215,8 +268,12 @@ float CYScrollViewDecelerationRateNormal;
     return (CyteWebViewController *) (IndirectDelegate *) indirect_;
 }
 
++ (void) addDiversion:(Diversion *)diversion {
+    [Diversions_ addObject:diversion];
+}
+
 - (NSURL *) URLWithURL:(NSURL *)url {
-    return url;
+    return [Diversion divertURL:url];
 }
 
 - (NSURLRequest *) requestWithURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy referrer:(NSString *)referrer {
@@ -981,8 +1038,13 @@ float CYScrollViewDecelerationRateNormal;
     } return self;
 }
 
+static _H<NSString> UserAgent_;
++ (void) setApplicationNameForUserAgent:(NSString *)userAgent {
+    UserAgent_ = userAgent;
+}
+
 - (NSString *) applicationNameForUserAgent {
-    return nil;
+    return UserAgent_;
 }
 
 - (void) loadView {

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 99b2b57a4510563fdd85a02ebe7ababd2abaafa5..a661436d678da059a7f011b261fef5a026ec8b50 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -667,7 +667,6 @@ static NSString *SerialNumber_ = nil;
 static NSString *ChipID_ = nil;
 static NSString *BBSNum_ = nil;
 static _H<NSString> UniqueID_;
-static _H<NSString> UserAgent_;
 static _H<NSString> Product_;
 static _H<NSString> Safari_;
 
@@ -4257,60 +4256,6 @@ class CydiaLogCleaner :
 @end
 /* }}} */
 
-static _H<NSMutableSet> Diversions_;
-
-@interface Diversion : NSObject {
-    RegEx pattern_;
-    _H<NSString> key_;
-    _H<NSString> format_;
-}
-
-@end
-
-@implementation Diversion
-
-- (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
-
 @interface CydiaObject : NSObject {
     _H<CyteWebViewController> indirect_;
     _transient id delegate_;
@@ -4326,7 +4271,6 @@ static _H<NSMutableSet> Diversions_;
     _H<CydiaObject> cydia_;
 }
 
-+ (void) addDiversion:(Diversion *)diversion;
 + (NSURLRequest *) requestWithHeaders:(NSURLRequest *)request;
 + (void) didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame withCydia:(CydiaObject *)cydia;
 - (void) setDelegate:(id)delegate;
@@ -4605,7 +4549,7 @@ static _H<NSMutableSet> Diversions_;
 }
 
 - (void) addInternalRedirect:(NSString *)from :(NSString *)to {
-    [CydiaWebViewController performSelectorOnMainThread:@selector(addDiversion:) withObject:[[[Diversion alloc] initWithFrom:from to:to] autorelease] waitUntilDone:NO];
+    [CyteWebViewController performSelectorOnMainThread:@selector(addDiversion:) withObject:[[[Diversion alloc] initWithFrom:from to:to] autorelease] waitUntilDone:NO];
 }
 
 - (NSDictionary *) getApplicationInfo:(NSString *)display value:(NSString *)key {
@@ -4953,16 +4897,6 @@ static _H<NSMutableSet> Diversions_;
         return nil;
 }
 
-+ (void) _initialize {
-    [super _initialize];
-
-    Diversions_ = [NSMutableSet setWithCapacity:0];
-}
-
-+ (void) addDiversion:(Diversion *)diversion {
-    [Diversions_ addObject:diversion];
-}
-
 - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
     [super webView:view didClearWindowObject:window forFrame:frame];
     [CydiaWebViewController didClearWindowObject:window forFrame:frame withCydia:cydia_];
@@ -4995,10 +4929,6 @@ static _H<NSMutableSet> Diversions_;
     [controller addAttachmentData:[NSData dataWithContentsOfFile:@"/tmp/dpkgl.log"] mimeType:@"text/plain" fileName:@"dpkgl.log"];
 }
 
-- (NSURL *) URLWithURL:(NSURL *)url {
-    return [Diversion divertURL:url];
-}
-
 - (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
     return [CydiaWebViewController requestWithHeaders:[super webView:view resource:resource willSendRequest:request redirectResponse:response fromDataSource:source]];
 }
@@ -5047,10 +4977,6 @@ static _H<NSMutableSet> Diversions_;
     [cydia_ setDelegate:delegate];
 }
 
-- (NSString *) applicationNameForUserAgent {
-    return UserAgent_;
-}
-
 - (id) init {
     if ((self = [super initWithWidth:0 ofClass:[CydiaWebViewController class]]) != nil) {
         cydia_ = [[[CydiaObject alloc] initWithDelegate:self.indirect] autorelease];
@@ -9681,7 +9607,7 @@ _trace();
         [BridgedHosts_ addObject:[[NSURL URLWithString:CydiaURL(@"")] host]];
     }
 
-    [CydiaWebViewController _initialize];
+    [CyteWebViewController _initialize];
 
     [NSURLProtocol registerClass:[CydiaURLProtocol class]];
 
@@ -10121,7 +10047,7 @@ int main(int argc, char *argv[]) {
     if (RegEx match = RegEx("([0-9]+(\\.[0-9]+)+).*", Product_))
         agent = [NSString stringWithFormat:@"Version/%@ %@", match[1], agent];
 
-    UserAgent_ = agent;
+    [CyteWebViewController setApplicationNameForUserAgent:agent];
     /* }}} */
     /* Load Database {{{ */
     SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];