Merge lp:~dude-from-by/openlp/my-ios-remote into lp:~danielborges93/openlp/ios-remote

[andrei]

Moved SettingsViewController to MVC and added tests
Added Countly and events

[andrei (dude-from-by)]

Events are described in CountlyClientSideUserPaths.swift

first app launch start with no server ip
settings screen was opened without server ip filled
settings screen was closed with server ip filled
received server response - setup complete

[Daniel Borges (danielborges93)]

The application works well and the analytics too, but the tests aren't running. Can you take a look about this?

OBS: I put the current events on Wekan card.

review: Needs Fixing

Unmerged revisions

65. By andrei on 2017-05-18

Added countly analytics pod and added events to track users from from start to getting response from server

64. By andrei on 2017-05-16

Moved SettingsViewController.swift to MVC, added tests

=== added file 'OLP RemoteTests/SettingsViewModelTests.swift'
--- OLP RemoteTests/SettingsViewModelTests.swift	1970-01-01 00:00:00 +0000
+++ OLP RemoteTests/SettingsViewModelTests.swift	2017-05-18 14:05:49 +0000
@@ -0,0 +1,77 @@
+//
+//  SettingsViewModelTests.swift
+//  Remote
+//
+//  Created by andrei shender on 5/16/17.
+//  Copyright © 2017 OpenLP. All rights reserved.
+//
+
+import XCTest
+import InAppSettingsKit
+
+class SettingsViewModelTests: XCTestCase {
+
+    func createModel() -> (defs: UserDefaults, sett: UserSettings, mod: SettingsViewModel) {
+        let userDefaults = UserDefaults()
+        let userSettings = UserSettings(defaults: userDefaults)
+        let settingsViewModel = SettingsViewModel(settings: userSettings)
+        return (userDefaults, userSettings, settingsViewModel)
+    }
+
+    func testNoAuth() {
+        let (_, _, settingsViewModel) = createModel()
+        XCTAssert(settingsViewModel.needAuth.value == false)
+    }
+
+    func testNoCrashNotificationWithoutUserInfo() {
+        let (_, _, _) = createModel()
+        NotificationCenter.default.post(Notification(name: NSNotification.Name(rawValue: kIASKAppSettingChanged), object: nil, userInfo: [:]))
+        NotificationCenter.default.post(Notification(name: NSNotification.Name(rawValue: kIASKAppSettingChanged), object: nil, userInfo: nil))
+    }
+
+    func testSettingNeedAuth() {
+        let (_, _, settingsViewModel) = createModel()
+        let userInfo = ["auth.needsAuth" : true]
+        NotificationCenter.default.post(Notification(name: NSNotification.Name(rawValue: kIASKAppSettingChanged), object: nil, userInfo: userInfo))
+        XCTAssert(settingsViewModel.needAuth.value)
+    }
+
+    func testDismissWithEmptyServerIP() {
+        let (userDefaults, _, settingsViewModel) = createModel()
+        userDefaults.set("", forKey: "server.ip")
+        settingsViewModel.dismiss()
+        XCTAssert(settingsViewModel.alert.value.message == Localizable.Error.validIP)
+    }
+
+    func testDismissWithInvalidServerIP() {
+        let (userDefaults, _, settingsViewModel) = createModel()
+        userDefaults.set("±±±±", forKey: "server.ip")
+        settingsViewModel.dismiss()
+        XCTAssert(settingsViewModel.alert.value.message == Localizable.Error.validIP)
+    }
+
+    func testDismissWithNoServerPort() {
+        let (userDefaults, _, settingsViewModel) = createModel()
+        userDefaults.set("1", forKey: "server.ip")
+        userDefaults.set("", forKey: "server.port")
+        settingsViewModel.dismiss()
+        XCTAssert(settingsViewModel.alert.value.message == Localizable.Error.validPort)
+    }
+
+    func testDismissWithInvalidServerPort() {
+        let (userDefaults, _, settingsViewModel) = createModel()
+        userDefaults.set("1", forKey: "server.ip")
+        userDefaults.set("invalid", forKey: "server.port")
+        settingsViewModel.dismiss()
+        XCTAssert(settingsViewModel.alert.value.message == Localizable.Error.validPort)
+    }
+
+    func testDismiss() {
+        let (userDefaults, _, settingsViewModel) = createModel()
+        userDefaults.set("1", forKey: "server.ip")
+        userDefaults.set("2", forKey: "server.port")
+        settingsViewModel.dismiss()
+        XCTAssert(settingsViewModel.alert.value.message == "")
+        XCTAssert(settingsViewModel.dismissController.value)
+    }
+ }

