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
Merge requests
!1541
Hide call encryption in call ended fragment if call wasn't answered
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Sylvain Berfini
requested to merge
fix/call_ended_no_encryption
into
master
5 months ago
Overview
0
Commits
1
Pipelines
1
Changes
2
0
0
Compare
master
master (base)
and
latest version
latest version
bb4e9fde
1 commit,
5 months ago
2 files
+
3
−
0
Expand all files
Preferences
Preferences
File browser
List view
Tree view
Compare changes
Inline
Side-by-side
Show whitespace changes
Show one file at a time
Search (e.g. *.vue) (Ctrl+P)
app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
+
2
−
0
Options
View file @ bb4e9fde
Edit in single-file editor
Open in Web IDE
Show full file
@@ -327,6 +327,7 @@ class CurrentCallViewModel @UiThread constructor() : GenericViewModel() {
updateVideoDirection
(
call
.
currentParams
.
videoDirection
)
if
(
call
.
state
==
Call
.
State
.
Connected
)
{
updateCallDuration
()
if
(
call
.
conference
!=
null
)
{
Log
.
i
(
"$TAG Call is in Connected state and conference isn't null, going to conference fragment"
@@ -337,6 +338,7 @@ class CurrentCallViewModel @UiThread constructor() : GenericViewModel() {
conferenceModel
.
destroy
()
}
}
else
if
(
call
.
state
==
Call
.
State
.
StreamsRunning
)
{
updateCallDuration
()
if
(
corePreferences
.
automaticallyStartCallRecording
)
{
isRecording
.
postValue
(
call
.
params
.
isRecording
)
}
app/src/main/res/layout/call_ended_fragment.xml
+
1
−
0
Options
View file @ bb4e9fde
Edit in single-file editor
Open in Web IDE
Show full file
@@ -64,6 +64,7 @@
android:id=
"@+id/call_media_encryption_info"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:visibility=
"@{viewModel.callDuration > 0 ? View.VISIBLE : View.GONE, default=gone}"
layout=
"@layout/call_media_encryption_info"
bind:viewModel=
"@{viewModel}"
app:layout_constraintTop_toBottomOf=
"@id/call_direction_label"
Menu
Explore
Projects
Groups
Topics
Snippets