Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pjsua2 Swift sample project bug fixes & feature updates. #2981

Closed
wants to merge 19 commits into from
Closed

Pjsua2 Swift sample project bug fixes & feature updates. #2981

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift click to select a range
18b39c4
Stun update functionality
Sep 10, 2021
e46fa9d
nat updates
Sep 14, 2021
5445db5
Merge remote-tracking branch 'refs/remotes/emretufekci/pjproject/master'
Sep 14, 2021
f06c51f
custom header changes
Oct 31, 2021
9790418
Accept Call with header
Oct 27, 2021
ff25c57
ack test
Nov 3, 2021
3d86a72
pjsua-on-rx-handler
Nov 3, 2021
3b9c0cf
Custom Header Turn changes
Dec 13, 2021
ec1b0f9
label fixes
Feb 15, 2022
21c01af
custom header thins are removed
Feb 15, 2022
6c33bc3
Merge branch 'pjsip:master' into master
emretufekci Feb 15, 2022
6600a10
Merge branch 'pjsip:master' into master
emretufekci Feb 21, 2022
a6baedb
Merge branch 'pjsip:master' into master
emretufekci Feb 22, 2022
d146ddd
Merge branch 'pjsip:master' into master
emretufekci Mar 3, 2022
e6a27ee
Merge branch 'pjsip:master' into master
emretufekci Mar 9, 2022
949705f
Merge branch 'pjsip:master' into master
emretufekci Mar 14, 2022
00ab45e
Revert "custom header thins are removed"
emretufekci Mar 17, 2022
f652184
Revert "Merge branch 'pjsip:master' into master"
emretufekci Mar 17, 2022
9944ac5
Merge branch 'pjsip:master' into master
emretufekci Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Stun update functionality
  • Loading branch information