=== modified file 'Podfile'
--- Podfile	2017-03-02 07:16:31 +0000
+++ Podfile	2017-05-18 14:05:49 +0000
@@ -12,6 +12,7 @@
     pod 'BlockLooper', :git=>'https://github.com/ashender/BlockLooper.git'
     pod 'CWStatusBarNotification'
     pod 'ReactiveCocoa'
+    pod 'Countly'
 end
 
 target 'OLP RemoteTests' do

=== modified file 'Podfile.lock'
--- Podfile.lock	2017-03-02 07:16:31 +0000
+++ Podfile.lock	2017-05-18 14:05:49 +0000
@@ -4,6 +4,7 @@
     - Alamofire (~> 4.1)
     - ObjectMapper (~> 2.0)
   - BlockLooper (0.0.3)
+  - Countly (16.12)
   - CWStatusBarNotification (2.3.5)
   - InAppSettingsKit (2.8.1)
   - Nimble (5.1.1)
@@ -35,6 +36,7 @@
   - Alamofire
   - AlamofireObjectMapper
   - BlockLooper (from `https://github.com/ashender/BlockLooper.git`)
+  - Countly
   - CWStatusBarNotification
   - InAppSettingsKit
   - Nimble
@@ -57,6 +59,7 @@
   Alamofire: 856a113053a7bc9cbe5d6367a555d773fc5cfef7
   AlamofireObjectMapper: 842d2eed43a4d0593ff0110d54ac86a170c4519c
   BlockLooper: 8bba05fef76734e8e52e39412a0212ac3474776c
+  Countly: 517a5c221463b29854e214b2193620690b5edb1a
   CWStatusBarNotification: 3d2738b25c3207f60cc50201388d3c96182545ff
   InAppSettingsKit: 94d2fba3ccd700fc4e32c6d09fabcc0af2426744
   Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
@@ -68,6 +71,6 @@
   TPKeyboardAvoiding: 0d6af20e95e2850f4c621841225b59ec7d8dd852
   UITextView+Placeholder: 77680995fcdd07c3f52ec92fe1150874a2ac89ff
 
-PODFILE CHECKSUM: 8bcb0a7a00d7e61acff50967f2778c47912a0880
+PODFILE CHECKSUM: 315619d4b8576ea53bb0e33054782ee9669fb788
 
 COCOAPODS: 1.1.1

=== modified file 'Remote.xcodeproj/project.pbxproj'
--- Remote.xcodeproj/project.pbxproj	2017-04-05 15:55:26 +0000
+++ Remote.xcodeproj/project.pbxproj	2017-05-18 14:05:49 +0000
@@ -83,6 +83,10 @@
 		759464A51CEB8493001A56BF /* SettingsControllerPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759464A41CEB8493001A56BF /* SettingsControllerPresenter.swift */; };
 		759778AE1CF83AC400C2E4B4 /* APITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759778AD1CF83AC400C2E4B4 /* APITest.swift */; };
 		75AF930F1E9297220051EB82 /* SearchResultsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 755B3FE11E8CFEE000DA570C /* SearchResultsViewModel.swift */; };
