Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
60b9f93a
Commit
60b9f93a
authored
Jun 07, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/Incall): better encryption tooltip
parent
bd6a2a89
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
10 deletions
+26
-10
en.ts
linphone-desktop/assets/languages/en.ts
+8
-4
fr.ts
linphone-desktop/assets/languages/fr.ts
+8
-4
CallModel.cpp
linphone-desktop/src/components/call/CallModel.cpp
+1
-1
Incall.js
linphone-desktop/ui/views/App/Calls/Incall.js
+8
-0
Incall.qml
linphone-desktop/ui/views/App/Calls/Incall.qml
+1
-1
No files found.
linphone-desktop/assets/languages/en.ts
View file @
60b9f93a
...
...
@@ -315,10 +315,6 @@
<
source
>
callErrorNotAcceptable
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
noMediaEncryption
<
/source
>
<
translation
>
None
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
CallSipAddress
<
/name
>
...
...
@@ -812,6 +808,14 @@ Server url not configured.</translation>
<
source
>
pendingRequestLabel
<
/source
>
<
translation
>
Please
to
wait
,
a
request
is
pending
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
securedStringFormat
<
/source
>
<
translation
>
Call
is
encrypted
with
:
%
1
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
callNotSecured
<
/source
>
<
translation
>
Call
not
encrypted
.
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
InviteFriends
<
/name
>
...
...
linphone-desktop/assets/languages/fr.ts
View file @
60b9f93a
...
...
@@ -315,10 +315,6 @@
<
source
>
callErrorNotAcceptable
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
noMediaEncryption
<
/source
>
<
translation
>
Aucun
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
CallSipAddress
<
/name
>
...
...
@@ -812,6 +808,14 @@ Url du serveur non configurée.</translation>
<
source
>
pendingRequestLabel
<
/source
>
<
translation
>
Merci
de
patienter
,
une
requ
ê
te
est
en
attente
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
securedStringFormat
<
/source
>
<
translation
>
L
&
apos
;
appel
est
chiffr
é
avec
:
%
1
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
callNotSecured
<
/source
>
<
translation
>
Appel
non
chiffr
é
.
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
InviteFriends
<
/name
>
...
...
linphone-desktop/src/components/call/CallModel.cpp
View file @
60b9f93a
...
...
@@ -541,7 +541,7 @@ QString CallModel::getSecuredString () const {
break
;
}
return
tr
(
"noMediaEncryption
"
);
return
QStringLiteral
(
"
"
);
}
// -----------------------------------------------------------------------------
...
...
linphone-desktop/ui/views/App/Calls/Incall.js
View file @
60b9f93a
...
...
@@ -64,6 +64,14 @@ function handleVideoRequested () {
})
}
function
makeReadableSecuredString
(
securedString
)
{
if
(
!
securedString
.
length
)
{
return
qsTr
(
'
callNotSecured
'
)
}
return
qsTr
(
'
securedStringFormat
'
).
replace
(
'
%1
'
,
securedString
)
}
function
showFullscreen
()
{
if
(
incall
.
_fullscreen
)
{
return
...
...
linphone-desktop/ui/views/App/Calls/Incall.qml
View file @
60b9f93a
...
...
@@ -111,7 +111,7 @@ Rectangle {
onClicked
:
zrtp
.
visible
=
(
incall
.
call
.
encryption
===
CallModel
.
CallEncryptionZRTP
)
TooltipArea
{
text
:
incall
.
call
.
securedString
text
:
Logic
.
makeReadableSecuredString
(
incall
.
call
.
securedString
)
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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