Merge pull request #703 from RocketChat/develop

[RELEASE] Merge develop into beta

Author: rafaelks

Rocket.Chat/Controllers/MainViewController.swift

@@ -30,62 +30,58 @@ final class MainViewController: BaseViewController {
         AuthManager.recoverAuthIfNeeded()
     }
 
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-
-        if AuthManager.isAuthenticated() == nil {
-            performSegue(withIdentifier: "Auth", sender: nil)
-        }
-
-        if !NetworkManager.isConnected {
-            openChat()
-        }
-    }
-
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
         DatabaseManager.cleanInvalidDatabases()
         DatabaseManager.changeDatabaseInstance()
 
+        labelAuthenticationStatus.isHidden = true
+        buttonConnect.isHidden = true
+        activityIndicator.startAnimating()
+    }
+
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
         if let auth = AuthManager.isAuthenticated() {
             AuthManager.persistAuthInformation(auth)
 
-            labelAuthenticationStatus.isHidden = true
-            buttonConnect.isHidden = true
-            activityIndicator.startAnimating()
+            AuthManager.resume(auth, completion: { [weak self] response in
+                guard !response.isError() else {
+                    self?.labelAuthenticationStatus.isHidden = false
+                    self?.buttonConnect.isHidden = false
+                    self?.activityIndicator.stopAnimating()
 
-            if NetworkManager.isConnected {
-                AuthManager.resume(auth, completion: { [weak self] response in
-                    guard !response.isError() else {
-                        self?.labelAuthenticationStatus.isHidden = false
-                        self?.buttonConnect.isHidden = false
-                        self?.activityIndicator.stopAnimating()
+                    self?.openChat()
 
-                        self?.openChat()
+                    return
+                }
 
-                        return
-                    }
+                SubscriptionManager.updateSubscriptions(auth, completion: { _ in
+                    AuthSettingsManager.updatePublicSettings(auth, completion: { _ in
 
-                    SubscriptionManager.updateSubscriptions(auth, completion: { _ in
-                        AuthSettingsManager.updatePublicSettings(auth, completion: { _ in
-
-                        })
+                    })
 
-                        UserManager.userDataChanges()
-                        UserManager.changes()
-                        SubscriptionManager.changes(auth)
+                    UserManager.userDataChanges()
+                    UserManager.changes()
+                    SubscriptionManager.changes(auth)
 
-                        if let userIdentifier = auth.userId {
-                            PushManager.updateUser(userIdentifier)
-                        }
+                    if let userIdentifier = auth.userId {
+                        PushManager.updateUser(userIdentifier)
+                    }
 
-                        self?.openChat()
-                    })
+                    self?.openChat()
                 })
-            }
+            })
         } else {
-            buttonConnect.isEnabled = true
+            let storyboardAuth = UIStoryboard(name: "Auth", bundle: Bundle.main)
+            let controller = storyboardAuth.instantiateInitialViewController()
+            let application = UIApplication.shared
+
+            if let window = application.keyWindow {
+                window.rootViewController = controller
+            }
         }
     }
 

Rocket.Chat/Info.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>98</string>
+	<string>99</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

Rocket.Chat/Managers/Model/SubscriptionManager.swift

@@ -80,10 +80,8 @@ struct SubscriptionManager {
 
                     auth.lastSubscriptionFetch = Date.serverDate
                     realm.add(subscriptions, update: true)
-
-                    DispatchQueue.main.async {
-                        completion(response)
-                    }
+                }, completion: {
+                    completion(response)
                 })
             }
         }

Rocket.Chat/Managers/Socket/SocketManager.swift

@@ -142,7 +142,7 @@ extension SocketManager {
     }
 
     static func removeConnectionHandler(token: String) {
-        sharedInstance.connectionHandlers[token] = nil
+        sharedInstance.connectionHandlers.removeValue(forKey: token)
     }
 
 }

Rocket.Chat/Storyboards/Auth.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="17A360a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="eFO-g0-vxH">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="eFO-g0-vxH">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -14,7 +14,7 @@
             <objects>
                 <navigationController id="eFO-g0-vxH" customClass="BaseNavigationController" customModule="Rocket_Chat" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="F7W-s9-wXu">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="48"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>

Rocket.ChatTests/Extensions/StringExtensionSpec.swift

@@ -34,6 +34,8 @@ class StringExtensionSpec: XCTestCase {
         XCTAssert(string.sha256() == hash, "String SHA-256 cryptographic is correct")
     }
 
+    // MARK: Range
+
     func testRangesOf() {
         let string = "this word is in position 5 and this word is in position 36"
         let ranges = string.ranges(of: "word")
@@ -44,4 +46,5 @@ class StringExtensionSpec: XCTestCase {
         XCTAssert(string.distance(from: ranges[0].lowerBound, to: ranges[0].upperBound) == 4, "will word 1 have correct size")
         XCTAssert(string.distance(from: ranges[1].lowerBound, to: ranges[1].upperBound) == 4, "will word 2 have correct size")
     }
+
 }