Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
linphone-android
Commits
99dfab91
Commit
99dfab91
authored
6 months ago
by
Sylvain Berfini
Browse files
Options
Download
Patches
Plain Diff
Fixed videoPolicy use with 5.4 SDK
parent
c6278493
test/UZ-8-no-telecom
feature/5.3
feature/UZ-8
No related merge requests found
Pipeline
#82338
passed with stage
in 17 minutes and 39 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/build.gradle
+1
-1
app/build.gradle
app/src/main/java/org/linphone/activities/main/settings/viewmodels/VideoSettingsViewModel.kt
+2
-2
...vities/main/settings/viewmodels/VideoSettingsViewModel.kt
app/src/main/java/org/linphone/core/CoreContext.kt
+4
-4
app/src/main/java/org/linphone/core/CoreContext.kt
with
7 additions
and
7 deletions
app/build.gradle
+
1
−
1
View file @
99dfab91
...
...
@@ -7,7 +7,7 @@ plugins {
}
def
appVersionName
=
"5.3.0"
def
appVersionCode
=
5200
0
def
appVersionCode
=
5200
5
def
packageName
=
"org.linphone"
...
...
This diff is collapsed.
Click to expand it.
app/src/main/java/org/linphone/activities/main/settings/viewmodels/VideoSettingsViewModel.kt
+
2
−
2
View file @
99dfab91
...
...
@@ -52,7 +52,7 @@ class VideoSettingsViewModel : GenericSettingsViewModel() {
val
initiateCallListener
=
object
:
SettingListenerStub
()
{
override
fun
onBoolValueChanged
(
newValue
:
Boolean
)
{
val
policy
=
core
.
videoActivationPolicy
val
policy
=
core
.
videoActivationPolicy
.
clone
()
policy
.
automaticallyInitiate
=
newValue
core
.
videoActivationPolicy
=
policy
}
...
...
@@ -61,7 +61,7 @@ class VideoSettingsViewModel : GenericSettingsViewModel() {
val
autoAcceptListener
=
object
:
SettingListenerStub
()
{
override
fun
onBoolValueChanged
(
newValue
:
Boolean
)
{
val
policy
=
core
.
videoActivationPolicy
val
policy
=
core
.
videoActivationPolicy
.
clone
()
policy
.
automaticallyAccept
=
newValue
core
.
videoActivationPolicy
=
policy
}
...
...
This diff is collapsed.
Click to expand it.
app/src/main/java/org/linphone/core/CoreContext.kt
+
4
−
4
View file @
99dfab91
...
...
@@ -144,10 +144,10 @@ class CoreContext(
core
.
isVideoCaptureEnabled
=
false
core
.
isVideoDisplayEnabled
=
false
val
videoP
olicy
=
core
.
videoActivationPolicy
videoP
olicy
.
automaticallyInitiate
=
false
videoP
olicy
.
automaticallyAccept
=
false
core
.
videoActivationPolicy
=
videoP
olicy
val
p
olicy
=
core
.
videoActivationPolicy
.
clone
()
p
olicy
.
automaticallyInitiate
=
false
p
olicy
.
automaticallyAccept
=
false
core
.
videoActivationPolicy
=
p
olicy
}
fetchContacts
()
...
...
This diff is collapsed.
Click to expand it.
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!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets