Missing parentheses in c43f35b

https://github.com/owncloud/enterprise/issues/1729

.travis.yml

@@ -1,15 +1,21 @@
+sudo: required
+
 language: cpp
+
+services:
+  - docker
+
 branches:
   only:
   - coverity_scan 
 
 before_install:
-- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
-- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
-- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_12.04/Release.key
+- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_14.04/Release.key
 - sudo apt-key add - < Release.key
 - sudo apt-get update
-- sudo apt-get build-dep owncloud-client
+- sudo apt-get -y build-dep owncloud-client
 - checkout=$(git show-ref --head --hash head)
 - cd ../
 - wget https://scan.coverity.com/download/linux-64 --post-data "token=$token&project=owncloud%2Fmirall" -O coverity_tool.tgz

CMakeLists.txt

@@ -1,3 +1,4 @@
+
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(VERSION 2.8.0)
 
@@ -125,6 +126,17 @@ if(OWNCLOUD_5XX_NO_BLACKLIST)
     add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
 endif()
 
+# When this option is enabled, a rename that is not allowed will be renamed back
+# do the original as a restoration step.  Withut this option, the restoration will
+# re-download the file instead.
+# The default is off because we don't want to rename the files back behind the user's back
+# Added for IL issue #550
+option(OWNCLOUD_RESTORE_RENAME "OWNCLOUD_RESTORE_RENAME" OFF)
+if(OWNCLOUD_RESTORE_RENAME)
+    add_definitions(-DOWNCLOUD_RESTORE_RENAME=1)
+endif()
+
+
 if(APPLE)
   set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()

ChangeLog

@@ -1,5 +1,71 @@
 ChangeLog
 =========
