From dc57628c81cc26fbee763a50d2b1b69add4db3d4 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Wed, 24 Feb 2016 15:17:37 +0100
Subject: [PATCH] SUUpdater now only gets created in release

---
 MacPass/Base.lproj/MainMenu.xib       |  8 ++------
 MacPass/Base.lproj/UpdateSettings.xib | 15 +++++----------
 MacPass/MPAppDelegate.m               |  6 ++++++
 MacPass/MPUpdateSettingsController.m  | 15 +++++++++++++++
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/MacPass/Base.lproj/MainMenu.xib b/MacPass/Base.lproj/MainMenu.xib
index 1905c94f..05fa5a7a 100644
--- a/MacPass/Base.lproj/MainMenu.xib
+++ b/MacPass/Base.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -25,9 +25,6 @@
                             </menuItem>
                             <menuItem title="Check for Updates…" id="zMO-8r-g5v">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="checkForUpdates:" target="EpI-0u-HQc" id="W42-xA-Wj6"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="236">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
@@ -320,6 +317,5 @@
             </connections>
         </customObject>
         <customObject id="420" customClass="NSFontManager"/>
-        <customObject id="EpI-0u-HQc" customClass="SUUpdater"/>
     </objects>
 </document>
diff --git a/MacPass/Base.lproj/UpdateSettings.xib b/MacPass/Base.lproj/UpdateSettings.xib
index 4446ce71..a77c535a 100644
--- a/MacPass/Base.lproj/UpdateSettings.xib
+++ b/MacPass/Base.lproj/UpdateSettings.xib
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPUpdateSettingsController">
             <connections>
+                <outlet property="automaticallyCheckForUpdatesCheckButton" destination="Z6x-oU-NC5" id="xHU-Lt-PmA"/>
+                <outlet property="checkIntervallPopupButton" destination="pWJ-eJ-MBf" id="znu-Me-2Me"/>
                 <outlet property="view" destination="1" id="0Ig-r5-x8L"/>
             </connections>
         </customObject>
@@ -24,9 +26,6 @@
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
-                    <connections>
-                        <binding destination="Tm5-i7-V4P" name="value" keyPath="automaticallyChecksForUpdates" id="8wg-xJ-C1I"/>
-                    </connections>
                 </button>
                 <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pWJ-eJ-MBf">
                     <rect key="frame" x="145" y="17" width="112" height="26"/>
@@ -44,10 +43,6 @@
                             </items>
                         </menu>
                     </popUpButtonCell>
-                    <connections>
-                        <binding destination="Tm5-i7-V4P" name="enabled" keyPath="automaticallyChecksForUpdates" id="Ctn-0w-mKO"/>
-                        <binding destination="Tm5-i7-V4P" name="selectedTag" keyPath="updateCheckInterval" id="N5f-FS-bbr"/>
-                    </connections>
                 </popUpButton>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ckg-9t-MDS">
                     <rect key="frame" x="21" y="23" width="120" height="17"/>
@@ -69,7 +64,7 @@
                 <constraint firstItem="ckg-9t-MDS" firstAttribute="baseline" secondItem="pWJ-eJ-MBf" secondAttribute="baseline" id="ozZ-bW-f7y"/>
                 <constraint firstAttribute="bottom" secondItem="pWJ-eJ-MBf" secondAttribute="bottom" constant="20" symbolic="YES" id="pHW-e8-EU6"/>
             </constraints>
+            <point key="canvasLocation" x="504" y="511.5"/>
         </customView>
-        <customObject id="Tm5-i7-V4P" customClass="SUUpdater"/>
     </objects>
 </document>
diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index f0f6bc40..4567058a 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -38,6 +38,8 @@
 
 #import "KeePassKit/KeePassKit.h"
 
+#import <Sparkle/Sparkle.h>
+
 NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDidChangeStoredKeyFilesSettings";
 
 @interface MPAppDelegate () {
@@ -158,6 +160,10 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
   [MPAutotypeDaemon defaultDaemon];
   /* Create Plugin Manager */
   [MPPluginManager sharedManager];
+#ifdef RELEASE
+  /* Only enabel updater in Release */
+  [SUUpdater sharedUpdater];
+#endif
 }
 
 #pragma mark -
diff --git a/MacPass/MPUpdateSettingsController.m b/MacPass/MPUpdateSettingsController.m
index ac27aa36..f8bbf311 100644
--- a/MacPass/MPUpdateSettingsController.m
+++ b/MacPass/MPUpdateSettingsController.m
@@ -7,8 +7,11 @@
 //
 
 #import "MPUpdateSettingsController.h"
+#import <Sparkle/Sparkle.h>
 
 @interface MPUpdateSettingsController ()
+@property (weak) IBOutlet NSButton *automaticallyCheckForUpdatesCheckButton;
+@property (weak) IBOutlet NSPopUpButton *checkIntervallPopupButton;
 
 @end
 
@@ -30,4 +33,16 @@
   return NSLocalizedString(@"UPDATE_SETTINGS", @"Update Settings Label");
 }
 
+- (void)awakeFromNib {
+#ifdef RELEASE
+  [self.checkIntervallPopupButton bind:NSSelectedTagBinding toObject:[SUUpdater sharedUpdater] withKeyPath:NSStringFromSelector(@selector(updateCheckInterval)) options:nil];
+  [self.checkIntervallPopupButton bind:NSEnabledBinding toObject:[SUUpdater sharedUpdater] withKeyPath:NSStringFromSelector(@selector(automaticallyChecksForUpdates)) options:nil];
+  [self.automaticallyCheckForUpdatesCheckButton bind:NSValueBinding toObject:[SUUpdater sharedUpdater] withKeyPath:NSStringFromSelector(@selector(automaticallyChecksForUpdates)) options:nil];
+#else
+  self.checkIntervallPopupButton.enabled = NO;
+  self.automaticallyCheckForUpdatesCheckButton.enabled = NO;
+#endif
+  
+}
+
 @end