Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-android
Commits
519fa74c
Commit
519fa74c
authored
Sep 22, 2021
by
Adrien Béraud
Committed by
Maxime Callet
Sep 23, 2021
Browse files
Conversation: launch new task
Change-Id: Ia70407b440db57fd87d6425eac81abed5bb0ee9e
parent
b8f112fa
Changes
1
Hide whitespace changes
Inline
Side-by-side
ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt
View file @
519fa74c
...
...
@@ -929,6 +929,7 @@ class ConversationFragment : BaseSupportFragment<ConversationPresenter, Conversa
Log
.
w
(
TAG
,
"DEBUG fn goToCallActivity"
)
startActivity
(
Intent
(
Intent
.
ACTION_VIEW
)
.
setClass
(
requireContext
().
applicationContext
,
CallActivity
::
class
.
java
)
.
setFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
)
.
putExtra
(
NotificationService
.
KEY_CALL_ID
,
conferenceId
)
)
}
...
...
@@ -936,11 +937,12 @@ class ConversationFragment : BaseSupportFragment<ConversationPresenter, Conversa
override
fun
goToCallActivityWithResult
(
accountId
:
String
,
conversationUri
:
net
.
jami
.
model
.
Uri
,
contactUri
:
net
.
jami
.
model
.
Uri
,
withCamera
:
Boolean
)
{
Log
.
w
(
TAG
,
"DEBUG fn goToCallActivityWithResult || hasVideo : $withCamera"
)
val
intent
=
Intent
(
Intent
.
ACTION_CALL
)
.
setFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
)
.
setClass
(
requireContext
(),
CallActivity
::
class
.
java
)
.
putExtras
(
ConversationPath
.
toBundle
(
accountId
,
conversationUri
))
.
putExtra
(
Intent
.
EXTRA_PHONE_NUMBER
,
contactUri
.
uri
)
.
putExtra
(
CallFragment
.
KEY_HAS_VIDEO
,
withCamera
)
startActivity
ForResult
(
intent
,
HomeActivity
.
REQUEST_CODE_CALL
)
startActivity
(
intent
)
}
private
fun
setupActionbar
(
conversation
:
Conversation
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment