From 18754293b8455fb820246fc536e38036c7a134ca Mon Sep 17 00:00:00 2001
From: Redmer Loen <redmer.loen@wearespindle.com>
Date: Wed, 25 Apr 2018 09:31:05 +0200
Subject: [PATCH 1/5] Add configurable codecs (#133)

---
 Example/VialerSIPLib/AppDelegate.swift        | 11 ++-
 .../VialerSIPLib_Example-Bridging-Header.h    |  2 +
 Pod/Classes/Codecs/VSLAudioCodecs.h           | 78 +++++++++++++++
 Pod/Classes/Codecs/VSLAudioCodecs.m           | 30 ++++++
 Pod/Classes/Codecs/VSLVideoCodecs.h           | 59 +++++++++++
 Pod/Classes/Codecs/VSLVideoCodecs.m           | 31 ++++++
 .../Configurations/VSLCodecConfiguration.h    | 23 +++++
 .../Configurations/VSLCodecConfiguration.m    | 42 ++++++++
 .../Configurations/VSLEndpointConfiguration.h | 12 +++
 .../Configurations/VSLEndpointConfiguration.m |  2 +-
 Pod/Classes/VSLEndpoint.h                     |  2 +-
 Pod/Classes/VSLEndpoint.m                     | 99 ++++++++++++++++++-
 Pod/Classes/VialerSIPLib.h                    |  2 +-
 13 files changed, 388 insertions(+), 5 deletions(-)
 create mode 100644 Pod/Classes/Codecs/VSLAudioCodecs.h
 create mode 100644 Pod/Classes/Codecs/VSLAudioCodecs.m
 create mode 100644 Pod/Classes/Codecs/VSLVideoCodecs.h
 create mode 100644 Pod/Classes/Codecs/VSLVideoCodecs.m
 create mode 100644 Pod/Classes/Configurations/VSLCodecConfiguration.h
 create mode 100644 Pod/Classes/Configurations/VSLCodecConfiguration.m

diff --git a/Example/VialerSIPLib/AppDelegate.swift b/Example/VialerSIPLib/AppDelegate.swift
index 66d2ff4f..3e190955 100644
--- a/Example/VialerSIPLib/AppDelegate.swift
+++ b/Example/VialerSIPLib/AppDelegate.swift
@@ -73,11 +73,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         endpointConfiguration.ipChangeConfiguration = ipChangeConfiguration;
 
+        let codecConfiguration = VSLCodecConfiguration()
+        codecConfiguration.audioCodecs = [
+            VSLAudioCodecs(audioCodec: .ILBC, andPriority: 210),
+            VSLAudioCodecs(audioCodec: .g711a, andPriority: 209)
+        ]
+//        codecConfiguration.videoCodecs = [
+//            VSLVideoCodecs(videoCodec: .H264, andPriority: 210)
+//        ]
+        endpointConfiguration.codecConfiguration = codecConfiguration;
+
         do {
             try VialerSIPLib.sharedInstance().configureLibrary(withEndPointConfiguration: endpointConfiguration)
             // Set your incoming call block here.
             setupIncomingCallBlock()
-            VialerSIPLib.sharedInstance().onlyUseIlbc(true)
         } catch let error {
             DDLogWrapper.logError("Error setting up VialerSIPLib: \(error)")
         }
diff --git a/Example/VialerSIPLib/VialerSIPLib_Example-Bridging-Header.h b/Example/VialerSIPLib/VialerSIPLib_Example-Bridging-Header.h
index 3efeef6d..6859d61b 100644
--- a/Example/VialerSIPLib/VialerSIPLib_Example-Bridging-Header.h
+++ b/Example/VialerSIPLib/VialerSIPLib_Example-Bridging-Header.h
@@ -7,3 +7,5 @@
 #import <VialerSIPLib/VialerSIPLib.h>
 #import <VialerSIPLib/VSLRingtone.h>
 #import <VialerSIPLib/CallKitProviderDelegate.h>
+#import <VialerSIPLib/VSLAudioCodecs.h>
+#import <VialerSIPLib/VSLVideoCodecs.h>
diff --git a/Pod/Classes/Codecs/VSLAudioCodecs.h b/Pod/Classes/Codecs/VSLAudioCodecs.h
new file mode 100644
index 00000000..6ae60d77
--- /dev/null
+++ b/Pod/Classes/Codecs/VSLAudioCodecs.h
@@ -0,0 +1,78 @@
+//
+//  VSLCodecs.h
+//  Copyright © 2018 Devhouse Spindle. All rights reserved.
+//
+
+
+#import <Foundation/Foundation.h>
+
+#import "VSLCodecConfiguration.h"
+
+/**
+ *  Enum of possible Audio Codecs.
+ */
+typedef NS_ENUM(NSInteger, VSLAudioCodec) {
+        // G711a
+    VSLAudioCodecG711a,
+        // G722
+    VSLAudioCodecG722,
+        // iLBC
+    VSLAudioCodecILBC,
+        // G711
+    VSLAudioCodecG711,
+        // Speex 8 kHz
+    VSLAudioCodecSpeex8000,
+        // Speex 16 kHz
+    VSLAudioCodecSpeex16000,
+        // Speex 32 kHz
+    VSLAudioCodecSpeex32000,
+        // GSM 8 kHZ
+    VSLAudioCodecGSM,
+        // Opus
+    VSLAudioCodecOpus,
+};
+#define VSLAudioCodecString(VSLAudioCodec) [VSLAudioCodecArray objectAtIndex:VSLAudioCodec]
+#define VSLAudioCodecStringWithIndex(NSInteger) [VSLAudioCodecArray objectAtIndex:NSInteger]
+#define VSLAudioCodecArray @[@"PCMA/8000/1", @"G722/16000/1", @"iLBC/8000/1", @"PCMU/8000/1", @"speex/8000/1", @"speex/16000/1", @"speex/32000/1", @"GSM/8000/1", @"opus/48000/2"]
+
+
+@interface VSLAudioCodecs : NSObject
+
+/**
+ *  The prioritiy of the codec
+ */
+@property (readonly, nonatomic) NSUInteger priority;
+
+/**
+ * The used codec.
+ */
+@property (readonly, nonatomic) VSLAudioCodec codec;
+
+/**
+ * Make the default init unavaibale.
+ */
+- (instancetype _Nonnull) init __attribute__((unavailable("init not available. Use initWithAudioCodec instead.")));
+
+/**
+ * The init to setup the audio codecs.
+ *
+ * @param codec     Audio codec codec to set the prioritiy for.
+ * @param priority  NSUInteger the priority the codec will have.
+ */
+- (instancetype _Nonnull)initWithAudioCodec:(VSLAudioCodec)codec andPriority:(NSUInteger)priority;
+
+/**
+ * Get the codec from the #define VSLCodecConfigurationAudioString with a VSLCodecConfigurationAudio type.
+ *
+ * @param codec VSLCodecConfigurationAudio the codec to get the string representation of.
+ *
+ * @return NSString the string representation of the VSLCodecConfigurationAudio type.
+ */
++ (NSString * _Nonnull)codecString:(VSLAudioCodec)codec;
+
+/**
+ * Get the codec from the defined VSLCodecConfigurationAudioString with an index.
+ */
++ (NSString * _Nonnull)codecStringWithIndex:(NSInteger)index;
+
+@end
diff --git a/Pod/Classes/Codecs/VSLAudioCodecs.m b/Pod/Classes/Codecs/VSLAudioCodecs.m
new file mode 100644
index 00000000..7fe727ea
--- /dev/null
+++ b/Pod/Classes/Codecs/VSLAudioCodecs.m
@@ -0,0 +1,30 @@
+//
+//  VSLCodecs.m
+//  Copyright © 2018 Devhouse Spindle. All rights reserved.
+//
+
+#import "VSLAudioCodecs.h"
+
+@interface VSLAudioCodecs()
+@property (readwrite, nonatomic) NSUInteger priority;
+@property (readwrite, nonatomic) VSLAudioCodec codec;
+@end
+
+@implementation VSLAudioCodecs
+- (instancetype)initWithAudioCodec:(VSLAudioCodec)codec andPriority:(NSUInteger)priority {
+    if (self = [super init]) {
+        self.codec = codec;
+        self.priority = priority;
+    }
+
+    return self;
+}
+
++ (NSString *)codecString:(VSLAudioCodec)codec {
+    return VSLAudioCodecString(codec);
+}
+
++ (NSString *)codecStringWithIndex:(NSInteger)index {
+    return VSLAudioCodecStringWithIndex(index);
+}
+@end
diff --git a/Pod/Classes/Codecs/VSLVideoCodecs.h b/Pod/Classes/Codecs/VSLVideoCodecs.h
new file mode 100644
index 00000000..65d03932
--- /dev/null
+++ b/Pod/Classes/Codecs/VSLVideoCodecs.h
@@ -0,0 +1,59 @@
+//
+//  VSLVideoCodecs.h
+//  VialerSIPLib
+//
+//  Created by Redmer Loen on 4/5/18.
+//
+
+#import <Foundation/Foundation.h>
+
+
+typedef NS_ENUM(NSInteger, VSLVideoCodec) {
+        // H264
+    VSLVideoCodecH264
+};
+#define VSLVideoCodecString(VSLVideoCodec) [VSLVideoCodecArray objectAtIndex:VSLVideoCodec]
+#define VSLVideoCodecStringWithIndex(NSInteger) [VSLVideoCodecArray objectAtIndex:NSInteger]
+#define VSLVideoCodecArray @[@"H264/97"]
+
+
+@interface VSLVideoCodecs : NSObject
+
+/**
+ *  The prioritiy of the codec
+ */
+@property (readonly, nonatomic) NSUInteger priority;
+
+/**
+ * The used codec.
+ */
+@property (readonly, nonatomic) VSLVideoCodec codec;
+
+/**
+ * Make the default init unavaibale.
+ */
+- (instancetype _Nonnull) init __attribute__((unavailable("init not available. Use initWithVideoCodec instead.")));
+
+/**
+ * The init to setup the video codecs.
+ *
+ * @param codec     Audio codec codec to set the prioritiy for.
+ * @param priority  NSUInteger the priority the codec will have.
+ */
+- (instancetype _Nonnull)initWithVideoCodec:(VSLVideoCodec)codec andPriority:(NSUInteger)priority;
+
+/**
+ * Get the codec from the #define VSLVideoCodecString with a VSLVideoCodec type.
+ *
+ * @param codec VSLVideoCodec the codec to get the string representation of.
+ *
+ * @return NSString the string representation of the VSLVideoCodec type.
+ */
++ (NSString * _Nonnull)codecString:(VSLVideoCodec)codec;
+
+/**
+ * Get the codec from the defined VSLVideoCodecString with an index.
+ */
++ (NSString * _Nonnull)codecStringWithIndex:(NSInteger)index;
+
+@end
diff --git a/Pod/Classes/Codecs/VSLVideoCodecs.m b/Pod/Classes/Codecs/VSLVideoCodecs.m
new file mode 100644
index 00000000..b7b9d2b1
--- /dev/null
+++ b/Pod/Classes/Codecs/VSLVideoCodecs.m
@@ -0,0 +1,31 @@
+//
+//  VSLVideoCodecs.m
+//  VialerSIPLib
+//
+//  Created by Redmer Loen on 4/5/18.
+//
+
+#import "VSLVideoCodecs.h"
+
+@interface VSLVideoCodecs()
+@property (readwrite, nonatomic) NSUInteger priority;
+@property (readwrite, nonatomic) VSLVideoCodec codec;
+@end
+
+@implementation VSLVideoCodecs
+-(instancetype)initWithVideoCodec:(VSLVideoCodec)codec andPriority:(NSUInteger)priority {
+    if (self = [super init]) {
+        self.codec = codec;
+        self.priority = priority;
+    }
+    return self;
+}
+
++ (NSString *)codecString:(VSLVideoCodec)codec {
+    return VSLVideoCodecString(codec);
+}
+
++ (NSString *)codecStringWithIndex:(NSInteger)index {
+    return VSLVideoCodecStringWithIndex(index);
+}
+@end
diff --git a/Pod/Classes/Configurations/VSLCodecConfiguration.h b/Pod/Classes/Configurations/VSLCodecConfiguration.h
new file mode 100644
index 00000000..d561eb1d
--- /dev/null
+++ b/Pod/Classes/Configurations/VSLCodecConfiguration.h
@@ -0,0 +1,23 @@
+//
+//  VSLCodecConfiguration.h
+//  Copyright © 2018 Devhouse Spindle. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class VSLAudioCodecs;
+@class VSLVideoCodecs;
+
+@interface VSLCodecConfiguration : NSObject
+
+/**
+ * An array of available audio codecs.
+ */
+@property (strong, nonatomic) NSArray* audioCodecs;
+
+/**
+ * An array of available video codecs.
+ */
+@property (strong, nonatomic) NSArray* videoCodecs;
+
+@end
diff --git a/Pod/Classes/Configurations/VSLCodecConfiguration.m b/Pod/Classes/Configurations/VSLCodecConfiguration.m
new file mode 100644
index 00000000..456530af
--- /dev/null
+++ b/Pod/Classes/Configurations/VSLCodecConfiguration.m
@@ -0,0 +1,42 @@
+//
+//  VSLCodecConfiguration.m
+//  Copyright © 2018 Devhouse Spindle. All rights reserved.
+
+
+#import "VSLCodecConfiguration.h"
+
+#import "VSLAudioCodecs.h"
+#import "VSLVideoCodecs.h"
+#import "NSString+PJString.h"
+
+@implementation VSLCodecConfiguration
+
+- (instancetype)init {
+    if (self = [super init]) {
+        self.audioCodecs = [self defaultAudioCodecs];
+        self.videoCodecs = [self defaultVideoCodecs];
+    }
+    return self;
+}
+
+- (NSArray *) defaultAudioCodecs {
+    return @[
+            [[VSLAudioCodecs alloc] initWithAudioCodec:VSLAudioCodecG711a andPriority:210],
+            [[VSLAudioCodecs alloc] initWithAudioCodec:VSLAudioCodecG722 andPriority:209],
+            [[VSLAudioCodecs alloc] initWithAudioCodec:VSLAudioCodecILBC andPriority:208],
+            [[VSLAudioCodecs alloc] initWithAudioCodec:VSLAudioCodecG711 andPriority:0],
+            [[VSLAudioCodecs alloc] initWithAudioCodec:VSLAudioCodecSpeex8000 andPriority:0],
+            [[VSLAudioCodecs alloc] initWithAudioCodec:VSLAudioCodecSpeex16000 andPriority:0],
+            [[VSLAudioCodecs alloc] initWithAudioCodec:VSLAudioCodecSpeex32000 andPriority:0],
+            [[VSLAudioCodecs alloc] initWithAudioCodec:VSLAudioCodecGSM andPriority:0],
+            [[VSLAudioCodecs alloc] initWithAudioCodec:VSLAudioCodecOpus andPriority:0]
+            ];
+}
+
+- (NSArray *) defaultVideoCodecs {
+    return @[
+             [[VSLVideoCodecs alloc] initWithVideoCodec:VSLVideoCodecH264 andPriority:210]
+             ];
+}
+
+@end
diff --git a/Pod/Classes/Configurations/VSLEndpointConfiguration.h b/Pod/Classes/Configurations/VSLEndpointConfiguration.h
index cbf9947e..2e3fff63 100644
--- a/Pod/Classes/Configurations/VSLEndpointConfiguration.h
+++ b/Pod/Classes/Configurations/VSLEndpointConfiguration.h
@@ -6,6 +6,7 @@
 #import <Foundation/Foundation.h>
 #import "VSLIpChangeConfiguration.h"
 #import "VSLStunConfiguration.h"
+#import "VSLCodecConfiguration.h"
 
 
 @interface VSLEndpointConfiguration : NSObject
@@ -81,10 +82,21 @@
  */
 @property (nonatomic) BOOL disableVideoSupport;
 
+/**
+ * The available STUN configuration
+ */
 @property (nonatomic) VSLStunConfiguration * _Nullable stunConfiguration;
 
+/**
+ * The IP change configuration, what happens when an ip address changes.
+ */
 @property (nonatomic) VSLIpChangeConfiguration * _Nullable ipChangeConfiguration;
 
+/**
+ * The codecs that are going to be used by the endpoint
+ */
+@property (nonatomic) VSLCodecConfiguration * _Nullable codecConfiguration;
+
 /**
  * Whether the account needs to be unregistered after a call has been made
  *
diff --git a/Pod/Classes/Configurations/VSLEndpointConfiguration.m b/Pod/Classes/Configurations/VSLEndpointConfiguration.m
index 08593af7..f90ed2ee 100644
--- a/Pod/Classes/Configurations/VSLEndpointConfiguration.m
+++ b/Pod/Classes/Configurations/VSLEndpointConfiguration.m
@@ -10,7 +10,7 @@
 
 static NSUInteger const VSLEndpointConfigurationMaxCalls = 4;
 static NSUInteger const VSLEndpointConfigurationLogLevel = 5;
-static NSUInteger const  VSLEndpointConfigurationLogConsoleLevel = 4;
+static NSUInteger const VSLEndpointConfigurationLogConsoleLevel = 4;
 static NSString * const VSLEndpointConfigurationLogFileName = nil;
 static NSUInteger const VSLEndpointConfigurationClockRate = PJSUA_DEFAULT_CLOCK_RATE;
 static NSUInteger const VSLEndpointConfigurationSndClockRate = 0;
diff --git a/Pod/Classes/VSLEndpoint.h b/Pod/Classes/VSLEndpoint.h
index 932698b2..68f6fe8e 100644
--- a/Pod/Classes/VSLEndpoint.h
+++ b/Pod/Classes/VSLEndpoint.h
@@ -158,6 +158,6 @@ typedef NS_ENUM(NSInteger, VSLEndpointState) {
  *
  *  @param activate BOOL, if YES, only iLBC will be used.
  */
-- (void)onlyUseILBC:(BOOL)activate;
+- (void)onlyUseILBC:(BOOL)activate __attribute__((deprecated("Deprecated, use VSLCodecConfigurarion to add codecs to the endpoint instead")));
 
 @end
diff --git a/Pod/Classes/VSLEndpoint.m b/Pod/Classes/VSLEndpoint.m
index 8624a79c..ba5a9631 100644
--- a/Pod/Classes/VSLEndpoint.m
+++ b/Pod/Classes/VSLEndpoint.m
@@ -11,10 +11,12 @@
 #import "VialerSIPLib.h"
 #import "VSLCall.h"
 #import "VSLCallManager.h"
+#import "VSLAudioCodecs.h"
 #import "VSLLogging.h"
 #import "VSLNetworkMonitor.h"
 #import "VSLIpChangeConfiguration.h"
 #import "VSLTransportConfiguration.h"
+#import "VSLVideoCodecs.h"
 
 static NSString * const VSLEndpointErrorDomain = @"VialerSIPLib.VSLEndpoint.error";
 
@@ -255,7 +257,12 @@ - (BOOL)startEndpointWithEndpointConfiguration:(VSLEndpointConfiguration  * _Non
     self.endpointConfiguration = endpointConfiguration;
     self.state = VSLEndpointStarted;
 
-    [self updateCodecs];
+    if (self.endpointConfiguration.codecConfiguration != NULL) {
+        [self updateAudioCodecs];
+        [self updateVideoCodecs];
+    } else {
+        [self updateCodecs];
+    }
 
     return YES;
 }
@@ -446,6 +453,96 @@ - (pj_uint8_t)priorityForCodec:(NSString *)identifier {
     return (pj_uint8_t)[priorities[identifier] unsignedIntegerValue];
 }
 
+-(BOOL)updateAudioCodecs {
+    if (self.state != VSLEndpointStarted) {
+        return NO;
+    }
+
+    const unsigned audioCodecInfoSize = 64;
+    pjsua_codec_info audioCodecInfo[audioCodecInfoSize];
+    unsigned audioCodecCount = audioCodecInfoSize;
+    pj_status_t status = pjsua_enum_codecs(audioCodecInfo, &audioCodecCount);
+    if (status != PJ_SUCCESS) {
+        VSLLogError(@"Error getting list of audio codecs");
+        return NO;
+    }
+
+    for (NSUInteger i = 0; i < audioCodecCount; i++) {
+        NSString *codecIdentifier = [NSString stringWithPJString:audioCodecInfo[i].codec_id];
+        pj_uint8_t priority = [self priorityForAudioCodec:codecIdentifier];
+        status = pjsua_codec_set_priority(&audioCodecInfo[i].codec_id, priority);
+        if (status != PJ_SUCCESS) {
+            VSLLogError(@"Error setting codec priority to the correct value");
+            return NO;
+        }
+    }
+    return YES;
+}
+
+-(pj_uint8_t)priorityForAudioCodec:(NSString *)identifier {
+    NSUInteger priority = 0;
+    for (VSLAudioCodecs* audioCodec in self.endpointConfiguration.codecConfiguration.audioCodecs) {
+        if ([VSLAudioCodecString(audioCodec.codec) isEqualToString:identifier]) {
+            priority = audioCodec.priority;
+            return (pj_uint8_t)priority;
+        }
+    }
+    return (pj_uint8_t)priority;
+}
+
+-(BOOL)updateVideoCodecs {
+    if (self.state != VSLEndpointStarted) {
+        return NO;
+    }
+
+    const unsigned videoCodecInfoSize = 64;
+    pjsua_codec_info videoCodecInfo[videoCodecInfoSize];
+    unsigned videoCodecCount = videoCodecInfoSize;
+    pj_status_t videoStatus = pjsua_vid_enum_codecs(videoCodecInfo, &videoCodecCount);
+    if (videoStatus != PJ_SUCCESS) {
+        VSLLogError(@"Error getting list of video codecs");
+        return NO;
+    } else {
+        for (NSUInteger i = 0; i < videoCodecCount; i++) {
+            NSString *codecIdentifier = [NSString stringWithPJString:videoCodecInfo[i].codec_id];
+            pj_uint8_t priority = [self priorityForVideoCodec:codecIdentifier];
+            
+            videoStatus = pjsua_vid_codec_set_priority(&videoCodecInfo[i].codec_id, priority);
+
+            if (priority > 0) {
+                pjmedia_vid_codec_param param;
+                pjsua_vid_codec_get_param(&videoCodecInfo[i].codec_id, &param);
+                param.ignore_fmtp = PJ_TRUE;
+                param.enc_fmt.det.vid.size.w = 288;
+                param.enc_fmt.det.vid.size.h = 352;
+                param.enc_fmt.det.vid.fps.num = 20;
+                param.enc_fmt.det.vid.fps.denum = 1;
+                param.dec_fmt.det.vid.size.w = 1920;
+                param.dec_fmt.det.vid.size.h = 1920;
+                pjsua_vid_codec_set_param(&videoCodecInfo[i].codec_id, &param);
+
+                if (videoStatus != PJ_SUCCESS) {
+                    DDLogError(@"Error setting video codec priority to the correct value");
+                    return NO;
+                }
+            }
+        }
+    }
+
+    return YES;
+}
+
+-(pj_uint8_t)priorityForVideoCodec:(NSString *)identifier {
+    NSUInteger priority = 0;
+    for (VSLVideoCodecs* videoCodec in self.endpointConfiguration.codecConfiguration.videoCodecs) {
+        if ([VSLVideoCodecString(videoCodec.codec) isEqualToString:identifier] && !self.endpointConfiguration.disableVideoSupport) {
+            priority = videoCodec.priority;
+            return (pj_uint8_t)priority;
+        }
+    }
+    return (pj_uint8_t)priority;
+}
+
 #pragma mark - PJSUA callbacks
 
 static void logCallBack(int logLevel, const char *data, int len) {
diff --git a/Pod/Classes/VialerSIPLib.h b/Pod/Classes/VialerSIPLib.h
index dd70d932..fd356900 100644
--- a/Pod/Classes/VialerSIPLib.h
+++ b/Pod/Classes/VialerSIPLib.h
@@ -286,6 +286,6 @@ typedef NS_ENUM(NSUInteger, VialerSIPLibErrors) {
  *
  *  @param activate BOOL, if YES, only iLBC will be used.
  */
-- (void)onlyUseIlbc:(BOOL)activate;
+- (void)onlyUseIlbc:(BOOL)activate __attribute__((deprecated("Deprecated, use VSLCodecConfigurarion to add codecs to the endpoint instead")));
 
 @end

From 3fc4eac539a855a54d09ffcb02770c8a33b17e1c Mon Sep 17 00:00:00 2001
From: Redmer Loen <redmer.loen@wearespindle.com>
Date: Fri, 4 May 2018 08:43:05 +0200
Subject: [PATCH 2/5] Added Blind transfer possibility to a call (#137)

---
 Example/Podfile.lock                          | 16 ++---
 .../VialerSIPLib/Base.lproj/Main.storyboard   | 58 ++++++++++++-------
 .../VSLTransferCallViewController.swift       | 18 ++++++
 .../VSLTransferInProgressViewController.swift | 10 ++++
 Pod/Classes/VSLCall.h                         |  9 +++
 Pod/Classes/VSLCall.m                         | 18 ++++++
 6 files changed, 99 insertions(+), 30 deletions(-)

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index d1812fdf..c5bf3f1a 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -1,15 +1,15 @@
 PODS:
-  - CocoaLumberjack (3.4.1):
-    - CocoaLumberjack/Default (= 3.4.1)
-    - CocoaLumberjack/Extensions (= 3.4.1)
-  - CocoaLumberjack/Default (3.4.1)
-  - CocoaLumberjack/Extensions (3.4.1):
+  - CocoaLumberjack (3.4.2):
+    - CocoaLumberjack/Default (= 3.4.2)
+    - CocoaLumberjack/Extensions (= 3.4.2)
+  - CocoaLumberjack/Default (3.4.2)
+  - CocoaLumberjack/Extensions (3.4.2):
     - CocoaLumberjack/Default
   - OCMock (3.4.1)
   - Reachability (3.2)
   - SPLumberjackLogFormatter (0.0.1):
     - CocoaLumberjack
-  - Vialer-pjsip-iOS (3.3.5)
+  - Vialer-pjsip-iOS (3.3.6)
   - VialerSIPLib (3.1.3):
     - CocoaLumberjack
     - Reachability
@@ -39,11 +39,11 @@ CHECKOUT OPTIONS:
     :git: https://github.com/VoIPGRID/SPLumberjackLogFormatter.git
 
 SPEC CHECKSUMS:
-  CocoaLumberjack: 2e258a064cacc8eb9a2aca318e24d02a0a7fd56d
+  CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
   OCMock: 2cd0716969bab32a2283ff3a46fd26a8c8b4c5e3
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SPLumberjackLogFormatter: a2290c9b880f3166b2d1bace45dc1fc1302b28ab
-  Vialer-pjsip-iOS: 73572fa0f9cf8791c318580c606d1b95163a4ca4
+  Vialer-pjsip-iOS: 34ba5d7f2a756be28f5a2c8d72e5f68b08003844
   VialerSIPLib: dfcf0f28bc9e77f9f763a7562bc8db7b6b82477d
 
 PODFILE CHECKSUM: d5d9deca56ac68b69c70ab9a6d89a30c6d4fef32
diff --git a/Example/VialerSIPLib/Base.lproj/Main.storyboard b/Example/VialerSIPLib/Base.lproj/Main.storyboard
index 1c61a85b..81f4bd9b 100644
--- a/Example/VialerSIPLib/Base.lproj/Main.storyboard
+++ b/Example/VialerSIPLib/Base.lproj/Main.storyboard
@@ -714,7 +714,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H7n-oH-PPy">
-                                <rect key="frame" x="66.5" y="297" width="54" height="54"/>
+                                <rect key="frame" x="57.5" y="294" width="60" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="H7n-oH-PPy" secondAttribute="height" multiplier="1:1" id="DZk-Cs-GKQ"/>
                                 </constraints>
@@ -725,7 +725,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A0p-hy-xlM">
-                                <rect key="frame" x="160.5" y="371" width="54" height="54"/>
+                                <rect key="frame" x="157.5" y="371" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="5"/>
                                 <connections>
@@ -733,7 +733,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z2n-Jf-zOa">
-                                <rect key="frame" x="66.5" y="371" width="54" height="54"/>
+                                <rect key="frame" x="57.5" y="371" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="4"/>
                                 <connections>
@@ -741,7 +741,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="8" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pDn-hA-ajb">
-                                <rect key="frame" x="160.5" y="445" width="54" height="54"/>
+                                <rect key="frame" x="157.5" y="445" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="8"/>
                                 <connections>
@@ -749,7 +749,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="9" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zt8-rK-Djp">
-                                <rect key="frame" x="254.5" y="445" width="54" height="54"/>
+                                <rect key="frame" x="257.5" y="445" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="9"/>
                                 <connections>
@@ -757,7 +757,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="7" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fc6-JZ-7OV">
-                                <rect key="frame" x="66.5" y="445" width="54" height="54"/>
+                                <rect key="frame" x="57.5" y="445" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="7"/>
                                 <connections>
@@ -765,7 +765,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1TF-ee-1dx">
-                                <rect key="frame" x="254.5" y="519" width="54" height="54"/>
+                                <rect key="frame" x="257.5" y="513" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="#"/>
                                 <connections>
@@ -773,7 +773,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="10" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K6a-2q-5z1">
-                                <rect key="frame" x="66.5" y="519" width="54" height="54"/>
+                                <rect key="frame" x="57.5" y="519" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="*"/>
                                 <connections>
@@ -781,7 +781,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="6" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xBt-nn-a7N">
-                                <rect key="frame" x="254.5" y="371" width="54" height="54"/>
+                                <rect key="frame" x="257.5" y="371" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="6"/>
                                 <connections>
@@ -789,7 +789,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s0u-V1-8bi">
-                                <rect key="frame" x="254.5" y="297" width="54" height="54"/>
+                                <rect key="frame" x="257.5" y="297" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="3"/>
                                 <connections>
@@ -808,7 +808,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LRV-2t-x47">
-                                <rect key="frame" x="160.5" y="297" width="54" height="54"/>
+                                <rect key="frame" x="157.5" y="297" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="2"/>
                                 <connections>
@@ -848,11 +848,11 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mYM-pX-A13">
-                                <rect key="frame" x="66.5" y="593" width="242" height="54"/>
+                                <rect key="frame" x="57.5" y="593" width="55" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
-                                <state key="normal" title="Call"/>
+                                <state key="normal" title="Blind"/>
                                 <connections>
-                                    <action selector="callButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="sM0-Hn-EKc"/>
+                                    <action selector="blindButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="e36-Gq-PhM"/>
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IjH-gN-v0Q">
@@ -860,18 +860,30 @@
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y8u-Zm-ORg">
-                                <rect key="frame" x="160.5" y="519" width="54" height="54"/>
+                                <rect key="frame" x="157.5" y="519" width="60" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="0"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="LMZ-t9-Bxp"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nAz-UG-4xV">
+                                <rect key="frame" x="262.5" y="593" width="55" height="54"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="25"/>
+                                <state key="normal" title="Call"/>
+                                <connections>
+                                    <action selector="callButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="r82-Jp-qeK"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="NiU-OF-gUz" firstAttribute="leading" secondItem="IjH-gN-v0Q" secondAttribute="trailing" constant="8" id="0do-Tm-Pf2"/>
+                            <constraint firstItem="y8u-Zm-ORg" firstAttribute="leading" secondItem="mYM-pX-A13" secondAttribute="trailing" constant="45" id="0uD-wm-pUG"/>
+                            <constraint firstItem="nAz-UG-4xV" firstAttribute="centerY" secondItem="mYM-pX-A13" secondAttribute="centerY" id="2ZM-Kb-Qyj"/>
                             <constraint firstAttribute="trailingMargin" secondItem="ygI-5J-Vl9" secondAttribute="trailing" constant="-20" id="4sw-A1-hCi"/>
+                            <constraint firstItem="hp8-eS-Ie3" firstAttribute="top" secondItem="nAz-UG-4xV" secondAttribute="bottom" constant="20" id="6Ue-fh-TNS"/>
+                            <constraint firstItem="nAz-UG-4xV" firstAttribute="top" secondItem="1TF-ee-1dx" secondAttribute="bottom" constant="26" id="6W6-6G-dst"/>
                             <constraint firstItem="ygI-5J-Vl9" firstAttribute="top" secondItem="zxi-7H-iae" secondAttribute="bottom" id="6yn-rr-Z2V"/>
                             <constraint firstItem="s0u-V1-8bi" firstAttribute="width" secondItem="H7n-oH-PPy" secondAttribute="width" id="9wM-Di-maI"/>
                             <constraint firstItem="pDn-hA-ajb" firstAttribute="top" secondItem="A0p-hy-xlM" secondAttribute="bottom" constant="20" id="AQ5-lc-xVV"/>
@@ -880,6 +892,7 @@
                             <constraint firstItem="A0p-hy-xlM" firstAttribute="width" secondItem="H7n-oH-PPy" secondAttribute="width" id="CTL-PP-Sbi"/>
                             <constraint firstItem="1TF-ee-1dx" firstAttribute="baseline" secondItem="y8u-Zm-ORg" secondAttribute="baseline" id="DWz-0v-Oy0"/>
                             <constraint firstItem="y8u-Zm-ORg" firstAttribute="centerX" secondItem="pDn-hA-ajb" secondAttribute="centerX" id="Fnu-D2-obd"/>
+                            <constraint firstItem="nAz-UG-4xV" firstAttribute="trailing" secondItem="1TF-ee-1dx" secondAttribute="trailing" id="GDP-8t-RHL"/>
                             <constraint firstItem="hp8-eS-Ie3" firstAttribute="top" secondItem="mYM-pX-A13" secondAttribute="bottom" constant="20" id="H1n-u7-vZp"/>
                             <constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="s0u-V1-8bi" secondAttribute="trailing" id="HGs-th-FQ2"/>
                             <constraint firstAttribute="leadingMargin" secondItem="IjH-gN-v0Q" secondAttribute="leading" id="Hm4-Tc-MTB"/>
@@ -914,7 +927,6 @@
                             <constraint firstItem="xBt-nn-a7N" firstAttribute="width" secondItem="H7n-oH-PPy" secondAttribute="width" id="ikF-ws-0vF"/>
                             <constraint firstItem="A0p-hy-xlM" firstAttribute="leading" secondItem="z2n-Jf-zOa" secondAttribute="trailing" constant="40" id="j4C-xY-u7h"/>
                             <constraint firstItem="NiU-OF-gUz" firstAttribute="top" secondItem="ygI-5J-Vl9" secondAttribute="bottom" constant="20" id="jMh-7z-Gsh"/>
-                            <constraint firstItem="mYM-pX-A13" firstAttribute="trailing" secondItem="1TF-ee-1dx" secondAttribute="trailing" id="lb5-qw-MFG"/>
                             <constraint firstItem="LRV-2t-x47" firstAttribute="leading" secondItem="H7n-oH-PPy" secondAttribute="trailing" constant="40" id="mX2-6z-FQe"/>
                             <constraint firstItem="H7n-oH-PPy" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="v6N-ls-4eB" secondAttribute="leadingMargin" id="nSR-mB-V3p"/>
                             <constraint firstItem="A0p-hy-xlM" firstAttribute="centerX" secondItem="LRV-2t-x47" secondAttribute="centerX" id="pOS-uZ-qLP"/>
@@ -925,6 +937,7 @@
                             <constraint firstItem="pDn-hA-ajb" firstAttribute="centerX" secondItem="A0p-hy-xlM" secondAttribute="centerX" id="w8c-ah-mkX"/>
                             <constraint firstItem="y8u-Zm-ORg" firstAttribute="top" secondItem="pDn-hA-ajb" secondAttribute="bottom" constant="20" id="xJi-6E-GI0"/>
                             <constraint firstItem="Zt8-rK-Djp" firstAttribute="leading" secondItem="pDn-hA-ajb" secondAttribute="trailing" constant="40" id="xaH-Mo-fCZ"/>
+                            <constraint firstItem="nAz-UG-4xV" firstAttribute="leading" secondItem="y8u-Zm-ORg" secondAttribute="trailing" constant="45" id="zed-AY-WeY"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Call transfer" id="jLZ-1a-dTg">
@@ -935,7 +948,6 @@
                         </barButtonItem>
                     </navigationItem>
                     <connections>
-                        <outlet property="callButton" destination="mYM-pX-A13" id="IUX-21-szP"/>
                         <outlet property="currentCallNumberLabel" destination="WX3-fG-qMM" id="FeT-CH-KgB"/>
                         <outlet property="currentCallStatusLabel" destination="3X1-Xk-Zv7" id="7d0-Fh-VZh"/>
                         <outlet property="deleteButton" destination="jR1-C4-ifr" id="OWO-QT-bvU"/>
@@ -943,12 +955,13 @@
                         <segue destination="eMd-Ko-MFh" kind="show" identifier="SecondCallActiveSegue" id="4TL-pb-R2X"/>
                         <segue destination="x53-3m-veC" kind="unwind" identifier="UnwindToMainViewSegue" unwindAction="unwindToMainViewController:" id="LP8-KC-3mc"/>
                         <segue destination="x53-3m-veC" kind="unwind" identifier="UnwindToFirstCallInProgressSegue" unwindAction="unwindToFirstCallInProgressSegue:" id="bT9-5y-r39"/>
+                        <segue destination="o5A-AG-e34" kind="show" identifier="TransferInProgressSegue" id="PgI-xq-Tu9"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="7pi-sV-x6w" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <exit id="x53-3m-veC" userLabel="Exit" sceneMemberID="exit"/>
             </objects>
-            <point key="canvasLocation" x="3378" y="2140"/>
+            <point key="canvasLocation" x="3376.8000000000002" y="2139.5802098950526"/>
         </scene>
         <!--Call-->
         <scene sceneID="66P-CD-GGF">
@@ -1331,7 +1344,7 @@
                 <placeholder placeholderIdentifier="IBFirstResponder" id="FwZ-jI-IOd" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <exit id="dRq-bv-NE6" userLabel="Exit" sceneMemberID="exit"/>
             </objects>
-            <point key="canvasLocation" x="4298" y="2140"/>
+            <point key="canvasLocation" x="4318" y="2000"/>
         </scene>
         <!--Call Transfer-->
         <scene sceneID="6qc-zs-FxM">
@@ -1393,7 +1406,7 @@
                 <placeholder placeholderIdentifier="IBFirstResponder" id="8Lm-Sp-H40" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <exit id="uh8-L6-fnF" userLabel="Exit" sceneMemberID="exit"/>
             </objects>
-            <point key="canvasLocation" x="5239" y="2140"/>
+            <point key="canvasLocation" x="4897" y="2764"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="c1L-6Y-LaN">
@@ -1415,8 +1428,9 @@
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="gOS-Fu-cCZ"/>
-        <segue reference="vU0-97-2zf"/>
+        <segue reference="PgI-xq-Tu9"/>
+        <segue reference="za9-Z6-H2d"/>
+        <segue reference="QD7-SH-Sgy"/>
         <segue reference="r6l-M1-URi"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/Example/VialerSIPLib/VSLTransferCallViewController.swift b/Example/VialerSIPLib/VSLTransferCallViewController.swift
index 70adc0e5..76f00083 100644
--- a/Example/VialerSIPLib/VSLTransferCallViewController.swift
+++ b/Example/VialerSIPLib/VSLTransferCallViewController.swift
@@ -17,6 +17,7 @@ private var myContext = 0
             static let UnwindToMainView = "UnwindToMainViewSegue"
             static let ShowKeypad = "ShowKeypadSegue"
             static let UnwindToFirstCallInProgress = "UnwindToFirstCallInProgressSegue"
+            static let TransferInProgress = "TransferInProgressSegue"
         }
     }
 
@@ -58,6 +59,19 @@ private var myContext = 0
         }
     }
 
