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

VoIP: Expose Dial Pad only if PSTN Supported #4034

Merged
merged 3 commits into from
Feb 12, 2021
Merged

VoIP: Expose Dial Pad only if PSTN Supported #4034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af3c766
Show dialpad option only if PSTN supported
ismailgulek Feb 12, 2021
37dc178
Update CHANGES.rst
ismailgulek Feb 12, 2021
aa90c4f
Merge branch 'develop' into element_4029
ismailgulek Feb 12, 2021
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
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
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
View file
Open in desktop
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