+
+version 2.2.4 (release 2016-09-27)
+* Dolphin Plugin: Use the Application name for the socket path (#5172)
+* SyncEngine: Fix renaming of folder when file are changed (#5195)
+* Selective Sync: Fix HTTP request loop and show error in view (#5154)
+* ConnectionValidator: properly handle error in status.php request (#5188)
+* Discovery: Set thread priority to low (#5017)
+* ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
+* ShareLink: Ensure the password line edit is enabled (#5117)
+
+version 2.2.3 (release 2016-08-08)
+* SyncEngine: Fix detection of backup (#5104)
+* Fix bug with overriding URL in config (#5016)
+* Sharing: Fix bug with file names containing percent encodes (#5042, #5043)
+* Sharing: Permissions for federated shares on servers >=9.1 (#4996, #5001)
+* Overlays: Fix issues with file name casing on OS X and Windows
+* Windows: Skip symlinks and junctions again (#5019)
+* Only accept notification API Capability if endpoint is OCS-enabled (#5034)
+* Fix windows HiDPI (#4994)
+* SocketAPI: Use different pipe name to avoid unusual delay (#4977)
+* Tray: Add minimal mode as workaround and testing tool for Linux issues (#4985, #4990)
+* owncloudcmd: Fix --exclude regression #4979
+* Small memleak: Use the full file stat destructors (#4992)
+* Fix small QAction memleak (#5008)
+* Fix crash on shutting down during propagation (#4979)
+* Decrease memory usage during sync #4979
+* Setup csync logging earlier to get all log output (#4991)
+* Enable Shibboleth debug view with OWNCLOUD_SHIBBOLETH_DEBUG env
+
+version 2.2.2 (release 2016-06-21)
+* Excludes: Don't redundantly add the same exclude files (memleak) (#4967, #4988)
+* Excludes: Only log if the pattern was really logged. (#4989)
+
+version 2.2.1 (release 2016-06-06)
+ * Fix out of memory error when too many uploads happen (#4611)
+ * Fix display errors in progress display (#4803 #4856)
+ * LockWatcher: Remember to upload files after they become unlocked (#4865) 
+ * Fix overlay icons for files with umlauts (#4884)
+ * Certs: Re-ask for different cert after rejection (#4898, #4911)
+ * Progress: Don't count items without propagation jobs (#4856, #4910)
+ * Utility: Fix for the translation of minutes, second (#4855)
+ * SyncEngine: invalid the blacklist entry when the rename destination change
+
+version 2.2.0 (release 2016-05-12)
+ * Overlay icons: Refactoring - mainly for performance improvements
+ * Improved error handling with Sync Journal on USB storages (#4632)
+ * Sharing Completion: Improved UI of completion in sharing from desktop. (#3737)
+ * Show server notifications on the client (#3733)
+ * Improved Speed with small files by dynamic parallel request count (#4529)
+ * LockWatcher: Make sure to sync files after apps released exclusive locks on Windows.
+ * Improved handling of Win32 file locks and network files
+ * Workaround Ubuntu 16.04 tray icon bug (#4693)
+ * Removed the Alias field from the folder definition (#4695)
+ * Improved netrc parser (#4691)
+ * Improved user notifications about ignored files and conflicts (#4761, #3222)
+ * Add warnings for old server versions (#4523)
+ * Enable tranportation checksums if the server supports based on server capabilities (#3735)
+
+ * Default Chunk-size changed to 10MB (#4354)
+ * Documentation Improvements, ie. about overlay icons
+ * Translation fixes
+ * Countless other bugfixes
+ * Sqlite Update to recent version
+ * Update of QtKeyChain to support Windows credential store
+ * Packaging of dolphin overlay icon module for bleeding edge distros
+
 version 2.1.1 (release 2016-02-10)
  * UI improvements for HiDPI screens, error messages, RTL languages
  * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used

Jenkinsfile

@@ -0,0 +1,58 @@
+#!groovy
+
+node('CLIENT') {
+    stage 'Checkout'
+        checkout scm
+        sh '''git submodule update --init'''
+
+    stage 'Qt4'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt4 - clang'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt5'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt5 - clang'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
+		make
+		ctest --output-on-failure'''
+
+
+    stage 'Win32'
+	def win32 = docker.image('deepdiver/docker-owncloud-client-win32:latest')
+	win32.pull() // make sure we have the latest available from Docker Hub
+	win32.inside {
+		sh '''
+		rm -rf build-win32
+		mkdir build-win32
+		cd build-win32
+		../admin/win/download_runtimes.sh
+		cmake .. -DCMAKE_TOOLCHAIN_FILE=../admin/win/Toolchain-mingw32-openSUSE.cmake -DWITH_CRASHREPORTER=ON
+		make -j4
+		make package
+		ctest .
+		'''
+	}
+}
+
+

README.md

@@ -15,7 +15,7 @@ with your computer.
 
 ### Binary packages
 
-* Refer to the download page http://owncloud.org/sync-clients/
+* Refer to the download page https://owncloud.org/install/#install-clients
 
 ### Source code
 

VERSION.cmake

@@ -1,6 +1,6 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 2 )
-set( MIRALL_VERSION_PATCH 0 )
+set( MIRALL_VERSION_PATCH 5 )
 set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )
 

admin/win/nsi/qt.conf

@@ -0,0 +1,7 @@
+[Paths]
+Prefix = .
+Plugins = .
+Binaries = .
+Imports = .
+Qml2Imports = .
+LibraryExecutables = .

binary.rej

@@ -1,5 +0,0 @@
---- binary
-+++ binary
-@@ -1 +1 @@
--Subproject commit 1fb9ddfa9a9a1b4dbc447eee10dbed89172d968a
-+Subproject commit 01d73965dc8b862d1b2310d3ef801c297b697ec7

cmake/modules/DefineCMakeDefaults.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/DefineCompilerFlags.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/DefineInstallationPaths.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/DefinePlatformDefaults.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/FindINotify.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/FindPackageVersionCheck.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/FindPdfLatex.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/FindQt5Keychain.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/FindQtKeychain.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/FindSphinx.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/MacroCopyFile.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/NSIS.template.in

@@ -411,6 +411,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "@CPACK_RESOURCE_FILE_LICENSE@"
    ;File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt
 
+   ;Qt config:
+   File "${NSI_PATH}\qt.conf"
+
    ;Qt stuff:
    File "${QT_DLL_PATH}\Qt5Core.dll"
    File "${QT_DLL_PATH}\Qt5Gui.dll"

cmake/modules/QtVersionAbstraction.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/UseDoxygen.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

cmake/modules/Warnings.cmake

@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud, Inc.
+# (c) 2014 Copyright ownCloud GmbH
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.
 

csync/src/csync_exclude.c

@@ -44,6 +44,18 @@
 static
 #endif
 int _csync_exclude_add(c_strlist_t **inList, const char *string) {
+    size_t i = 0;
+
+    // We never want duplicates, so check whether the string is already
+    // in the list first.
+    if (*inList) {
+        for (i = 0; i < (*inList)->count; ++i) {
+            char *pattern = (*inList)->vector[i];
+            if (c_streq(pattern, string)) {
+                return 1;
+            }
+        }
+    }
     return c_strlist_add_grow(inList, string);
 }
 
@@ -139,8 +151,10 @@ int csync_exclude_load(const char *fname, c_strlist_t **list) {
         buf[i] = '\0';
         if (*entry != '#') {
           const char *unescaped = csync_exclude_expand_escapes(entry);
-          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Adding entry: %s", unescaped);
           rc = _csync_exclude_add(list, unescaped);
+          if( rc == 0 ) {
+              CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Adding entry: %s", unescaped);
+          }
           SAFE_FREE(unescaped);
           if (rc < 0) {
               goto out;

csync/src/csync_statedb.c

@@ -472,7 +472,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
 
                 if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE
                         || excluded == CSYNC_FILE_SILENTLY_EXCLUDED) {
-                    SAFE_FREE(st);
+                    csync_file_stat_free(st);
                     continue;
                 }
 
@@ -481,7 +481,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
 
             /* store into result list. */
             if (c_rbtree_insert(ctx->remote.tree, (void *) st) < 0) {
-                SAFE_FREE(st);
+                csync_file_stat_free(st);
                 ctx->status_code = CSYNC_STATUS_TREE_ERROR;
                 break;
             }

csync/src/csync_update.c

@@ -269,7 +269,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
     tmp = csync_statedb_get_stat_by_hash(ctx, h);
 
     if(_last_db_return_error(ctx)) {
-        SAFE_FREE(st);
+        csync_file_stat_free(st);
+        csync_file_stat_free(tmp);
         ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
         return -1;
     }
@@ -356,7 +357,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
         enum csync_vio_file_type_e tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;
 
         /* tmp might point to malloc mem, so free it here before reusing tmp  */
-        SAFE_FREE(tmp);
+        csync_file_stat_free(tmp);
 
         /* check if it's a file and has been renamed */
         if (ctx->current == LOCAL_REPLICA) {
@@ -365,7 +366,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
             tmp = csync_statedb_get_stat_by_inode(ctx, fs->inode);
 
             if(_last_db_return_error(ctx)) {
-                SAFE_FREE(st);
+                csync_file_stat_free(st);
                 ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
                 return -1;
             }
@@ -421,7 +422,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
             tmp = csync_statedb_get_stat_by_file_id(ctx, fs->file_id);
 
             if(_last_db_return_error(ctx)) {
-                SAFE_FREE(st);
+                csync_file_stat_free(st);
                 ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
                 return -1;
             }
@@ -450,7 +451,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
 
                 if (fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY && ctx->current == REMOTE_REPLICA && ctx->callbacks.checkSelectiveSyncNewFolderHook) {
                     if (ctx->callbacks.checkSelectiveSyncNewFolderHook(ctx->callbacks.update_callback_userdata, path)) {
-                        SAFE_FREE(st);
+                        csync_file_stat_free(st);
                         return 1;
                     }
                 }
@@ -460,7 +461,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
     }
   } else  {
       CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb" );
-      SAFE_FREE(st);
+      csync_file_stat_free(st);
       ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
       return -1;
   }
@@ -522,14 +523,14 @@ out:
   switch (ctx->current) {
     case LOCAL_REPLICA:
       if (c_rbtree_insert(ctx->local.tree, (void *) st) < 0) {
-        SAFE_FREE(st);
+        csync_file_stat_free(st);
         ctx->status_code = CSYNC_STATUS_TREE_ERROR;
         return -1;
       }
       break;
     case REMOTE_REPLICA:
       if (c_rbtree_insert(ctx->remote.tree, (void *) st) < 0) {
-        SAFE_FREE(st);
+        csync_file_stat_free(st);
         ctx->status_code = CSYNC_STATUS_TREE_ERROR;
         return -1;
       }

csync/src/vio/csync_vio_file_stat.c

@@ -56,6 +56,7 @@ void csync_vio_file_stat_destroy(csync_vio_file_stat_t *file_stat) {
   SAFE_FREE(file_stat->directDownloadUrl);
   SAFE_FREE(file_stat->directDownloadCookies);
   SAFE_FREE(file_stat->name);
+  SAFE_FREE(file_stat->original_name);
   SAFE_FREE(file_stat);
 }
 

csync/src/vio/csync_vio_local_unix.c

@@ -141,7 +141,7 @@ csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle) {
   return file_stat;
 
 err:
-  SAFE_FREE(file_stat);
+  csync_vio_file_stat_destroy(file_stat);
 
   return NULL;
 }

csync/src/vio/csync_vio_local_win.c

@@ -167,16 +167,20 @@ csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle) {
   }
   file_stat->name = c_utf8_from_locale(handle->ffd.cFileName);
 
+    file_stat->flags = CSYNC_VIO_FILE_FLAGS_NONE;
     file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;
-    if ( (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
-         && (handle->ffd.dwReserved0 & IO_REPARSE_TAG_SYMLINK)
-         // The SIS or DEDUP flag points to a MS deduplication feature of
-         // certain file storage products. It is not a normal symlink
-         // that should be ignored.
-         && (! (handle->ffd.dwReserved0 & IO_REPARSE_TAG_SIS))
-         && (! (handle->ffd.dwReserved0 & IO_REPARSE_TAG_DEDUP)) ) {
-        file_stat->flags = CSYNC_VIO_FILE_FLAGS_SYMLINK;
-        file_stat->type = CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK;
+    if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+        // Detect symlinks, and treat junctions as symlinks too.
+        if (handle->ffd.dwReserved0 == IO_REPARSE_TAG_SYMLINK
+                || handle->ffd.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT) {
+            file_stat->flags |= CSYNC_VIO_FILE_FLAGS_SYMLINK;
+            file_stat->type = CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK;
+        } else {
+            // The SIS and DEDUP reparse points should be treated as
+            // regular files. We don't know about the other ones yet,
+            // but will also treat them normally for now.
+            file_stat->type = CSYNC_VIO_FILE_TYPE_REGULAR;
+        }
     } else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DEVICE
                 || handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_OFFLINE
                 || handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY) {
@@ -187,7 +191,6 @@ csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle) {
         file_stat->type = CSYNC_VIO_FILE_TYPE_REGULAR;
     }
 
-    file_stat->flags = CSYNC_VIO_FILE_FLAGS_NONE;
     /* Check for the hidden flag */
     if( handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN ) {
         file_stat->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;

csync/tests/ownCloud/t_recall.pl

@@ -56,6 +56,8 @@ assertLocalAndRemoteDir( '', 0);
 printInfo( "Testing with a .sys.admin#recall#" );
 system("echo 'dir/file2.dat' > ". $tmpdir . ".sys.admin\#recall\#");
 system("echo 'dir/file3.dat' >> ". $tmpdir . ".sys.admin\#recall\#");
+system("echo 'nonexistant' >> ". $tmpdir . ".sys.admin\#recall\#");
+system("echo '/tmp/t_recall/file4.dat' >> ". $tmpdir . ".sys.admin\#recall\#");
 glob_put( "$tmpdir/.sys.admin\#recall\#", "" );
 
 csync();
@@ -64,6 +66,14 @@ csync();
 assert( -e glob(localDir().'dir/file2_.sys.admin#recall#-*.dat' ) );
 assert( -e glob(localDir().'dir/file3_.sys.admin#recall#-*.dat' ) );
 
+# verify that the original files still exist
+assert( -e glob(localDir().'dir/file2.dat' ) );
+assert( -e glob(localDir().'dir/file3.dat' ) );
+
+assert( !-e glob(localDir().'nonexistant*' ) );
+assert( !-e glob('/tmp/t_recall/file4_.sys.admin#recall#-*.dat' ) );
+assert( -e glob('/tmp/t_recall/file4.dat' ) );
+
 #Remove the recall file
 unlink(localDir() . ".sys.admin#recall#");
 

doc/building.rst

@@ -159,8 +159,8 @@ In order to make setup simple, you can use the provided Dockerfile to build your
 1. Assuming you are in the root of the ownCloud Client's source tree, you can
    build an image from this Dockerfile like this::
 
-     cd admin/win32/docker
-     docker build . -t ownCloud-client-win32:<version>
+    cd admin/win/docker
+    docker build . -t owncloud-client-win32:<version>
 
    Replace ``<version>`` by the version of the client you are building, e.g.
    |version| for the release of the client that this document describes.
@@ -174,8 +174,8 @@ In order to make setup simple, you can use the provided Dockerfile to build your
 
 2. From within the source tree Run the docker instance::
 
-     docker run ownCloud-client-win32:<version> -v "$PWD:/home/jenkins/client" \
-                admin/win32/docker/build.sh $(id -u)
+     docker run -v "$PWD:/home/user/client" owncloud-client-win32:<version> \
+        /home/user/client/admin/win/docker/build.sh client/  $(id -u)
 
    It will run the build, create an NSIS based installer, as well as run tests.
    You will find the resulting binary in an newly created ``build-win32`` subfolder.

doc/conf.py.in

@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'ownCloud Client Manual'
-copyright = u'2013, The ownCloud developers'
+copyright = u'2013-2016, The ownCloud developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -250,7 +250,7 @@ texinfo_documents = [
 epub_title = u'ownCloud Client Manual'
 epub_author = u'The ownCloud developers'
 epub_publisher = u'The ownCloud developers'
-epub_copyright = u'2013, The ownCloud developers'
+epub_copyright = u'2013-2016, The ownCloud developers'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.

doc/index.rst

@@ -4,16 +4,16 @@ ownCloud Desktop Client Manual
 ==============================
 
 .. toctree::
-   :maxdepth: 3
+   :maxdepth: 2
 
    introduction
    installing
    navigating
    advancedusage
    autoupdate
-
    building 
    architecture
    troubleshooting
    faq
-   glossary
+   glossary
+   

doc/introduction.rst

@@ -12,26 +12,22 @@ Desktop Sync client enables you to:
 Your files are always automatically synchronized between your ownCloud server 
 and local PC.
 
-.. note:: Because of various technical issues, desktop sync clients older than 
-   1.7 will not allowed to connect and sync with the ownCloud 8.1+ server. It 
-   is highly recommended to keep your client updated.
-   
+Because of various technical issues, desktop sync clients older than 1.7 will 
+not allowed to connect and sync with the ownCloud 8.1+ server. It is highly 
+recommended to keep your client updated.
+
 Improvements and New Features
 -----------------------------
 
-The 2.1 release of the ownCloud desktop sync client has many new features and 
+The 2.2 release of the ownCloud desktop sync client has many new features and 
 improvements. (See the `complete changelog 
 <https://owncloud.org/changelog/desktop/>`_.)
  
-  * Improved appearance on HiDPI screens
-  * Improved error messages
-  * Several fixes/improvements to the sharing dialog
-  * Several fixes/improvements to the server activity tab
-  * Allow changeable upload chunk size in owncloud.cfg
-  * Forget password on explicit sign-out
-  * Windows: Fix deleting and replacing of read-only files
-  * Share with internal ownCloud users from your desktop
-  * Separate views for server activity, sync activity, and errors
-  * Don't re-upload *eml-files if size and checksum are unchanged
-  * Improved upload/download progress indicator
+  * Show server notifications on the client
+  * Improved sync speed
+  * Improved handling of Win32 file locks and network files 
+  * Improved user notifications about ignored files and conflicts
+  * Add warnings for old server versions
+  * Update of QtKeyChain to support Windows credential store
+  * Packaging of dolphin overlay icon module for bleeding edge distros
   

doc/navigating.rst

@@ -62,6 +62,7 @@ This menu provides the following options:
 * Recent Changes, showing latest activities
 * Settings
 * Help menu
+* Pause synchronizations
 * An option to log in or log out of all of your accounts at once
 * Quit ownCloud, logging out and closing the client
 
@@ -83,7 +84,7 @@ have the following features:
 * Connection status, showing which ownCloud server you are connected to, and 
   your ownCloud username.
 * An **Account** button, which contains a dropdown menu with **Add New**, 
-  **Log In/Log Out**, and **Remove**.
+  **Log Out**, and **Remove**.
 * Used and available space on the server.
 * Current synchronization status.
 * **Add Folder Sync Connection** button, which is active only when you have 
@@ -93,26 +94,17 @@ The little button with three dots (the overflow menu) that sits to the right of
 the sync status bar offers four additional options:
 
 * Open Folder
-* Choose What to Sync
+* Choose What to Sync (This appears only when your file tree is collapsed, and 
+  expands the file tree)
 * Pause Sync / Resume Sync
 * Remove folder sync connection
 
-**Open Folder** opens a file explorer window displaying the client-side folder
-that is being synced.
-
-**Choose What to Sync** opens the folder sync tree view. Use this to sync all 
-or only some of the folders in the folder tree.
+**Open Folder** opens your local ownCloud sync folder.
 
 **Pause Sync** pauses sync operations without making any changes to your 
 account. It will continue to update file and folder lists, without 
-downloading or updating files. To stop all sync activity use **Remove Sync**.
-
-**Resume Sync** resumes sync operations.
-
-**Remove Sync** removes the sync connection without removing the account. This 
-stops all sync activity, including file and folder list updates. If you want to 
-synchronize the folder tree again then click the **Add Folder Sync Connection** 
-button, and re-select the folder tree that you want to sync.
+downloading or updating files. To stop all sync activity use **Remove 
+Folder Sync Connection**.
 
 .. figure:: images/client-7.png
    :alt: Extra options for sync operations
@@ -125,12 +117,10 @@ button, and re-select the folder tree that you want to sync.
 Adding New Accounts
 ^^^^^^^^^^^^^^^^^^^
 
-You may configure multiple ownCloud accounts in your desktop sync client. 
-Simply 
+You may configure multiple ownCloud accounts in your desktop sync client. Simply 
 click the **Account** > **Add New** button on any account tab to add a new 
 account, and then follow the account creation wizard. The new account will 
-appear as a new tab in the settings dialog, where you can adjust its settings 
-at 
+appear as a new tab in the settings dialog, where you can adjust its settings at 
 any time. Use **Account** > **Remove** to delete accounts. 
 
 File Manager Overlay Icons
@@ -175,9 +165,7 @@ the ``owncloud-client-nautilus`` plugin.) You can create share links, and share
 with internal ownCloud users the same way as in your ownCloud Web interface.
 
 .. figure:: images/mac-share.png
-   :alt: Sync client integration in Finder on Mac OS X.
-   
-   *Shared ownCloud files in Finder on Mac OS X*
+   :alt: Sync client integration in Windows Explorer.
    
 Right-click your systray icon, hover over the account you want to use, and 
 left-click "Open folder [folder name] to quickly enter your local ownCloud 
@@ -206,6 +194,25 @@ such as files not synced.
 
 .. figure:: images/client-8.png
    :alt: Activity windows logs all server and client activities.
+   
+Server Notifications
+--------------------
+
+Starting with version 2.2.0, the client will display notifications from your 
+ownCloud server that require manual interaction by you. For example, when a 
+user on a remote ownCloud creates a new Federated share for you, you can accept 
+it from your desktop client.
+
+The desktop client automatically checks for available notifications 
+automatically on a regular basis. Notifications are displayed in the Server 
+Activity tab, and if you have **Show Desktop Notifications** enabled (General 
+tab) you'll also see a systray notification.
+
+.. figure:: images/client12.png
+   :alt: Activity window with notification.
+
+This also displays notifications sent to users by the ownCloud admin via the 
+Announcements app.
 
 General Window
 --------------

mirall.desktop.in

@@ -11,11 +11,605 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
-GenericName[sq]=Njëkohësim Dosjesh
-Name[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
-Icon[sq]=@APPLICATION_EXECUTABLE@
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
+GenericName[oc]=Dorsièr de Sincronizacion
+Name[oc]=@APPLICATION_NAME@ sincronizacion del client
+Icon[oc]=@APPLICATION_EXECUTABLE@
+Comment[ar]=@APPLICATION_NAME@ زبون مزامنة مكتبي
+GenericName[ar]=مزامنة المجلد
+Name[ar]=@APPLICATION_NAME@ زبون مزامنة مكتبي
+Icon[ar]=@APPLICATION_EXECUTABLE@
+Comment[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@
+GenericName[ca]=Sincronització de carpetes
+Name[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@
+Icon[ca]=@APPLICATION_EXECUTABLE@
+Comment[da]=@APPLICATION_NAME@ skrivebordsklient til synkronisering
+GenericName[da]=Mappesynkronisering
+Name[da]=@APPLICATION_NAME@ skrivebordsklient til synk
+Icon[da]=@APPLICATION_EXECUTABLE@
+Comment[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+GenericName[de]=Ordner-Synchronisation
+Name[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+Icon[de]=@APPLICATION_EXECUTABLE@
+Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
+GenericName[ja_JP]=フォルダー同期
+Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
+Icon[ja_JP]=@APPLICATION_EXECUTABLE@
+GenericName[el]=Συγχρονισμός φακέλου
+Icon[el]=@APPLICATION_EXECUTABLE@
+Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
+GenericName[en_GB]=Folder Sync
+Name[en_GB]=@APPLICATION_NAME@ desktop sync client 
+Icon[en_GB]=@APPLICATION_EXECUTABLE@
+Comment[es]=@APPLICATION_NAME@ cliente de sincronización de escritorio
+GenericName[es]=Sincronización de carpeta
+Name[es]=@APPLICATION_NAME@ cliente de sincronización de escritorio
+Icon[es]=@APPLICATION_EXECUTABLE@
+Comment[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+GenericName[de_DE]=Ordner-Synchronisation
+Name[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+Icon[de_DE]=@APPLICATION_EXECUTABLE@
+Comment[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
+GenericName[pl]=Folder Synchronizacji
+Name[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
+Icon[pl]=@APPLICATION_EXECUTABLE@
+Comment[fr]=@APPLICATION_NAME@ synchronisation du client
+GenericName[fr]=Dossier de Synchronisation
+Name[fr]=@APPLICATION_NAME@ synchronisation du client
+Icon[fr]=@APPLICATION_EXECUTABLE@
+Comment[he]=@APPLICATION_NAME@ לקוח סנכון שולחן עבודה
+GenericName[he]=סנכון תיקייה
+Name[he]=@APPLICATION_NAME@ לקוח סנכרון שולחן עבודה 
+Icon[he]=@APPLICATION_EXECUTABLE@
+Comment[id]=Klien sinkronisasi desktop @APPLICATION_NAME@
+GenericName[id]=Folder Sync
+Name[id]=Klien sync desktop @APPLICATION_NAME@
+Icon[id]=@APPLICATION_EXECUTABLE@
+Comment[is]=@APPLICATION_NAME@ skjáborðsforrit samstillingar
+GenericName[is]=Samstilling möppu
+Name[is]=@APPLICATION_NAME@ skjáborðsforrit samstillingar
+Icon[is]=@APPLICATION_EXECUTABLE@
+Comment[it]=Client di sincronizzazione del desktop di @APPLICATION_NAME@
+GenericName[it]=Sincronizzazione cartella
+Name[it]=Client di sincronizzazione del desktop di @APPLICATION_NAME@
+Icon[it]=@APPLICATION_EXECUTABLE@
+Comment[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
+GenericName[ko]=폴더 동기화
+Name[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
+Comment[hu_HU]=@APPLICATION_NAME@ asztali szinkronizációs kliens
+GenericName[hu_HU]=Könyvtár szinkronizálás
+Name[hu_HU]=@APPLICATION_NAME@ asztali szinkr. kliens
+Icon[hu_HU]=@APPLICATION_EXECUTABLE@
 Comment[nl]=@APPLICATION_NAME@ desktop synchronisatie client
 GenericName[nl]=Mappen sync
 Name[nl]=@APPLICATION_NAME@ desktop sync client 
 Icon[nl]=@APPLICATION_EXECUTABLE@
+Comment[et_EE]=@APPLICATION_NAME@ sünkroonimise klient töölauale
+GenericName[et_EE]=Kaustade sünkroonimine
+Name[et_EE]=@APPLICATION_NAME@ sünkroonimise klient töölauale
+Icon[et_EE]=@APPLICATION_EXECUTABLE@
+Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация
+GenericName[bg_BG]=Синхронизиране на папката
+Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация
+Icon[bg_BG]=@APPLICATION_EXECUTABLE@
+Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização do computador
+GenericName[pt_BR]=Sincronização de Pasta
+Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização de desktop
+Icon[pt_BR]=@APPLICATION_EXECUTABLE@
+Comment[cs_CZ]=@APPLICATION_NAME@ počítačový synchronizační klient
+GenericName[cs_CZ]=Synchronizace adresáře
+Name[cs_CZ]=@APPLICATION_NAME@ počítačový synchronizační klient
+Icon[cs_CZ]=@APPLICATION_EXECUTABLE@
+Comment[ru]=Настольный клиент синхронизации @НАЗВАНИЕ_ПРИЛОЖЕНИЯ@ 
+GenericName[ru]=Синхронизация папки
+Name[ru]=Настольный клиент синхронизации @НАЗВАНИЕ_ПРИЛОЖЕНИЯ@
+Icon[ru]=@ВЫПОЛНЯЕМОЕ_ПРИЛОЖЕНИЕ@
+Comment[sl]=@APPLICATION_NAME@ ‒ Program za usklajevanje datotek z namizjem
+GenericName[sl]=Usklajevanje map
+Name[sl]=@APPLICATION_NAME@ ‒ Program za usklajevanje datotek z namizjem
+Icon[sl]=@APPLICATION_EXECUTABLE@
+Comment[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
+GenericName[sq]=Njëkohësim Dosjesh
+Name[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
+Icon[sq]=@APPLICATION_EXECUTABLE@
+Comment[fi_FI]=@APPLICATION_NAME@ työpöytäsynkronointisovellus
+GenericName[fi_FI]=Kansion synkronointi
+Name[fi_FI]=@APPLICATION_NAME@ työpöytäsynkronointisovellus
+Icon[fi_FI]=@APPLICATION_EXECUTABLE@
+Comment[sv]=@APPLICATION_NAME@ desktop synkroniseringsklient
+GenericName[sv]=Mappsynk
+Name[sv]=@APPLICATION_NAME@ desktop synk-klient
+Icon[sv]=@APPLICATION_EXECUTABLE@
+Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
+GenericName[tr]=Dosya Eşitleme
+Name[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
+Icon[tr]=@APPLICATION_EXECUTABLE@
+Comment[uk]=Настільний клієнт синхронізації @APPLICATION_NAME@
+GenericName[uk]=Синхронізація теки
+Name[uk]=Настільний клієнт синхронізації @APPLICATION_NAME@
+Icon[uk]=@APPLICATION_EXECUTABLE@
+Comment[ro]=@APPLICATION_NAME@ client de sincronizare pe desktop
+GenericName[ro]=Sincronizare director
+Name[ro]=@APPLICATION_NAME@ client de sincronizare pe desktop
+Icon[ro]=@APPLICATION_EXECUTABLE@
+Comment[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
+GenericName[zh_CN]=文件夹同步
+Name[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
+Icon[zh_CN]=@APPLICATION_EXECUTABLE@
+GenericName[zh_TW]=資料夾同步
+Comment[lt_LT]=@APPLICATION_NAME@ darbalaukio sinchronizavimo programa
+GenericName[lt_LT]=Katalogo sinchnorizacija
+Name[lt_LT]=@APPLICATION_NAME@ darbalaukio programa
+Icon[lt_LT]=@APPLICATION_EXECUTABLE@
+Comment[th_TH]=@APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
+GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
+Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
+Icon[th_TH]=@APPLICATION_EXECUTABLE@
+GenericName[es_MX]=Sincronización de Carpetas
+Comment[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient
+GenericName[nb_NO]=Mappesynkronisering
+Name[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient 
+Icon[nb_NO]=@APPLICATION_EXECUTABLE@
+Comment[nn_NO]=@APPLICATION_NAME@ klient for å synkronisera frå skrivebord
+GenericName[nn_NO]=Mappe synkronisering
+Name[nn_NO]=@APPLICATION_NAME@ klient for å synkronisera frå skrivebord
+Icon[nn_NO]=@APPLICATION_EXECUTABLE@
+Comment[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização para PC
+GenericName[pt_PT]=Sincronizar Pasta
+Name[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização para PC
+Icon[pt_PT]=@APPLICATION_EXECUTABLE@
+Icon[km]=@APPLICATION_EXECUTABLE@
+Comment[lb]=@APPLICATION_NAME@ Desktop Synchronisatioun Client
+GenericName[lb]=Dossier Dync
+Name[lb]=@APPLICATION_NAME@ Desktop Sync Client
+Icon[lb]=@APPLICATION_EXECUTABLE@

shell_integration/dolphin/ownclouddolphinpluginhelper.cpp

@@ -21,6 +21,7 @@
 #include <qcoreevent.h>
 #include <QFile>
 #include "ownclouddolphinpluginhelper.h"
+#include "config.h"
 
 OwncloudDolphinPluginHelper* OwncloudDolphinPluginHelper::instance()
 {
@@ -67,7 +68,10 @@ void OwncloudDolphinPluginHelper::tryConnect()
         return;
     }
     QString runtimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
-    QString socketPath = runtimeDir + QLatin1String("/ownCloud/socket");
+    runtimeDir.append( QChar('/'));
+    runtimeDir.append( QLatin1String(APPLICATION_SHORTNAME) );
+
+    const QString socketPath = runtimeDir + QLatin1String("/socket");
     _socket.connectToServer(socketPath);
 }
 

shell_integration/windows/OCContextMenu/OCClientInterface.h

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2015 ownCloud, Inc. All rights reserved.
+* Copyright (c) 2015 ownCloud GmbH. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free
@@ -12,7 +12,7 @@
 */
 
 /**
-* Copyright (c) 2014 ownCloud, Inc. All rights reserved.
+* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free

shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj

@@ -59,22 +59,22 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <TargetName>$(ProjectName)_x86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <TargetName>$(ProjectName)_x64</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <TargetName>$(ProjectName)_x64</TargetName>
   </PropertyGroup>
@@ -89,10 +89,13 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
       <AdditionalDependencies>OCUtil_x86.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>OCContextMenu.def</ModuleDefinitionFile>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -108,14 +111,17 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
       <AdditionalDependencies>OCUtil_x86.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>OCContextMenu.def</ModuleDefinitionFile>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Link>
-      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>OCContextMenu.def</ModuleDefinitionFile>
       <AdditionalDependencies>OCUtil_x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -127,6 +133,9 @@
       <Optimization>Disabled</Optimization>
       <PrecompiledHeader />
     </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -134,12 +143,15 @@
       <PreprocessorDefinitions>NDEBUG;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
       <AdditionalDependencies>OCUtil_x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>OCContextMenu.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <Text Include="ReadMe.txt" />

shell_integration/windows/OCOverlays/OCOverlay.cpp

@@ -110,17 +110,17 @@ IFACEMETHODIMP OCOverlay::GetPriority(int *pPriority)
 	// we order this in terms of likelyhood
 	switch (_state) {
 	case State_OK:
-		*pPriority = 0;
+		*pPriority = 0; break;
 	case State_OKShared:
-		*pPriority = 1;
+		*pPriority = 1; break;
 	case State_Warning:
-		*pPriority = 2;
+		*pPriority = 2; break;
 	case State_Sync:
-		*pPriority = 3;
+		*pPriority = 3; break;
 	case State_Error:
-		*pPriority = 4;
+		*pPriority = 4; break;
 	default:
-		*pPriority = 5;
+		*pPriority = 5; break;
 	}
 
 	return S_OK;

shell_integration/windows/OCOverlays/OCOverlays.vcxproj

@@ -66,25 +66,25 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <TargetName>$(ProjectName)_x86</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <TargetName>$(ProjectName)_x64</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <TargetName>$(ProjectName)_x86</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <TargetName>$(ProjectName)_x64</TargetName>
     <TargetExt>.dll</TargetExt>
@@ -99,11 +99,14 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
       <AdditionalDependencies>OCUtil_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -114,11 +117,14 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
       <AdditionalDependencies>OCUtil_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -133,11 +139,14 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
       <AdditionalDependencies>OCUtil_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -152,11 +161,14 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
       <AdditionalDependencies>OCUtil_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="DllMain.cpp" />

shell_integration/windows/OCUtil/CommunicationSocket.cpp

@@ -45,7 +45,7 @@ std::wstring getUserName() {
 std::wstring CommunicationSocket::DefaultPipePath()
 {
 	auto pipename = std::wstring(L"\\\\.\\pipe\\");
-	pipename += L"ownCloud\\";
+	pipename += L"ownCloud-";
 	pipename += getUserName();
 	return pipename;
 }

shell_integration/windows/OCUtil/OCUtil.vcxproj

@@ -67,26 +67,26 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetExt>.dll</TargetExt>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <TargetName>$(ProjectName)_x86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetExt>.dll</TargetExt>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <TargetName>$(ProjectName)_x64</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>$(ProjectName)_x64</TargetName>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetExt>.dll</TargetExt>
     <TargetName>$(ProjectName)_x86</TargetName>
     <IntDir>$(Configuration)\$(Platform)\</IntDir>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -155,6 +155,7 @@
     <ClInclude Include="CommunicationSocket.h" />
     <ClInclude Include="FileUtil.h" />
     <ClInclude Include="RegistryUtil.h" />
+    <ClInclude Include="Version.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CommunicationSocket.cpp" />

shell_integration/windows/OCUtil/RemotePathChecker.cpp

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 ownCloud, Inc. All rights reserved.
+* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free

shell_integration/windows/OCUtil/RemotePathChecker.h

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 ownCloud, Inc. All rights reserved.
+* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free

shell_integration/windows/OCUtil/StringUtil.cpp

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 ownCloud, Inc. All rights reserved.
+* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free

shell_integration/windows/OCUtil/StringUtil.h

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 ownCloud, Inc. All rights reserved.
+* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free

shell_integration/windows/OCUtil/Version.h

@@ -0,0 +1,11 @@
+#pragma once
+
+// This is the number that will end up in the version window of the DLLs.
+// Increment this version before committing a new build if you are today's shell_integration build master.
+#define OCEXT_BUILD_NUM 43
+
+#define STRINGIZE2(s) #s
+#define STRINGIZE(s) STRINGIZE2(s)
+
+#define OCEXT_VERSION 1,0,0,OCEXT_BUILD_NUM
+#define OCEXT_VERSION_STRING STRINGIZE(OCEXT_VERSION)

src/3rdparty/certificates/p12topem.cpp

@@ -28,16 +28,12 @@
  * \return string PEM
  */
 string x509ToString(BIO *o) {
-    int len = 0;
     BUF_MEM *bptr;
-    void* data;
-    string ret = "";
-    
     BIO_get_mem_ptr(o, &bptr);
-    len = bptr->length;
-    data = calloc(len+10, sizeof(char));
+    int len = bptr->length;
+    void* data = calloc(len+10, sizeof(char));
     BIO_read(o, data, len);
-    ret = strdup((char*)data);
+    string ret = std::string(static_cast<char*>(data));
     free(data);
         
     return ret;

src/cmd/cmd.cpp

@@ -272,6 +272,12 @@ void selectiveSyncFixup(OCC::SyncJournalDb *journal, const QStringList &newList)
 int main(int argc, char **argv) {
     QCoreApplication app(argc, argv);
 
+#ifdef Q_OS_WIN
+    // Ensure OpenSSL config file is only loaded from app directory
+    QString opensslConf = QCoreApplication::applicationDirPath()+QString("/openssl.cnf");
+    qputenv("OPENSSL_CONF", opensslConf.toLocal8Bit());
+#endif
+
     qsrand(QTime::currentTime().msec() * QCoreApplication::applicationPid());
 
     CmdOptions options;
@@ -443,16 +449,27 @@ restart_sync:
     QObject::connect(&engine, SIGNAL(finished(bool)), &app, SLOT(quit()));
     QObject::connect(&engine, SIGNAL(transmissionProgress(ProgressInfo)), &cmd, SLOT(transmissionProgressSlot()));
 
+
     // Exclude lists
-    engine.excludedFiles().addExcludeFilePath(ConfigFile::excludeFileFromSystem());
-    if( QFile::exists(options.exclude) )
+
+    bool hasUserExcludeFile = !options.exclude.isEmpty();
+    QString systemExcludeFile = ConfigFile::excludeFileFromSystem();
+
+    // Always try to load the user-provided exclude list if one is specified
+    if ( hasUserExcludeFile ) {
         engine.excludedFiles().addExcludeFilePath(options.exclude);
+    }
+    // Load the system list if available, or if there's no user-provided list
+    if ( !hasUserExcludeFile || QFile::exists(systemExcludeFile) ) {
+        engine.excludedFiles().addExcludeFilePath(systemExcludeFile);
+    }
+
     if (!engine.excludedFiles().reloadExcludes()) {
-        // Always make sure at least one list has been loaded
         qFatal("Cannot load system exclude list or list supplied via --exclude");
         return EXIT_FAILURE;
     }
 
+
     // Have to be done async, else, an error before exec() does not terminate the event loop.
     QMetaObject::invokeMethod(&engine, "startSync", Qt::QueuedConnection);
 

src/gui/accountmanager.cpp

@@ -68,11 +68,14 @@ bool AccountManager::restore()
 
 bool AccountManager::restoreFromLegacySettings()
 {
+
     // try to open the correctly themed settings
     auto settings = Account::settingsWithGroup(Theme::instance()->appName());
 
     bool migratedCreds = false;
 
+    qDebug() << "LEGACY!" << Theme::instance()->appName() << settings->childKeys();
+
     // if the settings file could not be opened, the childKeys list is empty
     // then try to load settings from a very old place
     if( settings->childKeys().isEmpty() ) {
@@ -213,14 +216,16 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings)
 
     QString authType = settings.value(QLatin1String(authTypeC)).toString();
     QString overrideUrl = Theme::instance()->overrideServerUrl();
-    if( !overrideUrl.isEmpty() ) {
-        // if there is a overrideUrl, don't even bother reading from the config as all the accounts
-        // must use the overrideUrl
+    QString forceAuth = Theme::instance()->forceConfigAuthType();
+
+    qDebug() << "LOADING ACCOUNT" << authType << overrideUrl << forceAuth << settings.value(QLatin1String(urlC));
+
+    if(!forceAuth.isEmpty() && !overrideUrl.isEmpty() ) {
+        // If forceAuth is set, this might also mean the overrideURL has changed.
+        // See enterprise issues #1126
         acc->setUrl(overrideUrl);
-        auto forceAuth = Theme::instance()->forceConfigAuthType();
-        if (!forceAuth.isEmpty()) {
-            authType = forceAuth;
-        }
+        authType = forceAuth;
+        qDebug() << "SHOULD NOT BE THERE !!!!!!";
     } else {
         acc->setUrl(settings.value(QLatin1String(urlC)).toUrl());
     }
@@ -235,8 +240,12 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings)
         acc->_settingsMap.insert(key, settings.value(key));
     }
 
+    qDebug() << acc->_settingsMap << "from" << settings.childKeys();
+
     acc->setCredentials(CredentialsFactory::create(authType));
 
+    qDebug() << "Loaded Cred" <<  acc->credentials() << authType;
+
     // now the cert, it is in the general group
     settings.beginGroup(QLatin1String("General"));
     acc->setApprovedCerts(QSslCertificate::fromData(settings.value(caCertsKeyC).toByteArray()));

src/gui/accountsettings.cpp

@@ -159,7 +159,13 @@ void AccountSettings::createAccountToolbox()
 
 void AccountSettings::slotOpenAccountWizard()
 {
-    if (QSystemTrayIcon::isSystemTrayAvailable()) {
+    if (
+#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+            qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5" ||
+                // We can't call isSystemTrayAvailable with appmenu-qt5 because it breaks the systemtray
+                // (issue #4693, #4944)
+#endif
+            QSystemTrayIcon::isSystemTrayAvailable()) {
         topLevelWidget()->close();
     }
 #ifdef Q_OS_MAC

src/gui/accountstate.cpp

@@ -190,7 +190,8 @@ void AccountState::checkConnectivity()
     } else {
         // Check the server and then the auth.
 
-#ifdef Q_OS_WIN
+// Let's try this for all OS and see if it fixes the Qt issues we have on Linux  #4720 #3888 #4051
+//#ifdef Q_OS_WIN
         // There seems to be a bug in Qt on Windows where QNAM sometimes stops
         // working correctly after the computer woke up from sleep. See #2895 #2899
         // and #2973.
@@ -201,7 +202,7 @@ void AccountState::checkConnectivity()
         // If we don't reset the ssl config a second CheckServerJob can produce a
         // ssl config that does not have a sensible certificate chain.
         account()->setSslConfiguration(QSslConfiguration());
-#endif
+//#endif
         conValidator->checkServerAndAuth();
     }
 }
@@ -209,6 +210,7 @@ void AccountState::checkConnectivity()
 void AccountState::slotConnectionValidatorResult(ConnectionValidator::Status status, const QStringList& errors)
 {
     if (isSignedOut()) {
+        qDebug() << "Signed out, ignoring" << connectionStatusString(status) << _account->url().toString();
         return;
     }
 

src/gui/application.cpp

@@ -105,6 +105,12 @@ Application::Application(int &argc, char **argv) :
 {
     _startedAt.start();
 
+#ifdef Q_OS_WIN
+    // Ensure OpenSSL config file is only loaded from app directory
+    QString opensslConf = QCoreApplication::applicationDirPath()+QString("/openssl.cnf");
+    qputenv("OPENSSL_CONF", opensslConf.toLocal8Bit());
+#endif
+
 // TODO: Can't set this without breaking current config paths
 //    setOrganizationName(QLatin1String(APPLICATION_VENDOR));
     setOrganizationDomain(QLatin1String(APPLICATION_REV_DOMAIN));
@@ -139,6 +145,7 @@ Application::Application(int &argc, char **argv) :
     setupTranslations();
 
     // Setup global excludes
+    qDebug() << "Loading global exclude list";
     ConfigFile cfg;
     ExcludedFiles& excludes = ExcludedFiles::instance();
     excludes.addExcludeFilePath( cfg.excludeFile(ConfigFile::SystemScope) );
@@ -335,6 +342,14 @@ void Application::slotownCloudWizardDone( int res )
     }
 }
 
+static void csyncLogCatcher(int /*verbosity*/,
+                        const char */*function*/,
+                        const char *buffer,
+                        void */*userdata*/)
+{
+    Logger::instance()->csyncLog( QString::fromUtf8(buffer) );
+}
+
 void Application::setupLogging()
 {
     // might be called from second instance
@@ -350,6 +365,9 @@ void Application::setupLogging()
                 .arg(property("ui_lang").toString())
                 .arg(_theme->version());
 
+    // Setup CSYNC logging to forward to our own logger
+    csync_set_log_callback( csyncLogCatcher );
+    csync_set_log_level( Logger::instance()->isNoop() ? 0 : 11 );
 }
 
 void Application::slotUseMonoIconsChanged(bool)

src/gui/creds/credentialsfactory.cpp

@@ -18,6 +18,8 @@
 #include "creds/dummycredentials.h"
 #include "creds/shibbolethcredentials.h"
 
+#include <QDebug>
+
 namespace OCC
 {
 
@@ -26,6 +28,7 @@ namespace CredentialsFactory
 
 AbstractCredentials* create(const QString& type)
 {
+    qDebug() << type;
     // empty string might happen for old version of configuration
     if (type == "http" || type == "") {
         return new HttpCredentialsGui;

src/gui/creds/shibboleth/shibbolethwebview.cpp

@@ -20,6 +20,7 @@
 #include <QMessageBox>
 #include <QNetworkReply>
 #include <QSettings>
+#include <QMainWindow>
 
 #include "creds/shibboleth/shibbolethwebview.h"
 #include "creds/shibbolethcredentials.h"
@@ -38,7 +39,12 @@ namespace OCC
 
 class UserAgentWebPage : public QWebPage {
  public:
-    UserAgentWebPage(QObject *parent) : QWebPage(parent) {}
+    UserAgentWebPage(QObject *parent) : QWebPage(parent)
+    {
+        if (!qgetenv("OWNCLOUD_SHIBBOLETH_DEBUG").isEmpty()) {
+            settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+        }
+    }
     QString userAgentForUrl(const QUrl &url ) const {
         return QWebPage::userAgentForUrl(url) + " " + Utility::userAgentString();
     }
@@ -69,10 +75,23 @@ ShibbolethWebView::ShibbolethWebView(AccountPtr account, QWidget* parent)
     connect(page->networkAccessManager()->cookieJar(),
             SIGNAL(newCookiesForUrl (QList<QNetworkCookie>, QUrl)),
             this, SLOT(onNewCookiesForUrl (QList<QNetworkCookie>, QUrl)));
+
     page->mainFrame()->load(account->url());
     this->setPage(page);
     setWindowTitle(tr("%1 - Authenticate").arg(Theme::instance()->appNameGUI()));
 
+    // Debug view to display the cipher suite
+    if( !qgetenv("OWNCLOUD_SHIBBOLETH_DEBUG").isEmpty() ) {
+        // open an additional window to display some cipher debug info
+        QWebPage *debugPage = new UserAgentWebPage(this);
+        debugPage->mainFrame()->load( QUrl("https://cc.dcsec.uni-hannover.de/"));
+        QWebView *debugView = new QWebView(this);
+        debugView->setPage(debugPage);
+        QMainWindow *window = new QMainWindow(this);
+        window->setWindowTitle(tr("SSL Chipher Debug View"));
+        window->setCentralWidget(debugView);
+        window->show();
+    }
     // If we have a valid cookie, it's most likely expired. We can use this as
     // as a criteria to tell the user why the browser window pops up
     QNetworkCookie shibCookie = ShibbolethCredentials::findShibCookie(_account.data(), ShibbolethCredentials::accountCookies(_account.data()));
@@ -137,7 +156,6 @@ void ShibbolethWebView::slotLoadFinished(bool success)
 
     if (!success) {
         qDebug() << Q_FUNC_INFO << "Could not load Shibboleth login page to log you in.";
-
     }
 }
 

src/gui/creds/shibbolethcredentials.cpp

@@ -53,7 +53,10 @@ ShibbolethCredentials::ShibbolethCredentials()
       _ready(false),
       _stillValid(false),
       _browser(0)
-{}
+{
+    qDebug() << "HELO ShibbolethCredentials 1";
+
+}
 
 ShibbolethCredentials::ShibbolethCredentials(const QNetworkCookie& cookie)
   : _ready(true),
@@ -61,6 +64,7 @@ ShibbolethCredentials::ShibbolethCredentials(const QNetworkCookie& cookie)
     _browser(0),
     _shibCookie(cookie)
 {
+    qDebug() << "HELO ShibbolethCredentials 2" << cookie.toRawForm();
 }
 
 void ShibbolethCredentials::setAccount(Account* account)
@@ -72,6 +76,8 @@ void ShibbolethCredentials::setAccount(Account* account)
         _user = _account->credentialSetting(QLatin1String(userC)).toString();
     }
 
+    qDebug() << _user;
+
     // When constructed with a cookie (by the wizard), we usually don't know the
     // user name yet. Request it now from the server.
     if (_ready && _user.isEmpty()) {
@@ -107,13 +113,19 @@ QString ShibbolethCredentials::user() const
 QNetworkAccessManager* ShibbolethCredentials::getQNAM() const
 {
     QNetworkAccessManager* qnam(new AccessManager);
-    connect(qnam, SIGNAL(finished(QNetworkReply*)),
+    bool ok = connect(qnam, SIGNAL(finished(QNetworkReply*)),
             this, SLOT(slotReplyFinished(QNetworkReply*)));
+    qDebug() << "QNAM creaded and connected" << ok;
     return qnam;
 }
 
 void ShibbolethCredentials::slotReplyFinished(QNetworkReply* r)
 {
+    qWarning() << r->request().url() << _browser << r->attribute(QNetworkRequest::HttpStatusCodeAttribute)
+        << r->attribute(QNetworkRequest::RedirectionTargetAttribute) << r->header(QNetworkRequest::LocationHeader);
+
+
+
     if (!_browser.isNull()) {
         return;
     }
@@ -163,6 +175,7 @@ bool ShibbolethCredentials::stillValid(QNetworkReply *reply)
 
 void ShibbolethCredentials::persist()
 {
+    qDebug() << _shibCookie;
     storeShibCookie(_shibCookie);
     if (!_user.isEmpty()) {
         _account->setCredentialSetting(QLatin1String(userC), _user);
@@ -201,6 +214,7 @@ void ShibbolethCredentials::onShibbolethCookieReceived(const QNetworkCookie& shi
 {
     storeShibCookie(shibCookie);
     _shibCookie = shibCookie;
+    qDebug() << _shibCookie;
     addToCookieJar(shibCookie);
 
     slotFetchUser();
@@ -252,10 +266,13 @@ void ShibbolethCredentials::slotBrowserRejected()
 
 void ShibbolethCredentials::slotReadJobDone(QKeychain::Job *job)
 {
+    qDebug() << "FROM KEYCHAIN" << job->error();
+
     if (job->error() == QKeychain::NoError) {
         ReadPasswordJob *readJob = static_cast<ReadPasswordJob*>(job);
         delete readJob->settings();
         QList<QNetworkCookie> cookies = QNetworkCookie::parseCookies(readJob->textData().toUtf8());
+        qDebug() <<readJob->textData() << cookies.count();
         if (cookies.count() > 0) {
             _shibCookie = cookies.first();
             addToCookieJar(_shibCookie);
@@ -274,6 +291,9 @@ void ShibbolethCredentials::slotReadJobDone(QKeychain::Job *job)
 
 void ShibbolethCredentials::showLoginWindow()
 {
+    qWarning() << "SHOW LOGIN WINDOW " << _browser;
+
+
     if (!_browser.isNull()) {
         ownCloudGui::raiseDialog(_browser);
         return;

src/gui/folder.cpp

@@ -46,14 +46,6 @@
 
 namespace OCC {
 
-static void csyncLogCatcher(int /*verbosity*/,
-                        const char */*function*/,
-                        const char *buffer,
-                        void */*userdata*/)
-{
-    Logger::instance()->csyncLog( QString::fromUtf8(buffer) );
-}
-
 
 Folder::Folder(const FolderDefinition& definition,
                AccountState* accountState,
@@ -121,6 +113,8 @@ Folder::Folder(const FolderDefinition& definition,
 
 Folder::~Folder()
 {
+    // Reset then engine first as it will abort and try to access members of the Folder
+    _engine.reset();
 }
 
 void Folder::checkLocalPath()
@@ -320,6 +314,7 @@ void Folder::slotRunEtagJob()
         // sync if it's different.
 
         _requestEtagJob = new RequestEtagJob(account, remotePath(), this);
+        _requestEtagJob->setTimeout(60*1000);
         // check if the etag is different
         QObject::connect(_requestEtagJob, SIGNAL(etagRetreived(QString)), this, SLOT(etagRetreived(QString)));
         FolderMan::instance()->slotScheduleETagJob(alias(), _requestEtagJob);
@@ -578,19 +573,10 @@ int Folder::slotWipeErrorBlacklist()
 
 void Folder::slotWatchedPathChanged(const QString& path)
 {
-    // When no sync is running or it's in the prepare phase, we can
-    // always schedule a new sync.
-    if (! _engine->isSyncRunning() || _syncResult.status() == SyncResult::SyncPrepare) {
-        emit watchedFileChangedExternally(path);
-        emit scheduleToSync(this);
-        return;
-    }
-
     // The folder watcher fires a lot of bogus notifications during
     // a sync operation, both for actual user files and the database
     // and log. Therefore we check notifications against operations
     // the sync is doing to filter out our own changes.
-    bool ownChange = false;
 #ifdef Q_OS_MAC
     Q_UNUSED(path)
     // On OSX the folder watcher does not report changes done by our
@@ -600,14 +586,23 @@ void Folder::slotWatchedPathChanged(const QString& path)
     const auto maxNotificationDelay = 15*1000;
     qint64 time = _engine->timeSinceFileTouched(path);
     if (time != -1 && time < maxNotificationDelay) {
-        ownChange = true;
+        return;
     }
 #endif
 
-    if (! ownChange) {
-        emit watchedFileChangedExternally(path);
-        emit scheduleToSync(this);
+    // Check that the mtime actually changed.
+    if (path.startsWith(this->path())) {
+        auto relativePath = path.mid(this->path().size());
+        auto record = _journal.getFileRecord(relativePath);
+        if (record.isValid() && !FileSystem::fileChanged(path, record._fileSize,
+                Utility::qDateTimeToTime_t(record._modtime))) {
+            qDebug() << "Ignoring spurious notification for file" << relativePath;
+            return;  // probably a spurious notification
+        }
     }
+
+    emit watchedFileChangedExternally(path);
+    emit scheduleToSync(this);
 }
 
 void Folder::slotThreadTreeWalkResult(const SyncFileItemVector& items)
@@ -630,7 +625,7 @@ void Folder::removeFromSettings() const
 {
     auto  settings = _accountState->settings();
     settings->beginGroup(QLatin1String("Folders"));
-    settings->remove(_definition.alias);
+    settings->remove(FolderMan::escapeAlias(_definition.alias));
 }
 
 bool Folder::isFileExcludedAbsolute(const QString& fullPath) const
@@ -694,6 +689,10 @@ void Folder::wipe()
 
 bool Folder::setIgnoredFiles()
 {
+    // Note: Doing this on each sync run and on Folder construction is
+    // unnecessary, because _engine->excludedFiles() persists between
+    // sync runs. This is not a big problem because ExcludedFiles maintains
+    // a QSet of files to load.
     ConfigFile cfg;
     QString systemList = cfg.excludeFile(ConfigFile::SystemScope);
     if( QFile::exists(systemList) ) {
@@ -725,8 +724,6 @@ void Folder::startSync(const QStringList &pathList)
     if (proxyDirty()) {
         setProxyDirty(false);
     }
-    csync_set_log_callback( csyncLogCatcher );
-    csync_set_log_level( Logger::instance()->isNoop() ? 0 : 11 );
 
     if (isBusy()) {
         qCritical() << "* ERROR csync is still running and new sync requested.";
@@ -915,7 +912,7 @@ void Folder::slotFolderDiscovered(bool, QString folderName)
 // and hand the result over to the progress dispatcher.
 void Folder::slotTransmissionProgress(const ProgressInfo &pi)
 {
-    if( !pi.hasStarted() ) {
+    if( !pi.isUpdatingEstimates() ) {
         // this is the beginning of a sync, set the warning level to 0
         _syncResult.setWarnCount(0);
     }

src/gui/folderman.cpp

@@ -849,7 +849,8 @@ Folder *FolderMan::folderForPath(const QString &path)
     foreach(Folder* folder, this->map().values()) {
         const QString folderPath = folder->cleanPath()+QLatin1Char('/');
 
-        if(absolutePath.startsWith(folderPath)) {
+        if(absolutePath.startsWith(folderPath, (Utility::isWindows() || Utility::isMac())?
+                    Qt::CaseInsensitive : Qt::CaseSensitive)) {
             //qDebug() << "found folder: " << folder->path() << " for " << absolutePath;
             return folder;
         }

src/gui/folderstatusmodel.cpp

@@ -164,7 +164,8 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
         switch(role) {
             case Qt::DisplayRole:
                 if (x->_hasError) {
-                    return tr("Error while loading the list of folders from the server.");
+                    return QVariant(tr("Error while loading the list of folders from the server.")
+                                               + QString("\n") + x->_lastErrorString);
                 } else {
                     return tr("Fetching folder list from server...");
                 }
@@ -498,6 +499,10 @@ bool FolderStatusModel::canFetchMore(const QModelIndex& parent) const
     auto info = infoForIndex(parent);
     if (!info || info->_fetched || info->_fetching)
         return false;
+    if (info->_hasError) {
+        // Keep showing the error to the user, it will be hidden when the account reconnects
+        return false;
+    }
     return true;
 }
 
@@ -548,6 +553,7 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list)
 
     if (parentInfo->hasLabel()) {
         beginRemoveRows(idx, 0 ,0);
+        parentInfo->_lastErrorString.clear();
         parentInfo->_hasError = false;
         parentInfo->_fetchingLabel = false;
         endRemoveRows();
@@ -675,6 +681,9 @@ void FolderStatusModel::slotLscolFinishedWithError(QNetworkReply* r)
     }
     auto parentInfo = infoForIndex(idx);
     if (parentInfo) {
+        qDebug() << r->errorString();
+        parentInfo->_lastErrorString = r->errorString();
+
         if (r->error() == QNetworkReply::ContentNotFoundError) {
             parentInfo->_fetched = true;
         } else {

src/gui/folderstatusmodel.h

@@ -63,6 +63,7 @@ public:
         bool _fetched; // If we did the LSCOL for this folder already
         bool _fetching; // Whether a LSCOL job is currently running
         bool _hasError; // If the last fetching job ended in an error
+        QString _lastErrorString;
         bool _fetchingLabel; // Whether a 'fetching in progress' label is shown.
 
         bool _isUndecided; // undecided folders are the big folders that the user has not accepted yet

src/gui/folderwatcher_mac.cpp

@@ -51,6 +51,14 @@ static void callback(
     Q_UNUSED(eventFlags)
     Q_UNUSED(eventIds)
 
+    const FSEventStreamEventFlags c_interestingFlags
+            = kFSEventStreamEventFlagItemCreated // for new folder/file
+            | kFSEventStreamEventFlagItemRemoved // for rm
+            | kFSEventStreamEventFlagItemInodeMetaMod // for mtime change
+            | kFSEventStreamEventFlagItemRenamed // also coming for moves to trash in finder
+            | kFSEventStreamEventFlagItemModified; // for content change
+    //We ignore other flags, e.g. for owner change, xattr change, Finder label change etc
+
     qDebug() << "FolderWatcherPrivate::callback by OS X";
 
     QStringList paths;
@@ -62,8 +70,14 @@ static void callback(
         CFIndex pathLength = CFStringGetLength(path);
         qstring.resize(pathLength);
         CFStringGetCharacters(path, CFRangeMake(0, pathLength), reinterpret_cast<UniChar *>(qstring.data()));
+        QString fn = qstring.normalized(QString::NormalizationForm_C);
 
-        paths.append(qstring.normalized(QString::NormalizationForm_C));
+        if (!(eventFlags[i] & c_interestingFlags)) {
+            qDebug() << "Ignoring non-content changes for" << fn;
+            continue;
+        }
+
+        paths.append(fn);
     }
 
     reinterpret_cast<FolderWatcherPrivate*>(clientCallBackInfo)->doNotifyParent(paths);

src/gui/folderwizard.cpp

@@ -68,13 +68,6 @@ FolderWizardLocalPath::FolderWizardLocalPath()
     _ui.localFolderLineEdit->setText( QDir::toNativeSeparators( defaultPath ) );
     _ui.localFolderLineEdit->setToolTip(tr("Enter the path to the local folder."));
 
-    QString newAlias = Theme::instance()->appName();
-    int count = 0;
-    while (FolderMan::instance()->folder(newAlias)) {
-        // There is already a folder configured with this name and folder names need to be unique
-        newAlias = Theme::instance()->appName() + QString::number(++count);
-    }
-
     _ui.warnLabel->setTextFormat(Qt::RichText);
     _ui.warnLabel->hide();
 }
@@ -135,14 +128,6 @@ void FolderWizardLocalPath::slotChooseLocalFolder()
     if (!dir.isEmpty()) {
         // set the last directory component name as alias
         _ui.localFolderLineEdit->setText(QDir::toNativeSeparators(dir));
-
-        QDir pickedDir(dir);
-        QString newAlias = pickedDir.dirName();
-        int count = 0;
-        while (FolderMan::instance()->folder(newAlias)) {
-            // There is already a folder configured with this name and folder names need to be unique
-            newAlias = pickedDir.dirName() + QString::number(++count);
-        }
     }
     emit completeChanged();
 }
@@ -503,11 +488,13 @@ FolderWizardSelectiveSync::~FolderWizardSelectiveSync()
 
 void FolderWizardSelectiveSync::initializePage()
 {
-    QString alias        = wizard()->field(QLatin1String("alias")).toString();
     QString targetPath   = wizard()->property("targetPath").toString();
     if (targetPath.startsWith('/')) {
         targetPath = targetPath.mid(1);
     }
+    QString alias        = QFileInfo(targetPath).fileName();
+    if (alias.isEmpty())
+        alias = Theme::instance()->appName();
     _treeView->setFolderInfo(targetPath, alias);
     QWizardPage::initializePage();
 }
@@ -520,8 +507,10 @@ bool FolderWizardSelectiveSync::validatePage()
 
 void FolderWizardSelectiveSync::cleanupPage()
 {
-    QString alias        = wizard()->field(QLatin1String("alias")).toString();
     QString targetPath   = wizard()->property("targetPath").toString();
+    QString alias        = QFileInfo(targetPath).fileName();
+    if (alias.isEmpty())
+        alias = Theme::instance()->appName();
     _treeView->setFolderInfo(targetPath, alias);
     QWizardPage::cleanupPage();
 }

src/gui/generalsettings.cpp

@@ -161,12 +161,4 @@ void GeneralSettings::slotIgnoreFilesEditor()
     }
 }
 
-void GeneralSettings::slotOpenAccountWizard()
-{
-    if (QSystemTrayIcon::isSystemTrayAvailable()) {
-        topLevelWidget()->close();
-    }
-    OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), 0);
-}
-
 } // namespace OCC

src/gui/generalsettings.h

@@ -44,7 +44,6 @@ private slots:
     void slotToggleOptionalDesktopNotifications(bool);
     void slotUpdateInfo();
     void slotIgnoreFilesEditor();
-    void slotOpenAccountWizard();
 
 private:
     void loadMiscSettings();

src/gui/main.cpp

@@ -47,18 +47,21 @@ int main(int argc, char **argv)
 {
     Q_INIT_RESOURCE(client);
 
-#ifndef Q_OS_MAC
+#ifdef Q_OS_WIN
     // If the font size ratio is set on Windows, we need to
     // enable the auto pixelRatio in Qt since we don't
     // want to use sizes relative to the font size everywhere.
     // This is automatic on OS X, but opt-in on Windows and Linux
     // https://doc-snapshots.qt.io/qt5-5.6/highdpi.html#qt-support
-#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
-    qputenv("QT_DEVICE_PIXEL_RATIO", "auto");
-#else
+    // We do not define it on linux so the behaviour is kept the same
+    // as other Qt apps in the desktop environment. (which may or may
+    // not set this envoronment variable)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
+#else
+    qputenv("QT_DEVICE_PIXEL_RATIO", "auto"); // See #4840, #4994
 #endif
-#endif // !Q_OS_MAC
+#endif // !Q_OS_WIN
 
 #ifdef Q_OS_MAC
     Mac::CocoaInitializer cocoaInit; // RIIA

src/gui/ocsjob.cpp

@@ -47,6 +47,19 @@ void OcsJob::appendPath(const QString &id)
     setPath(path() + QLatin1Char('/') + id);
 }
 
+static QList<QPair<QByteArray, QByteArray>>
+percentEncodeQueryItems(
+        const QList<QPair<QString, QString>> & items)
+{
+    QList<QPair<QByteArray, QByteArray>> result;
+    foreach (const auto& item, items) {
+        result.append(qMakePair(
+            QUrl::toPercentEncoding(item.first),
+            QUrl::toPercentEncoding(item.second)));
+    }
+    return result;
+}
+
 void OcsJob::start()
 {
     QNetworkRequest req;
@@ -57,7 +70,9 @@ void OcsJob::start()
     QBuffer *buffer = new QBuffer;
 
     if (_verb == "GET") {
-        url.setQueryItems(_params);
+        // Note: QUrl::setQueryItems() does not fully percent encode
+        // the query items, see #5042
+        url.setEncodedQueryItems(percentEncodeQueryItems(_params));
     } else if (_verb == "POST" || _verb == "PUT") {
         // Url encode the _postParams and put them in a buffer.
         QByteArray postData;
@@ -73,9 +88,9 @@ void OcsJob::start()
     }
 
     //We want json data
-    auto queryItems = url.queryItems();
-    queryItems.append(qMakePair(QString::fromLatin1("format"), QString::fromLatin1("json")));
-    url.setQueryItems(queryItems);
+    auto queryItems = url.encodedQueryItems();
+    queryItems.append(qMakePair(QByteArray("format"), QByteArray("json")));
+    url.setEncodedQueryItems(queryItems);
 
     setReply(davRequest(_verb, url, req, buffer));
     setupConnections(reply());

src/gui/owncloudgui.cpp

@@ -367,7 +367,7 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
             menu->addAction(tr("Managed Folders:"))->setDisabled(true);
         }
 
-        QAction *action = new QAction( tr("Open folder '%1'").arg(folder->shortGuiLocalPath()), this );
+        QAction *action = new QAction( tr("Open folder '%1'").arg(folder->shortGuiLocalPath()), menu );
         connect(action, SIGNAL(triggered()),_folderOpenActionMapper, SLOT(map()));
         _folderOpenActionMapper->setMapping( action, folder->alias() );
         menu->addAction(action);
@@ -399,8 +399,26 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
 
 }
 
+static bool minimalTrayMenu()
+{
+    static QByteArray var = qgetenv("OWNCLOUD_MINIMAL_TRAY_MENU");
+    return !var.isEmpty();
+}
+
 void ownCloudGui::setupContextMenu()
 {
+    // The tray menu is surprisingly problematic. Being able to switch to
+    // a minimal version of it is a useful workaround and testing tool.
+    if (minimalTrayMenu()) {
+        if (!_contextMenu) {
+            _contextMenu.reset(new QMenu());
+            _recentActionsMenu = new QMenu(tr("Recent Changes"), _contextMenu.data());
+            _tray->setContextMenu(_contextMenu.data());
+            _contextMenu->addAction(_actionQuit);
+        }
+        return;
+    }
+
     auto accountList = AccountManager::instance()->accounts();
 
     bool isConfigured = (!accountList.isEmpty());
@@ -685,7 +703,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo&
         slotRebuildRecentMenus();
     }
 
-    if (progress.hasStarted()
+    if (progress.isUpdatingEstimates()
             && progress.completedFiles() >= progress.totalFiles()
             && progress._currentDiscoveredFolder.isEmpty()) {
         QTimer::singleShot(2000, this, SLOT(slotDisplayIdle()));
@@ -821,6 +839,10 @@ void ownCloudGui::slotHelp()
 
 void ownCloudGui::raiseDialog( QWidget *raiseWidget )
 {
+    qDebug() << "RAISE " << raiseWidget;
+    if (raiseWidget) qDebug() << raiseWidget->parentWidget() << raiseWidget->isVisible();
+
+
     if( raiseWidget && raiseWidget->parentWidget() == 0) {
         // Qt has a bug which causes parent-less dialogs to pop-under.
         raiseWidget->showNormal();

src/gui/owncloudsetupwizard.cpp

@@ -173,7 +173,7 @@ void OwncloudSetupWizard::slotNoOwnCloudFoundAuth(QNetworkReply *reply)
 
     // Allow the credentials dialog to pop up again for the same URL.
     // Maybe the user just clicked 'Cancel' by accident or changed his mind.
-    _ocWizard->account()->resetSslCertErrorState();
+    _ocWizard->account()->resetRejectedCertificates();
 }
 
 void OwncloudSetupWizard::slotNoOwnCloudFoundAuthTimeout(const QUrl&url)

src/gui/protocolwidget.cpp

@@ -57,9 +57,15 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
     header << tr("Action");
     header << tr("Size");
 
+    int timestampColumnExtra = 0;
+#ifdef Q_OS_WIN
+    timestampColumnExtra = 20; // font metrics are broken on Windows, see #4721
+#endif
+
     _ui->_treeWidget->setHeaderLabels( header );
     int timestampColumnWidth =
-        _ui->_treeWidget->fontMetrics().width(timeString(QDateTime::currentDateTime()));
+        _ui->_treeWidget->fontMetrics().width(timeString(QDateTime::currentDateTime()))
+        + timestampColumnExtra;
     _ui->_treeWidget->setColumnWidth(0, timestampColumnWidth);
     _ui->_treeWidget->setColumnWidth(1, 180);
     _ui->_treeWidget->setColumnCount(5);
@@ -84,7 +90,8 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
     _issueItemView->setHeaderLabels( header );
     timestampColumnWidth =
             ActivityItemDelegate::rowHeight() // icon
-            + _issueItemView->fontMetrics().width(timeString(QDateTime::currentDateTime()));
+            + _issueItemView->fontMetrics().width(timeString(QDateTime::currentDateTime()))
+            + timestampColumnExtra;
     _issueItemView->setColumnWidth(0, timestampColumnWidth);
     _issueItemView->setColumnWidth(1, 180);
     _issueItemView->setColumnCount(4);
@@ -114,17 +121,9 @@ void ProtocolWidget::hideEvent(QHideEvent *ev)
 
 void ProtocolWidget::cleanItems(const QString& folder)
 {
-    int itemCnt = _ui->_treeWidget->topLevelItemCount();
-
-    // Limit the number of items
-    while(itemCnt > 2000) {
-        delete _ui->_treeWidget->takeTopLevelItem(itemCnt - 1);
-        itemCnt--;
-    }
-
     // The issue list is a state, clear it and let the next sync fill it
     // with ignored files and propagation errors.
-    itemCnt = _issueItemView->topLevelItemCount();
+    int itemCnt = _issueItemView->topLevelItemCount();
     for( int cnt = itemCnt-1; cnt >=0 ; cnt-- ) {
         QTreeWidgetItem *item = _issueItemView->topLevelItem(cnt);
         QString itemFolder = item->data(2, Qt::UserRole).toString();
@@ -212,7 +211,7 @@ QTreeWidgetItem* ProtocolWidget::createCompletedTreewidgetItem(const QString& fo
 
 void ProtocolWidget::slotProgressInfo( const QString& folder, const ProgressInfo& progress )
 {
-    if( !progress.hasStarted() ) {
+    if( !progress.isUpdatingEstimates() ) {
         // The sync is restarting, clean the old items
         cleanItems(folder);
     } else if (progress.completedFiles() >= progress.totalFiles()) {
@@ -232,6 +231,12 @@ void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItem
             _issueItemView->insertTopLevelItem(0, line);
             emit issueItemCountUpdated(_issueItemView->topLevelItemCount());
         } else {
+            // Limit the number of items
+            int itemCnt = _ui->_treeWidget->topLevelItemCount();
+            while(itemCnt > 2000) {
+                delete _ui->_treeWidget->takeTopLevelItem(itemCnt - 1);
+                itemCnt--;
+            }
             _ui->_treeWidget->insertTopLevelItem(0, line);
         }
     }

src/gui/sharelinkwidget.cpp

@@ -366,6 +366,7 @@ void ShareLinkWidget::slotCheckBoxShareLinkClicked()
             _ui->checkBox_password->setText(tr("Public sh&aring requires a password"));
             _ui->checkBox_expire->setEnabled(false);
             _ui->checkBox_editing->setEnabled(false);
+            _ui->lineEdit_password->setEnabled(true);
             _ui->lineEdit_password->setFocus();
             _ui->pushButton_copy->hide();
             _ui->widget_shareLink->show();
@@ -432,6 +433,7 @@ void ShareLinkWidget::slotCheckBoxPasswordClicked()
         _ui->lineEdit_password->show();
         _ui->pushButton_setPassword->show();
         _ui->lineEdit_password->setPlaceholderText(tr("Please Set Password"));
+        _ui->lineEdit_password->setEnabled(true);
         _ui->lineEdit_password->setFocus();
     } else {
         setPassword(QString());

src/gui/shareusergroupwidget.cpp

@@ -72,9 +72,7 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account,
 
     _completer->setModel(_completerModel);
     _completer->setCaseSensitivity(Qt::CaseInsensitive);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-    _completer->setFilterMode(Qt::MatchContains);
-#endif
+    _completer->setCompletionMode(QCompleter::UnfilteredPopupCompletion);
     _ui->shareeLineEdit->setCompleter(_completer);
 
     _manager = new ShareManager(_account, this);
@@ -250,10 +248,12 @@ void ShareUserGroupWidget::slotCompleterActivated(const QModelIndex & index)
     layout->addWidget(indicator);
 
     /*
-     * Don't send the reshare permissions for federataed shares
+     * Don't send the reshare permissions for federated shares for servers <9.1
      * https://github.com/owncloud/core/issues/22122#issuecomment-185637344
+     * https://github.com/owncloud/client/issues/4996
      */
-    if (sharee->type() == Sharee::Federated) {
+    if (sharee->type() == Sharee::Federated
+            && _account->serverVersionInt() < 0x090100) {
         int permissions = SharePermissionRead | SharePermissionUpdate;
         if (!_isFile) {
             permissions |= SharePermissionCreate | SharePermissionDelete;
@@ -337,10 +337,12 @@ ShareWidget::ShareWidget(QSharedPointer<Share> share,
     connect(_ui->permissionsEdit,  SIGNAL(clicked(bool)), SLOT(slotEditPermissionsChanged()));
 
     /*
-     * We don't show permssion share for federated shares
+     * We don't show permssion share for federated shares with server <9.1
      * https://github.com/owncloud/core/issues/22122#issuecomment-185637344
+     * https://github.com/owncloud/client/issues/4996
      */
-    if (share->getShareType() == Share::TypeRemote) {
+    if (share->getShareType() == Share::TypeRemote
+            && share->account()->serverVersionInt() < 0x090100) {
         _ui->permissionShare->setVisible(false);
         _ui->permissionToolButton->setVisible(false);
     }

src/gui/socketapi.cpp

@@ -74,7 +74,7 @@ SocketApi::SocketApi(QObject* parent)
 
     if (Utility::isWindows()) {
         socketPath = QLatin1String("\\\\.\\pipe\\")
-                + QLatin1String("ownCloud") + '\\'
+                + QLatin1String("ownCloud-")
                 + QString::fromLocal8Bit(qgetenv("USERNAME"));
         // TODO: once the windows extension supports multiple
         // client connections, switch back to the theme name

src/gui/updater/ocupdater.cpp

@@ -218,6 +218,7 @@ void OCUpdater::slotVersionInfoArrived()
 {
     _timeoutWatchdog->stop();
     QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+    reply->deleteLater();
     if( reply->error() != QNetworkReply::NoError ) {
         qDebug() << "Failed to reach version check url: " << reply->errorString();
         return;
@@ -258,6 +259,7 @@ void NSISUpdater::slotWriteFile()
 void NSISUpdater::slotDownloadFinished()
 {
     QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+    reply->deleteLater();
     if (reply->error() != QNetworkReply::NoError) {
         setDownloadState(DownloadFailed);
         return;

src/libsync/abstractnetworkjob.cpp

@@ -155,6 +155,10 @@ QNetworkReply *AbstractNetworkJob::deleteRequest(const QUrl &url)
 
 void AbstractNetworkJob::slotFinished()
 {
+
+    qWarning() << reply()->request().url() << reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute) << _followRedirects << reply()->attribute(QNetworkRequest::RedirectionTargetAttribute)  <<
+    reply()->header(QNetworkRequest::LocationHeader);
+
     _timer.stop();
 
     if( _reply->error() == QNetworkReply::SslHandshakeFailedError ) {
@@ -242,6 +246,7 @@ void AbstractNetworkJob::slotTimeout()
         reply()->abort();
     } else {
         qDebug() << Q_FUNC_INFO << this << "Timeout reply was NULL";
+        deleteLater();
     }
 }
 

src/libsync/account.cpp

@@ -38,9 +38,6 @@ namespace OCC {
 Account::Account(QObject *parent)
     : QObject(parent)
     , _capabilities(QVariantMap())
-    , _am(0)
-    , _credentials(0)
-    , _treatSslErrorsAsFailure(false)
     , _davPath( Theme::instance()->webDavPath() )
     , _wasMigrated(false)
 {
@@ -56,8 +53,6 @@ AccountPtr Account::create()
 
 Account::~Account()
 {
-    delete _credentials;
-    delete _am;
 }
 
 QString Account::davPath() const
@@ -108,6 +103,8 @@ static bool isEqualExceptProtocol(const QUrl &url1, const QUrl &url2)
 
 bool Account::changed(AccountPtr other, bool ignoreUrlProtocol) const
 {
+    qDebug() << _credentials << other->credentials();
+
     if (!other) {
         return false;
     }
@@ -118,47 +115,47 @@ bool Account::changed(AccountPtr other, bool ignoreUrlProtocol) const
         changes = (_url == other->_url);
     }
 
-    changes |= _credentials->changed(other->_credentials);
+    changes |= _credentials->changed(other->credentials());
 
     return changes;
 }
 
 AbstractCredentials *Account::credentials() const
 {
-    return _credentials;
+    return _credentials.data();
 }
 
 void Account::setCredentials(AbstractCredentials *cred)
 {
+    qDebug() << this << cred;
+
     // set active credential manager
     QNetworkCookieJar *jar = 0;
     if (_am) {
         jar = _am->cookieJar();
         jar->setParent(0);
 
-        _am->deleteLater();
-    }
-
-    if (_credentials) {
-        credentials()->deleteLater();
+        _am = QSharedPointer<QNetworkAccessManager>();
     }
 
     // The order for these two is important! Reading the credential's
-    // settings accesses the account as well as account->_credentials
-    _credentials = cred;
+    // settings accesses the account as well as account->_credentials,
+    // so deleteLater must be used.
+    _credentials = QSharedPointer<AbstractCredentials>(cred, &QObject::deleteLater);
     cred->setAccount(this);
 
-    _am = _credentials->getQNAM();
+    _am = QSharedPointer<QNetworkAccessManager>(_credentials->getQNAM(), &QObject::deleteLater);
+
     if (jar) {
         _am->setCookieJar(jar);
     }
-    connect(_am, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
+    connect(_am.data(), SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
             SLOT(slotHandleSslErrors(QNetworkReply*,QList<QSslError>)));
-    connect(_am, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+    connect(_am.data(), SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
             SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
-    connect(_credentials, SIGNAL(fetched()),
+    connect(_credentials.data(), SIGNAL(fetched()),
             SLOT(slotCredentialsFetched()));
-    connect(_credentials, SIGNAL(asked()),
+    connect(_credentials.data(), SIGNAL(asked()),
             SLOT(slotCredentialsAsked()));
 }
 
@@ -197,18 +194,21 @@ void Account::resetNetworkAccessManager()
 
     qDebug() << "Resetting QNAM";
     QNetworkCookieJar* jar = _am->cookieJar();
-    _am->deleteLater();
-    _am = _credentials->getQNAM();
+
+    // Use a QSharedPointer to allow locking the life of the QNAM on the stack.
+    // Make it call deleteLater to make sure that we can return to any QNAM stack frames safely.
+    _am = QSharedPointer<QNetworkAccessManager>(_credentials->getQNAM(), &QObject::deleteLater);
+
     _am->setCookieJar(jar); // takes ownership of the old cookie jar
-    connect(_am, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
+    connect(_am.data(), SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
             SLOT(slotHandleSslErrors(QNetworkReply*,QList<QSslError>)));
-    connect(_am, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+    connect(_am.data(), SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
             SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
 }
 
 QNetworkAccessManager *Account::networkAccessManager()
 {
-    return _am;
+    return _am.data();
 }
 
 QNetworkReply *Account::headRequest(const QString &relPath)
@@ -329,9 +329,9 @@ void Account::addApprovedCerts(const QList<QSslCertificate> certs)
     _approvedCerts += certs;
 }
 
-void Account::resetSslCertErrorState()
+void Account::resetRejectedCertificates()
 {
-    _treatSslErrorsAsFailure = false;
+    _rejectedCertificates.clear();
 }
 
 void Account::setSslErrorHandler(AbstractSslErrorHandler *handler)
@@ -412,8 +412,15 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
                      << error.errorString() << "("<< error.error() << ")" << "\n";
     }
 
-    if( _treatSslErrorsAsFailure ) {
-        // User decided once not to trust. Honor this decision.
+    bool allPreviouslyRejected = true;
+    foreach (const QSslError &error, errors) {
+        if (!_rejectedCertificates.contains(error.certificate())) {
+            allPreviouslyRejected = false;
+        }
+    }
+
+    // If all certs have previously been rejected by the user, don't ask again.
+    if( allPreviouslyRejected ) {
         qDebug() << out << "Certs not trusted by user decision, returning.";
         return;
     }
@@ -424,6 +431,12 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
         return;
     }
 
+    // SslDialogErrorHandler::handleErrors will run an event loop that might execute
+    // the deleteLater() of the QNAM before we have the chance of unwinding our stack.
+    // Keep a ref here on our stackframe to make sure that it doesn't get deleted before
+    // handleErrors returns.
+    QSharedPointer<QNetworkAccessManager> qnamLock = _am;
+
     if (_sslErrorHandler->handleErrors(errors, reply->sslConfiguration(), &approvedCerts, sharedFromThis())) {
         QSslSocket::addDefaultCaCertificates(approvedCerts);
         addApprovedCerts(approvedCerts);
@@ -436,7 +449,12 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
         // certificate changes.
         reply->ignoreSslErrors(errors);
     } else {
-        _treatSslErrorsAsFailure = true;
+        // Mark all involved certificates as rejected, so we don't ask the user again.
+        foreach (const QSslError &error, errors) {
+            if (!_rejectedCertificates.contains(error.certificate())) {
+                _rejectedCertificates.append(error.certificate());
+            }
+        }
         // if during normal operation, a new certificate was MITM'ed, and the user does not
         // ACK it, the running request must be aborted and the QNAM must be reset, to not
         // treat the new cert as granted. See bug #3283
@@ -448,12 +466,12 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
 
 void Account::slotCredentialsFetched()
 {
-    emit credentialsFetched(_credentials);
+    emit credentialsFetched(_credentials.data());
 }
 
 void Account::slotCredentialsAsked()
 {
-    emit credentialsAsked(_credentials);
+    emit credentialsAsked(_credentials.data());
 }
 
 void Account::handleInvalidCredentials()

src/libsync/account.h

@@ -133,7 +133,7 @@ public:
     // Usually when a user explicitly rejects a certificate we don't
     // ask again. After this call, a dialog will again be shown when
     // the next unknown certificate is encountered.
-    void resetSslCertErrorState();
+    void resetRejectedCertificates();
 
     // pluggable handler
     void setSslErrorHandler(AbstractSslErrorHandler *handler);
@@ -214,9 +214,12 @@ private:
     QString _serverVersion;
     QScopedPointer<AbstractSslErrorHandler> _sslErrorHandler;
     QuotaInfo *_quotaInfo;
-    QNetworkAccessManager *_am;
-    AbstractCredentials* _credentials;
-    bool _treatSslErrorsAsFailure;
+    QSharedPointer<QNetworkAccessManager> _am;
+    QSharedPointer<AbstractCredentials> _credentials;
+
+    /// Certificates that were explicitly rejected by the user
+    QList<QSslCertificate> _rejectedCertificates;
+
     static QString _configFileName;
     QByteArray _pemCertificate; 
     QString _pemPrivateKey;  

src/libsync/capabilities.cpp

@@ -73,7 +73,8 @@ bool Capabilities::shareResharing() const
 
 bool Capabilities::notificationsAvailable() const
 {
-    return _capabilities.contains("notifications");
+    // We require the OCS style API in 9.x, can't deal with the REST one only found in 8.2
+    return _capabilities.contains("notifications") && _capabilities["notifications"].toMap().contains("ocs-endpoints");
 }
 
 bool Capabilities::isValid() const

src/libsync/connectionvalidator.cpp

@@ -106,7 +106,7 @@ void ConnectionValidator::slotCheckServerAndAuth()
     checkJob->setTimeout(timeoutToUseMsec);
     checkJob->setIgnoreCredentialFailure(true);
     connect(checkJob, SIGNAL(instanceFound(QUrl,QVariantMap)), SLOT(slotStatusFound(QUrl,QVariantMap)));
-    connect(checkJob, SIGNAL(networkError(QNetworkReply*)), SLOT(slotNoStatusFound(QNetworkReply*)));
+    connect(checkJob, SIGNAL(instanceNotFound(QNetworkReply*)), SLOT(slotNoStatusFound(QNetworkReply*)));
     connect(checkJob, SIGNAL(timeout(QUrl)), SLOT(slotJobTimeout(QUrl)));
     checkJob->start();
 }
@@ -185,6 +185,10 @@ void ConnectionValidator::slotAuthFailed(QNetworkReply *reply)
 {
     Status stat = Timeout;
 
+
+    qWarning() << reply->error() << _account->credentials()->stillValid(reply) << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+
+
     if( reply->error() == QNetworkReply::AuthenticationRequiredError ||
              !_account->credentials()->stillValid(reply)) {
         qDebug() <<  reply->error() << reply->errorString();

src/libsync/excludedfiles.cpp

@@ -12,6 +12,7 @@
  */
 
 #include "excludedfiles.h"
+#include "utility.h"
 
 #include <QFileInfo>
 
@@ -42,7 +43,7 @@ ExcludedFiles& ExcludedFiles::instance()
 
 void ExcludedFiles::addExcludeFilePath(const QString& path)
 {
-    _excludeFiles.append(path);
+    _excludeFiles.insert(path);
 }
 
 bool ExcludedFiles::reloadExcludes()
@@ -63,7 +64,7 @@ bool ExcludedFiles::isExcluded(
         const QString& basePath,
         bool excludeHidden) const
 {
-    if (!filePath.startsWith(basePath)) {
+    if (!filePath.startsWith(basePath, Utility::fsCasePreserving() ? Qt::CaseInsensitive : Qt::CaseSensitive)) {
         // Mark paths we're not responsible for as excluded...
         return true;
     }

src/libsync/excludedfiles.h

@@ -16,7 +16,8 @@
 #include "owncloudlib.h"
 
 #include <QObject>
-#include <QStringList>
+#include <QSet>
+#include <QString>
 
 extern "C" {
 #include "std/c_string.h"
@@ -66,7 +67,7 @@ private:
     // This is a pointer to the csync exclude list, its is owned by this class
     // but the pointer can be in a csync_context so that it can itself also query the list.
     c_strlist_t** _excludesPtr;
-    QStringList _excludeFiles;
+    QSet<QString> _excludeFiles;
 };
 
 } // namespace OCC

src/libsync/filesystem.cpp

@@ -496,16 +496,16 @@ QString FileSystem::fileSystemForPath(const QString & path)
 }
 #endif
 
-#define BUFSIZE 1024*1024*10
+#define BUFSIZE qint64(500*1024)  // 500 KiB
 
 static QByteArray readToCrypto( const QString& filename, QCryptographicHash::Algorithm algo )
 {
-    const qint64 bufSize = BUFSIZE;
-    QByteArray buf(bufSize,0);
+    QFile file(filename);
+    const qint64 bufSize = qMin(BUFSIZE, file.size() + 1);
+    QByteArray buf(bufSize, Qt::Uninitialized);
     QByteArray arr;
     QCryptographicHash crypto( algo );
 
-    QFile file(filename);
     if (file.open(QIODevice::ReadOnly)) {
         qint64 size;
         while (!file.atEnd()) {
@@ -532,11 +532,11 @@ QByteArray FileSystem::calcSha1( const QString& filename )
 #ifdef ZLIB_FOUND
 QByteArray FileSystem::calcAdler32( const QString& filename )
 {
-    unsigned int adler = adler32(0L, Z_NULL, 0);
-    const qint64 bufSize = BUFSIZE;
-    QByteArray buf(bufSize, 0);
-
     QFile file(filename);
+    const qint64 bufSize = qMin(BUFSIZE, file.size() + 1);
+    QByteArray buf(bufSize, Qt::Uninitialized);
+
+    unsigned int adler = adler32(0L, Z_NULL, 0);
     if (file.open(QIODevice::ReadOnly)) {
         qint64 size;
         while (!file.atEnd()) {

src/libsync/filesystem.h

@@ -111,9 +111,9 @@ bool OWNCLOUDSYNC_EXPORT rename(const QString& originFileName,
  *
  * @return true if the file's mtime or size are not what is expected.
  */
-bool fileChanged(const QString& fileName,
-                 qint64 previousSize,
-                 time_t previousMtime);
+bool OWNCLOUDSYNC_EXPORT fileChanged(const QString& fileName,
+                                     qint64 previousSize,
+                                     time_t previousMtime);
 
 /**
  * @brief Like !fileChanged() but with verbose logging if the file *did* change.

src/libsync/owncloudpropagator.cpp

@@ -695,6 +695,12 @@ void PropagateDirectory::finalize()
     bool ok = true;
     if (!_item->isEmpty() && _hasError == SyncFileItem::NoStatus) {
         if( !_item->_renameTarget.isEmpty() ) {
+            if(_item->_instruction == CSYNC_INSTRUCTION_RENAME
+                    && _item->_originalFile != _item->_renameTarget) {
+                // Remove the stale entries from the database.
+                _propagator->_journal->deleteFileRecord(_item->_originalFile, true);
+            }
+
             _item->_file = _item->_renameTarget;
         }
 
@@ -762,6 +768,7 @@ void CleanupPollsJob::slotPollFinished()
     Q_ASSERT(job);
     if (job->_item->_status == SyncFileItem::FatalError) {
         emit aborted(job->_item->_errorString);
+        deleteLater();
         return;
     } else if (job->_item->_status != SyncFileItem::Success) {
         qDebug() << "There was an error with file " << job->_item->_file << job->_item->_errorString;
@@ -771,6 +778,7 @@ void CleanupPollsJob::slotPollFinished()
             job->_item->_status = SyncFileItem::FatalError;
             job->_item->_errorString = tr("Error writing metadata to the database");
             emit aborted(job->_item->_errorString);
+            deleteLater();
             return;
         }
     }

src/libsync/owncloudpropagator.h

@@ -297,7 +297,12 @@ public:
 
     QAtomicInt _abortRequested; // boolean set by the main thread to abort.
 
-    /* The list of currently active jobs */
+    /** The list of currently active jobs.
+        This list contains the jobs that are currently using ressources and is used purely to
+        know how many jobs there is currently running for the scheduler.
+        Jobs add themself to the list when they do an assynchronous operation.
+        Jobs can be several time on the list (example, when several chunks are uploaded in parallel)
+     */
     QList<PropagateItemJob*> _activeJobList;
 
     /** We detected that another sync is required after this one */
@@ -383,6 +388,7 @@ private:
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     // access to signals which are protected in Qt4
     friend class PropagateDownloadFileQNAM;
+    friend class PropagateUploadFileQNAM;
 #endif
 };
 
@@ -404,6 +410,10 @@ public:
 
     ~CleanupPollsJob();
 
+    /**
+     * Start the job.  After the job is completed, it will emit either finished or aborted, and it
+     * will destroy itself.
+     */
     void start();
 signals:
     void finished();

src/libsync/owncloudtheme.cpp

@@ -47,7 +47,7 @@ QString ownCloudTheme::about() const
     devString = trUtf8("<p>Version %2. For more information visit <a href=\"%3\">%4</a></p>"
                "<p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, "
                "Olivier Goffart, Markus Götz and others.</small></p>"
-               "<p>Copyright ownCloud, Inc.</p>"
+               "<p>Copyright ownCloud GmbH</p>"
                "<p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>"
                "ownCloud and the ownCloud Logo are registered trademarks of ownCloud, "
                "Inc. in the United States, other countries, or both.</p>"

src/libsync/progressdispatcher.cpp

@@ -127,27 +127,65 @@ void ProgressDispatcher::setProgressInfo(const QString& folder, const ProgressIn
     emit progressInfo( folder, progress );
 }
 
-void ProgressInfo::start()
+ProgressInfo::ProgressInfo()
 {
     connect(&_updateEstimatesTimer, SIGNAL(timeout()), SLOT(updateEstimates()));
+    reset();
+}
+
+void ProgressInfo::reset()
+{
+    _currentItems.clear();
+    _currentDiscoveredFolder.clear();
+    _sizeProgress = Progress();
+    _fileProgress = Progress();
+    _totalSizeOfCompletedJobs = 0;
+    _maxBytesPerSecond = 100000.0;
+    _maxFilesPerSecond = 2.0;
+    _updateEstimatesTimer.stop();
+}
+
+void ProgressInfo::startEstimateUpdates()
+{
     _updateEstimatesTimer.start(1000);
 }
 
-bool ProgressInfo::hasStarted() const
+bool ProgressInfo::isUpdatingEstimates() const
 {
     return _updateEstimatesTimer.isActive();
 }
 
+static bool shouldCountProgress(const SyncFileItem &item)
+{
+    const auto instruction = item._instruction;
+
+    // Don't worry about directories that won't have propagation
+    // jobs associated with them.
+    if (item._isDirectory
+            && (instruction == CSYNC_INSTRUCTION_NONE
+                || instruction == CSYNC_INSTRUCTION_SYNC
+                || instruction == CSYNC_INSTRUCTION_CONFLICT)) {
+        return false;
+    }
+
+    // Skip any ignored or error files, we do nothing with them.
+    if (instruction == CSYNC_INSTRUCTION_IGNORE
+            || instruction == CSYNC_INSTRUCTION_ERROR) {
+        return false;
+    }
+
+    return true;
+}
+
 void ProgressInfo::adjustTotalsForFile(const SyncFileItem &item)
 {
-    if (!item._isDirectory) {
-        _fileProgress._total++;
-        if (isSizeDependent(item)) {
-            _sizeProgress._total += item._size;
-        }
-    } else if (item._instruction != CSYNC_INSTRUCTION_NONE) {
-        // Added or removed directories certainly count.
-        _fileProgress._total++;
+    if (!shouldCountProgress(item)) {
+        return;
+    }
+
+    _fileProgress._total += item._affectedItems;
+    if (isSizeDependent(item)) {
+        _sizeProgress._total += item._size;
     }
 }
 
@@ -178,6 +216,10 @@ quint64 ProgressInfo::completedSize() const
 
 void ProgressInfo::setProgressComplete(const SyncFileItem &item)
 {
+    if (!shouldCountProgress(item)) {
+        return;
+    }
+
     _currentItems.remove(item._file);
     _fileProgress.setCompleted(_fileProgress._completed + item._affectedItems);
     if (ProgressInfo::isSizeDependent(item)) {
@@ -189,6 +231,10 @@ void ProgressInfo::setProgressComplete(const SyncFileItem &item)
 
 void ProgressInfo::setProgressItem(const SyncFileItem &item, quint64 completed)
 {
+    if (!shouldCountProgress(item)) {
+        return;
+    }
+
     _currentItems[item._file]._item = item;
     _currentItems[item._file]._progress._total = item._size;
     _currentItems[item._file]._progress.setCompleted(completed);

src/libsync/progressdispatcher.h

@@ -37,27 +37,27 @@ class OWNCLOUDSYNC_EXPORT ProgressInfo : public QObject
 {
     Q_OBJECT
 public:
-    ProgressInfo()
-        : _totalSizeOfCompletedJobs(0)
-        , _maxFilesPerSecond(2.0)
-        , _maxBytesPerSecond(100000.0)
-    {}
+    ProgressInfo();
+
+    /** Resets for a new sync run.
+     */
+    void reset();
 
     /**
      * Called when propagation starts.
      *
-     * hasStarted() will return true afterwards.
+     * isUpdatingEstimates() will return true afterwards.
      */
-    void start();
+    void startEstimateUpdates();
 
     /**
-     * Returns true when propagation has started (start() was called).
+     * Returns true when startEstimateUpdates() was called.
      *
      * This is used when the SyncEngine wants to indicate a new sync
      * is about to start via the transmissionProgress() signal. The
-     * first ProgressInfo will have hasStarted() == false.
+     * first ProgressInfo will have isUpdatingEstimates() == false.
      */
-    bool hasStarted() const;
+    bool isUpdatingEstimates() const;
 
     /**
      * Increase the file and size totals by the amount indicated in item.

src/libsync/propagatedownload.cpp

@@ -617,29 +617,47 @@ static QString makeRecallFileName(const QString &fn)
     return recallFileName;
 }
 
-static void handleRecallFile(const QString &fn)
+void handleRecallFile(const QString& filePath, const QString& folderPath, SyncJournalDb& journal)
 {
-    qDebug() << "handleRecallFile: " << fn;
+    qDebug() << "handleRecallFile: " << filePath;
 
-    FileSystem::setFileHidden(fn, true);
+    FileSystem::setFileHidden(filePath, true);
 
-    QFile file(fn);
+    QFile file(filePath);
     if (!file.open(QIODevice::ReadOnly)) {
         qWarning() << "Could not open recall file" << file.errorString();
         return;
     }
-    QFileInfo existingFile(fn);
-    QDir thisDir = existingFile.dir();
+    QFileInfo existingFile(filePath);
+    QDir baseDir = existingFile.dir();
 
     while (!file.atEnd()) {
         QByteArray line = file.readLine();
         line.chop(1); // remove trailing \n
-        QString fpath = thisDir.filePath(line);
-        QString rpath = makeRecallFileName(fpath);
 
-        qDebug() << "Copy recall file: " << fpath << " -> " << rpath;
-        QString error;
-        FileSystem::uncheckedRenameReplace(fpath, rpath, &error);
+        QString recalledFile = QDir::cleanPath(baseDir.filePath(line));
+        if (!recalledFile.startsWith(folderPath) || !recalledFile.startsWith(baseDir.path())) {
+            qDebug() << "Ignoring recall of " << recalledFile;
+            continue;
+        }
+
+        // Path of the recalled file in the local folder
+        QString localRecalledFile = recalledFile.mid(folderPath.size());
+
+        SyncJournalFileRecord record = journal.getFileRecord(localRecalledFile);
+        if (!record.isValid()) {
+            qDebug() << "No db entry for recall of" << localRecalledFile;
+            continue;
+        }
+
+        qDebug() << "Recalling" << localRecalledFile << "Checksum:" << record._contentChecksumType << record._contentChecksum;
+
+        QString targetPath = makeRecallFileName(recalledFile);
+
+        qDebug() << "Copy recall file: " << recalledFile << " -> " << targetPath;
+        // Remove the target first, QFile::copy will not overwrite it.
+        FileSystem::remove(targetPath);
+        QFile::copy(recalledFile, targetPath);
     }
 }
 
@@ -654,7 +672,6 @@ static void preserveGroupOwnership(const QString& fileName, const QFileInfo& fi)
 }
 } // end namespace
 
-
 void PropagateDownloadFileQNAM::transmissionChecksumValidated(const QByteArray &checksumType, const QByteArray &checksum)
 {
     const auto theContentChecksumType = contentChecksumType();
@@ -797,8 +814,10 @@ void PropagateDownloadFileQNAM::downloadFinished()
     done(isConflict ? SyncFileItem::Conflict : SyncFileItem::Success);
 
     // handle the special recall file
-    if(_item->_file == QLatin1String(".sys.admin#recall#") || _item->_file.endsWith("/.sys.admin#recall#")) {
-        handleRecallFile(fn);
+    if(!_item->_remotePerm.contains("S")
+            && (_item->_file == QLatin1String(".sys.admin#recall#")
+                || _item->_file.endsWith("/.sys.admin#recall#"))) {
+        handleRecallFile(fn, _propagator->_localDir, *_propagator->_journal);
     }
 
     qint64 duration = _stopwatch.elapsed();