Skip to content

Commit

Permalink
Merge pull request #53 from skyway/v3.1.0
Browse files Browse the repository at this point in the history
Release v3.1.0
  • Loading branch information
ibuibu authored Nov 10, 2020
2 parents d5485ee + 4d2dc3b commit 990b76a
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 15 deletions.
4 changes: 2 additions & 2 deletions SkyWay.podspec
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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' => '[email protected]' }
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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down Expand Up @@ -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];
Expand Down Expand Up @@ -327,8 +327,8 @@ - (IBAction)onActionButtonClicked:(id)sender {
//

[self closeRemoteStream];
[_mediaConnection close];
[_signalingChannel close];
[_mediaConnection close:YES];
[_signalingChannel close:YES];
_callState = CALL_STATE_TERMINATED;
[self updateActionButtonTitle];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ - (IBAction)onActionButtonClicked:(id)sender {
// Close a DataConnection
//

[_dataConnection close];
[_dataConnection close:YES];
_dataConnection = nil;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ - (void) closeRemoteStream {
[_remoteStream removeVideoRenderer:_remoteView track:0];
}

[_remoteStream close];
[_remoteStream close:YES];
_remoteStream = nil;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -64,7 +64,7 @@ class DataConnectionViewController: UIViewController {
}

@IBAction func tapEndCall(){
self.dataConnection?.close()
self.dataConnection?.close(true)
self.changeConnectionStatusUI(connected: false)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand All @@ -48,7 +48,7 @@ class MediaConnectionViewController: UIViewController {
}

@IBAction func tapEndCall(){
self.mediaConnection?.close()
self.mediaConnection?.close(true)
self.changeConnectionStatusUI(connected: false)
}

Expand Down
8 changes: 8 additions & 0 deletions release-notes.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

[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
Expand Down

0 comments on commit 990b76a

Please sign in to comment.