From: Christian Kamm <mail@ckamm.de>
Date: Wed, 12 Jul 2017 08:06:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/2.3'
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~704^2^2~43
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=da54b3d7e56e636d89f2ed07287246695585abe2;p=nextcloud-desktop.git

Merge remote-tracking branch 'origin/2.3'
---

da54b3d7e56e636d89f2ed07287246695585abe2
diff --cc ChangeLog
index 0e475fa59,617d63de7..ad96ac656
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,36 -1,18 +1,48 @@@
  ChangeLog
  =========
  
 +version 2.4.0 (2017-0X-XX)
 +* OAuth2 authentication support
 +* Sharing: Add support for multiple public link shares (#5655)
 +* Sharing: Add option to copy/email direct links (#5627)
 +* Sharing: Show warning that links are public
 +* Sharing: Many UI improvements
 +* Wizards: Never propose an existing folder for syncing (#5597)
 +* Wizard: Don't show last page anymore, go to settings directly (#5726)
 +* Settings Dialog: Display the user server avatar
 +* Selective Sync: Open sub folder context menu (#5596)
 +* Selective Sync: Skip excluded folders when reading db
 +* Selective Sync: SelectiveSync: Remove local files of unselected folder despite other modified files (#5783)
 +* Exclude list: remove .htaccess
 +* Detect maintenance mode (#4485)
 +* Discovery: Increase the MAX_DEPTH and show deep folders as ignored
 +* Downloads: Remove empty temporary if disk space full (#5746)
 +* Downloads: Re-trigger folder discovery on 404
 +* When creating explorer favorite use more specific windows functions (#5690)
 +* Added owncloudcmd bandwidth limit parameter (#5707)
 +* AccountSettings: Sync with clean discovery on Ctrl-F6 (#5666)
 +* Dynamic size of chunks in chunked uploads for improved big file upload performance
 +* ShareDialog: Make "can edit" partially checked sometimes #5642
 +* Require Qt5
 +* Switch 3rdparty/json usage to Qt5's QJson (#5710)
 +* Reduce memory usage
 +* Documentation improvements
 +* Logging improvements (with Qt logging categories), new --logdebug parameter
 +* Harmonize source code style with clang-format
 +* Crash fixes
 +
+ version 2.3.3 (2017-07-XX)
+ * Chunking NG: Don't use old chunking on new DAV endpoint (#5855)
+ * Selective Sync: Skip excluded folders when reading DB, don't let them show errors (#5772)
+ * Settings: Make window bigger so Qt version is always visible (#5760)
+ * Share links: Show warning that public link shares are public (#5786)
+ * Downloads: Re-trigger folder discovery on HTTP 404 (#5799)
+ * Overlay Icons: Fix potential hangs on Windows
+ * SyncJournalDB: Don't use ._ as filename pattern if that does not work because of SMB storage settings (#5844)
+ * SyncJournalDB: Log reason for sqlite3 opening errors
+ * Switch Linux build also to Qt 5.6.2 (#5470)
+ * Stopped maintaining Qt 4 buildability
+ 
  version 2.3.2 (2017-05-08)
  * Fix more crashes (thanks to everyone submitting to our crash reporter!)
  * Improve compatibility with server 10.0 (#5691, X-OC-Total-Size)
diff --cc src/libsync/syncengine.cpp
index 96ffbcbb7,5efee80af..5dc4ec07b
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@@ -394,12 -385,14 +394,14 @@@ int SyncEngine::treewalkFile(TREE_WALK_
      item->_originalFile = item->_file;
  
      if (item->_instruction == CSYNC_INSTRUCTION_NONE
 -            || (item->_instruction == CSYNC_INSTRUCTION_IGNORE && instruction != CSYNC_INSTRUCTION_NONE)) {
 +        || (item->_instruction == CSYNC_INSTRUCTION_IGNORE && instruction != CSYNC_INSTRUCTION_NONE)) {
+         // Take values from side (local/remote) where instruction is not _NONE
          item->_instruction = instruction;
          item->_modtime = file->modtime;
+         item->_size = file->size;
      } else {
          if (instruction != CSYNC_INSTRUCTION_NONE) {
 -            qWarning() << "ERROR: Instruction" << item->_instruction << "vs" << instruction << "for" << fileUtf8;
 +            qCWarning(lcEngine) << "ERROR: Instruction" << item->_instruction << "vs" << instruction << "for" << fileUtf8;
              ASSERT(false);
              // Set instruction to NONE for safety.
              file->instruction = item->_instruction = instruction = CSYNC_INSTRUCTION_NONE;
diff --cc test/testsyncjournaldb.cpp
index ec673077d,3787eb4c1..881bb865d
--- a/test/testsyncjournaldb.cpp
+++ b/test/testsyncjournaldb.cpp
@@@ -17,10 -17,11 +17,13 @@@ class TestSyncJournalDB : public QObjec
  {
      Q_OBJECT
  
+     QTemporaryDir _tempDir;
++
  public:
 -    TestSyncJournalDB() : _db((_tempDir.path() + "/sync.db"))
 +    TestSyncJournalDB()
-         : _db("/tmp/csync-test.db")
++        : _db((_tempDir.path() + "/sync.db"))
      {
+         QVERIFY(_tempDir.isValid());
      }
  
      QDateTime dropMsecs(QDateTime time)