+    @IBAction func blindButtonPressed(_ sender: UIButton) {
+        guard let number = numberToDialLabel.text, number != "" else { return }
+        guard let call = currentCall else { return }
+
+        if call.blindTransferCall(withNumber: number) {
+            callManager.end(call) { (error) in
+                if error != nil {
+                    self.performSegue(withIdentifier: Configuration.Segues.TransferInProgress, sender: nil)
+                }
+            }
+        }
+    }
+
     @IBAction override func callButtonPressed(_ sender: UIButton) {
         guard let number = numberToDialLabel.text, number != "" else { return }
 
@@ -98,6 +112,10 @@ private var myContext = 0
             } else if let call = currentCall, call.callState != .null && call.callState != .disconnected {
                 callVC.activeCall = call
             }
+        } else if let transferInProgressVC = segue.destination as? VSLTransferInProgressViewController {
+            guard let call = currentCall else { return }
+            transferInProgressVC.firstCall = call
+            transferInProgressVC.secondCallBlindNumber = numberToDialLabel.text
         }
     }
 
diff --git a/Example/VialerSIPLib/VSLTransferInProgressViewController.swift b/Example/VialerSIPLib/VSLTransferInProgressViewController.swift
index 210bd5bf..d2a54658 100644
--- a/Example/VialerSIPLib/VSLTransferInProgressViewController.swift
+++ b/Example/VialerSIPLib/VSLTransferInProgressViewController.swift
@@ -34,6 +34,12 @@ class VSLTransferInProgressViewController: UIViewController {
         }
     }
 
