Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
c3161cd2
Commit
c3161cd2
authored
1 year ago
by
Alexander Lussier-Cullen
Committed by
Adrien Béraud
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
ConversationFragment: enable calling group swarms on Android TV
GitLab:
#1149
Change-Id: I7006075ceb3596710d66c53c8ab44e6540cd4305
parent
b779a2f4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
jami-android/app/src/main/java/cx/ring/tv/conversation/TvConversationFragment.kt
+27
-1
27 additions, 1 deletion
...in/java/cx/ring/tv/conversation/TvConversationFragment.kt
with
27 additions
and
1 deletion
jami-android/app/src/main/java/cx/ring/tv/conversation/TvConversationFragment.kt
+
27
−
1
View file @
c3161cd2
...
...
@@ -47,10 +47,14 @@ import androidx.transition.TransitionManager
import
com.google.android.material.dialog.MaterialAlertDialogBuilder
import
com.google.android.material.snackbar.Snackbar
import
cx.ring.R
import
cx.ring.client.CallActivity
import
cx.ring.client.ContactDetailsActivity
import
cx.ring.client.MediaViewerActivity
import
cx.ring.databinding.FragConversationTvBinding
import
cx.ring.fragments.CallFragment
import
cx.ring.mvp.BaseSupportFragment
import
cx.ring.service.DRingService
import
cx.ring.tv.call.TVCallActivity
import
cx.ring.tv.camera.CustomCameraActivity
import
cx.ring.utils.AndroidFileUtils
import
cx.ring.utils.ContentUriHandler
...
...
@@ -66,6 +70,7 @@ import net.jami.conversation.ConversationPresenter
import
net.jami.conversation.ConversationView
import
net.jami.model.*
import
net.jami.model.Account.ComposingStatus
import
net.jami.services.NotificationService
import
net.jami.smartlist.ConversationItemViewModel
import
java.io.File
import
java.io.IOException
...
...
@@ -687,7 +692,28 @@ class TvConversationFragment : BaseSupportFragment<ConversationPresenter, Conver
contactUri
:
net
.
jami
.
model
.
Uri
,
hasVideo
:
Boolean
)
{
TODO
(
"Not yet implemented"
)
// Try to find an existing call
val
conf
=
conversation
.
currentCall
// If there is an existing call, go to it
if
(
conf
!=
null
&&
conf
.
participants
.
isNotEmpty
()
&&
conf
.
participants
[
0
].
callStatus
!=
Call
.
CallStatus
.
INACTIVE
&&
conf
.
participants
[
0
].
callStatus
!=
Call
.
CallStatus
.
FAILURE
)
{
startActivity
(
Intent
(
Intent
.
ACTION_VIEW
)
.
setClass
(
requireContext
(),
TVCallActivity
::
class
.
java
)
.
putExtra
(
NotificationService
.
KEY_CALL_ID
,
conf
.
id
)
)
}
else
{
// Otherwise, start a new call
val
intent
=
Intent
(
Intent
.
ACTION_CALL
)
.
setClass
(
requireContext
(),
TVCallActivity
::
class
.
java
)
.
putExtras
(
ConversationPath
.
toBundle
(
conversation
))
.
putExtra
(
Intent
.
EXTRA_PHONE_NUMBER
,
contactUri
.
uri
)
.
putExtra
(
CallFragment
.
KEY_HAS_VIDEO
,
hasVideo
)
startActivityForResult
(
intent
,
ContactDetailsActivity
.
REQUEST_CODE_CALL
)
}
}
override
fun
refuseFile
(
accountId
:
String
,
conversationUri
:
net
.
jami
.
model
.
Uri
,
transfer
:
DataTransfer
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment