Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
7a31d8ca
Commit
7a31d8ca
authored
Aug 31, 2013
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
User can now end an encrypted session.
parent
6ac24c3b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
converse.js
converse.js
+4
-6
No files found.
converse.js
View file @
7a31d8ca
...
@@ -326,10 +326,8 @@
...
@@ -326,10 +326,8 @@
break
;
break
;
case
otr
.
OTR
.
CONST
.
STATUS_END_OTR
:
case
otr
.
OTR
.
CONST
.
STATUS_END_OTR
:
if
(
this
.
otr
.
msgstate
===
otr
.
OTR
.
CONST
.
MSGSTATE_FINISHED
)
{
if
(
this
.
otr
.
msgstate
===
otr
.
OTR
.
CONST
.
MSGSTATE_FINISHED
)
{
// XXX: inform the user that his correspondent has closed his end
// of the private connection and the user should do the same
this
.
set
(
'
otr_status
'
,
FINISHED
);
this
.
set
(
'
otr_status
'
,
FINISHED
);
}
else
if
(
this
.
otr
.
msgstate
===
otr
.
OTR
.
CONST
.
MSGSTATE_
FINISHED
)
{
}
else
if
(
this
.
otr
.
msgstate
===
otr
.
OTR
.
CONST
.
MSGSTATE_
PLAINTEXT
)
{
this
.
set
(
'
otr_status
'
,
UNENCRYPTED
);
this
.
set
(
'
otr_status
'
,
UNENCRYPTED
);
}
}
break
;
break
;
...
@@ -779,7 +777,7 @@
...
@@ -779,7 +777,7 @@
},
},
endOTR
:
function
(
ev
)
{
endOTR
:
function
(
ev
)
{
alert
(
'
to be done
'
);
this
.
model
.
otr
.
endOtr
(
);
},
},
authOTR
:
function
(
ev
)
{
authOTR
:
function
(
ev
)
{
...
@@ -854,9 +852,9 @@
...
@@ -854,9 +852,9 @@
if
(
data
.
otr_status
==
UNENCRYPTED
)
{
if
(
data
.
otr_status
==
UNENCRYPTED
)
{
msgs
.
push
(
__
(
"
Your messages are not encrypted anymore
"
));
msgs
.
push
(
__
(
"
Your messages are not encrypted anymore
"
));
}
else
if
(
data
.
otr_status
==
UNVERIFIED
){
}
else
if
(
data
.
otr_status
==
UNVERIFIED
){
msgs
.
push
(
__
(
"
Your messages are encrypted but your buddy's identity has not been verified.
"
));
msgs
.
push
(
__
(
"
Your messages are
now
encrypted but your buddy's identity has not been verified.
"
));
}
else
if
(
data
.
otr_status
==
VERIFIED
){
}
else
if
(
data
.
otr_status
==
VERIFIED
){
msgs
.
push
(
__
(
"
Your
messages are encrypted and your buddy's identify
verified.
"
));
msgs
.
push
(
__
(
"
Your
buddy's identify has been
verified.
"
));
}
else
if
(
data
.
otr_status
==
FINISHED
){
}
else
if
(
data
.
otr_status
==
FINISHED
){
msgs
.
push
(
__
(
"
Your buddy has ended encryption on their end, you should do the same.
"
));
msgs
.
push
(
__
(
"
Your buddy has ended encryption on their end, you should do the same.
"
));
}
}
...
...
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