Skip to content

[stable-24.0] Added dialog before entering a voice room + additional string #6234

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

Merged
mahibi merged 1 commit into from
May 28, 2026
Merged

[stable-24.0] Added dialog before entering a voice room + additional string #6234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 23 additions & 1 deletion app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ class ConversationsListActivity : BaseActivity() {
showSnackbar(getString(R.string.send_to_forbidden))
}
} else if (conversation.checkIfVoiceRoom()) {
startACall(false, true)
showStartCallDialog()
} else {
openConversation()
}
Expand Down Expand Up @@ -1215,6 +1215,28 @@ class ConversationsListActivity : BaseActivity() {
)
}

fun showStartCallDialog() {
val dialogBuilder = MaterialAlertDialogBuilder(this)
.setIcon(viewThemeUtils.dialog.colorMaterialAlertDialogIcon(context, R.drawable.ic_call_black_24dp))
.setTitle(R.string.join_call)
.setPositiveButton(R.string.video_call) { _, _ ->
startACall(isVoiceOnlyCall = false, callWithoutNotification = false)
}
.setNegativeButton(R.string.audio_call) { _, _ ->
startACall(isVoiceOnlyCall = true, callWithoutNotification = false)
}
.setNeutralButton(R.string.nc_cancel) { _, _ -> }

viewThemeUtils.dialog
.colorMaterialAlertDialogBackground(this, dialogBuilder)
val dialog = dialogBuilder.show()
viewThemeUtils.platform.colorTextButtons(
dialog.getButton(AlertDialog.BUTTON_POSITIVE),
dialog.getButton(AlertDialog.BUTTON_NEGATIVE),
dialog.getButton(AlertDialog.BUTTON_NEUTRAL)
)
}

private fun showUnauthorizedDialog() {
val dialogBuilder = MaterialAlertDialogBuilder(this)
.setIcon(
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,7 @@ How to translate with transifex:
<string name="custom">Custom</string>
<string name="set">Set</string>
<string name="calendar">Calendar</string>
<string name="join_call">Join call</string>
<string name="video_call">Video call</string>
<string name="audio_call">Audio call</string>
<string name="started_a_call">started a call</string>
Expand Down
Loading