+		75BC63271ECDCAB500A21BF2 /* CountlyClientSideUserPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75BC63261ECDCAB500A21BF2 /* CountlyClientSideUserPaths.swift */; };
+		75C1BF671ECA1D9C00939F73 /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75C1BF661ECA1D9C00939F73 /* SettingsViewModel.swift */; };
+		75D100C61ECB2D0B00818402 /* SettingsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D100C51ECB2D0B00818402 /* SettingsViewModelTests.swift */; };
+		75D100C71ECB2E0000818402 /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75C1BF661ECA1D9C00939F73 /* SettingsViewModel.swift */; };
 		863574EB78CF355A8463055D /* Pods_Remote.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3194E32378DD6BB8E273BB47 /* Pods_Remote.framework */; };
 /* End PBXBuildFile section */
 
@@ -147,6 +151,9 @@
 		759778A31CF839C200C2E4B4 /* OLP RemoteTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OLP RemoteTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		759778A71CF839C200C2E4B4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		759778AD1CF83AC400C2E4B4 /* APITest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APITest.swift; sourceTree = "<group>"; };
+		75BC63261ECDCAB500A21BF2 /* CountlyClientSideUserPaths.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CountlyClientSideUserPaths.swift; sourceTree = "<group>"; };
+		75C1BF661ECA1D9C00939F73 /* SettingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewModel.swift; sourceTree = "<group>"; };
+		75D100C51ECB2D0B00818402 /* SettingsViewModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewModelTests.swift; sourceTree = "<group>"; };
 		BF194B8FEA335C68D241C125 /* Pods-OLP RemoteTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OLP RemoteTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-OLP RemoteTests/Pods-OLP RemoteTests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -217,6 +224,7 @@
 			children = (
 				759464A41CEB8493001A56BF /* SettingsControllerPresenter.swift */,
 				462395801BE505EC00B90146 /* SettingsViewController.swift */,
+				75C1BF661ECA1D9C00939F73 /* SettingsViewModel.swift */,
 			);
 			path = Settings;
 			sourceTree = "<group>";
@@ -278,6 +286,7 @@
 				46A612301C78E75D00B61DC8 /* ColorUtil.swift */,
 				46FD378E1C79867C00DED423 /* ErrorUtil.swift */,
 				46753A9A1E593EAC007872C0 /* LocalizationUtil.swift */,
+				75BC63261ECDCAB500A21BF2 /* CountlyClientSideUserPaths.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -367,6 +376,7 @@
 				750831BA1CFF594400CA9299 /* service_response.json */,
 				750831BC1CFF597D00CA9299 /* slides_response.json */,
 				757326FF1E8C06B7001E618B /* SearchViewModelTests.swift */,
+				75D100C51ECB2D0B00818402 /* SettingsViewModelTests.swift */,
 			);
 			path = "OLP RemoteTests";
 			sourceTree = "<group>";
@@ -595,10 +605,12 @@
 				4623B6971C07BC2E007FFE2B /* SlidesViewController.swift in Sources */,
 				46A9EED81BFD89DF00E8D520 /* ServiceAPI.swift in Sources */,
 				46FD37871C7959EF00DED423 /* SearchAPI.swift in Sources */,
+				75C1BF671ECA1D9C00939F73 /* SettingsViewModel.swift in Sources */,
 				4623B69C1C07C569007FFE2B /* ControllerAPI.swift in Sources */,
 				463A91851C092E6B00D572E6 /* DictionaryUtil.swift in Sources */,
 				462395831BE50C5A00B90146 /* ViewControllerUtil.swift in Sources */,
 				46CC0CED1BE6972300423EB4 /* UserSettings.swift in Sources */,
+				75BC63271ECDCAB500A21BF2 /* CountlyClientSideUserPaths.swift in Sources */,
 				46FD37891C796C9B00DED423 /* SearchResultViewController.swift in Sources */,
 				463A918D1C093DD500D572E6 /* AlertsViewController.swift in Sources */,
 				755B3FE21E8CFEE000DA570C /* SearchResultsViewModel.swift in Sources */,
@@ -636,6 +648,7 @@
 				75667B561CFEE949008FDFE0 /* ItemModel.swift in Sources */,
 				75667B591CFEE949008FDFE0 /* LiveModel.swift in Sources */,
 				75667B521CFEE938008FDFE0 /* AddAPI.swift in Sources */,
