From 9781e1e1a5c7816b40bbfc40ffc1726af5194db1 Mon Sep 17 00:00:00 2001 From: tetrapod117 Date: Tue, 10 Nov 2020 16:17:15 +0900 Subject: [PATCH 1/5] Update release notes for v3.1.0 --- release-notes.en.md | 8 ++++++++ release-notes.md | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/release-notes.en.md b/release-notes.en.md index da90a13..6483bbb 100644 --- a/release-notes.en.md +++ b/release-notes.en.md @@ -2,6 +2,14 @@ [日本語](./release-notes.md) +## [Version 3.1.0](https://github.com/skyway/skyway-ios-sdk/releases/tag/v3.1.0) + +### Added +- Add an `forceClose` option when calling `SKWMediaConnection`, `SKWDataConnection` to signal intention to disconnection to the remote peer instantly. + +### Deprecated +- The `NO` default value of `forceClose` is deprecated and may be changed to `YES` in future versions. + ## [Version 3.0.1](https://github.com/skyway/skyway-ios-sdk/releases/tag/v3.0.1) ### Fixed diff --git a/release-notes.md b/release-notes.md index 5703543..b94536d 100644 --- a/release-notes.md +++ b/release-notes.md @@ -2,6 +2,14 @@ [English](./release-notes.en.md) +## [Version 3.1.0](https://github.com/skyway/skyway-ios-sdk/releases/tag/v3.1.0) +### Added +- `SKWMediaConnection`, `SKWDataConnection` に `forceClose` オプションを追加しました。このオプションを有効にすると、接続相手においても各 `Connection` が即座にクローズします。 + +### Deprecated +- `forceClose` のデフォルト値 `NO` は将来のバージョンでは `YES` に変更される可能性があります。 + + ## [Version 3.0.1](https://github.com/skyway/skyway-ios-sdk/releases/tag/v3.0.1) ### Fixed From 5f9397e61fedab7a1cfe7a35399957922aa948ba Mon Sep 17 00:00:00 2001 From: tetrapod117 Date: Tue, 10 Nov 2020 16:17:39 +0900 Subject: [PATCH 2/5] Update podspec notes for v3.1.0 --- SkyWay.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SkyWay.podspec b/SkyWay.podspec index 08f32c6..a1b4441 100644 --- a/SkyWay.podspec +++ b/SkyWay.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'SkyWay' - s.version = '3.0.1' + s.version = '3.1.0' s.summary = 'SkyWay simplifies peer-to-peer data, video, and audio calls using WebRTC.' s.description = <<-DESC "SkyWay" is a framework that enables using SkyWay in iOS apps. @@ -9,7 +9,7 @@ SkyWay simplifies peer-to-peer data, video, and audio calls using WebRTC. s.homepage = 'https://webrtc.ecl.ntt.com' s.license = { :type => 'Apache License', :file => 'LICENSE.txt' } s.author = { 'NTT Communications' => 'skyway@ntt.com' } - s.source = { :http => 'https://github.com/skyway/skyway-ios-sdk/releases/download/v3.0.1/SkyWay_iOS_3.0.1.zip', :flatten => true } + s.source = { :http => 'https://github.com/skyway/skyway-ios-sdk/releases/download/v3.1.0/SkyWay_iOS_3.1.0.zip', :flatten => true } s.ios.deployment_target = '10.0' s.vendored_frameworks = 'SkyWay.framework' s.source_files = 'SkyWay.framework/Headers/*.h' From f1b11a0646f8645e653fa7e077d16e405983b0a8 Mon Sep 17 00:00:00 2001 From: tetrapod117 Date: Tue, 10 Nov 2020 16:24:48 +0900 Subject: [PATCH 3/5] Update example to use forceClose option --- .../p2p-call/eclwebrtc-ios-sample-p2p-call/Viewcontroller.m | 2 +- .../eclwebrtc-ios-sample-p2p-textchat/ViewController.m | 2 +- .../eclwebrtc-ios-sample-p2p-videochat/ViewController.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/objective-c/p2p-call/eclwebrtc-ios-sample-p2p-call/Viewcontroller.m b/examples/objective-c/p2p-call/eclwebrtc-ios-sample-p2p-call/Viewcontroller.m index 7142fe2..9c22da3 100644 --- a/examples/objective-c/p2p-call/eclwebrtc-ios-sample-p2p-call/Viewcontroller.m +++ b/examples/objective-c/p2p-call/eclwebrtc-ios-sample-p2p-call/Viewcontroller.m @@ -327,7 +327,7 @@ - (IBAction)onActionButtonClicked:(id)sender { // [self closeRemoteStream]; - [_mediaConnection close]; + [_mediaConnection close:YES]; [_signalingChannel close]; _callState = CALL_STATE_TERMINATED; [self updateActionButtonTitle]; diff --git a/examples/objective-c/p2p-textchat/eclwebrtc-ios-sample-p2p-textchat/ViewController.m b/examples/objective-c/p2p-textchat/eclwebrtc-ios-sample-p2p-textchat/ViewController.m index d08679a..33e8e12 100644 --- a/examples/objective-c/p2p-textchat/eclwebrtc-ios-sample-p2p-textchat/ViewController.m +++ b/examples/objective-c/p2p-textchat/eclwebrtc-ios-sample-p2p-textchat/ViewController.m @@ -285,7 +285,7 @@ - (IBAction)onActionButtonClicked:(id)sender { // Close a DataConnection // - [_dataConnection close]; + [_dataConnection close:YES]; _dataConnection = nil; } } diff --git a/examples/objective-c/p2p-videochat/eclwebrtc-ios-sample-p2p-videochat/ViewController.m b/examples/objective-c/p2p-videochat/eclwebrtc-ios-sample-p2p-videochat/ViewController.m index bf8837e..77ee522 100644 --- a/examples/objective-c/p2p-videochat/eclwebrtc-ios-sample-p2p-videochat/ViewController.m +++ b/examples/objective-c/p2p-videochat/eclwebrtc-ios-sample-p2p-videochat/ViewController.m @@ -190,7 +190,7 @@ - (void) closeRemoteStream { [_remoteStream removeVideoRenderer:_remoteView track:0]; } - [_remoteStream close]; + [_remoteStream close:YES]; _remoteStream = nil; } From a70c03d9474b55ff3a85b9646db7ea1e7642e693 Mon Sep 17 00:00:00 2001 From: tetrapod117 Date: Tue, 10 Nov 2020 16:37:37 +0900 Subject: [PATCH 4/5] Update swift example to use forceClose --- .../swift/viewcontroller/DataConnectionViewController.swift | 4 ++-- .../swift/viewcontroller/MediaConnectionViewController.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/swift/swift/viewcontroller/DataConnectionViewController.swift b/examples/swift/swift/viewcontroller/DataConnectionViewController.swift index 36764d4..a7bd040 100644 --- a/examples/swift/swift/viewcontroller/DataConnectionViewController.swift +++ b/examples/swift/swift/viewcontroller/DataConnectionViewController.swift @@ -43,7 +43,7 @@ class DataConnectionViewController: UIViewController { override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) - self.dataConnection?.close() + self.dataConnection?.close(true) self.peer?.disconnect() self.peer?.destroy() } @@ -64,7 +64,7 @@ class DataConnectionViewController: UIViewController { } @IBAction func tapEndCall(){ - self.dataConnection?.close() + self.dataConnection?.close(true) self.changeConnectionStatusUI(connected: false) } diff --git a/examples/swift/swift/viewcontroller/MediaConnectionViewController.swift b/examples/swift/swift/viewcontroller/MediaConnectionViewController.swift index f32ee0b..8d62897 100644 --- a/examples/swift/swift/viewcontroller/MediaConnectionViewController.swift +++ b/examples/swift/swift/viewcontroller/MediaConnectionViewController.swift @@ -28,7 +28,7 @@ class MediaConnectionViewController: UIViewController { override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) - self.mediaConnection?.close() + self.mediaConnection?.close(true) self.peer?.destroy() } @@ -48,7 +48,7 @@ class MediaConnectionViewController: UIViewController { } @IBAction func tapEndCall(){ - self.mediaConnection?.close() + self.mediaConnection?.close(true) self.changeConnectionStatusUI(connected: false) } From 4d2dc3b72e2fe357544c2b4e7e8c46e6146b8984 Mon Sep 17 00:00:00 2001 From: tetrapod117 Date: Tue, 10 Nov 2020 16:38:01 +0900 Subject: [PATCH 5/5] Update p2p-call example to use forceClose --- .../eclwebrtc-ios-sample-p2p-call/Viewcontroller.m | 12 ++++++------ release-notes.md | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/examples/objective-c/p2p-call/eclwebrtc-ios-sample-p2p-call/Viewcontroller.m b/examples/objective-c/p2p-call/eclwebrtc-ios-sample-p2p-call/Viewcontroller.m index 9c22da3..dbe6a9b 100644 --- a/examples/objective-c/p2p-call/eclwebrtc-ios-sample-p2p-call/Viewcontroller.m +++ b/examples/objective-c/p2p-call/eclwebrtc-ios-sample-p2p-call/Viewcontroller.m @@ -163,7 +163,7 @@ - (void)setMediaCallbacks { [self closeRemoteStream]; [self unsetMediaCallbacks]; self->_mediaConnection = nil; - [self->_signalingChannel close]; + [self->_signalingChannel close:YES]; self->_callState = CALL_STATE_TERMINATED; [self updateActionButtonTitle]; @@ -194,14 +194,14 @@ - (void)setSignalingCallbacks { NSLog(@"[On/Data] %@", message); if ([message isEqualToString:@"reject"]) { - [self->_mediaConnection close]; - [self->_signalingChannel close]; + [self->_mediaConnection close:YES]; + [self->_signalingChannel close:YES]; self->_callState = CALL_STATE_TERMINATED; [self updateActionButtonTitle]; } else if ([message isEqualToString:@"cancel"]) { - [self->_mediaConnection close]; - [self->_signalingChannel close]; + [self->_mediaConnection close:YES]; + [self->_signalingChannel close:YES]; self->_callState = CALL_STATE_TERMINATED; [self updateActionButtonTitle]; [self dismissIncomingCallAlert]; @@ -328,7 +328,7 @@ - (IBAction)onActionButtonClicked:(id)sender { [self closeRemoteStream]; [_mediaConnection close:YES]; - [_signalingChannel close]; + [_signalingChannel close:YES]; _callState = CALL_STATE_TERMINATED; [self updateActionButtonTitle]; diff --git a/release-notes.md b/release-notes.md index b94536d..c3a7fbe 100644 --- a/release-notes.md +++ b/release-notes.md @@ -9,7 +9,6 @@ ### Deprecated - `forceClose` のデフォルト値 `NO` は将来のバージョンでは `YES` に変更される可能性があります。 - ## [Version 3.0.1](https://github.com/skyway/skyway-ios-sdk/releases/tag/v3.0.1) ### Fixed