Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
KDE PIM Runtime
Commits
bd813cdb
Commit
bd813cdb
authored
Jul 29, 2020
by
Shashwat Jolly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up comments
parent
b5076539
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
10 deletions
+18
-10
resources/etesync/calendartaskbasehandler.cpp
resources/etesync/calendartaskbasehandler.cpp
+9
-5
resources/etesync/contacthandler.cpp
resources/etesync/contacthandler.cpp
+9
-0
resources/etesync/setupwizard.cpp
resources/etesync/setupwizard.cpp
+0
-5
No files found.
resources/etesync/calendartaskbasehandler.cpp
View file @
bd813cdb
...
...
@@ -68,8 +68,6 @@ void CalendarTaskBaseHandler::setupItems(EteSyncEntry **entries, Akonadi::Collec
KCalendarCore
::
Incidence
::
Ptr
incidence
=
format
.
fromString
(
QStringFromCharPtr
(
contentStr
));
const
QString
action
=
QStringFromCharPtr
(
CharPtr
(
etesync_sync_entry_get_action
(
syncEntry
.
get
())));
qCDebug
(
ETESYNC_LOG
)
<<
action
;
qCDebug
(
ETESYNC_LOG
)
<<
incidence
->
created
();
if
(
action
==
QStringLiteral
(
ETESYNC_SYNC_ENTRY_ACTION_ADD
)
||
action
==
QStringLiteral
(
ETESYNC_SYNC_ENTRY_ACTION_CHANGE
))
{
incidences
[
incidence
->
uid
()]
=
incidence
;
}
else
if
(
action
==
QStringLiteral
(
ETESYNC_SYNC_ENTRY_ACTION_DELETE
))
{
...
...
@@ -160,18 +158,19 @@ void CalendarTaskBaseHandler::deleteLocalCalendar(const KCalendarCore::Incidence
void
CalendarTaskBaseHandler
::
itemAdded
(
const
Akonadi
::
Item
&
item
,
const
Akonadi
::
Collection
&
collection
)
{
qCDebug
(
ETESYNC_LOG
)
<<
"Mime: "
<<
collection
.
contentMimeTypes
();
KCalendarCore
::
Calendar
::
Ptr
calendar
(
new
MemoryCalendar
(
QTimeZone
::
utc
()));
calendar
->
addIncidence
(
item
.
payload
<
Incidence
::
Ptr
>
());
KCalendarCore
::
ICalFormat
format
;
// qCDebug(ETESYNC_LOG) << "Calendar item added " << format.toString(calendar);
EteSyncJournalPtr
journal
(
etesync_journal_manager_fetch
(
mClientState
->
journalManager
(),
collection
.
remoteId
()));
// Handle EteSync conflict error: If stored UID is old, sync and retry
QString
lastJournalUid
=
QStringFromCharPtr
(
CharPtr
(
etesync_journal_get_last_uid
(
journal
.
get
())));
if
(
lastJournalUid
!=
collection
.
remoteRevision
())
{
mResource
->
deferTask
();
mResource
->
retrieveItems
(
collection
);
}
EteSyncCryptoManagerPtr
cryptoManager
(
etesync_journal_get_crypto_manager
(
journal
.
get
(),
mClientState
->
derived
(),
mClientState
->
keypair
()));
EteSyncSyncEntryPtr
syncEntry
(
etesync_sync_entry_new
(
QStringLiteral
(
ETESYNC_SYNC_ENTRY_ACTION_ADD
),
format
.
toString
(
calendar
)));
...
...
@@ -202,14 +201,16 @@ void CalendarTaskBaseHandler::itemChanged(const Akonadi::Item &item,
KCalendarCore
::
Calendar
::
Ptr
calendar
(
new
MemoryCalendar
(
QTimeZone
::
utc
()));
calendar
->
addIncidence
(
item
.
payload
<
Incidence
::
Ptr
>
());
KCalendarCore
::
ICalFormat
format
;
// qCDebug(ETESYNC_LOG) << "Calendar item changed " << format.toString(calendar);
EteSyncJournalPtr
journal
(
etesync_journal_manager_fetch
(
mClientState
->
journalManager
(),
collection
.
remoteId
()));
// Handle EteSync conflict error: If stored UID is old, sync and retry
QString
lastJournalUid
=
QStringFromCharPtr
(
CharPtr
(
etesync_journal_get_last_uid
(
journal
.
get
())));
if
(
lastJournalUid
!=
collection
.
remoteRevision
())
{
mResource
->
deferTask
();
mResource
->
retrieveItems
(
collection
);
}
EteSyncCryptoManagerPtr
cryptoManager
(
etesync_journal_get_crypto_manager
(
journal
.
get
(),
mClientState
->
derived
(),
mClientState
->
keypair
()));
EteSyncSyncEntryPtr
syncEntry
(
etesync_sync_entry_new
(
QStringLiteral
(
ETESYNC_SYNC_ENTRY_ACTION_CHANGE
),
format
.
toString
(
calendar
)));
...
...
@@ -237,11 +238,14 @@ void CalendarTaskBaseHandler::itemRemoved(const Akonadi::Item &item)
Collection
collection
=
item
.
parentCollection
();
EteSyncJournalPtr
journal
(
etesync_journal_manager_fetch
(
mClientState
->
journalManager
(),
collection
.
remoteId
()));
// Handle EteSync conflict error: If stored UID is old, sync and retry
QString
lastJournalUid
=
QStringFromCharPtr
(
CharPtr
(
etesync_journal_get_last_uid
(
journal
.
get
())));
if
(
lastJournalUid
!=
collection
.
remoteRevision
())
{
mResource
->
deferTask
();
mResource
->
retrieveItems
(
collection
);
}
EteSyncCryptoManagerPtr
cryptoManager
(
etesync_journal_get_crypto_manager
(
journal
.
get
(),
mClientState
->
derived
(),
mClientState
->
keypair
()));
QString
calendar
=
getLocalCalendar
(
item
.
remoteId
());
...
...
resources/etesync/contacthandler.cpp
View file @
bd813cdb
...
...
@@ -162,11 +162,14 @@ void ContactHandler::itemAdded(const Akonadi::Item &item,
const
Akonadi
::
Collection
&
collection
)
{
EteSyncJournalPtr
journal
(
etesync_journal_manager_fetch
(
mClientState
->
journalManager
(),
collection
.
remoteId
()));
// Handle EteSync conflict error: If stored UID is old, sync and retry
QString
lastJournalUid
=
QStringFromCharPtr
(
CharPtr
(
etesync_journal_get_last_uid
(
journal
.
get
())));
if
(
lastJournalUid
!=
collection
.
remoteRevision
())
{
mResource
->
deferTask
();
mResource
->
retrieveItems
(
collection
);
}
EteSyncCryptoManagerPtr
cryptoManager
(
etesync_journal_get_crypto_manager
(
journal
.
get
(),
mClientState
->
derived
(),
mClientState
->
keypair
()));
KContacts
::
VCardConverter
converter
;
...
...
@@ -198,11 +201,14 @@ void ContactHandler::itemChanged(const Akonadi::Item &item,
Collection
collection
=
item
.
parentCollection
();
EteSyncJournalPtr
journal
(
etesync_journal_manager_fetch
(
mClientState
->
journalManager
(),
collection
.
remoteId
()));
// Handle EteSync conflict error: If stored UID is old, sync and retry
QString
lastJournalUid
=
QStringFromCharPtr
(
CharPtr
(
etesync_journal_get_last_uid
(
journal
.
get
())));
if
(
lastJournalUid
!=
collection
.
remoteRevision
())
{
mResource
->
deferTask
();
mResource
->
retrieveItems
(
collection
);
}
EteSyncCryptoManagerPtr
cryptoManager
(
etesync_journal_get_crypto_manager
(
journal
.
get
(),
mClientState
->
derived
(),
mClientState
->
keypair
()));
KContacts
::
VCardConverter
converter
;
...
...
@@ -232,11 +238,14 @@ void ContactHandler::itemRemoved(const Akonadi::Item &item)
Collection
collection
=
item
.
parentCollection
();
EteSyncJournalPtr
journal
(
etesync_journal_manager_fetch
(
mClientState
->
journalManager
(),
collection
.
remoteId
()));
// Handle EteSync conflict error: If stored UID is old, sync and retry
QString
lastJournalUid
=
QStringFromCharPtr
(
CharPtr
(
etesync_journal_get_last_uid
(
journal
.
get
())));
if
(
lastJournalUid
!=
collection
.
remoteRevision
())
{
mResource
->
deferTask
();
mResource
->
retrieveItems
(
collection
);
}
EteSyncCryptoManagerPtr
cryptoManager
(
etesync_journal_get_crypto_manager
(
journal
.
get
(),
mClientState
->
derived
(),
mClientState
->
keypair
()));
QString
contact
=
getLocalContact
(
item
.
remoteId
());
...
...
resources/etesync/setupwizard.cpp
View file @
bd813cdb
...
...
@@ -80,7 +80,6 @@ int LoginPage::nextId() const
bool
LoginPage
::
validatePage
()
{
qCDebug
(
ETESYNC_LOG
)
<<
"validate login page"
;
QString
username
=
field
(
QStringLiteral
(
"credentialsUserName"
)).
toString
();
QString
password
=
field
(
QStringLiteral
(
"credentialsPassword"
)).
toString
();
QString
advancedServerUrl
=
field
(
QStringLiteral
(
"credentialsServerUrl"
)).
toString
();
...
...
@@ -88,7 +87,6 @@ bool LoginPage::validatePage()
if
(
!
advancedServerUrl
.
isNull
()
&&
!
advancedServerUrl
.
isEmpty
())
{
serverUrl
=
advancedServerUrl
;
}
// return true;
bool
loginResult
=
static_cast
<
SetupWizard
*>
(
wizard
())
->
mClientState
->
initToken
(
serverUrl
,
username
,
password
);
if
(
!
loginResult
)
{
mLoginLabel
->
setText
(
i18n
(
"Incorrect login credentials. Please try again."
));
...
...
@@ -115,7 +113,6 @@ EncryptionPasswordPage::EncryptionPasswordPage(QWidget *parent)
int
EncryptionPasswordPage
::
nextId
()
const
{
// Implement keypair job
return
-
1
;
}
...
...
@@ -130,13 +127,11 @@ void EncryptionPasswordPage::initializePage()
bool
EncryptionPasswordPage
::
validatePage
()
{
qCDebug
(
ETESYNC_LOG
)
<<
"validate encryptionpassword page"
;
QString
encryptionPassword
=
field
(
QStringLiteral
(
"credentialsEncryptionPassword"
)).
toString
();
if
(
mInitAccount
)
{
static_cast
<
SetupWizard
*>
(
wizard
())
->
mClientState
->
initAccount
(
encryptionPassword
);
return
true
;
}
// return true;
bool
keypairResult
=
static_cast
<
SetupWizard
*>
(
wizard
())
->
mClientState
->
initKeypair
(
encryptionPassword
);
if
(
!
keypairResult
)
{
mEncryptionPasswordLabel
->
setText
(
i18n
(
"Incorrect encryption password. Please try again."
));
...
...
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