Hide custom function_ as an implementation detail.

diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h
index c8630d90e1e2ba5d993740edcf1ef0106fe49ad0..20fe47523d925300d100c1445ffc9a2c669dad46 100644 (file)
--- a/CyteKit/WebViewController.h
+++ b/CyteKit/WebViewController.h
@@ -121,7 +121,6 @@
 - (void) customButtonClicked;
 
 - (void) applyRightButton;
 - (void) customButtonClicked;
 
 - (void) applyRightButton;

-- (UIBarButtonItem *) customButton;

 - (UIBarButtonItem *) rightButton;
 
 - (void) applyLeftButton;
 - (UIBarButtonItem *) rightButton;
 
 - (void) applyLeftButton;

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 18b40d945ca68943aafe83911d97dc6fe954c160..4f11b5d01c2b6050b7e8a217f65bb7214974414b 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -793,9 +793,9 @@ float CYScrollViewDecelerationRateNormal;
 
 - (UIBarButtonItem *) customButton {
     if (custom_ == nil)
 
 - (UIBarButtonItem *) customButton {
     if (custom_ == nil)

-        return nil;
+        return [self rightButton];

     else if ((/*clang:*/id) custom_ == [NSNull null])
     else if ((/*clang:*/id) custom_ == [NSNull null])

-        return (UIBarButtonItem *) [NSNull null];
+        return nil;

 
     return [[[UIBarButtonItem alloc]
         initWithTitle:static_cast<NSString *>(custom_.operator NSObject *())
 
     return [[[UIBarButtonItem alloc]
         initWithTitle:static_cast<NSString *>(custom_.operator NSObject *())


@@ -848,14 +848,7 @@ float CYScrollViewDecelerationRateNormal;
         [self applyLoadingTitle];
     } else {
         [indicator_ stopAnimating];
         [self applyLoadingTitle];
     } else {
         [indicator_ stopAnimating];

-
-        UIBarButtonItem *button([self customButton]);
-        if (button == nil)
-            button = [self rightButton];
-        else if (button == (UIBarButtonItem *) [NSNull null])
-            button = nil;
-
-        [[self navigationItem] setRightBarButtonItem:button animated:YES];
+        [[self navigationItem] setRightBarButtonItem:[self customButton] animated:YES];

     }
 }
 
     }
 }
 


@@ -920,7 +913,7 @@ float CYScrollViewDecelerationRateNormal;
             initWithTitle:(kCFCoreFoundationVersionNumber >= 800 ? @"       " : @" ")
             style:UIBarButtonItemStylePlain
             target:self
             initWithTitle:(kCFCoreFoundationVersionNumber >= 800 ? @"       " : @" ")
             style:UIBarButtonItemStylePlain
             target:self

-            action:@selector(reloadButtonClicked)
+            action:@selector(customButtonClicked)

         ] autorelease];
 
         UIActivityIndicatorViewStyle style;
         ] autorelease];
 
         UIActivityIndicatorViewStyle style;

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 0485f54fd1a56b45f851468581d811ee8f2e6393..a1c06d76ed7345b02e75c12295943f0aa62738f0 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -6398,6 +6398,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 #if !AlwaysReload
 - (void) _customButtonClicked {
 
 #if !AlwaysReload
 - (void) _customButtonClicked {

+    if (commercial_ && [package_ uninstalled])
+        return [self reloadURLWithCache:NO];
+

     size_t count(buttons_.size());
     if (count == 0)
         return;
     size_t count(buttons_.size());
     if (count == 0)
         return;


@@ -6425,12 +6428,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     }
 }
 
     }
 }
 

-- (void) reloadButtonClicked {
-    if (commercial_ && function_ == nil && [package_ uninstalled])
-        return;
-    [self customButtonClicked];
-}
-

 - (void) applyLoadingTitle {
     // Don't show "Loading" as the title. Ever.
 }
 - (void) applyLoadingTitle {
     // Don't show "Loading" as the title. Ever.
 }