From: Olivier Goffart <ogoffart@woboq.com>
Date: Thu, 10 Oct 2019 11:21:28 +0000 (+0200)
Subject: Restoration items should appear in the sync protocol
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~170
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ee611e60049aa6857be607b94f6d459ec45fefac;p=nextcloud-desktop.git

Restoration items should appear in the sync protocol

When an item is downloaded because it is restored, it shall be shown in the
sync protocol.
(It is also going to be shown in the not synchronized for a short while, but
that's fine)
---

diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h
index dddc79832..36a6d925c 100644
--- a/src/libsync/syncfileitem.h
+++ b/src/libsync/syncfileitem.h
@@ -190,7 +190,7 @@ public:
      */
     bool showInProtocolTab() const
     {
-        return !showInIssuesTab()
+        return (!showInIssuesTab() || _status == SyncFileItem::Restoration)
             // Don't show conflicts that were resolved as "not a conflict after all"
             && !(_instruction == CSYNC_INSTRUCTION_CONFLICT && _status == SyncFileItem::Success);
     }