-
Notifications
You must be signed in to change notification settings - Fork 210
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/0.18.0/master'
- Loading branch information
Showing
69 changed files
with
4,609 additions
and
722 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
MatrixSDK/JSONModels/Call/Events/MXCallAnswerEventContent.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // | ||
| // Copyright 2020 The Matrix.org Foundation C.I.C | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import "MXCallEventContent.h" | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @class MXCallSessionDescription; | ||
| @class MXCallCapabilitiesModel; | ||
|
|
||
| /** | ||
| `MXCallAnswerEventContent` represents the content of an `m.call.answer` event. | ||
| */ | ||
| @interface MXCallAnswerEventContent : MXCallEventContent | ||
|
|
||
| /** | ||
| The session description. | ||
| */ | ||
| @property (nonatomic) MXCallSessionDescription *answer; | ||
|
|
||
| /** | ||
| Capabilities for this call. | ||
| */ | ||
| @property (nonatomic, nullable) MXCallCapabilitiesModel *capabilities; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
36 changes: 36 additions & 0 deletions
36
MatrixSDK/JSONModels/Call/Events/MXCallAnswerEventContent.m
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // | ||
| // Copyright 2020 The Matrix.org Foundation C.I.C | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #import "MXCallAnswerEventContent.h" | ||
| #import "MXCallSessionDescription.h" | ||
| #import "MXCallCapabilitiesModel.h" | ||
|
|
||
| @implementation MXCallAnswerEventContent | ||
|
|
||
| + (id)modelFromJSON:(NSDictionary *)JSONDictionary | ||
| { | ||
| MXCallAnswerEventContent *callAnswerEventContent = [[MXCallAnswerEventContent alloc] init]; | ||
| if (callAnswerEventContent) | ||
| { | ||
| [callAnswerEventContent parseJSON:JSONDictionary]; | ||
| MXJSONModelSetMXJSONModel(callAnswerEventContent.answer, MXCallSessionDescription, JSONDictionary[@"answer"]); | ||
| MXJSONModelSetMXJSONModel(callAnswerEventContent.capabilities, MXCallCapabilitiesModel, JSONDictionary[@"capabilities"]); | ||
| } | ||
|
|
||
| return callAnswerEventContent; | ||
| } | ||
|
|
||
| @end |
35 changes: 35 additions & 0 deletions
35
MatrixSDK/JSONModels/Call/Events/MXCallCandidatesEventContent.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // | ||
| // Copyright 2020 The Matrix.org Foundation C.I.C | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import "MXCallEventContent.h" | ||
| #import "MXCallCandidate.h" | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /** | ||
| `MXCallCandidatesEventContent` represents the content of an `m.call.candidates` event. | ||
| */ | ||
| @interface MXCallCandidatesEventContent : MXCallEventContent | ||
|
|
||
| /** | ||
| Array of object describing the candidates (@see MXCallCandidate). | ||
| */ | ||
| @property (nonatomic) NSArray<MXCallCandidate *> *candidates; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
33 changes: 33 additions & 0 deletions
33
MatrixSDK/JSONModels/Call/Events/MXCallCandidatesEventContent.m
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // | ||
| // Copyright 2020 The Matrix.org Foundation C.I.C | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #import "MXCallCandidatesEventContent.h" | ||
|
|
||
| @implementation MXCallCandidatesEventContent | ||
|
|
||
| + (id)modelFromJSON:(NSDictionary *)JSONDictionary | ||
| { | ||
| MXCallCandidatesEventContent *callCandidatesEventContent = [[MXCallCandidatesEventContent alloc] init]; | ||
| if (callCandidatesEventContent) | ||
| { | ||
| [callCandidatesEventContent parseJSON:JSONDictionary]; | ||
| MXJSONModelSetMXJSONModelArray(callCandidatesEventContent.candidates, MXCallCandidate, JSONDictionary[@"candidates"]); | ||
| } | ||
|
|
||
| return callCandidatesEventContent; | ||
| } | ||
|
|
||
| @end |
33 changes: 33 additions & 0 deletions
33
MatrixSDK/JSONModels/Call/Events/MXCallCapabilitiesModel.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // | ||
| // Copyright 2020 The Matrix.org Foundation C.I.C | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #import <MatrixSDK/MatrixSDK.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /** | ||
| `MXCallCapabilitiesModel` represents capabilities in `m.call.invite` and `m.call.answer` events. | ||
| */ | ||
| @interface MXCallCapabilitiesModel : MXJSONModel | ||
|
|
||
| /** | ||
| Capability defined by `m.call.transferee`. | ||
| */ | ||
| @property (nonatomic) BOOL transferee; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
33 changes: 33 additions & 0 deletions
33
MatrixSDK/JSONModels/Call/Events/MXCallCapabilitiesModel.m
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // | ||
| // Copyright 2020 The Matrix.org Foundation C.I.C | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #import "MXCallCapabilitiesModel.h" | ||
|
|
||
| @implementation MXCallCapabilitiesModel | ||
|
|
||
| + (id)modelFromJSON:(NSDictionary *)JSONDictionary | ||
| { | ||
| MXCallCapabilitiesModel *capabilitiesModel = [[MXCallCapabilitiesModel alloc] init]; | ||
|
|
||
| if (capabilitiesModel) | ||
| { | ||
| MXJSONModelSetBoolean(capabilitiesModel.transferee, JSONDictionary[@"m.call.transferee"]); | ||
| } | ||
|
|
||
| return capabilitiesModel; | ||
| } | ||
|
|
||
| @end |
Oops, something went wrong.