+				75D100C61ECB2D0B00818402 /* SettingsViewModelTests.swift in Sources */,
 				75667B5C1CFEFF7E008FDFE0 /* DictionaryUtil.swift in Sources */,
 				757327001E8C06B7001E618B /* SearchViewModelTests.swift in Sources */,
 				75667B5E1CFEFF86008FDFE0 /* ErrorUtil.swift in Sources */,
@@ -648,6 +661,7 @@
 				757326FE1E8C060F001E618B /* LocalizationUtil.swift in Sources */,
 				75667B5F1CFEFFA7008FDFE0 /* DisplayAPI.swift in Sources */,
 				75667B4E1CFEE930008FDFE0 /* PollAPI.swift in Sources */,
+				75D100C71ECB2E0000818402 /* SettingsViewModel.swift in Sources */,
 				75667B541CFEE93D008FDFE0 /* AlertAPI.swift in Sources */,
 				75667B531CFEE938008FDFE0 /* Service.swift in Sources */,
 				75667B291CFCA8C9008FDFE0 /* UserSettings.swift in Sources */,

=== modified file 'Remote/AppDelegate.swift'
--- Remote/AppDelegate.swift	2017-04-05 15:55:26 +0000
+++ Remote/AppDelegate.swift	2017-05-18 14:05:49 +0000
@@ -24,6 +24,7 @@
 
 import UIKit
 import BlockLooper
+import Countly
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, UITabBarControllerDelegate, ServiceViewControllerDelegate {
@@ -42,9 +43,10 @@
     }
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-
+        startAnalytics()
         settings = UserSettings(defaults: UserDefaults.standard)
         settings.registerDefaults()
+        Countly.sharedInstance().applicationStartWithSettings(settings)
         service = Service(settings: settings)
 
         var rootViewControllers = [UINavigationController]()
@@ -94,6 +96,14 @@
         useAnimator = false
     }
 