+    var secondCallBlindNumber: String? {
+        didSet {
+            updateUI()
+        }
+    }
+
     // MARK: - Lifecycle
 
     override func viewWillAppear(_ animated: Bool) {
@@ -79,6 +85,10 @@ class VSLTransferInProgressViewController: UIViewController {
         if let call = secondCall, let label = secondCallNumberLabel {
             label.text = call.callerNumber!
         }
+
+        if let phoneNumber = secondCallBlindNumber, let label = secondCallNumberLabel {
+            label.text = phoneNumber
+        }
     }
 
     fileprivate func prepareForDismissing() {
diff --git a/Pod/Classes/VSLCall.h b/Pod/Classes/VSLCall.h
index f57448ec..bb1a6c63 100644
--- a/Pod/Classes/VSLCall.h
+++ b/Pod/Classes/VSLCall.h
@@ -416,6 +416,15 @@ typedef NS_ENUM(NSInteger, VSLCallTerminateReason) {
  */
 - (BOOL)sendDTMF:(NSString * _Nonnull)character error:(NSError * _Nullable * _Nullable)error;
 
+/**
+ *  Blind transfer a call with a given number.
+ *
+ *  @param number NSString the number that should be transfered to.
+ *
+ *  @return BOOL success if the transfer has been sent.
+ */
+- (BOOL)blindTransferCallWithNumber:(NSString * _Nonnull)number;
+
 /**
  *  Transfer the call to the given VSLCall.
  *
diff --git a/Pod/Classes/VSLCall.m b/Pod/Classes/VSLCall.m
index 01fcd044..6ca39966 100644
--- a/Pod/Classes/VSLCall.m
+++ b/Pod/Classes/VSLCall.m
@@ -257,6 +257,24 @@ - (AVAudioPlayer *)disconnectedSoundPlayer {
     return _disconnectedSoundPlayer;
 }
 
+- (BOOL)blindTransferCallWithNumber:(NSString *)number {
+    NSString *cleanedNumber = [VialerUtils cleanPhoneNumber:number];
+
+    if ([cleanedNumber isEqualToString:@""]) {
+        return NO;
+    }
+
+    pj_str_t sipUri = [cleanedNumber sipUriWithDomain:self.account.accountConfiguration.sipDomain];
+
+    pj_status_t status = pjsua_call_xfer((pjsua_call_id)self.callId, &sipUri, nil);
+
+    if (status == PJ_SUCCESS) {
+        self.transferStatus = VSLCallTransferStateInitialized;
+        return YES;
+    }
+    return NO;
+}
+
 - (BOOL)transferToCall:(VSLCall *)secondCall {
     NSError *error;
     if (!self.onHold && ![self toggleHold:&error]) {

From 00dfdbc6704ee0c0987e063ba9fbe6a11f4f8ba9 Mon Sep 17 00:00:00 2001
From: Redmer Loen <redmer.loen@wearespindle.com>
Date: Mon, 7 May 2018 08:13:22 +0200
Subject: [PATCH 3/5] Add a check to see if there is currently audio for a
 call. (#138)

---
 .../VialerSIPLib/Base.lproj/Main.storyboard   |  2 +-
 .../VialerSIPLib/VSLCallViewController.swift  |  8 ++++
 .../VialerSIPLib_Example-Bridging-Header.h    |  1 +
 Pod/Classes/VSLCall.h                         |  9 ++++-
 Pod/Classes/VSLCall.m                         | 38 ++++++++++++++++++-
 Pod/Classes/VSLEndpoint.m                     |  1 +
 6 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/Example/VialerSIPLib/Base.lproj/Main.storyboard b/Example/VialerSIPLib/Base.lproj/Main.storyboard
index 81f4bd9b..04d67334 100644
--- a/Example/VialerSIPLib/Base.lproj/Main.storyboard
+++ b/Example/VialerSIPLib/Base.lproj/Main.storyboard
@@ -66,7 +66,7 @@
                                     <action selector="useVideoSwichPressed:" destination="AyF-vj-IOS" eventType="touchUpInside" id="bak-YC-pTt"/>
                                 </connections>
                             </switch>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unreigster after call" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hgl-hR-eAW">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unregister after call" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hgl-hR-eAW">
                                 <rect key="frame" x="18" y="521" width="210" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <color key="textColor" red="0.0" green="0.48058944939999998" blue="0.99789065119999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/Example/VialerSIPLib/VSLCallViewController.swift b/Example/VialerSIPLib/VSLCallViewController.swift
index 761d90ed..9824929f 100644
--- a/Example/VialerSIPLib/VSLCallViewController.swift
+++ b/Example/VialerSIPLib/VSLCallViewController.swift
@@ -54,6 +54,7 @@ class VSLCallViewController: UIViewController, VSLKeypadViewControllerDelegate {
         activeCall?.addObserver(self, forKeyPath: "callState", options: .new, context: &myContext)
         activeCall?.addObserver(self, forKeyPath: "onHold", options: .new, context: &myContext)
         NotificationCenter.default.addObserver(self, selector: #selector(updateUI), name: NSNotification.Name(rawValue: VSLAudioControllerAudioInterrupted), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(noAudioForCall), name: Notification.Name.VSLCallNoAudioForCall, object: nil)
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -63,6 +64,7 @@ class VSLCallViewController: UIViewController, VSLKeypadViewControllerDelegate {
         activeCall?.removeObserver(self, forKeyPath: "callState")
         activeCall?.removeObserver(self, forKeyPath: "onHold")
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: VSLAudioControllerAudioInterrupted), object: nil)
+        NotificationCenter.default.removeObserver(self, name: Notification.Name.VSLCallNoAudioForCall, object: nil)
     }
 
     // MARK: - Outlets
@@ -168,6 +170,12 @@ class VSLCallViewController: UIViewController, VSLKeypadViewControllerDelegate {
         }
     }
 
+    @objc func noAudioForCall() {
+        guard let call = activeCall, call.callState != .disconnected else { return }
+
+        call.reinvite()
+    }
+
     @objc func updateUI() {
         guard let call = activeCall else { return }
         updateLabels(call: call, statusLabel: statusLabel, numberLabel: numberLabel)
diff --git a/Example/VialerSIPLib/VialerSIPLib_Example-Bridging-Header.h b/Example/VialerSIPLib/VialerSIPLib_Example-Bridging-Header.h
index 6859d61b..71c11470 100644
--- a/Example/VialerSIPLib/VialerSIPLib_Example-Bridging-Header.h
+++ b/Example/VialerSIPLib/VialerSIPLib_Example-Bridging-Header.h
@@ -4,6 +4,7 @@
 
 #import "DDLogWrapper.h"
 #import <VialerSIPLib/VSLAudioController.h>
+#import <VialerSIPLib/VSLCall.h>
 #import <VialerSIPLib/VialerSIPLib.h>
 #import <VialerSIPLib/VSLRingtone.h>
 #import <VialerSIPLib/CallKitProviderDelegate.h>
diff --git a/Pod/Classes/VSLCall.h b/Pod/Classes/VSLCall.h
index bb1a6c63..a88177cf 100644
--- a/Pod/Classes/VSLCall.h
+++ b/Pod/Classes/VSLCall.h
@@ -22,8 +22,16 @@ extern NSString * _Nonnull const VSLCallStateChangedNotification;
  */
 extern NSString * _Nonnull const VSLNotificationUserInfoVideoSizeRenderKey;
 
+/**
+ *  Notification for when the VSLCall object has been dealloced.
+ */
 extern NSString * _Nonnull const VSLCallDeallocNotification;
 
+/**
+ *  Notification for when there is no audio during a call.
+ */
+extern NSString * _Nonnull const VSLCallNoAudioForCallNotification;
+
 /**
  *  Notification that will be posted when a phonecall is connected.
  */
@@ -34,7 +42,6 @@ extern NSString * _Nonnull const VSLCallConnectedNotification DEPRECATED_MSG_ATT
  */
 extern NSString * _Nonnull const VSLCallDisconnectedNotification DEPRECATED_MSG_ATTRIBUTE("Deprecated, listen for VSLCallStateChangedNotification instead");
 
-
 /**
  *  The posible errors VSLCall can return.
  */
diff --git a/Pod/Classes/VSLCall.m b/Pod/Classes/VSLCall.m
index 6ca39966..df043e24 100644
--- a/Pod/Classes/VSLCall.m
+++ b/Pod/Classes/VSLCall.m
@@ -24,6 +24,7 @@
 NSString * const VSLCallConnectedNotification = @"VSLCallConnectedNotification";
 NSString * const VSLCallDisconnectedNotification = @"VSLCallDisconnectedNotification";
 NSString * const VSLCallDeallocNotification = @"VSLCallDeallocNotification";
+NSString * const VSLCallNoAudioForCallNotification = @"VSLCallNoAudioForCallNotification";
 
 @interface VSLCall()
 @property (readwrite, nonatomic) VSLCallState callState;
@@ -51,6 +52,8 @@ @interface VSLCall()
 @property (strong, nonatomic) NSString *numberToCall;
 @property (weak, nonatomic) VSLAccount *account;
 @property (nonatomic) BOOL reinviteCall;
+@property (readwrite, nonatomic) NSTimer *audioCheckTimer;
+@property (readwrite, nonatomic) int audioCheckTimerFired;
 /**
  *  Stats
  */
@@ -388,9 +391,42 @@ - (void)mediaStateChanged:(pjsua_call_info)callInfo  {
         pjsua_conf_connect(0, callInfo.conf_slot);
     }
 
+    if (self.mediaState == VSLMediaStateActive && ![self.audioCheckTimer isValid]) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self.audioCheckTimerFired = 0;
+            self.audioCheckTimer = [NSTimer scheduledTimerWithTimeInterval:2.0 target:self selector:@selector(checkIfAudioPresent) userInfo: nil repeats: YES];
+        });
+    }
+
     [self updateCallInfo:callInfo];
 }
 
