Update example app to have reconnect and disconnect buttons

hamchapman · hamchapman · commit a25bacae759e · 2016-07-10T11:19:20.000+01:00
diff --git a/Example/Main.storyboard b/Example/Main.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="yEm-Wa-8Rj">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="yEm-Wa-8Rj">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -13,14 +14,39 @@
                         <viewControllerLayoutGuide type="bottom" id="r12-OR-bkP"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="y96-ws-RaM">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pak-HB-Rmg">
+                                <rect key="frame" x="122" y="132" width="78" height="30"/>
+                                <state key="normal" title="Disconnect"/>
+                                <connections>
+                                    <action selector="disconnectButton:" destination="yEm-Wa-8Rj" eventType="touchUpInside" id="DIg-Tc-6e2"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zrh-9X-Fym">
+                                <rect key="frame" x="122" y="38" width="78" height="30"/>
+                                <state key="normal" title="Connect"/>
+                                <connections>
+                                    <action selector="connectButton:" destination="yEm-Wa-8Rj" eventType="touchUpInside" id="Hla-Ru-KoR"/>
+                                </connections>
+                            </button>
+                        </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="pak-HB-Rmg" firstAttribute="width" secondItem="zrh-9X-Fym" secondAttribute="width" id="4lR-eK-ZIZ"/>
+                            <constraint firstItem="pak-HB-Rmg" firstAttribute="centerX" secondItem="y96-ws-RaM" secondAttribute="centerX" constant="1" id="55L-vA-Tvc"/>
+                            <constraint firstItem="zrh-9X-Fym" firstAttribute="centerX" secondItem="y96-ws-RaM" secondAttribute="centerX" constant="1" id="BgE-CD-tkr"/>
+                            <constraint firstItem="pak-HB-Rmg" firstAttribute="height" secondItem="zrh-9X-Fym" secondAttribute="height" id="VhG-sC-yO0"/>
+                            <constraint firstItem="pak-HB-Rmg" firstAttribute="top" secondItem="fji-4t-sKP" secondAttribute="bottom" constant="112" id="aX3-md-844"/>
+                            <constraint firstItem="zrh-9X-Fym" firstAttribute="top" secondItem="fji-4t-sKP" secondAttribute="bottom" constant="18" id="goe-io-Zww"/>
+                        </constraints>
                     </view>
+                    <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="weS-V8-jg5" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="3746" y="98"/>
+            <point key="canvasLocation" x="3745.5" y="97.5"/>
         </scene>
     </scenes>
 </document>
diff --git a/Example/ViewController.swift b/Example/ViewController.swift
@@ -10,6 +10,15 @@ import UIKit
 import PusherSwift
 
 class ViewController: UIViewController, ConnectionStateChangeDelegate {
+    var pusher: Pusher! = nil
+
+    @IBAction func connectButton(sender: AnyObject) {
+        pusher.connect()
+    }
+
+    @IBAction func disconnectButton(sender: AnyObject) {
+        pusher.disconnect()
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -44,7 +53,7 @@ class ViewController: UIViewController, ConnectionStateChangeDelegate {
 
         chan.bind("test-event", callback: { (data: AnyObject?) -> Void in
             print(data)
-            pusher.subscribe("presence-channel", onMemberAdded: onMemberAdded)
+            self.pusher.subscribe("presence-channel", onMemberAdded: onMemberAdded)
 
             if let data = data as? [String : AnyObject] {
                 if let testVal = data["test"] as? String {
diff --git a/Source/PusherConnection.swift b/Source/PusherConnection.swift
@@ -30,13 +30,13 @@ public class PusherConnection {
     public lazy var reachability: Reachability? = {
         let reachability = try? Reachability.reachabilityForInternetConnection()
         reachability?.whenReachable = { [unowned self] reachability in
-            self.debugLogger?("[PUSHER DEBUG] WE ARE REACHABLE AGAIN")
+            self.debugLogger?("[PUSHER DEBUG] Network reachable")
             if self.connectionState == .Disconnected {
                 self.attemptReconnect()
             }
         }
         reachability?.whenUnreachable = { [unowned self] reachability in
-            print("Network unreachable")
+            self.debugLogger?("[PUSHER DEBUG] Network unreachable")
         }
         return reachability
     }()
@@ -285,9 +285,7 @@ public class PusherConnection {
                 self.reconnectTimer?.invalidate()
 
                 for (_, channel) in self.channels.channels {
-                    print("Here's my channel \(channel.name)")
                     if !channel.subscribed {
-                        print("And we aren't subbed")
                         if !self.authorize(channel) {
                             print("Unable to subscribe to channel: \(channel.name)")
                         }

Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,13 @@ public class PusherConnection {`
`30`	`30`	`public lazy var reachability: Reachability? = {`
`31`	`31`	`let reachability = try? Reachability.reachabilityForInternetConnection()`
`32`	`32`	`reachability?.whenReachable = { [unowned self] reachability in`
`33`		`- self.debugLogger?("[PUSHER DEBUG] WE ARE REACHABLE AGAIN")`
	`33`	`+ self.debugLogger?("[PUSHER DEBUG] Network reachable")`
`34`	`34`	`if self.connectionState == .Disconnected {`
`35`	`35`	`self.attemptReconnect()`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`reachability?.whenUnreachable = { [unowned self] reachability in`
`39`		`- print("Network unreachable")`
	`39`	`+ self.debugLogger?("[PUSHER DEBUG] Network unreachable")`
`40`	`40`	`}`
`41`	`41`	`return reachability`
`42`	`42`	`}()`
`@@ -285,9 +285,7 @@ public class PusherConnection {`
`285`	`285`	`self.reconnectTimer?.invalidate()`
`286`	`286`
`287`	`287`	`for (_, channel) in self.channels.channels {`
`288`		`- print("Here's my channel \(channel.name)")`
`289`	`288`	`if !channel.subscribed {`
`290`		`- print("And we aren't subbed")`
`291`	`289`	`if !self.authorize(channel) {`
`292`	`290`	`print("Unable to subscribe to channel: \(channel.name)")`
`293`	`291`	`}`