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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
624d2370
Commit
624d2370
authored
Jul 25, 2023
by
Pierre Nicolas
Browse files
Options
Downloads
Patches
Plain Diff
tv: call: disable telecom service
GitLab:
#1337
Change-Id: Ie44a7f1837d418679f772cfa001113435dc24714
parent
4c3553ed
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
jami-android/app/src/main/java/cx/ring/services/CallServiceImpl.kt
+9
-0
9 additions, 0 deletions
...oid/app/src/main/java/cx/ring/services/CallServiceImpl.kt
with
9 additions
and
0 deletions
jami-android/app/src/main/java/cx/ring/services/CallServiceImpl.kt
+
9
−
0
View file @
624d2370
...
@@ -11,6 +11,7 @@ import cx.ring.application.JamiApplication
...
@@ -11,6 +11,7 @@ import cx.ring.application.JamiApplication
import
cx.ring.service.CallConnection
import
cx.ring.service.CallConnection
import
cx.ring.service.CallRequestResult
import
cx.ring.service.CallRequestResult
import
cx.ring.utils.ConversationPath
import
cx.ring.utils.ConversationPath
import
cx.ring.utils.DeviceUtils
import
io.reactivex.rxjava3.core.Single
import
io.reactivex.rxjava3.core.Single
import
io.reactivex.rxjava3.subjects.SingleSubject
import
io.reactivex.rxjava3.subjects.SingleSubject
import
net.jami.model.Call
import
net.jami.model.Call
...
@@ -47,6 +48,10 @@ class CallServiceImpl(val mContext: Context, executor: ScheduledExecutorService,
...
@@ -47,6 +48,10 @@ class CallServiceImpl(val mContext: Context, executor: ScheduledExecutorService,
override
fun
requestPlaceCall
(
accountId
:
String
,
conversationUri
:
Uri
?,
contactUri
:
String
,
hasVideo
:
Boolean
):
Single
<
SystemCall
>
{
override
fun
requestPlaceCall
(
accountId
:
String
,
conversationUri
:
Uri
?,
contactUri
:
String
,
hasVideo
:
Boolean
):
Single
<
SystemCall
>
{
// Use the Android Telecom API to implement requestPlaceCall if available
// Use the Android Telecom API to implement requestPlaceCall if available
// Disabled because doesn't seem well integrated. GitLab: #1337.
if
(
DeviceUtils
.
isTv
(
mContext
))
return
CALL_ALLOWED
if
(
Build
.
VERSION
.
SDK_INT
>=
CONNECTION_SERVICE_TELECOM_API_SDK_COMPATIBILITY
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
CONNECTION_SERVICE_TELECOM_API_SDK_COMPATIBILITY
)
{
mContext
.
getSystemService
<
TelecomManager
>()
?.
let
{
telecomService
->
mContext
.
getSystemService
<
TelecomManager
>()
?.
let
{
telecomService
->
val
accountHandle
=
JamiApplication
.
instance
!!
.
androidPhoneAccountHandle
val
accountHandle
=
JamiApplication
.
instance
!!
.
androidPhoneAccountHandle
...
@@ -105,6 +110,10 @@ class CallServiceImpl(val mContext: Context, executor: ScheduledExecutorService,
...
@@ -105,6 +110,10 @@ class CallServiceImpl(val mContext: Context, executor: ScheduledExecutorService,
override
fun
requestIncomingCall
(
call
:
Call
):
Single
<
SystemCall
>
{
override
fun
requestIncomingCall
(
call
:
Call
):
Single
<
SystemCall
>
{
// Use the Android Telecom API if available
// Use the Android Telecom API if available
// Disabled because doesn't seem well integrated. GitLab: #1337.
if
(
DeviceUtils
.
isTv
(
mContext
))
return
CALL_ALLOWED
if
(
Build
.
VERSION
.
SDK_INT
>=
CONNECTION_SERVICE_TELECOM_API_SDK_COMPATIBILITY
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
CONNECTION_SERVICE_TELECOM_API_SDK_COMPATIBILITY
)
{
mContext
.
getSystemService
<
TelecomManager
>()
?.
let
{
telecomService
->
mContext
.
getSystemService
<
TelecomManager
>()
?.
let
{
telecomService
->
val
extras
=
Bundle
()
val
extras
=
Bundle
()
...
...
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
sign in
to comment