Emre Tüfekçi committed Sep 10, 2021
commit 18b39c44ccbb18de801e09848b737f4f309e9898
30 changes: 22 additions & 8 deletions pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 28,27 @@
C351399225A5F70D00A090AA /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522525A5EC380037A8AB /* libsrtp.a */; };
C351399325A5F70D00A090AA /* libwebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522A25A5EC380037A8AB /* libwebrtc.a */; };
C351399425A5F70D00A090AA /* libyuv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522B25A5EC380037A8AB /* libyuv.a */; };
C36D296A26B9637E00371235 /* CallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C36D296926B9637E00371235 /* CallViewController.swift */; };
C374860825B84FA100FBE972 /* OutgoingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C374860725B84FA100FBE972 /* OutgoingViewController.swift */; };
C399A57125AF2721000F742A /* IncomingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C399A57025AF2721000F742A /* IncomingViewController.swift */; };
C3AB889B25A734B400224276 /* wrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = C3AB889A25A734B400224276 /* wrapper.mm */; };
C3AB88A025A7358700224276 /* CustomPJSUA2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3AB889E25A7358700224276 /* CustomPJSUA2.cpp */; };
C3B851FF25A5EA6C0037A8AB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B851FE25A5EA6C0037A8AB /* AppDelegate.swift */; };
C3B8520125A5EA6C0037A8AB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B8520025A5EA6C0037A8AB /* SceneDelegate.swift */; };
C3B8520325A5EA6C0037A8AB /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B8520225A5EA6C0037A8AB /* ViewController.swift */; };
C3B8520325A5EA6C0037A8AB /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B8520225A5EA6C0037A8AB /* SettingsViewController.swift */; };
C3B8520625A5EA6C0037A8AB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C3B8520425A5EA6C0037A8AB /* Main.storyboard */; };
C3B8520825A5EA6D0037A8AB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3B8520725A5EA6D0037A8AB /* Assets.xcassets */; };
C3B8520B25A5EA6D0037A8AB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C3B8520925A5EA6D0037A8AB /* LaunchScreen.storyboard */; };
C3B8524325A5EC940037A8AB /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8524125A5EC940037A8AB /* AVFoundation.framework */; };
C3B8524425A5EC940037A8AB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8524225A5EC940037A8AB /* Foundation.framework */; };
C3B8524725A5ED6D0037A8AB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8524625A5ED6D0037A8AB /* AudioToolbox.framework */; };
C3C4082E25B9A547002C19EB /* ActiveViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C4082D25B9A547002C19EB /* ActiveViewController.swift */; };
C3EE0CC426CB9B1C00DBE3CD /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3EE0CC326CB9B1C00DBE3CD /* Network.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
C337417225BADEEE007785D7 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };
C36D296926B9637E00371235 /* CallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallViewController.swift; sourceTree = "<group>"; };
C374860725B84FA100FBE972 /* OutgoingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutgoingViewController.swift; sourceTree = "<group>"; };
C399A57025AF2721000F742A /* IncomingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncomingViewController.swift; sourceTree = "<group>"; };
C3AB889A25A734B400224276 /* wrapper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = wrapper.mm; sourceTree = "<group>"; };
Expand All @@ -55,7 58,7 @@
C3B851FB25A5EA6C0037A8AB /* ios-swift-pjsua2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ios-swift-pjsua2.app"; sourceTree = BUILT_PRODUCTS_DIR; };
C3B851FE25A5EA6C0037A8AB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
C3B8520025A5EA6C0037A8AB /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
C3B8520225A5EA6C0037A8AB /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
C3B8520225A5EA6C0037A8AB /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
C3B8520525A5EA6C0037A8AB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
C3B8520725A5EA6D0037A8AB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
C3B8520A25A5EA6D0037A8AB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -85,13 88,18 @@
C3B8524225A5EC940037A8AB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
C3B8524625A5ED6D0037A8AB /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
C3C4082D25B9A547002C19EB /* ActiveViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActiveViewController.swift; sourceTree = "<group>"; };
C3EE0CBB26CB98FB00DBE3CD /* libcoretls.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcoretls.tbd; path = usr/lib/libcoretls.tbd; sourceTree = SDKROOT; };
C3EE0CBC26CB98FB00DBE3CD /* libETLSAHDynamic.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libETLSAHDynamic.tbd; path = usr/lib/libETLSAHDynamic.tbd; sourceTree = SDKROOT; };
C3EE0CBD26CB98FB00DBE3CD /* libcoretls_cfhelpers.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcoretls_cfhelpers.tbd; path = usr/lib/libcoretls_cfhelpers.tbd; sourceTree = SDKROOT; };
C3EE0CC326CB9B1C00DBE3CD /* Network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Network.framework; path = System/Library/Frameworks/Network.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
C3B851F825A5EA6C0037A8AB /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C3EE0CC426CB9B1C00DBE3CD /* Network.framework in Frameworks */,
C351398125A5F70D00A090AA /* libg7221codec.a in Frameworks */,
C351398225A5F70D00A090AA /* libgsmcodec.a in Frameworks */,
C351398325A5F70D00A090AA /* libilbccodec.a in Frameworks */,
Expand Down Expand Up @@ -132,7 140,8 @@
C337417625BADF12007785D7 /* Controller */ = {
isa = PBXGroup;
children = (
C3B8520225A5EA6C0037A8AB /* ViewController.swift */,
C36D296926B9637E00371235 /* CallViewController.swift */,
C3B8520225A5EA6C0037A8AB /* SettingsViewController.swift */,
C399A57025AF2721000F742A /* IncomingViewController.swift */,
C374860725B84FA100FBE972 /* OutgoingViewController.swift */,
C3C4082D25B9A547002C19EB /* ActiveViewController.swift */,
Expand Down Expand Up @@ -185,6 194,10 @@
C3B8521725A5EC380037A8AB /* Frameworks */ = {
isa = PBXGroup;
children = (
C3EE0CC326CB9B1C00DBE3CD /* Network.framework */,
C3EE0CBD26CB98FB00DBE3CD /* libcoretls_cfhelpers.tbd */,
C3EE0CBB26CB98FB00DBE3CD /* libcoretls.tbd */,
C3EE0CBC26CB98FB00DBE3CD /* libETLSAHDynamic.tbd */,
C3B8524625A5ED6D0037A8AB /* AudioToolbox.framework */,
C3B8524125A5EC940037A8AB /* AVFoundation.framework */,
C3B8524225A5EC940037A8AB /* Foundation.framework */,
Expand Down Expand Up @@ -299,9 312,10 @@
C399A57125AF2721000F742A /* IncomingViewController.swift in Sources */,
C3AB889B25A734B400224276 /* wrapper.mm in Sources */,
C374860825B84FA100FBE972 /* OutgoingViewController.swift in Sources */,
C3B8520325A5EA6C0037A8AB /* ViewController.swift in Sources */,
C3B8520325A5EA6C0037A8AB /* SettingsViewController.swift in Sources */,
C3B851FF25A5EA6C0037A8AB /* AppDelegate.swift in Sources */,
C3B8520125A5EA6C0037A8AB /* SceneDelegate.swift in Sources */,
C36D296A26B9637E00371235 /* CallViewController.swift in Sources */,
C3AB88A025A7358700224276 /* CustomPJSUA2.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -451,7 465,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = PZ7LKWA782;
DEVELOPMENT_TEAM = TY2FWL588U;
ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -490,7 504,7 @@
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/Libraries",
);
PRODUCT_BUNDLE_IDENTIFIER = "tbtk.ios-swift-pjsua2";
PRODUCT_BUNDLE_IDENTIFIER = "tbtk.ios-corepjsua2";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "ios-swift-pjsua2/ios-swift-pjsua2-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -506,7 520,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = PZ7LKWA782;
DEVELOPMENT_TEAM = TY2FWL588U;
ENABLE_BITCODE = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = "PJ_AUTOCONF=1";
Expand Down Expand Up @@ -542,7 556,7 @@
"$(PROJECT_DIR)/Libraries",
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "tbtk.ios-swift-pjsua2";
PRODUCT_BUNDLE_IDENTIFIER = "tbtk.ios-corepjsua2";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "ios-swift-pjsua2/ios-swift-pjsua2-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down
1 change: 1 addition & 0 deletions ...-swift-pjsua2/ios-swift-pjsua2.xcodeproj/xcshareddata/xcschemes/ios-swift-pjsua2.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 34,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
enableASanStackUseAfterReturn = "YES"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
130 changes: 130 additions & 0 deletions pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/CallViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 1,130 @@
//
// CallViewController.swift
// ios-swift-pjsua2
//
// Created by Emre on 3.08.2021.
//

import UIKit

class CallViewController: UIViewController {

//Destination Uri to Making outgoing call
@IBOutlet weak var sipDestinationUriTField: UITextField!

@IBOutlet weak var ipPortLabel: UILabel!

var sipIp: String = ""
var sipPort: String = ""
var sipUsername: String = ""

override func viewDidLoad() {
super.viewDidLoad()

// Do any additional setup after loading the view.
sipDestinationUriTField.addDoneButtonOnKeyboard()


//TODO::FIX IT TERRIBLE USAGE.
sipIp = UserDefaults.standard.string(forKey: "sipIP") ?? "sipIP"
sipPort = UserDefaults.standard.string(forKey: "sipPort") ?? "sipPort"
sipUsername = UserDefaults.standard.string(forKey: "sipUsername") ?? "sipUsername"

}

override func viewDidAppear(_ animated: Bool) {
//TODO::FIX IT TERRIBLE USAGE.
sipIp = UserDefaults.standard.string(forKey: "sipIP") ?? "sipIP"
sipPort = UserDefaults.standard.string(forKey: "sipPort") ?? "sipPort"
sipUsername = UserDefaults.standard.string(forKey: "sipUsername") ?? "sipUsername"

ipPortLabel.text = "@" sipIp ":" sipPort
}


//Call Button
@IBAction func callClick(_ sender: UIButton) {

if(CPPWrapper().registerStateInfoWrapper() != false){
let vcToPresent = self.storyboard!.instantiateViewController(withIdentifier: "outgoingCallVC") as! OutgoingViewController
if(sipDestinationUriTField.text != nil){
vcToPresent.outgoingCallId = "sip:" sipDestinationUriTField.text! "@" sipIp ":" sipPort
self.present(vcToPresent, animated: true, completion: nil)
}

}else {
let alert = UIAlertController(title: "Outgoing Call Error", message: "Please register to be able to make call", preferredStyle: .alert)
alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in
switch action.style{
case .default:
print("default")

case .cancel:
print("cancel")

case .destructive:
print("destructive")

@unknown default:
fatalError()
}
}))
self.present(alert, animated: true, completion: nil)
}

}


@IBAction func call9900(_ sender: UIButton) {
if(CPPWrapper().registerStateInfoWrapper() != false){
let vcToPresent = self.storyboard!.instantiateViewController(withIdentifier: "outgoingCallVC") as! OutgoingViewController
vcToPresent.outgoingCallId = "sip:" "9900" "@" sipIp ":" sipPort
self.present(vcToPresent, animated: true, completion: nil)
}else {
let alert = UIAlertController(title: "Outgoing Call Error", message: "Please register to be able to make call", preferredStyle: .alert)
alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in
switch action.style{
case .default:
print("default")

case .cancel:
print("cancel")

case .destructive:
print("destructive")

@unknown default:
fatalError()
}
}))
self.present(alert, animated: true, completion: nil)
}
}

@IBAction func call9901(_ sender: UIButton) {
if(CPPWrapper().registerStateInfoWrapper() != false){
let vcToPresent = self.storyboard!.instantiateViewController(withIdentifier: "outgoingCallVC") as! OutgoingViewController
vcToPresent.outgoingCallId = "sip:" "9901" "@" sipIp ":" sipPort
self.present(vcToPresent, animated: true, completion: nil)
}else {
let alert = UIAlertController(title: "Outgoing Call Error", message: "Please register to be able to make call", preferredStyle: .alert)
alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in
switch action.style{
case .default:
print("default")

case .cancel:
print("cancel")

case .destructive:
print("destructive")

@unknown default:
fatalError()
}
}))
self.present(alert, animated: true, completion: nil)
}
}

}
Loading