Merge branch 'release/3.1.3'

VoIPGRID · Apr 6, 2018 · 7c2f9ab · 7c2f9ab
2 parents f138545 + 04b3032
commit 7c2f9ab
Show file tree

Hide file tree

Showing 21 changed files with 200 additions and 112 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -6,11 +6,11 @@
 
 {file or feature containing the issue}
 
-### Expected behaviour
+### Expected behavior
 
 {what should happen}
 
-### Actual behaviour
+### Actual behavior
 
 {what happens}
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,11 +2,11 @@
 
 {if exists provide related issue}
 
-### Expected behaviour
+### Expected behavior
 
 {what should have happened}
 
-### Actual behaviour
+### Actual behavior
 
 {what happens}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,17 +3,28 @@ All notable changes to this project will be documented in this file.
 
 ---
 
-## [3.1.2](https://github.com/VoIPGRID/VialerSIPLib/tree/3.1.2) (13/06/2018)
+## [3.1.3](https://github.com/VoIPGRID/VialerSIPLib/tree/3.1.2) (04/06/2018)
+Released on Friday, April 6, 2018.
+
+### Added
+- Updated Vialer-pjsip-iOS to the newest version.
+
+### Fixed
+- Fix issue when there were no calls possible from the background when video is disabled remove the video codec option from the INVITE (#131)
+- Incoming callername not showing #124 (#130)
+- Fixed issue that call was not being to release on hold status (#129)
+
+## [3.1.2](https://github.com/VoIPGRID/VialerSIPLib/tree/3.1.2) (03/16/2018)
 Released on Tuesday, March 16, 2018.
 
 ### Added
-* Update Vialer-PJSIP-IOS pod to the newest version
+- Update Vialer-PJSIP-IOS pod to the newest version
 
 ## [3.1.1](https://github.com/VoIPGRID/VialerSIPLib/tree/3.1.1) (03/06/2018)
 Released on Tuesday, March 06, 2018.
 
 ### Added
-* Update Vialer-PJSIP-IOS pod to the newest version
+- Update Vialer-PJSIP-IOS pod to the newest version
 
 ## [3.1.0](https://github.com/VoIPGRID/VialerSIPLib/tree/3.1.0) (02/19/2018)
 Released on Monday, February 19, 2018.

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -9,8 +9,8 @@ PODS:
   - Reachability (3.2)
   - SPLumberjackLogFormatter (0.0.1):
     - CocoaLumberjack
-  - Vialer-pjsip-iOS (3.3.4)
-  - VialerSIPLib (3.1.1):
+  - Vialer-pjsip-iOS (3.3.5)
+  - VialerSIPLib (3.1.3):
     - CocoaLumberjack
     - Reachability
     - Vialer-pjsip-iOS
@@ -20,11 +20,18 @@ DEPENDENCIES:
   - SPLumberjackLogFormatter (from `https://github.com/VoIPGRID/SPLumberjackLogFormatter.git`)
   - VialerSIPLib (from `../`)
 
+SPEC REPOS:
+  https://github.com/CocoaPods/Specs.git:
+    - CocoaLumberjack
+    - OCMock
+    - Reachability
+    - Vialer-pjsip-iOS
+
 EXTERNAL SOURCES:
   SPLumberjackLogFormatter:
     :git: https://github.com/VoIPGRID/SPLumberjackLogFormatter.git
   VialerSIPLib:
-    :path: ../
+    :path: "../"
 
 CHECKOUT OPTIONS:
   SPLumberjackLogFormatter:
@@ -36,9 +43,9 @@ SPEC CHECKSUMS:
   OCMock: 2cd0716969bab32a2283ff3a46fd26a8c8b4c5e3
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SPLumberjackLogFormatter: a2290c9b880f3166b2d1bace45dc1fc1302b28ab
-  Vialer-pjsip-iOS: e424942984350a4493d998d5fccb03e723284005
-  VialerSIPLib: d87cf97f24843b9de945534ab2b2ac0a8af2891d
+  Vialer-pjsip-iOS: 73572fa0f9cf8791c318580c606d1b95163a4ca4
+  VialerSIPLib: dfcf0f28bc9e77f9f763a7562bc8db7b6b82477d
 
-PODFILE CHECKSUM: 96f5daa87b4af4791838d6c46730f065f53edec3
+PODFILE CHECKSUM: d5d9deca56ac68b69c70ab9a6d89a30c6d4fef32
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.0
diff --git a/Example/VialerSIPLib.xcodeproj/project.pbxproj b/Example/VialerSIPLib.xcodeproj/project.pbxproj
@@ -391,7 +391,6 @@
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				F271B5561DABD18F0028D620 /* Embed App Extensions */,
-				D897CEC3B244448989CE9535 /* [CP] Embed Pods Frameworks */,
 				9867CF3405BE944EA05D1127 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
@@ -412,7 +411,6 @@
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
-				03357C1676371026BC156CA3 /* [CP] Embed Pods Frameworks */,
 				4CC6A93B1A74CE8A94C2B1D1 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
@@ -450,7 +448,7 @@
 			attributes = {
 				CLASSPREFIX = VSL;
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = Harold;
 				TargetAttributes = {
 					6003F589195388D20070C39A = {
@@ -526,21 +524,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		03357C1676371026BC156CA3 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VialerSIPLib_Tests/Pods-VialerSIPLib_Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		4CC6A93B1A74CE8A94C2B1D1 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -613,21 +596,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D897CEC3B244448989CE9535 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VialerSIPLib_Example/Pods-VialerSIPLib_Example-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -732,12 +700,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -785,12 +755,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

diff --git a/Example/VialerSIPLib.xcodeproj/xcshareddata/xcschemes/VialerSIPLib-Example.xcscheme b/Example/VialerSIPLib.xcodeproj/xcshareddata/xcschemes/VialerSIPLib-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -57,7 +56,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Example/VialerSIPLib.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/VialerSIPLib.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Example/VialerSIPLib/AppDelegate.swift b/Example/VialerSIPLib/AppDelegate.swift
@@ -7,21 +7,23 @@ import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
-    class var shared: AppDelegate {
-        return UIApplication.shared.delegate as! AppDelegate
-    }
-
     struct Configuration {
         struct Notifications {
             static let incomingCall = Notification.Name("AppDelegate.Notification.IncomingCall")
         }
     }
 
+    static var shared: AppDelegate!
+
     var window: UIWindow?
     var providerDelegate: CallKitProviderDelegate?
     var account: VSLAccount!
 
+    override init() {
+        super.init()
+        AppDelegate.shared = self
+    }
+
     // MARK: - Lifecycle
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
@@ -31,7 +33,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             setupCallKit()
         }
 
-//        setupLogCallBack()
+        setupLogCallBack()
         setupVialerEndpoint()
         setupAccount()
         return true
@@ -63,6 +65,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         endpointConfiguration.userAgent = "VialerSIPLib Example App"
         endpointConfiguration.transportConfigurations = transportToUse
         endpointConfiguration.disableVideoSupport = !prefs.bool(forKey: "useVideo")
+        endpointConfiguration.unregisterAfterCall = prefs.bool(forKey: "unregisterAfterCall")
+
+        let ipChangeConfiguration = VSLIpChangeConfiguration()
+        ipChangeConfiguration.ipChangeCallsUpdate = .update
+        ipChangeConfiguration.ipAddressChangeReinviteFlags = VSLIpChangeConfiguration.defaultReinviteFlags()
+
+        endpointConfiguration.ipChangeConfiguration = ipChangeConfiguration;
 
         do {
             try VialerSIPLib.sharedInstance().configureLibrary(withEndPointConfiguration: endpointConfiguration)
@@ -82,6 +91,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             assert(false)
         }
     }
+
+    func getAccount() -> VSLAccount! {
+        return account
+    }
 
     func setupIncomingCallBlock() {
         // The code from this block will be called when the framework receives an incoming call.
@@ -92,11 +105,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
     }
 
-//    func setupLogCallBack() {
-//        VialerSIPLib.sharedInstance().setLogCallBack { (logMessage) in
-//            DDLogWrapper.log(message: logMessage)
-//        }
-//    }
+    func setupLogCallBack() {
+        VialerSIPLib.sharedInstance().setLogCallBack { (logMessage) in
+            DDLogWrapper.log(message: logMessage)
+        }
+    }
 
     func displayIncomingCall(call: VSLCall) {
         if #available(iOS 10, *) {