APT incorrectly overlaps http and https origin :/.

[cydia.git] / CyteKit / WebViewController.h

diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h
index 897a204083a85559da02270f5f75f2522aab76dd..c8630d90e1e2ba5d993740edcf1ef0106fe49ad0 100644 (file)
--- a/CyteKit/WebViewController.h
+++ b/CyteKit/WebViewController.h
@@ -1,40 +1,22 @@
 /* Cydia - iPhone UIKit Front-End for Debian APT
- * Copyright (C) 2008-2011  Jay Freeman (saurik)
+ * Copyright (C) 2008-2015  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 <http://www.gnu.org/licenses/>.
+**/
 /* }}} */
 
 #ifndef CyteKit_WebViewController_H
@@ -53,7 +35,7 @@
 @protocol CyteWebViewControllerDelegate
 - (void) retainNetworkActivityIndicator;
 - (void) releaseNetworkActivityIndicator;
-- (CyteViewController *) pageForURL:(NSURL *)url forExternal:(BOOL)external;
+- (CyteViewController *) pageForURL:(NSURL *)url forExternal:(BOOL)external withReferrer:(NSString *)referrer;
 - (void) unloadData;
 @end
 
@@ -73,14 +55,15 @@
     _H<NSURLRequest> request_;
     bool ready_;
 
-    _H<NSURLRequest> stage1_;
-    _H<NSURLRequest> stage2_;
-
     _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_;
@@ -100,7 +83,11 @@
 
 + (void) _initialize;
 
+- (CyteWebView *) webView;
+
+- (void) setRequest:(NSURLRequest *)request;
 - (void) setURL:(NSURL *)url;
+- (void) setURL:(NSURL *)url withReferrer:(NSString *)referrer;
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
 - (void) loadURL:(NSURL *)url;
@@ -108,18 +95,21 @@
 - (void) loadRequest:(NSURLRequest *)request;
 - (bool) isLoading;
 
-- (void) reloadURLWithCache:(BOOL)cache;
-- (void) reloadURL;
-
 - (id) init;
+
 - (id) initWithURL:(NSURL *)url;
+- (id) initWithRequest:(NSURLRequest *)request;
+
 - (id) initWithWidth:(float)width;
 - (id) initWithWidth:(float)width ofClass:(Class)_class;
 
 - (void) callFunction:(WebScriptObject *)function;
+- (void) reloadURLWithCache:(BOOL)cache;
 
 - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame;
+
 - (NSURLRequest *) webView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source;
+- (NSURLRequest *) webThreadWebView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source;
 
 + (float) defaultWidth;
 
@@ -137,6 +127,8 @@
 - (void) applyLeftButton;
 - (UIBarButtonItem *) leftButton;
 
+- (void) removeButton;
+
 - (void) _didStartLoading;
 - (void) _didFinishLoading;
 
@@ -146,6 +138,11 @@
 
 - (void) setViewportWidthOnMainThread:(float)value;
 
+- (void) setScrollAlwaysBounceVertical:(bool)value;
+- (void) setScrollIndicatorStyle:(UIScrollViewIndicatorStyle)style;
+
+- (void) registerFrame:(WebFrame *)frame;
+
 @end
 
 #endif//CyteKit_WebViewController_H