+    func startAnalytics() {
+        let config = CountlyConfig()
+        config.appKey = "f057136e457a5d2da05c3b569a48caaee9a8644b"
+        config.host = "https://stats.openlp.io"
+        config.features = [CLYCrashReporting]
+        Countly.sharedInstance().start(with: config)
+    }
+
 
     // MARK: - ServiceViewControllerDelegate
     func serviceViewControllerDidSelectItem(_ item: ItemModel) {

=== modified file 'Remote/Classes/Controller/Settings/SettingsControllerPresenter.swift'
--- Remote/Classes/Controller/Settings/SettingsControllerPresenter.swift	2017-02-05 02:25:57 +0000
+++ Remote/Classes/Controller/Settings/SettingsControllerPresenter.swift	2017-05-18 14:05:49 +0000
@@ -26,13 +26,10 @@
 import UIKit
 
 class SettingsControllerPresenter: NSObject {
-
-    let pollAPI: PollAPI
     let settings: UserSettings
     var fromController: UIViewController?
 
     init(settings: UserSettings, pollAPI: PollAPI) {
-        self.pollAPI = pollAPI
         self.settings = settings
         super.init()
     }
@@ -46,7 +43,8 @@
 
 
     func presentSettingViewController() {
-        let settingsController = SettingsViewController(settings:settings,  pollAPI: pollAPI)
+        let settingsViewModel = SettingsViewModel(settings: settings)
+        let settingsController = SettingsViewController(viewModel: settingsViewModel)
         let navigationController = UINavigationController(rootViewController: settingsController)
         guard let fromController = self.fromController else { return }
         if #available(iOS 9.0, *) {

=== modified file 'Remote/Classes/Controller/Settings/SettingsViewController.swift'
--- Remote/Classes/Controller/Settings/SettingsViewController.swift	2017-02-19 05:21:00 +0000
+++ Remote/Classes/Controller/Settings/SettingsViewController.swift	2017-05-18 14:05:49 +0000
@@ -24,24 +24,37 @@
 
 import UIKit
 import InAppSettingsKit
+import Countly
 
 class SettingsViewController: IASKAppSettingsViewController {
 
     fileprivate let hiddenSettingsKeys = ["auth.userID" as NSObject, "auth.password" as NSObject] as Set<NSObject>
-    fileprivate let pollAPI: PollAPI!
-    fileprivate let settings: UserSettings!
+    fileprivate let viewModel: SettingsViewModel?
 
-    init(settings: UserSettings, pollAPI: PollAPI) {
-        self.pollAPI = pollAPI
-        self.settings = settings
+    init(viewModel: SettingsViewModel) {
+        self.viewModel = viewModel
         super.init(nibName:nil, bundle:nil)
+        viewModel.needAuth.producer.startWithValues { (needAuth) in
+            self.setHiddenKeys(needAuth ? [] : self.hiddenSettingsKeys, animated: true)
+            self.synchronizeSettings()
+        }
+
+        viewModel.alert.producer.skip(first: 1).startWithValues { (alert) in
+            UIAlertView(title: alert.title, message: alert.message, delegate: nil, cancelButtonTitle: "OK")
+                .show()
+        }
+
+        viewModel.dismissController.producer.skip(first: 1).startWithValues { (shouldDismiss) in
+            self.synchronizeSettings()
+            self.dismiss(animated: true, completion: nil)
+        }
+
         self.setupSettingViewController()
         self.setupNavigationBar()
     }
     
     required init?(coder aDecoder: NSCoder) {
-        self.pollAPI = nil
-        self.settings = nil
+        viewModel = nil
         super.init(coder: aDecoder)
     }
     
@@ -53,55 +66,26 @@
         self.tableView.delegate = self
         self.tableView.dataSource = self
     }
-    
+
     // MARK: My methods
     
     fileprivate func setupSettingViewController() {
         self.showDoneButton = false
         self.showCreditsFooter = false
         self.delegate = self
-        
-        let needsAuth = settings.needsAuth
-        self.hiddenKeys = needsAuth ? [] : self.hiddenSettingsKeys
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewController.settingsDidChange(_:)), name: NSNotification.Name(rawValue: kIASKAppSettingChanged), object: nil)
-    }
-    
-    @objc fileprivate func settingsDidChange(_ notification: Notification) {
-        if let object = notification.userInfo {
-            if object["auth.needsAuth"] != nil {
-                let enabled = settings.needsAuth
-                let hiddenKeys = enabled ? [] : self.hiddenSettingsKeys
-                self.setHiddenKeys(hiddenKeys, animated: true)
-            }
-        }
+ 
     }
     
     fileprivate func setupNavigationBar() {
         self.navigationItem.title = Localizable.settings
-        
         let strSave = Localizable.ok
         let btSave = UIBarButtonItem(title: strSave, style: .done, target: self, action: #selector(SettingsViewController.dismissViewController))
         self.navigationItem.rightBarButtonItem = btSave
     }
-    
+
     @objc fileprivate func dismissViewController() {
-        if !settings.validateServerIP() {
-            let title = Localizable.error
-            let message = Localizable.Error.validIP
-            UIAlertView(title: title, message: message, delegate: nil, cancelButtonTitle: "OK")
-                .show()
-        } else if !settings.validateServerPort() {
-            let title = Localizable.error
-            let message = Localizable.Error.validPort
-            UIAlertView(title: title, message: message, delegate: nil, cancelButtonTitle: "OK")
-                .show()
-        } else {
-            self.synchronizeSettings()
-            self.dismiss(animated: true, completion: nil)
-        }
+        viewModel?.dismiss()
     }
-    
 }
 
 // MARK: - IASKSettingsDelegate

=== added file 'Remote/Classes/Controller/Settings/SettingsViewModel.swift'
--- Remote/Classes/Controller/Settings/SettingsViewModel.swift	1970-01-01 00:00:00 +0000
+++ Remote/Classes/Controller/Settings/SettingsViewModel.swift	2017-05-18 14:05:49 +0000
@@ -0,0 +1,73 @@
+/******************************************************************************
+ * OpenLP iOS Remote                                                           *
+ * --------------------------------------------------------------------------- *
+ * Copyright (c) 2008-2016 OpenLP Developers                                   *
+ * --------------------------------------------------------------------------- *
+ * Permission is hereby granted, free of charge, to any person obtaining a     *
+ * copy of this software and associated documentation files (the "Software"),  *
+ * to deal in the Software without restriction, including without limitation   *
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,    *
+ * and/or sell copies of the Software, and to permit persons to whom the       *
+ * Software is furnished to do so, subject to the following conditions:        *
+ *                                                                             *
+ * The above copyright notice and this permission notice shall be included in  *
+ * all copies or substantial portions of the Software.                         *
+ *                                                                             *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  *
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,    *
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE *
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      *
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING     *
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER         *
+ * DEALINGS IN THE SOFTWARE.                                                   *
+ ******************************************************************************/
+
+
+import UIKit
+import ReactiveCocoa
+import ReactiveSwift
+import InAppSettingsKit
+import Countly
+
+struct Alert {
+    let title: String
+    let message: String
+}
+
+class SettingsViewModel: NSObject {
+    let needAuth: MutableProperty<Bool>
+    let settings: UserSettings
+    let alert: MutableProperty<Alert> = MutableProperty<Alert>(Alert(title: "", message: ""))
+    let dismissController = MutableProperty<Bool>(false)
+
+    init(settings: UserSettings) {
+        self.needAuth = MutableProperty<Bool>(settings.needsAuth)
+        self.settings = settings
+        super.init()
+        NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewModel.settingsDidChange(_:)), name: NSNotification.Name(rawValue: kIASKAppSettingChanged), object: nil)
+        Countly.sharedInstance().settingsScreenOpenedWithUserSettings(settings)
+    }
+
+    @objc fileprivate func settingsDidChange(_ notification: Notification) {
+        if let object = notification.userInfo, let needAuth = object["auth.needsAuth"] as? Bool {
+            self.needAuth.value = needAuth
+        }
+    }
+
+    func dismiss() {
+        if !settings.validateServerIP() {
+            let title = Localizable.error
+            let message = Localizable.Error.validIP
+            alert.value = Alert(title: title, message: message)
+        } else if !settings.validateServerPort() {
+            let title = Localizable.error
+            let message = Localizable.Error.validPort
+            alert.value = Alert(title: title, message: message)
+        } else {
+            dismissController.value = true
+            if  self.settings.serverIP.characters.count != 0 {
+                Countly.sharedInstance().settingsScreenClosedWithUserSettings(settings)
+            }
+        }
+    }
+}