+- (void)checkIfAudioPresent {
+    pjsua_call_info callInfo;
+    pjsua_call_get_info((pjsua_call_id)self.callId, &callInfo);
+
+    pj_status_t status;
+    pjsua_stream_stat stream_stat;
+    status = pjsua_call_get_stream_stat((pjsua_call_id)self.callId, callInfo.media[0].index, &stream_stat);
+
+    int rxPkt = stream_stat.rtcp.rx.pkt;
+    int txPkt = stream_stat.rtcp.tx.pkt;
+
+    if (rxPkt == 0 || txPkt == 0) {
+        VSLLogWarning(@"There is NO audio %f: sec into the call. Trying a reinvite", self.lastSeenConnectDuration);
+        [[NSNotificationCenter defaultCenter] postNotificationName:VSLCallNoAudioForCallNotification object:nil];
+        [self.audioCheckTimer invalidate];
+    }
+
+    if (self.audioCheckTimerFired > 5) {
+        VSLLogInfo(@"There is audio in the last 10 seconds rxPkt: %d and txPkt: %d", rxPkt, txPkt);
+        [self.audioCheckTimer invalidate];
+        self.audioCheckTimerFired = 0;
+    }
+
+    self.audioCheckTimerFired++;
+}
+
 #pragma mark - User actions
 - (void)answerWithCompletion:(void (^)(NSError *error))completion {
     pj_status_t status;
@@ -729,7 +765,6 @@ - (void)calculateStats {
         VSLLogError(@"Stream is not active!");
     }
 
-
     VSLCallStats *callStats = [[VSLCallStats alloc] initWithCall: self];
     NSDictionary *stats = [callStats generate];
     if ([stats count] > 0) {
@@ -740,6 +775,7 @@ - (void)calculateStats {
         
         VSLLogDebug(@"activeCodec: %@ with MOS score: %f and MBs used: %f", self.activeCodec, self.MOS, self.totalMBsUsed);
     }
+    [self.audioCheckTimer invalidate];
 }
 
 - (NSString *)debugDescription {
diff --git a/Pod/Classes/VSLEndpoint.m b/Pod/Classes/VSLEndpoint.m
index ba5a9631..fe6bb4cd 100644
--- a/Pod/Classes/VSLEndpoint.m
+++ b/Pod/Classes/VSLEndpoint.m
@@ -622,6 +622,7 @@ static void onRegState2(pjsua_acc_id acc_id, pjsua_reg_info *info) {
     if ([VSLEndpoint sharedEndpoint].ipChangeInProgress) {
         // When disableVideoSupport is on reinivite the calls again. And in the reinivite
         // disable the video stream. Otherwise the response is an 488 Not Acceptatble here.
+        // When videosupport has been disabled in the PBX.
         if ([VSLEndpoint sharedEndpoint].endpointConfiguration.disableVideoSupport) {
             VSLIpChangeConfiguration *ipChangeConfiguration = [VSLEndpoint sharedEndpoint].endpointConfiguration.ipChangeConfiguration;
             VSLAccount *account = [[VSLEndpoint sharedEndpoint] lookupAccount:acc_id];

From 8feba2579b7cecca335f7f6eaf41359584aa597a Mon Sep 17 00:00:00 2001
From: Redmer Loen <redmer.loen@wearespindle.com>
Date: Thu, 14 Jun 2018 15:18:53 +0200
Subject: [PATCH 4/5] Feature/code cleanup (#142)

* Cleanup of deprecated code and memory management of VSLCall and VSLRingback
---
 Pod/Classes/CallKitProviderDelegate.m         | 14 +--
 .../Configurations/VSLCodecConfiguration.h    |  4 +-
 Pod/Classes/VSLAccount.h                      |  2 +
 Pod/Classes/VSLAccount.m                      |  7 +-
 Pod/Classes/VSLAudioController.m              |  7 +-
 Pod/Classes/VSLCall.m                         | 96 ++++++++++++-------
 Pod/Classes/VSLCallManager.m                  | 27 +++++-
 Pod/Classes/VSLCallStats.m                    |  4 +-
 Pod/Classes/VSLEndpoint.h                     |  6 +-
 Pod/Classes/VSLEndpoint.m                     | 76 +++++++--------
 Pod/Classes/VSLRingback.m                     | 11 +++
 Pod/Classes/VialerSIPLib.h                    |  7 +-
 Pod/Classes/VialerSIPLib.m                    |  8 +-
 13 files changed, 164 insertions(+), 105 deletions(-)

diff --git a/Pod/Classes/CallKitProviderDelegate.m b/Pod/Classes/CallKitProviderDelegate.m
index 62d7b9eb..0d0dabcb 100644
--- a/Pod/Classes/CallKitProviderDelegate.m
+++ b/Pod/Classes/CallKitProviderDelegate.m
@@ -96,7 +96,7 @@ - (void)reportIncomingCall:(VSLCall *)call {
  * "native" CallKit interface.
  */
 - (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAction *)action NS_AVAILABLE_IOS(10.0) {
-    VSLCall *call = [self.callManager callWithUUID:action.callUUID];
+    __weak VSLCall *call = [self.callManager callWithUUID:action.callUUID];
     if (call) {
         [self.callManager.audioController configureAudioSession];
 
@@ -127,7 +127,7 @@ - (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAct
  */
 - (void)provider:(CXProvider *)provider performEndCallAction:(CXEndCallAction *)action NS_AVAILABLE_IOS(10.0){
     // Find call.
-    VSLCall *call = [self.callManager callWithUUID:action.callUUID];
+    __weak VSLCall *call = [self.callManager callWithUUID:action.callUUID];
     if (!call) {
         VSLLogInfo(@"Error hanging up call(%@). No call found", action.callUUID.UUIDString);
         [action fulfill];
@@ -158,7 +158,7 @@ - (void)provider:(CXProvider *)provider performEndCallAction:(CXEndCallAction *)
  * Delegate method called when CallKit approves the apps request to start an outbound call.
  */
 - (void)provider:(CXProvider *)provider performStartCallAction:(CXStartCallAction *)action NS_AVAILABLE_IOS(10.0) {
-    VSLCall *call = [self.callManager callWithUUID:action.callUUID];
+    __weak VSLCall *call = [self.callManager callWithUUID:action.callUUID];
     [self.callManager.audioController configureAudioSession];
 
     [call startWithCompletion:^(NSError *error) {
@@ -179,7 +179,7 @@ - (void)provider:(CXProvider *)provider performStartCallAction:(CXStartCallActio
 }
 
 - (void)provider:(CXProvider *)provider performSetMutedCallAction:(CXSetMutedCallAction *)action NS_AVAILABLE_IOS(10.0) {
-    VSLCall *call = [self.callManager callWithUUID:action.callUUID];
+    __weak VSLCall *call = [self.callManager callWithUUID:action.callUUID];
     if (!call) {
         [action fail];
         return;
@@ -196,7 +196,7 @@ - (void)provider:(CXProvider *)provider performSetMutedCallAction:(CXSetMutedCal
 }
 
 - (void)provider:(CXProvider *)provider performSetHeldCallAction:(CXSetHeldCallAction *)action NS_AVAILABLE_IOS(10.0) {
-    VSLCall *call = [self.callManager callWithUUID:action.callUUID];
+    __weak VSLCall *call = [self.callManager callWithUUID:action.callUUID];
     if (!call) {
         [action fail];
         return;
@@ -213,7 +213,7 @@ - (void)provider:(CXProvider *)provider performSetHeldCallAction:(CXSetHeldCallA
 }
 
 - (void)provider:(CXProvider *)provider performPlayDTMFCallAction:(CXPlayDTMFCallAction *)action NS_AVAILABLE_IOS(10.0) {
-    VSLCall *call = [self.callManager callWithUUID:action.callUUID];
+    __weak VSLCall *call = [self.callManager callWithUUID:action.callUUID];
     if (!call) {
         [action fail];
         return;
@@ -242,7 +242,7 @@ - (void)providerDidReset:(CXProvider *)provider NS_AVAILABLE_IOS(10.0) {
 }
 
 - (void)callStateChanged:(NSNotification *)notification {
-    VSLCall *call = [[notification userInfo] objectForKey:VSLNotificationUserInfoCallKey];
+    __weak VSLCall *call = [[notification userInfo] objectForKey:VSLNotificationUserInfoCallKey];
     switch (call.callState) {
         case VSLCallStateNull:
             break;
diff --git a/Pod/Classes/Configurations/VSLCodecConfiguration.h b/Pod/Classes/Configurations/VSLCodecConfiguration.h
index d561eb1d..0445c03f 100644
--- a/Pod/Classes/Configurations/VSLCodecConfiguration.h
+++ b/Pod/Classes/Configurations/VSLCodecConfiguration.h
@@ -5,8 +5,8 @@
 
 #import <Foundation/Foundation.h>
 
-@class VSLAudioCodecs;
-@class VSLVideoCodecs;
+#import "VSLAudioCodecs.h"
+#import "VSLVideoCodecs.h"
 
 @interface VSLCodecConfiguration : NSObject
 
diff --git a/Pod/Classes/VSLAccount.h b/Pod/Classes/VSLAccount.h
index 8ea6006b..da63fabe 100644
--- a/Pod/Classes/VSLAccount.h
+++ b/Pod/Classes/VSLAccount.h
@@ -90,6 +90,8 @@ typedef void (^RegistrationCompletionBlock)(BOOL success, NSError * _Nullable er
  */
 @property (readonly, nonatomic) VSLAccountConfiguration * _Nonnull accountConfiguration;
 
+@property (readwrite, nonatomic) BOOL forceRegistration;
+
 /**
  * This init is not available.
  */
diff --git a/Pod/Classes/VSLAccount.m b/Pod/Classes/VSLAccount.m
index 6707fcd0..c17391d6 100644
--- a/Pod/Classes/VSLAccount.m
+++ b/Pod/Classes/VSLAccount.m
@@ -94,7 +94,6 @@ - (BOOL)isRegistered {
 }
 
 - (BOOL)configureWithAccountConfiguration:(VSLAccountConfiguration * _Nonnull)accountConfiguration error:(NSError **)error {
-
     // If the endpoint has a tcp connection create a variable with the needed information.
     NSString *transportString = @"";
     if ([[VSLEndpoint sharedEndpoint].endpointConfiguration hasTCPConfiguration]) {
@@ -217,7 +216,7 @@ - (void)removeAccount {
 
 - (void)registerAccountWithCompletion:(RegistrationCompletionBlock)completion {
     VSLLogDebug(@"Account valid: %@", self.isAccountValid ? @"YES": @"NO");
-
+    VSLLogDebug(@"Should force registration: %@", self.forceRegistration ? @"YES" : @"NO");
     pjsua_acc_info info;
     pjsua_acc_get_info((pjsua_acc_id)self.accountId, &info);
 
@@ -227,7 +226,7 @@ - (void)registerAccountWithCompletion:(RegistrationCompletionBlock)completion {
     // If pjsua_acc_info.expires == -1 the account has a registration but, as it turns out,
     // this is not a valid check whether there is a registration in progress or not, at least,
     // not wit a connection loss. So, to track a registration in progress, an ivar is used.
-    if (!self.registrationInProgress && info.expires == -1) {
+    if (self.forceRegistration || (!self.registrationInProgress && info.expires == -1)) {
         self.registrationInProgress = YES;
         VSLLogVerbose(@"Sending registration for account: %@", [NSNumber numberWithInteger:self.accountId]);
 
@@ -294,7 +293,7 @@ - (BOOL)unregisterAccount:(NSError * _Nullable __autoreleasing *)error {
 }
 
 - (void)reregisterAccount {
-    if ([[self.callManager callsForAccount:self] count] > 0) {
+    if ([self.callManager callsForAccount:self].count > 0) {
         self.shouldReregister = YES;
         [self unregisterAccount:nil];
     }
diff --git a/Pod/Classes/VSLAudioController.m b/Pod/Classes/VSLAudioController.m
index 4a64ff4a..93e8b757 100644
--- a/Pod/Classes/VSLAudioController.m
+++ b/Pod/Classes/VSLAudioController.m
@@ -82,18 +82,17 @@ - (void)checkCurrentThreadIsRegisteredWithPJSUA {
     static pj_thread_desc a_thread_desc;
     static pj_thread_t *a_thread;
     if (!pj_thread_is_registered()) {
-        pj_thread_register(NULL, a_thread_desc, &a_thread);
+        pj_thread_register("VialerPJSIP", a_thread_desc, &a_thread);
     }
 }
 
 - (void)activateAudioSession {
     VSLLogDebug(@"Activating audiosession");
     [self checkCurrentThreadIsRegisteredWithPJSUA];
+
     pjsua_set_no_snd_dev();
 
-    pjsua_snd_dev_param snd_dev_param;
-    pjsua_snd_dev_param_default(&snd_dev_param);
-    pj_status_t status = pjsua_set_snd_dev2(&snd_dev_param);
+    pj_status_t status = pjsua_set_snd_dev(PJMEDIA_AUD_DEFAULT_CAPTURE_DEV, PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV);
 
     if (status != PJ_SUCCESS) {
         VSLLogWarning(@"Failure in enabling sound device");
diff --git a/Pod/Classes/VSLCall.m b/Pod/Classes/VSLCall.m
index df043e24..ec2b3366 100644
--- a/Pod/Classes/VSLCall.m
+++ b/Pod/Classes/VSLCall.m
@@ -104,7 +104,7 @@ - (void)dealloc {
     [[NSNotificationCenter defaultCenter] postNotificationName:VSLCallDeallocNotification
                                                         object:nil
                                                       userInfo:nil];
-    VSLLogVerbose(@"Dealloc Call uuid:%@ id:%ld", self.uuid.UUIDString, (long)self.callId);
+    VSLLogVerbose(@"Dealloc call with uuid:%@ callId:%ld", self.uuid.UUIDString, (long)self.callId);
 }
 
 #pragma mark - Properties
@@ -142,20 +142,26 @@ - (void)setCallState:(VSLCallState)callState {
 
             case VSLCallStateConfirmed: {
                 self.connected = YES;
-                [self.ringback stop];
+                if (!self.incoming) {
+                    // Stop ringback for outgoing calls.
+                    [self.ringback stop];
+                    self.ringback = nil;
+                }
                 // Register for the audio interruption notification to be able to restore the sip audio session after an interruption (incoming call/alarm....).
                 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(audioInterruption:) name:VSLAudioControllerAudioInterrupted object:nil];
                 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(audioInterruption:) name:VSLAudioControllerAudioResumed object:nil];
-//                [[NSNotificationCenter defaultCenter] postNotificationName:VSLCallConnectedNotification object:nil];
             } break;
 
             case VSLCallStateDisconnected: {
                 [self calculateStats];
-                [self.ringback stop];
+                if (!self.incoming) {
+                    // Stop ringback for outgoing calls.
+                    [self.ringback stop];
+                    self.ringback = nil;
+                }
 
                 [[NSNotificationCenter defaultCenter] removeObserver:self name:VSLAudioControllerAudioResumed object:nil];
                 [[NSNotificationCenter defaultCenter] removeObserver:self name:VSLAudioControllerAudioInterrupted object:nil];
-//                [[NSNotificationCenter defaultCenter] postNotificationName:VSLCallDisconnectedNotification object:nil];
 
                 if (self.connected && !self.userDidHangUp) {
                     [self.disconnectedSoundPlayer play];
@@ -164,7 +170,10 @@ - (void)setCallState:(VSLCallState)callState {
         }
         [self didChangeValueForKey:stringFromCallStateProperty];
 
-        NSDictionary *notificationUserInfo = @{VSLNotificationUserInfoCallKey : self};
+        NSDictionary *notificationUserInfo = @{
+                                               VSLNotificationUserInfoCallKey : self,
+                                               VSLNotificationUserInfoCallStateKey: [NSNumber numberWithInt:callState]
+                                               };
         [[NSNotificationCenter defaultCenter] postNotificationName:VSLCallStateChangedNotification
                                                             object:nil
                                                           userInfo:notificationUserInfo];
@@ -367,12 +376,15 @@ - (void)updateCallInfo:(pjsua_call_info)callInfo {
     self.callStateText = [NSString stringWithPJString:callInfo.state_text];
     self.lastStatus = callInfo.last_status;
     self.lastStatusText = [NSString stringWithPJString:callInfo.last_status_text];
-    self.localURI = [NSString stringWithPJString:callInfo.local_info];
-    self.remoteURI = [NSString stringWithPJString:callInfo.remote_info];
-    if (self.remoteURI) {
-        NSDictionary *callerInfo = [self getCallerInfoFromRemoteUri:self.remoteURI];
-        self.callerName = callerInfo[@"caller_name"];
-        self.callerNumber = callerInfo[@"caller_number"];
+
+    if (self.callState != VSLCallStateDisconnected) {
+        self.localURI = [NSString stringWithPJString:callInfo.local_info];
+        self.remoteURI = [NSString stringWithPJString:callInfo.remote_info];
+        if (self.remoteURI) {
+            NSDictionary *callerInfo = [self getCallerInfoFromRemoteUri:self.remoteURI];
+            self.callerName = callerInfo[@"caller_name"];
+            self.callerNumber = callerInfo[@"caller_number"];
+        }
     }
 }
 
@@ -386,7 +398,10 @@ - (void)mediaStateChanged:(pjsua_call_info)callInfo  {
     self.mediaState = (VSLMediaState)mediaState;
 
     if (self.mediaState == VSLMediaStateActive || self.mediaState == VSLMediaStateRemoteHold) {
-        [self.ringback stop];
+        if (!self.incoming) {
+            // Stop the ringback for outgoing calls.
+            [self.ringback stop];
+        }
         pjsua_conf_connect(callInfo.conf_slot, 0);
         pjsua_conf_connect(0, callInfo.conf_slot);
     }
@@ -405,23 +420,31 @@ - (void)checkIfAudioPresent {
     pjsua_call_info callInfo;
     pjsua_call_get_info((pjsua_call_id)self.callId, &callInfo);
 
+    if (self.audioCheckTimerFired > 5) {
+        VSLLogInfo(@"There was audio in the last 10 seconds");
+        [self.audioCheckTimer invalidate];
+        self.audioCheckTimerFired = 0;
+    }
+
+    if (callInfo.media_status != PJSUA_CALL_MEDIA_ACTIVE) {
+        VSLLogDebug(@"Unable to check if audio present no active stream!");
+        self.audioCheckTimerFired++;
+        return;
+    }
+
     pj_status_t status;
     pjsua_stream_stat stream_stat;
     status = pjsua_call_get_stream_stat((pjsua_call_id)self.callId, callInfo.media[0].index, &stream_stat);
 
-    int rxPkt = stream_stat.rtcp.rx.pkt;
-    int txPkt = stream_stat.rtcp.tx.pkt;
-
-    if (rxPkt == 0 || txPkt == 0) {
-        VSLLogWarning(@"There is NO audio %f: sec into the call. Trying a reinvite", self.lastSeenConnectDuration);
-        [[NSNotificationCenter defaultCenter] postNotificationName:VSLCallNoAudioForCallNotification object:nil];
-        [self.audioCheckTimer invalidate];
-    }
+    if (status == PJ_SUCCESS) {
+        int rxPkt = stream_stat.rtcp.rx.pkt;
+        int txPkt = stream_stat.rtcp.tx.pkt;
 
-    if (self.audioCheckTimerFired > 5) {
-        VSLLogInfo(@"There is audio in the last 10 seconds rxPkt: %d and txPkt: %d", rxPkt, txPkt);
-        [self.audioCheckTimer invalidate];
-        self.audioCheckTimerFired = 0;
+        if (rxPkt == 0 || txPkt == 0) {
+            VSLLogInfo(@"There is NO audio %f: sec into the call. Trying a reinvite", self.lastSeenConnectDuration);
+            [[NSNotificationCenter defaultCenter] postNotificationName:VSLCallNoAudioForCallNotification object:nil];
+            [self.audioCheckTimer invalidate];
+        }
     }
 
     self.audioCheckTimerFired++;
@@ -762,18 +785,17 @@ - (void)calculateStats {
     pjsua_call_get_info((pjsua_call_id)self.callId, &callInfo);
 
     if (callInfo.media_status != PJSUA_CALL_MEDIA_ACTIVE) {
-        VSLLogError(@"Stream is not active!");
-    }
-
-    VSLCallStats *callStats = [[VSLCallStats alloc] initWithCall: self];
-    NSDictionary *stats = [callStats generate];
-    if ([stats count] > 0) {
-        
-        self.activeCodec = stats[VSLCallStatsActiveCodec];
-        self.MOS = [[stats objectForKey:VSLCallStatsMOS] floatValue];
-        self.totalMBsUsed = [stats[VSLCallStatsTotalMBsUsed] floatValue];
-        
-        VSLLogDebug(@"activeCodec: %@ with MOS score: %f and MBs used: %f", self.activeCodec, self.MOS, self.totalMBsUsed);
+        VSLLogDebug(@"Stream is not active!");
+    } else {
+        VSLCallStats *callStats = [[VSLCallStats alloc] initWithCall: self];
+        NSDictionary *stats = [callStats generate];
+        if ([stats count] > 0) {
+            self.activeCodec = stats[VSLCallStatsActiveCodec];
+            self.MOS = [[stats objectForKey:VSLCallStatsMOS] floatValue];
+            self.totalMBsUsed = [stats[VSLCallStatsTotalMBsUsed] floatValue];
+
+            VSLLogDebug(@"activeCodec: %@ with MOS score: %f and MBs used: %f", self.activeCodec, self.MOS, self.totalMBsUsed);
+        }
     }
     [self.audioCheckTimer invalidate];
 }
diff --git a/Pod/Classes/VSLCallManager.m b/Pod/Classes/VSLCallManager.m
index af5cd5fb..41ae7e80 100644
--- a/Pod/Classes/VSLCallManager.m
+++ b/Pod/Classes/VSLCallManager.m
@@ -66,14 +66,14 @@ - (void)startCallToNumber:(NSString *)number forAccount:(VSLAccount *)account co
     if (account.accountState != VSLAccountStateConnected) {
         [account registerAccountWithCompletion:nil];
     }
-    
+
     VSLCall *call = [[VSLCall alloc] initOutboundCallWithNumberToCall:number account:account];
     [self addCall:call];
-
+    
     if (@available(iOS 10.0, *)) {
         CXHandle *numberHandle = [[CXHandle alloc] initWithType:CXHandleTypePhoneNumber value:call.numberToCall];
         CXAction *startCallAction = [[CXStartCallAction alloc] initWithCallUUID:call.uuid handle:numberHandle];
-
+        
         [self requestCallKitAction:startCallAction completion:^(NSError *error) {
             if (error) {
                 VSLLogError(@"Error requesting \"Start Call Transaction\" error: %@", error);
@@ -203,15 +203,23 @@ - (void)requestCallKitAction:(CXAction *)action completion:(void (^)(NSError *er
 - (void)addCall:(VSLCall *)call {
     [self.calls addObject:call];
     VSLLogVerbose(@"Call(%@) added. Calls count:%ld",call.uuid.UUIDString, (long)[self.calls count]);
-
 }
 
 - (void)removeCall:(VSLCall *)call {
     [self.calls removeObject:call];
+
+    if ([self.calls count] == 0) {
+        self.calls = nil;
+        self.audioController = nil;
+    }
     VSLLogVerbose(@"Call(%@) removed. Calls count: %ld",call.uuid.UUIDString, (long)[self.calls count]);
 }
 
 - (void)endAllCalls {
+    if ([self.calls count] == 0) {
+        return;
+    }
+    
     for (VSLCall *call in self.calls) {
         VSLLogVerbose(@"Ending call: %@", call.uuid.UUIDString);
         NSError *hangupError;
@@ -221,6 +229,7 @@ - (void)endAllCalls {
         } else {
             [self.audioController deactivateAudioSession];
         }
+        [self removeCall:call];
     }
 }
 
@@ -271,6 +280,10 @@ - (VSLCall *)callWithCallId:(NSInteger)callId {
 }
 
 - (NSArray *)callsForAccount:(VSLAccount *)account {
+    if ([self.calls count] == 0) {
+        return nil;
+    }
+
     NSMutableArray *callsForAccount = [[NSMutableArray alloc] init];
     for (VSLCall *call in self.calls) {
         if ([call.account isEqual:account]) {
@@ -304,6 +317,10 @@ - (VSLCall *)firstActiveCallForAccount:(VSLAccount *)account {
 }
 
 - (NSArray <VSLCall *> *)activeCallsForAccount:(VSLAccount *)account {
+    if ([self.calls count] == 0) {
+        
+    }
+
     NSMutableArray *activeCallsForAccount = [[NSMutableArray alloc] init];
     for (VSLCall *call in self.calls) {
         if (call.callState > VSLCallStateNull && call.callState < VSLCallStateDisconnected) {
@@ -335,7 +352,7 @@ - (void)updateActiveCallsForAccount:(VSLAccount *)account {
 }
 
 - (void)callStateChanged:(NSNotification *)notification {
-    VSLCall *call = [[notification userInfo] objectForKey:VSLNotificationUserInfoCallKey];
+    __weak VSLCall *call = [[notification userInfo] objectForKey:VSLNotificationUserInfoCallKey];
     if (call.callState == VSLCallStateDisconnected) {
         [self removeCall:call];
     }
diff --git a/Pod/Classes/VSLCallStats.m b/Pod/Classes/VSLCallStats.m
index 6606e3af..68250e39 100644
--- a/Pod/Classes/VSLCallStats.m
+++ b/Pod/Classes/VSLCallStats.m
@@ -210,15 +210,13 @@ - (NSDictionary *)generate{
     pjsua_call_get_info((pjsua_call_id)self.call.callId, &callInfo);
 
     if (callInfo.media_status != PJSUA_CALL_MEDIA_ACTIVE) {
-        VSLLogError(@"Stream is not active!");
+        VSLLogDebug(@"Stream is not active!");
         return stats;
     }
-
     
     pj_status_t status;
     pjsua_stream_info stream_info;
     status = pjsua_call_get_stream_info((pjsua_call_id)self.call.callId, callInfo.media[0].index, &stream_info);
-    
 
     if (status == PJ_SUCCESS) {
         self.streamInfo = stream_info;
diff --git a/Pod/Classes/VSLEndpoint.h b/Pod/Classes/VSLEndpoint.h
index 68f6fe8e..5832f735 100644
--- a/Pod/Classes/VSLEndpoint.h
+++ b/Pod/Classes/VSLEndpoint.h
@@ -54,7 +54,11 @@ typedef NS_ENUM(NSInteger, VSLEndpointState) {
     /**
      *  Endpoint is running.
      */
-    VSLEndpointStarted
+    VSLEndpointStarted,
+    /**
+     *  Endpoint is closing.
+     */
+    VSLEndpointClosing,
 };
 #define VSLEndpointStateString(VSLEndpointState) [@[@"VSLEndpointStopped", @"VSLEndpointStarting", @"VSLEndpointStarted"] objectAtIndex:VSLEndpointState]
 
diff --git a/Pod/Classes/VSLEndpoint.m b/Pod/Classes/VSLEndpoint.m
index fe6bb4cd..2e8c9561 100644
--- a/Pod/Classes/VSLEndpoint.m
+++ b/Pod/Classes/VSLEndpoint.m
@@ -84,6 +84,7 @@ - (void)setState:(VSLEndpointState)state {
                 }
                 break;
             }
+            case VSLEndpointClosing:
             case VSLEndpointStarting: {
                 break;
             }
@@ -104,7 +105,7 @@ - (VSLNetworkMonitor *)networkMonitor {
     if (!_networkMonitor) {
         VSLAccount *activeAccount;
         for (VSLAccount *account in self.accounts) {
-            if ([account firstActiveCall]) {
+            if ([self.callManager firstCallForAccount:account]) {
                 activeAccount = account;
                 break;
             }
@@ -136,8 +137,15 @@ - (BOOL)startEndpointWithEndpointConfiguration:(VSLEndpointConfiguration  * _Non
     VSLLogDebug(@"Creating new PJSIP Endpoint instance.");
     self.state = VSLEndpointStarting;
 
-    // Create PJSUA on the main thread to make all subsequent calls from the main
-    // thread.
+
+    // Create worker thread for pjsip.
+    NSError *threadError;
+    if (![self createPJSIPThreadWithError:&threadError]) {
+        *error = threadError;
+        return NO;
+    }
+
+    // Create PJSUA on the main thread to make all subsequent calls from the main thread.
     pj_status_t status = pjsua_create();
     if (status != PJ_SUCCESS) {
         self.state = VSLEndpointStopped;
@@ -151,12 +159,7 @@ - (BOOL)startEndpointWithEndpointConfiguration:(VSLEndpointConfiguration  * _Non
         return NO;
     }
 
-    // Create Thread & Pool
-    NSError *threadError;
-    if (![self createPJThreadAndPoolwithError:&threadError]) {
-        *error = threadError;
-        return NO;
-    }
+    [self createPoolForPJSIP];
 
     // Configure the different logging information for the endpoint.
     pjsua_logging_config logConfig;
@@ -200,6 +203,7 @@ - (BOOL)startEndpointWithEndpointConfiguration:(VSLEndpointConfiguration  * _Non
     mediaConfig.snd_clock_rate = (unsigned int)endpointConfiguration.sndClockRate;
     mediaConfig.has_ioqueue = PJ_TRUE;
     mediaConfig.thread_cnt = 1;
+    mediaConfig.no_vad = PJ_TRUE;
 
     // Initialize Endpoint.
     status = pjsua_init(&endpointConfig, &logConfig, &mediaConfig);
@@ -267,12 +271,12 @@ - (BOOL)startEndpointWithEndpointConfiguration:(VSLEndpointConfiguration  * _Non
     return YES;
 }
 
-- (BOOL)createPJThreadAndPoolwithError:(NSError * _Nullable __autoreleasing *)error {
+- (BOOL)createPJSIPThreadWithError:(NSError * _Nullable __autoreleasing *)error {
     // Create a seperate thread
     pj_thread_desc aPJThreadDesc;
     if (!pj_thread_is_registered()) {
         pj_thread_t *pjThread;
-        pj_status_t status = pj_thread_register(NULL, aPJThreadDesc, &pjThread);
+        pj_status_t status = pj_thread_register("VialerPJSIP", aPJThreadDesc, &pjThread);
         if (status != PJ_SUCCESS) {
             if (error != NULL) {
                 *error = [NSError VSLUnderlyingError:nil
@@ -285,24 +289,28 @@ - (BOOL)createPJThreadAndPoolwithError:(NSError * _Nullable __autoreleasing *)er
         }
     }
 
+    return YES;
+}
+
+- (void)createPoolForPJSIP {
     // Create pool for PJSUA.
     self.pjPool = pjsua_pool_create("VialerSIPLib-pjsua", 1000, 1000);
-    return YES;
 }
 
 - (void)destroyPJSUAInstance {
     VSLLogDebug(@"PJSUA was already running destroying old instance.");
+    self.state = VSLEndpointClosing;
     [self stopNetworkMonitoring];
+    [self.callManager endAllCalls];
 
     for (VSLAccount *account in self.accounts) {
-        [account removeAllCalls];
         [self removeAccount:account];
     }
 
     if (!pj_thread_is_registered()) {
         pj_thread_desc aPJThreadDesc;
         pj_thread_t *pjThread;
-        pj_status_t status = pj_thread_register(NULL, aPJThreadDesc, &pjThread);
+        pj_status_t status = pj_thread_register("VialerPJSIP", aPJThreadDesc, &pjThread);
 
         if (status != PJ_SUCCESS) {
             VSLLogError(@"Error registering thread at PJSUA");
@@ -310,7 +318,7 @@ - (void)destroyPJSUAInstance {
     }
 
     if (self.pjPool != NULL) {
-        pj_pool_release(self->_pjPool);
+        pj_pool_release(self.pjPool);
     }
     
     // Destroy PJSUA.
@@ -332,7 +340,6 @@ - (void)removeAccount:(VSLAccount *)account {
     NSMutableArray *mutableArray = [self.accounts mutableCopy];
     [mutableArray removeObject:account];
     self.accounts = [mutableArray copy];
-    
 }
 
 - (VSLAccount *)lookupAccount:(NSInteger)accountId {
@@ -352,13 +359,7 @@ - (VSLAccount *)lookupAccount:(NSInteger)accountId {
 }
 
 - (VSLCall *)lookupCall:(NSInteger)callId {
-    for (VSLAccount *account in self.accounts) {
-        VSLCall *call = [account lookupCall:callId];
-        if (call) {
-            return call;
-        }
-    }
-    return nil;
+    return [self.callManager callWithCallId:callId];
 }
 
 - (VSLAccount *)getAccountWithSipAccount:(NSString *)sipAccount {
@@ -555,7 +556,7 @@ static void logCallBack(int logLevel, const char *data, int len) {
     // The data obtained from the callback has a NewLine character at the end, remove it.
     unichar last = [logString characterAtIndex:[logString length] - 1];
     if ([[NSCharacterSet newlineCharacterSet] characterIsMember:last]) {
-        logString = [logString substringToIndex:[logString length]-1];
+        logString = [logString substringToIndex:[logString length] - 1];
     }
 
     switch (logLevel) {
@@ -584,7 +585,7 @@ static void onCallState(pjsua_call_id callId, pjsip_event *event) {
 
     VSLAccount *account = [[VSLEndpoint sharedEndpoint] lookupAccount:callInfo.acc_id];
     if (account) {
-        VSLCall *call = [account lookupCall:callId];
+        VSLCall *call = [[VSLEndpoint sharedEndpoint].callManager callWithCallId:callId];
         if (call) {
             [call callStateChanged:callInfo];
         } else {
@@ -599,7 +600,7 @@ static void onCallMediaState(pjsua_call_id call_id) {
 
     VSLAccount *account = [[VSLEndpoint sharedEndpoint] lookupAccount:callInfo.acc_id];
     if (account) {
-        VSLCall *call = [account lookupCall:call_id];
+        VSLCall *call = [[VSLEndpoint sharedEndpoint].callManager callWithCallId:call_id];
         VSLLogVerbose(@"Received MediaState update for call:%@", call.uuid.UUIDString);
         if (call) {
             [call mediaStateChanged:callInfo];
@@ -683,7 +684,7 @@ static void onTxStateChange(pjsua_call_id call_id, pjsip_transaction *tx, pjsip_
     }
 }
 
-void onIncomingCall(pjsua_acc_id acc_id, pjsua_call_id call_id, pjsip_rx_data *rdata) {
+static void onIncomingCall(pjsua_acc_id acc_id, pjsua_call_id call_id, pjsip_rx_data *rdata) {
     VSLEndpoint *endpoint = [VSLEndpoint sharedEndpoint];
     VSLAccount *account = [endpoint lookupAccount:acc_id];
     if (account) {
@@ -695,20 +696,21 @@ void onIncomingCall(pjsua_acc_id acc_id, pjsua_call_id call_id, pjsip_rx_data *r
                 [VSLEndpoint sharedEndpoint].incomingCallBlock(call);
             }
         }
+        call = nil;
     } else {
         VSLLogWarning(@"Could not accept incoming call. No account found with ID:%d", acc_id);
     }
 }
 
 static void onCallTransferStatus(pjsua_call_id callId, int statusCode, const pj_str_t *statusText, pj_bool_t final, pj_bool_t *continueNotifications) {
-    VSLCall *call = [[VSLEndpoint sharedEndpoint] lookupCall:callId];
+    VSLCall *call = [[VSLEndpoint sharedEndpoint].callManager callWithCallId:callId];
     if (call) {
         [call callTransferStatusChangedWithStatusCode:statusCode statusText:[NSString stringWithPJString:*statusText] final:final == 1];
     }
 }
 
 - (void)callDealloc:(NSNotification *)notification {
-    if (!self.endpointConfiguration.unregisterAfterCall) {
+    if (!self.endpointConfiguration.unregisterAfterCall || self.state != VSLEndpointStarted) {
         return;
     }
 
@@ -753,9 +755,9 @@ - (void)callDealloc:(NSNotification *)notification {
  *  and reinitialize the TCP transport.
  */
 - (void)checkNetworkMonitoring:(NSNotification *)notification {
-    VSLCall *call = notification.userInfo[VSLNotificationUserInfoCallKey];
+    VSLCallState callState = [notification.userInfo[VSLNotificationUserInfoCallStateKey] intValue];
 
-    switch (call.callState) {
+    switch (callState) {
         case VSLCallStateDisconnected: {
             [self stopNetworkMonitoring];
             break;
@@ -763,7 +765,7 @@ - (void)checkNetworkMonitoring:(NSNotification *)notification {
         case VSLCallStateConfirmed: {
             if (!self.monitoringCalls) {
                 for (VSLAccount *account in self.accounts) {
-                    if ([account firstActiveCall]) {
+                    if ([self.callManager firstCallForAccount:account]) {
                         VSLLogVerbose(@"Starting network monitor");
                         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ipAddressChanged:) name:VSLNetworkMonitorChangedNotification object:nil];
                         [self.networkMonitor startMonitoring];
@@ -792,7 +794,7 @@ - (void)stopNetworkMonitoring {
     BOOL activeCallForAnyAccount = NO;
     // Try to find an account which has an active call.
     for (VSLAccount *account in self.accounts) {
-        if ([account firstActiveCall]) {
+        if ([self.callManager firstCallForAccount:account]) {
             activeCallForAnyAccount = YES;
             break;
         }
@@ -809,7 +811,6 @@ - (void)stopNetworkMonitoring {
         [self.networkMonitor stopMonitoring];
         self.networkMonitor = nil;
         self.monitoringCalls = NO;
-        [self callDealloc: nil];
     }
 }
 
@@ -833,7 +834,7 @@ - (void)ipAddressChanged:(NSNotification *)notification {
 static void onIpChangeProgress(pjsua_ip_change_op op, pj_status_t status, const pjsua_ip_change_op_info *info) {
     VSLLogInfo(@"onIpChangeProgress:");
 
-    [VSLEndpoint sharedEndpoint].ipChangeInProgress = TRUE;
+    [VSLEndpoint sharedEndpoint].ipChangeInProgress = YES;
 
     switch (op) {
         case PJSUA_IP_CHANGE_OP_RESTART_LIS: {
@@ -854,7 +855,7 @@ static void onIpChangeProgress(pjsua_ip_change_op op, pj_status_t status, const
         }
         case PJSUA_IP_CHANGE_OP_ACC_REINVITE_CALLS: {
             VSLLogInfo(@"Account reinvite calls: %u", status);
-            [VSLEndpoint sharedEndpoint].ipChangeInProgress = FALSE;
+            [VSLEndpoint sharedEndpoint].ipChangeInProgress = NO;
             break;
         }
         default:
@@ -880,8 +881,7 @@ + (void)wasCallMissed:(pjsua_call_id)call_id pjsuaCallInfo:(pjsua_call_info)call
         }
         
         if ([VSLEndpoint sharedEndpoint].missedCallBlock && reason != VSLCallTerminateReasonUnknown) {
-            VSLAccount *account = [[VSLEndpoint sharedEndpoint] lookupAccount:callInfo.acc_id];
-            VSLCall *call = [account lookupCall:call_id];
+            VSLCall *call = [[VSLEndpoint sharedEndpoint].callManager callWithCallId:call_id];;
             if (call) {
                 call.terminateReason = reason;
                 VSLLogDebug(@"Call was terminated for reason: %@", VSLCallTerminateReasonString(reason));
diff --git a/Pod/Classes/VSLRingback.m b/Pod/Classes/VSLRingback.m
index 038785a6..ed7f045b 100644
--- a/Pod/Classes/VSLRingback.m
+++ b/Pod/Classes/VSLRingback.m
@@ -71,16 +71,19 @@ -(instancetype)init {
 }
 
 -(void)dealloc {
+    [self checkCurrentThreadIsRegisteredWithPJSUA];
     // Destory the conference port otherwise the maximum number of ports will reached and pjsip will crash.
     pj_status_t status = pjsua_conf_remove_port((int)self.ringbackSlot);
     if (status != PJ_SUCCESS) {
         VSLLogWarning(@"Error removing the port!");
+        return;
     }
     
     pjmedia_port_destroy(self.ringbackPort);
 }
 
 -(void)start {
+    VSLLogInfo(@"Start ringback, isPlaying: %@", self.isPlaying ? @"YES" : @"NO");
     if (!self.isPlaying) {
         pjsua_conf_connect((int)self.ringbackSlot, 0);
         self.isPlaying = YES;
@@ -88,6 +91,7 @@ -(void)start {
 }
 
 -(void)stop {
+    VSLLogInfo(@"Stop ringback, isPlaying: %@", self.isPlaying ? @"YES" : @"NO");
     if (self.isPlaying) {
         pjsua_conf_disconnect((int)self.ringbackSlot, 0);
         self.isPlaying = NO;
@@ -100,4 +104,11 @@ -(void)stop {
     }
 }
 
+- (void)checkCurrentThreadIsRegisteredWithPJSUA {
+    static pj_thread_desc a_thread_desc;
+    static pj_thread_t *a_thread;
+    if (!pj_thread_is_registered()) {
+        pj_thread_register("VialerPJSIP", a_thread_desc, &a_thread);
+    }
+}
 @end
diff --git a/Pod/Classes/VialerSIPLib.h b/Pod/Classes/VialerSIPLib.h
index fd356900..427d896c 100644
--- a/Pod/Classes/VialerSIPLib.h
+++ b/Pod/Classes/VialerSIPLib.h
@@ -33,6 +33,11 @@ extern NSString * __nonnull const VSLNotificationUserInfoWindowIdKey;
  */
 extern NSString * __nonnull const VSLNotificationUserInfoWindowSizeKey;
 
+/**
+ * Key of be used for retrieving the currentCall state out of the NSSNotification user info dict.
+ */
+extern NSString * __nonnull const VSLNotificationUserInfoCallStateKey;
+
 /**
  *  Possible errors the VialerSIPLib can return.
  */
@@ -222,7 +227,7 @@ typedef NS_ENUM(NSUInteger, VialerSIPLibErrors) {
  *  @param completion Completion block which will be executed when registration has completed or failed. 
  *                    It will return the success of the registration and an account if registration was successfull.
  */
-- (void)registerAccountWithUser:(__autoreleasing id<SIPEnabledUser> _Nonnull)sipUser withCompletion:(void (^_Nullable)(BOOL success, VSLAccount * _Nullable account))completion;
+- (void)registerAccountWithUser:(__autoreleasing id<SIPEnabledUser> _Nonnull)sipUser forceRegistration:(BOOL)force withCompletion:(void (^_Nullable)(BOOL success, VSLAccount * _Nullable account))completion;
 
 /*
  *  This will return the first account that is available.
diff --git a/Pod/Classes/VialerSIPLib.m b/Pod/Classes/VialerSIPLib.m
index bc4861d5..bad96518 100644
--- a/Pod/Classes/VialerSIPLib.m
+++ b/Pod/Classes/VialerSIPLib.m
@@ -16,6 +16,7 @@
 NSString * const VSLNotificationUserInfoCallIdKey = @"VSLNotificationUserInfoCallIdKey";
 NSString * const VSLNotificationUserInfoWindowIdKey = @"VSLNotificationUserInfoWindowIdKey";
 NSString * const VSLNotificationUserInfoWindowSizeKey = @"VSLNotificationUserInfoWindowSizeKey";
+NSString * const VSLNotificationUserInfoCallStateKey = @"VSLNotificationUserInfoCallStateKey";
 
 @interface VialerSIPLib()
 @property (strong, nonatomic) VSLEndpoint *endpoint;
@@ -58,7 +59,7 @@ - (BOOL)endpointAvailable {
 }
 
 - (BOOL)hasTLSTransport {
-    return self.endpoint.state == VSLEndpointStarted && self.endpoint.endpointConfiguration.hasTLSConfiguration;
+    return self.endpointAvailable && self.endpoint.endpointConfiguration.hasTLSConfiguration;
 }
 
 - (VSLCallManager *)callManager {
@@ -165,7 +166,7 @@ - (void)setLogCallBackBlock:(void (^)(DDLogMessage*))logCallBackBlock {
     [VSLEndpoint sharedEndpoint].logCallBackBlock = logCallBackBlock;
 }
 
-- (void)registerAccountWithUser:(id<SIPEnabledUser>  _Nonnull __autoreleasing)sipUser withCompletion:(void (^)(BOOL, VSLAccount * _Nullable))completion {
+- (void)registerAccountWithUser:(id<SIPEnabledUser> _Nonnull __autoreleasing)sipUser forceRegistration:(BOOL)force withCompletion:(void (^)(BOOL, VSLAccount * _Nullable))completion {
     NSError *accountConfigError;
     VSLAccount *account = [self createAccountWithSipUser:sipUser error:&accountConfigError];
     if (!account) {
@@ -173,6 +174,7 @@ - (void)registerAccountWithUser:(id<SIPEnabledUser>  _Nonnull __autoreleasing)si
         completion(NO, nil);
     }
 
+    account.forceRegistration = force;
     [account registerAccountWithCompletion:^(BOOL success, NSError * _Nullable error) {
         if (!success) {
             VSLLogError(@"The registration of the account has failed.\n%@", error);
@@ -209,7 +211,7 @@ - (NSArray *)accounts {
 
 - (BOOL)anotherCallInProgress:(VSLCall *)call {
     VSLAccount *account = [self firstAccount];
-    VSLCall *activeCall = [account firstActiveCall];
+    VSLCall *activeCall = [self.callManager firstCallForAccount:account];
 
     if (call.callId != activeCall.callId) {
         return YES;

From c0d0470065eeb79225e97028853a9defd9d2df5c Mon Sep 17 00:00:00 2001
From: Redmer Loen <redmer.loen@wearespindle.com>
Date: Fri, 15 Jun 2018 08:50:08 +0200
Subject: [PATCH 5/5] Release 3.2.0

---
 CHANGELOG.md         | 12 ++++++++++++
 Example/Podfile.lock | 12 ++++++------
 VialerSIPLib.podspec |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51fca488..448eb87c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [3.2.0](https://github.com/VoIPGRID/VialerSIPLib/tree/3.1.2) (06/15/2018)
+Released on Friday, June 15, 2018.
+
+### Added
+- Configurable codecs through the new VSLCodecConfiguration class. (#133)
+- Ability to do a blind transfer of a call (#137)
+- Build in a check to see if there is audio for call. When there is no audio in the first 10 seconds a notification is posted. (#138)
+
+### Fixed
+- First pass of removing the call referencing from the VSLAccount class in favor of the VSLCallManager (#142)
+- Some memory managent for the VSLCall and the VSLRingback classes (#142)
+
 ## [3.1.3](https://github.com/VoIPGRID/VialerSIPLib/tree/3.1.2) (04/06/2018)
 Released on Friday, April 6, 2018.
 
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index c5bf3f1a..287b5844 100644
--- 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.6)
-  - VialerSIPLib (3.1.3):
+  - Vialer-pjsip-iOS (3.3.7)
+  - VialerSIPLib (3.2.0):
     - CocoaLumberjack
     - Reachability
     - Vialer-pjsip-iOS
@@ -21,7 +21,7 @@ DEPENDENCIES:
   - VialerSIPLib (from `../`)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - CocoaLumberjack
     - OCMock
     - Reachability
@@ -43,9 +43,9 @@ SPEC CHECKSUMS:
   OCMock: 2cd0716969bab32a2283ff3a46fd26a8c8b4c5e3
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SPLumberjackLogFormatter: a2290c9b880f3166b2d1bace45dc1fc1302b28ab
-  Vialer-pjsip-iOS: 34ba5d7f2a756be28f5a2c8d72e5f68b08003844
-  VialerSIPLib: dfcf0f28bc9e77f9f763a7562bc8db7b6b82477d
+  Vialer-pjsip-iOS: 3b8bac1bf7e6831379cd0b4763dce1842db0abb4
+  VialerSIPLib: 2664f71bc819a86399a6ee33877619c15ec1ef4c
 
 PODFILE CHECKSUM: d5d9deca56ac68b69c70ab9a6d89a30c6d4fef32
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.3
diff --git a/VialerSIPLib.podspec b/VialerSIPLib.podspec
index 682df371..a585e1e3 100644
--- a/VialerSIPLib.podspec
+++ b/VialerSIPLib.podspec
@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |s|
 	s.name             	= "VialerSIPLib"
-	s.version          	= "3.1.3"
+	s.version          	= "3.2.0"
 	s.summary          	= "Vialer SIP Library for iOS"
 	s.description      	= "Objective-C wrapper around PJSIP."
 	s.homepage         	= "https://github.com/VoIPGRID/VialerSIPLib"