Skip to content

Commit

Permalink
Merge pull request #4034 from vector-im/element_4029
Browse files Browse the repository at this point in the history
VoIP: Expose Dial Pad only if PSTN Supported
  • Loading branch information
ismailgulek authored Feb 12, 2021
2 parents 1359463 + aa90c4f commit 4cf285b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Changes to be released in next version

🐛 Bugfix
* NSE: Wait for VoIP push request if any before calling contentHandler (#4018).
* VoIP: Show dial pad option only if PSTN is supported (#4029).

⚠️ API Changes
*
Expand Down
6 changes: 5 additions & 1 deletion Riot/Modules/Room/RoomViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -3384,10 +3384,14 @@ - (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView placeCallWith
{
[self roomInputToolbarView:toolbarView placeCallWithVideo2:video];
}
else
else if (self.mainSession.callManager.supportsPSTN)
{
[self showVoiceCallActionSheetWith:toolbarView];
}
else
{
[self roomInputToolbarView:toolbarView placeCallWithVideo2:NO];
}
}
else
{
Expand Down

0 comments on commit 4cf285b

Please sign in to comment.