Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Graphics
Okular
Commits
c061d575
Commit
c061d575
authored
Sep 13, 2021
by
Georgiy Sgibnev
Committed by
Albert Astals Cid
Sep 13, 2021
Browse files
Fix issues when cancelling while adding a digital signature
parent
e0f92557
Pipeline
#80439
passed with stage
in 9 minutes and 36 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
part/pageviewannotator.cpp
View file @
c061d575
...
...
@@ -320,6 +320,7 @@ public:
,
m_page
(
nullptr
)
,
m_pageView
(
pageView
)
,
m_startOver
(
false
)
,
m_aborted
(
false
)
{
m_block
=
true
;
}
...
...
@@ -356,8 +357,8 @@ public:
const
Okular
::
CertificateStore
*
certStore
=
m_document
->
certificateStore
();
bool
userCancelled
;
const
QList
<
Okular
::
CertificateInfo
*>
&
certs
=
certStore
->
signingCertificates
(
&
userCancelled
);
if
(
userCancelled
)
{
m_aborted
=
true
;
return
{};
}
...
...
@@ -403,6 +404,7 @@ public:
if
(
ok
)
{
passok
=
cert
->
checkPassword
(
passToUse
);
}
else
{
passok
=
false
;
break
;
}
}
...
...
@@ -411,9 +413,12 @@ public:
certCommonName
=
cert
->
subjectInfo
(
Okular
::
CertificateInfo
::
CommonName
);
}
else
{
certNicknameToUse
.
clear
();
m_aborted
=
true
;
}
}
else
{
// The Cancel button has been clicked in the certificate dialog.
certNicknameToUse
.
clear
();
m_aborted
=
true
;
}
m_creationCompleted
=
false
;
...
...
@@ -426,7 +431,7 @@ public:
bool
isAccepted
()
const
{
return
!
certNicknameToUse
.
isEmpty
();
return
!
m_aborted
&&
!
certNicknameToUse
.
isEmpty
();
}
bool
userWantsToStartOver
()
const
...
...
@@ -434,6 +439,11 @@ public:
return
m_startOver
;
}
bool
isAborted
()
const
{
return
m_aborted
;
}
bool
sign
(
const
QString
&
newFilePath
)
{
Okular
::
NewSignatureData
data
;
...
...
@@ -456,6 +466,7 @@ private:
PageView
*
m_pageView
;
bool
m_startOver
;
bool
m_aborted
;
};
/** @short PolyLineEngine */
...
...
@@ -1051,10 +1062,17 @@ QRect PageViewAnnotator::performRouteMouseOrTabletEvent(const AnnotatorEngine::E
KMessageBox
::
error
(
m_pageView
,
i18nc
(
"%1 is a file path"
,
"Could not sign. Invalid certificate password or could not write to '%1'"
,
newFilePath
));
}
}
// Exit the signature mode.
setSignatureMode
(
false
);
selectBuiltinTool
(
-
1
,
ShowTip
::
No
);
}
else
if
(
signEngine
->
userWantsToStartOver
())
{
delete
m_engine
;
m_engine
=
new
PickPointEngineSignature
(
m_document
,
m_pageView
);
return
{};
}
else
if
(
signEngine
->
isAborted
())
{
// Exit the signature mode.
setSignatureMode
(
false
);
selectBuiltinTool
(
-
1
,
ShowTip
::
No
);
}
m_continuousMode
=
false
;
}
...
...
Write
Preview
Supports
Markdown
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