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
PIM
PIM Sieve Editor
Commits
1d061397
Commit
1d061397
authored
Nov 10, 2020
by
Laurent Montel
😁
Browse files
Prepare to use qtkeychain
parent
e7ca5026
Pipeline
#40356
canceled with stage
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/serversievelistwidget.cpp
View file @
1d061397
...
...
@@ -19,11 +19,12 @@
#include "serversievelistwidget.h"
#include "serversievesettingsdialog.h"
#include "sieveserversettings.h"
#include <KLocalizedString>
#include <QListWidgetItem>
#include <QPointer>
#include <KWallet>
ServerSieveListWidget
::
ServerSieveListWidget
(
QWidget
*
parent
)
:
QListWidget
(
parent
)
...
...
@@ -56,7 +57,24 @@ void ServerSieveListWidget::writeConfig()
}
}
SieveEditorUtil
::
writeServerSieveConfig
(
lstServerConfig
);
SieveEditorUtil
::
deletePasswords
(
mNeedToRemovePasswordInWallet
);
}
void
ServerSieveListWidget
::
deletePasswords
()
{
if
(
!
mNeedToRemovePasswordInWallet
.
isEmpty
())
{
KWallet
::
Wallet
*
wallet
=
SieveServerSettings
::
self
()
->
wallet
();
if
(
wallet
&&
wallet
->
isOpen
())
{
if
(
wallet
->
hasFolder
(
QStringLiteral
(
"sieveeditor"
)))
{
wallet
->
setFolder
(
QStringLiteral
(
"sieveeditor"
));
for
(
const
QString
&
identifier
:
mNeedToRemovePasswordInWallet
)
{
//TODO move to qtkeychain
if
(
wallet
->
hasEntry
(
identifier
))
{
wallet
->
removeEntry
(
identifier
);
}
}
}
}
}
}
void
ServerSieveListWidget
::
modifyServerConfig
()
...
...
src/serversievelistwidget.h
View file @
1d061397
...
...
@@ -52,6 +52,7 @@ public Q_SLOTS:
void
modifyServerConfig
();
private:
void
deletePasswords
();
QStringList
mNeedToRemovePasswordInWallet
;
};
...
...
src/sieveeditorutil.cpp
View file @
1d061397
...
...
@@ -87,6 +87,7 @@ bool SieveEditorUtil::SieveServerConfig::operator ==(const SieveEditorUtil::Siev
QVector
<
SieveEditorUtil
::
SieveServerConfig
>
SieveEditorUtil
::
readServerSieveConfig
()
{
//TODO move to async
QVector
<
SieveServerConfig
>
lstConfig
;
KSharedConfigPtr
cfg
=
KSharedConfig
::
openConfig
();
QRegularExpression
re
(
QStringLiteral
(
"^ServerSieve (.+)$"
));
...
...
@@ -233,23 +234,6 @@ void SieveEditorUtil::addServerSieveConfig(const SieveEditorUtil::SieveServerCon
cfg
->
sync
();
}
void
SieveEditorUtil
::
deletePasswords
(
const
QStringList
&
identifiers
)
{
if
(
!
identifiers
.
isEmpty
())
{
KWallet
::
Wallet
*
wallet
=
SieveServerSettings
::
self
()
->
wallet
();
if
(
wallet
&&
wallet
->
isOpen
())
{
if
(
wallet
->
hasFolder
(
QStringLiteral
(
"sieveeditor"
)))
{
wallet
->
setFolder
(
QStringLiteral
(
"sieveeditor"
));
for
(
const
QString
&
identifier
:
identifiers
)
{
if
(
wallet
->
hasEntry
(
identifier
))
{
wallet
->
removeEntry
(
identifier
);
}
}
}
}
}
}
QDebug
operator
<<
(
QDebug
d
,
const
SieveEditorUtil
::
SieveServerConfig
&
settings
)
{
d
<<
"sieveSettings "
<<
settings
.
sieveSettings
;
...
...
src/sieveeditorutil.h
View file @
1d061397
...
...
@@ -66,7 +66,6 @@ QVector<SieveServerConfig> readServerSieveConfig();
void
writeServerSieveConfig
(
const
QVector
<
SieveEditorUtil
::
SieveServerConfig
>
&
lstConfig
);
void
addServerSieveConfig
(
const
SieveEditorUtil
::
SieveServerConfig
&
conf
);
void
writeSieveSettings
(
KWallet
::
Wallet
*
wallet
,
const
KSharedConfigPtr
&
cfg
,
const
SieveEditorUtil
::
SieveServerConfig
&
conf
,
int
index
);
void
deletePasswords
(
const
QStringList
&
identifiers
);
QString
sievePasswordIdentifier
(
const
QString
&
userName
,
const
QString
&
serverName
);
QString
imapPasswordIdentifier
(
const
QString
&
userName
,
const
QString
&
serverName
);
}
...
...
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