=== modified file 'Remote/Classes/Network/Service.swift'
--- Remote/Classes/Network/Service.swift	2017-04-05 15:55:26 +0000
+++ Remote/Classes/Network/Service.swift	2017-05-18 14:05:49 +0000
@@ -27,6 +27,7 @@
 import Result
 import ReactiveCocoa
 import BlockLooper
+import Countly
 
 
 protocol PollAPIServiceDelegate {
@@ -109,14 +110,14 @@
 
 
         pollSignal
-            .filter({ (result) -> Bool in
+            .filter() { (result) -> Bool in
                 switch result {
                 case .success:
                     return true
                 default:
                     return false
                 }
-            })
+            }
             .observe { (event) in
                 self.handlePollResponse((event.value?.value)!)
             }
@@ -157,6 +158,7 @@
 
     fileprivate func handlePollResponse(_ poll: PollModel?) {
         if let poll = poll {
+            Countly.sharedInstance().serverSentNonEmptyResponse()
             if self.poll.service != poll.service {
                 self.updateService({
                     self.serviceDelegate?.updateSelectedItem(itemId: poll.item)

=== added file 'Remote/Classes/Util/CountlyClientSideUserPaths.swift'
--- Remote/Classes/Util/CountlyClientSideUserPaths.swift	1970-01-01 00:00:00 +0000
+++ Remote/Classes/Util/CountlyClientSideUserPaths.swift	2017-05-18 14:05:49 +0000
@@ -0,0 +1,85 @@
+/******************************************************************************
+ * OpenLP iOS Remote                                                           *
+ * --------------------------------------------------------------------------- *
+ * Copyright (c) 2008-2016 OpenLP Developers                                   *
+ * --------------------------------------------------------------------------- *
+ * Permission is hereby granted, free of charge, to any person obtaining a     *
+ * copy of this software and associated documentation files (the "Software"),  *
+ * to deal in the Software without restriction, including without limitation   *
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,    *
+ * and/or sell copies of the Software, and to permit persons to whom the       *
+ * Software is furnished to do so, subject to the following conditions:        *
+ *                                                                             *
+ * The above copyright notice and this permission notice shall be included in  *
+ * all copies or substantial portions of the Software.                         *
+ *                                                                             *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  *
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,    *
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE *
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      *
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING     *
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER         *
+ * DEALINGS IN THE SOFTWARE.                                                   *
+ ******************************************************************************/
+
+import UIKit
+import Countly
+
+extension Countly {
+
+    enum UserPathFirstExperienceState : String {
+        case Started = "started"
+        case SettingsOpenedWithEmptyServerAddress = "SettingsOpenedWithEmptyServerAddress"
+        case SettingsClosedWithFilledServerAddress = "SettingsClosedWithFilledServerAddress"
+        case GotNonEmptyResponseFromServer = "GotNonEmptyResponseFromServer"
+    }
+
+    static let firstExperiencePathStartedKey = "userPath_firstExperienceState"
+
+    func applicationStartWithSettings(_ settings: UserSettings) {
+        if firstExperiencePathState() == .none, settings.serverIP.characters.count == 0 {
+            startFirstExperienceUserPath()
+            type(of: self).sharedInstance().recordEvent("first app launch start with no server ip")
+        }
+    }
+
+    func settingsScreenOpenedWithUserSettings(_ settings: UserSettings) {
+        if let state = firstExperiencePathState(), state == .Started, settings.serverIP.characters.count == 0 {
+            updateFirstExperiencePathState(newState: .SettingsOpenedWithEmptyServerAddress)
+            type(of: self).sharedInstance().recordEvent("settings screen was opened without server ip filled")
+        }
+    }
+
+    func settingsScreenClosedWithUserSettings(_ settings: UserSettings) {
+        if let state = firstExperiencePathState(), state == .SettingsOpenedWithEmptyServerAddress, settings.serverIP.characters.count != 0 {
+            updateFirstExperiencePathState(newState: .SettingsClosedWithFilledServerAddress)
+            type(of: self).sharedInstance().recordEvent("settings screen was closed with server ip filled")
+        }
+    }
+
+    func serverSentNonEmptyResponse() {
+        if let state = firstExperiencePathState(), state == .SettingsClosedWithFilledServerAddress {
+            updateFirstExperiencePathState(newState: .GotNonEmptyResponseFromServer)
+            type(of: self).sharedInstance().recordEvent("received server response - setup complete")
+        }
+    }
+
+    // MARK: private 
+
+    fileprivate func startFirstExperienceUserPath() {
+        updateFirstExperiencePathState(newState: .Started)
+    }
+
+    fileprivate func firstExperiencePathState() -> UserPathFirstExperienceState? {
+        if let state =  UserDefaults.standard.object(forKey: type(of: self).firstExperiencePathStartedKey) as? String {
+            return UserPathFirstExperienceState(rawValue:state)
+        }
+        else {
+            return Optional.none
+        }
+    }
+
+    fileprivate func updateFirstExperiencePathState(newState: UserPathFirstExperienceState) {
+        UserDefaults.standard.set(newState.rawValue, forKey: type(of: self).firstExperiencePathStartedKey)
+    }
+}