diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-06-02 13:33:17 +0200 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-06-02 13:33:17 +0200 |
| commit | 9d34e102d3ab2ce568f414dc767ea2b03bbf6d7b (patch) | |
| tree | 1eb609422a7f66d27d4d7c420c487e205027e61d | |
| parent | c950e43e8f06324c6ba95dffe59ca0e6d6b840a8 (diff) | |
| download | sink-9d34e102d3ab2ce568f414dc767ea2b03bbf6d7b.tar.gz sink-9d34e102d3ab2ce568f414dc767ea2b03bbf6d7b.zip | |
Load the right revision for changereplay, not just the latest one
| -rw-r--r-- | common/sourcewriteback.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/sourcewriteback.cpp b/common/sourcewriteback.cpp index 1c07577..87f6934 100644 --- a/common/sourcewriteback.cpp +++ b/common/sourcewriteback.cpp | |||
| @@ -79,14 +79,14 @@ KAsync::Job<void> SourceWriteBack::replay(const QByteArray &type, const QByteArr | |||
| 79 | if (operation != Sink::Operation_Creation) { | 79 | if (operation != Sink::Operation_Creation) { |
| 80 | oldRemoteId = syncStore().resolveLocalId(type, uid); | 80 | oldRemoteId = syncStore().resolveLocalId(type, uid); |
| 81 | } | 81 | } |
| 82 | Trace() << "Replaying " << key << type; | 82 | Trace() << "Replaying " << key << type << oldRemoteId; |
| 83 | 83 | ||
| 84 | KAsync::Job<QByteArray> job = KAsync::null<QByteArray>(); | 84 | KAsync::Job<QByteArray> job = KAsync::null<QByteArray>(); |
| 85 | if (type == ENTITY_TYPE_FOLDER) { | 85 | if (type == ENTITY_TYPE_FOLDER) { |
| 86 | auto folder = store().read<ApplicationDomain::Folder>(uid); | 86 | auto folder = store().readFromKey<ApplicationDomain::Folder>(key); |
| 87 | job = replay(folder, operation, oldRemoteId); | 87 | job = replay(folder, operation, oldRemoteId); |
| 88 | } else if (type == ENTITY_TYPE_MAIL) { | 88 | } else if (type == ENTITY_TYPE_MAIL) { |
| 89 | auto mail = store().read<ApplicationDomain::Mail>(uid); | 89 | auto mail = store().readFromKey<ApplicationDomain::Mail>(key); |
| 90 | job = replay(mail, operation, oldRemoteId); | 90 | job = replay(mail, operation, oldRemoteId); |
| 91 | } | 91 | } |
| 92 | 92 | ||