VERSION.cmake: 2.4.0 alpha1

2026-04-05 05:34:18 +02:00 · 2017-10-05 17:43:32 +02:00
184 changed files with 13334 additions and 19393 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,91 +0,0 @@
 #
 # We are building GCC with make and Clang with ninja, the combinations are more
 # or less arbitrarily chosen. We just want to check that both compilers and both
 # CMake generators work. It's unlikely that a specific generator only breaks
 # with a specific compiler.
 #
 workspace:
  base: /drone
  path: src/github.com/owncloud/client
 branches:
  - master
  - 2.4
 clone:
  git:
    image: plugins/git
    pull: true
    tags: false
 pipeline:
  prepare-clang:
    image: owncloudci/client:latest
    pull: true
    environment:
      - LC_ALL=C.UTF-8
    commands:
      - mkdir clang-build
      - cd clang-build
      - cmake -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 ..
  building-clang:
    image: owncloudci/client:latest
    pull: true
    environment:
      - LC_ALL=C.UTF-8
    commands:
      - cd clang-build
      - ninja -j4
  testing-clang:
    image: owncloudci/client:latest
    pull: true
    environment:
      - LC_ALL=C.UTF-8
    commands:
      - cd clang-build
      - useradd -m -s /bin/bash tester
      - chown -R tester:tester .
      - su-exec tester ctest --output-on-failure
  prepare-gcc:
    image: owncloudci/client:latest
    pull: true
    environment:
      - LC_ALL=C.UTF-8
    commands:
      - mkdir gcc-build
      - cd gcc-build
      - cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 ..
  building-gcc:
    image: owncloudci/client:latest
    pull: true
    environment:
      - LC_ALL=C.UTF-8
    commands:
      - cd gcc-build
      - make -j4
  testing-gcc:
    image: owncloudci/client:latest
    pull: true
    environment:
      - LC_ALL=C.UTF-8
    commands:
      - cd gcc-build
      - useradd -m -s /bin/bash tester
      - chown -R tester:tester .
      - su-exec tester ctest --output-on-failure
  notify-slack:
    image: plugins/slack
    pull: true
    secrets: [ slack_webhook ]
    channel: desktop
    when:
      local: false
      status: [ changed, failure ]
      event: [ push ]
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,37 @@
 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/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 -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
 - mkdir coverity
 - tar -xvf coverity_tool.tgz -C coverity --strip-components=1
 - export PATH=$PATH:$PWD/coverity/bin/
 - cd $TRAVIS_BUILD_DIR
 install:
 - cd ../
 - mkdir client-build
 - cd client-build
 - cmake -DCMAKE_BUILD_TYPE="Debug" $TRAVIS_BUILD_DIR
 - cov-build --dir cov-int make
 - tar czvf client.tgz cov-int 
 - curl --form token=$token --form email=lukas@statuscode.ch --form file=@$PWD/client.tgz --form version="$checkout" --form description="$checkout" https://scan.coverity.com/builds?project=owncloud%2Fmirall
 # Hack to stop processing
 script: true
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -199,7 +199,7 @@ if(BUILD_CLIENT)
        endif()
    endif()
-   find_package(ZLIB REQUIRED)
+   find_package(ZLIB)
 endif()
 if (NOT DEFINED APPLICATION_ICON_NAME)
@@ -243,7 +243,6 @@ set(WITH_TESTING ${UNIT_TESTING})
 if(BUILD_CLIENT)
    add_subdirectory(src)
    if(NOT BUILD_LIBRARIES_ONLY)
        add_subdirectory(man)
        add_subdirectory(doc)
        add_subdirectory(doc/dev)
        if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
--- a/137
+++ b/137
@@ -1,149 +1,75 @@
 ChangeLog
 =========
-version 2.4.3 (2018-08-xx)
+version 2.4.0 (2017-1X-XX)
-* Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY (#6696, #6610)
+* OAuth2 authentication support by opening external browser
-* OAuth2: Fix infinite loop when the refresh token is expired
+* Sync Issues: More functional error view including filters and conflicts (#5516)
 * Windows MSI: Fix crash in the auto updater
 * Nautilus: Guard against None state (#6643)
 version 2.4.2 (2018-07-18)
 * Linux: Tray workarounds (#6545)
 * Fix nautilus/nemo shell issues (#6393, #6406)
 * Updater: Add update channel feature (#6259)
 * Updater: Support EXE->MSI upgrade
 * SyncJournal: Fixes for sync folders on removable media (#6049, #6049)
 * SslButton: Add HTTP/2 info (#3146)
 * Fix assert when using ownCloud server 5 (which you should not) (#6403)
 * Normalize local path (#4424)
 * Blacklisting must prevent parent etag updates (#6411)
 * macdeployqt: Adjust minimum version based on our Qt (#5932)
 * macOS: Unload the Finder extension on exit (#5382, #3819)
 * Upload: Adjust timeout for final job based on file size (#6527)
 * Sync: When detecting a local move, keep the local mtime (#6629)
 * Credentials: Retry fetching from the keychain in case the keychain is still starting (#4274, #6522)
 * OAuth2: Try to refresh the token even if the credentials weren't ready (#6522)
 version 2.4.1 (2018-02-xx)
 * Ignore files with file names that can't be encoded for the filesystem (#6287, #5676, #5719)
 * Issues: Speed up insertion and add hard upper limit (#6272)
 * Notifications: Fix "Dismiss" action
 * Notifications: Fix timer invocation on macOS
 * Notifications: Immediately poll when account online
 * Protocol: Remove entries for auto resolved conflicts (#6316)
 * owncloudcmd: Set proxy before capabilities call (#6281)
 * owncloudcmd: Do not do the capability call when --nonshib is passed
 * Avatars: Use old location for servers <10 (#6279)
 * Link shares: Change default share name (#6298)
 * Sharing: Use maximum allowed permissions for new share (#6346)
 * Nautilus integration: Work with python2 and python3
 * Windows: Don't delete contents behind directory junctions (#6322)
 * SyncJournal: Don't use LIKE with paths (#6322)
 * Fix setting launch-on-startup when the first account is set up (#6347)
 * HTTP2: Only allow with Qt 5.9.4 (#6285)
 * Crash fixes
 version 2.4.0 (2017-12-21)
 * If you're using 2.4.0 alpha1, please upgrade as previous alphas/rcs had an issue with hidden files and renames!
 * OAuth2 authentication support by opening external browser (#5668)
 * Shibboleth: Change to use OAuth2 if supported (#6198)
 * Sharing: Add support for multiple public link shares (#5655)
-* Sharing: Add option to copy/email private links (#5023, #5627)
+* Sharing: Add option to copy/email private links (#5627, #5023)
 * Sharing: Add option "show file listing" (#5837)
-* Sharing: Show warning that links are public (#5747)
+* Sharing: Show warning that links are public
-* Sharing: Sharing dialog redesign: multiple share links support (#5695)
+* Sharing: Many UI improvements
 * Sharing: Make "can edit" partially checked sometimes (#5642)
 * Sharing: Trigger a sync for folder affected by a change of sharing (#6098)
 * Wizard: Never propose an existing folder for syncing (#5597)
 * Wizard: Don't show last page anymore, go to settings directly (#5726)
-* Wizard: Handle url-shortener redirects (#5954)
+* Wizard: Handle url-shortener redirects #5954
-* Wizard: Resolve url/ redirects only if url/status.php not found (#5954)
+* Gui: Display the user server avatar
 * Wizard: Add explanation text when server error is shown (#6157)
 * Wizard: Update the window size on high dpi screen (#6156)
 * Wizard: Don't report confusing error message (#6116)
 * Gui: Display the user server avatar (#5482)
 * Gui: Use display name of user, not internal name
 * Server URL: Update configuration in case of permanent redirection (#5972)
-* Gui: Allow to add multiple sync folder connection of the same folder (#6032)
+* Gui: Allow to add multiple sync folder connection of the same folder
 * Tray Menu: More detailed status messages
 * Tray Menu: Shibboleth: raise the browser when clicking on the tray (#6105)
 * Activity: Link errors from the account tab, allow filtering by account/folder (#5861)
 * Activity: Present conflicts more prominently (#5894)
 * Activity: Allow sorting the columns in issues and protocol tabs (#6093, #6086)
 * Selective Sync: Open sub folder context menu (#5596)
-* Selective Sync: Skip excluded folders when reading db (#5772)
+* Selective Sync: Skip excluded folders when reading db
 * Selective Sync: Remove local files of unselected folder despite other modified files (#5783)
-* Excludes: Remove .htaccess form list of excluded files (#5701)
+* Excludes: remove .htaccess form list of excluded files
 * Excludes: Hardcode desktop.ini
 * Excludes: Allow escaping "#" (#6012)
-* Excludes: Use faster matching via QRegularExpression (#6063)
+* Excludes: Use faster matching via QRegularExpression
-* Discovery: Increase the MAX_DEPTH and show deep folders as ignored (#1067)
+* Discovery: Increase the MAX_DEPTH and show deep folders as ignored
 * Discovery: General speed improvements
 * Downloads: Remove empty temporary if disk space full (#5746)
-* Downloads: Read Content-MD5 header for object store setups
+* Downloads: Re-trigger folder discovery on 404
-* Checksums: Add global disable environment variable (#5017)
+* Quota:  PropagateUpload: Model of remote quota, avoid some uploads (#5537)
-* Quota: PropagateUpload: Model of remote quota, avoid some uploads (#5537)
+* When creating explorer favorite use more specific windows functions (#5690)
 * Create favorite also in folder wizard (#455)
-* Windows: Use the application icon for the Windows 8 sidebar favorite (#2446, #5690)
+* Windows: Use the application icon for the Windows 8 sidebar favorite (#2446)
 * macOS: Finder sidebar icon (#296)
 * Overlay Icons: Consider also the "shared by me" as shared (#4788)
 * Overlay Icons: Update right after sharing (#6115)
 * Overlay Icons: Fix different case paths not matching (#5257)
 * Overlay Icons: Detect changes in the shared flag (#6098)
 * Windows Overlay Icons: Potential hang fixes
 * Linux Overlay Icons: fix branded nemo and caja shell integration (#5966)
-* Credentials: Fix behavior for bad password (#5989)
+* Http credentials: Fix behavior for bad password (#5989)
-* Credentials: Don't create empty client cert keychain entries (#5752)
+* Credentials: Use per-account keychain entries (#5830)
 * Credentials: Namespace windows cred keys (#6125)
 * Credentials: Use per-account keychain entries (#5830, #6126)
 * AccountSettings: Triggering log in re-ask about previously rejected certificates (#5819)
-* owncloudcmd: Added bandwidth limit parameter (#5707)
+* Added owncloudcmd bandwidth limit parameter (#5707)
 * owncloudcmd: Fix timestamps, Fix --logdebug
 * AccountSettings: Sync with clean discovery on Ctrl-F6 (#5666)
-* Sync: Dynamic sizing of chunks in chunked uploads for improved big file upload performance (#5852)
+* Sync: Dynamic sizing of chunks in chunked uploads for improved big file upload performance
 * Sync: Introduce overall errors that are not tied to a file (#5746)
 * Sync: Better messaging for 507 Insufficient Storage (#5537)
 * Sync: Create conflicts by comparing the hash of files with identical mtime/size (#5589)
 * Sync: Avoid downloads by comparing the hash of files with identical mtime/size (#6153)
 * Sync: Upload conflict files if OWNCLOUD_UPLOAD_CONFLICT_FILES environment variable is set (#6038)
 * Sync: Blacklist: Don't let errors become warnings (#5516)
 * Sync: Check etag again after active sync (#4116)
 * Sync: Rename handling fixes: duplicate file ids (#6096, #6212)
 * Sync: Rename handling fixes: File size must be equal
 * Sync: Rename handling: Fix duplicate files on abort/resume sync (#5949)
 * Sync: Add capability for invalid filename regexes (#6092)
 * SyncJournalDB: Fall back to DELETE journal mode if WAL mode does not seem to work (#5723)
 * SyncJournalDB: Don't crash if the db file is readonly (#6050)
 * SyncJournalDB: DB close error is not fatal
 * Fix at least one memory leak
 * Documentation improvements
-* Logging improvements (With Qt logging categories) (#5671)
+* Logging improvements (with Qt logging categories), new --logdebug parameter
 * Logging filtering per account (#5672)
 * Crash fixes
 * Test improvements
 * Small UI layout fixes
 * Performance improvements
 * Maintenance Mode: Detect maintenance mode (#4485)
 * Maintenance Mode: Add a 1 to 5 min reconnection delay (#5872)
 * HTTP: Send a unique X-Request-ID with each request (#5853)
-* HTTP: Support HTTP2 when built and running with Qt 5.9.x (Official packages still on Qt 5.6.x) (#5659)
+* HTTP: Support HTTP2 when built and running with Qt 5.9.x (Official packages still on Qt 5.6.x)
 * owncloudcmd: Don't start if connection or auth fails (#5692)
-* csync: Switch build from C to C++ (#6033)
+* csync: Switch build from C to C++
 * csync: Refactor a lot to use common data structures to save memory and memory copying
 * csync: Switch some data structures to Qt data structures
-* csync: Switch to using upper layer SyncJournalDB (#6087)
+* csync: Switch to using upper layer SyncJournalDB
 * Switch 3rdparty/json usage to Qt5's QJson (#5710)
-* OpenSSL: Don't require directly, only via Qt (#5833)
+* OpenSSL: Don't require directly, only via Qt
-* Remove iconv dependency, use Qt for file system locale encoding/decoding (emoji filename support on macOS) (#5875)
+* Remove iconv dependency, use Qt for file system locale encoding/decoding (emoji filename support on macOS)
-* Compilation: Remove Qt 4 code (#6025, #5702, #5505)
+* Compilation: Remove Qt 4 code
-* Harmonize source code style with clang-format (#5732)
+* Harmonize source code style with clang-format
-* Switch over to Qt 5 function pointer signal/slot syntax (#6041)
+* Switch over to Qt 5 function pointer signal/slot syntax
-* Compile with stack-smashing protection
+* Updater: Rudimentary support for beta channel
 * Updater: Rudimentary support for beta channel (#6048)
 version 2.3.4 (2017-11-02)
 * Checksums: Use addData function to avoid endless loop CPU load issues with Office files
 * Packaging: Require ZLIB
 version 2.3.3 (2017-08-29)
 * Chunking NG: Don't use old chunking on new DAV endpoint (#5855)
@@ -154,7 +80,6 @@ version 2.3.3 (2017-08-29)
 * Overlay Icons: Fix potential hangs on Windows
 * SyncJournalDB: Don't use ._ as filename pattern if that does not work because of SMB storage settings (#5844)
 * SyncJournalDB: Log reason for sqlite3 opening errors
 * Notifications: Proapgate "Dismiss" button action to server (#5922)
 * Switch Linux build also to Qt 5.6.2 (#5470)
 * Stopped maintaining Qt 4 buildability
--- a/51
+++ b/51
@@ -0,0 +1,51 @@
 #!groovy
 //
 // We now run the tests in Debug mode so that ASSERTs are triggered.
 // Ideally we should run the tests in both Debug and Release so we catch
 // all possible error combinations.
 // See also the top comment in syncenginetestutils.h
 //
 node('CLIENT') {
    stage 'Checkout'
        checkout scm
        sh '''git submodule update --init'''
    stage 'Qt5'
        sh '''rm -rf build
 		mkdir build
 		cd build
 		cmake -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 -DWITH_TESTING=1 -DBUILD_WITH_QT4=OFF ..
 		make -j4
 		ctest -V --output-on-failure'''
    stage 'Qt5 - clang'
        sh '''rm -rf build
 		mkdir build
 		cd build
 		cmake -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DWITH_TESTING=1 -DBUILD_WITH_QT4=OFF ..
 		make -j4
 		ctest -V --output-on-failure'''
    stage 'Win32'
 	def win32 = docker.image('guruz/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 .
 		'''
 	}
   // Stage 'macOS' TODO
 }
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -19,4 +19,4 @@ set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-back
 option( WITH_CRASHREPORTER "Build crashreporter" OFF )
 set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
-
+set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # ownCloud Desktop Client
-[![Build Status](https://drone.owncloud.com/api/badges/owncloud/client/status.svg)](https://drone.owncloud.com/owncloud/client)
+[![Build Status](https://jenkins.owncloud.org/buildStatus/icon?job=owncloud-client/client/master)](https://jenkins.owncloud.org/job/owncloud-client/job/client/job/master/)
 ## Introduction
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,11 +1,11 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 4 )
-set( MIRALL_VERSION_PATCH 3 )
+set( MIRALL_VERSION_PATCH 0 )
-set( MIRALL_VERSION_YEAR  2018 )
+set( MIRALL_VERSION_YEAR  2017 )
 set( MIRALL_SOVERSION 0 )
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "rc1") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "alpha1") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 if( NOT DEFINED MIRALL_VERSION_BUILD )
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -11,7 +11,6 @@ else()
  set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()
 find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
 configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
 configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
--- a/admin/osx/create_mac_pkg.sh.cmake
+++ b/admin/osx/create_mac_pkg.sh.cmake
@@ -23,7 +23,7 @@ identity="$3"
 prjfile=$build_path/admin/osx/macosx.pkgproj
 # The name of the installer package
-installer="@APPLICATION_SHORTNAME@-qt@Qt5Core_VERSION@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
+installer="@APPLICATION_SHORTNAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
 installer_file="$installer.pkg"
 installer_file_tar="$installer.pkg.tar"
 installer_file_tar_bz2="$installer.pkg.tar.bz2"
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -22,7 +22,6 @@ import subprocess
 import commands
 import sys
 from glob import glob
 from distutils.version import LooseVersion
 def QueryQMake(attrib):
    return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
@@ -93,8 +92,6 @@ commands.append(['mkdir', '-p', resources_dir])
 plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
 binaries = [i for i in glob(os.path.join(bundle_dir, 'Contents', 'MacOS', "*")) if is_exe(i)];
 qt_version = QueryQMake('QT_VERSION')
 print "Using Qt", qt_version
 fixed_libraries = []
 fixed_frameworks = []
@@ -337,19 +334,9 @@ def FindQtPlugin(name):
 for binary in binaries:
  FixBinary(binary)
 if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
  QT_PLUGINS.append('styles/libqmacstyle.dylib')
 for plugin in QT_PLUGINS:
  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
 if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.10.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
  commands.append(args)
 else:
  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.7.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
  commands.append(args)
 if len(sys.argv) <= 2:
  print 'Will run %d commands:' % len(commands)
  for command in commands:
--- a/admin/win/nsi/l10n/Norwegian.nsh
+++ b/admin/win/nsi/l10n/Norwegian.nsh
@@ -3,7 +3,7 @@ StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Vis versjonsmerknader"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Fant ${APPLICATION_EXECUTABLE}-prosess(er) som må stoppes.$\nVil du at installasjonsprogrammet skal stoppe dem for deg?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Terminerer ${APPLICATION_EXECUTABLE}-prosesser."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Fant ikke prosess som skulle termineres!"
-StrCpy $PageReinstall_NEW_Field_1 "En eldre versjon av ${APPLICATION_NAME} er installert på systemet ditt. Det anbefales at du avinstallerer den versjonen før installering av ny versjon. Velg hva du vil gjøre og klikk Neste for å fortsette."
+StrCpy $PageReinstall_NEW_Field_1 "En eldre versjon av ${APPLICATION_NAME} er installert på systemet ditt. Det anbefales at du avnistallerer den versjonen før installering av ny versjon. Velg hva du vil gjøre og klikk Neste for å fortsette."
 StrCpy $PageReinstall_NEW_Field_2 "Avinstaller før installering"
 StrCpy $PageReinstall_NEW_Field_3 "Ikke avinstaller"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Allerede installert"
--- a/admin/win/nsi/l10n/Spanish.nsh
+++ b/admin/win/nsi/l10n/Spanish.nsh
@@ -1,9 +1,9 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar las notas de la versión"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "El/los proceso(s) ${APPLICATION_EXECUTABLE} debe(n) ser detenido(s).$\n¿Quiere que el instalador lo haga por usted?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "El/los proceso/s ${APPLICATION_EXECUTABLE} debe/n ser detenidos.$\n¿Quiere que el instalador lo haga por usted?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Deteniendo el/los proceso(s) ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Deteniendo el/los proceso/s ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso a finalizar no encontrado!"
-StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} se encuentra instalada en el sistema. Se recomienda desinstalar la versión actual antes de instalar la nueva. Seleccione la operacion deseada y haga click en Siguiente para continuar."
+StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} se encuentra instalada en el sistema. Se recomienda de instalar la versión actual antes de instalar la nueva. Seleccione la operacion deseada y haga click en Siguiente para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "No desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ya está instalado"
@@ -17,13 +17,13 @@ StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Elija la opcion de mantenim
 StrCpy $SEC_APPLICATION_DETAILS "Instalando  ${APPLICATION_NAME} esenciales."
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integración para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando la integración para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo al programa en Menú de Inicio"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo al programa Menú de Inicio"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Añadiendo accesos directos para ${APPLICATION_NAME} en el Menú de Inicio."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo de Escritorio"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando accesos directos de escritorio"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atajo de acceso rápido"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atajo de accceso rápido"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creando un Acceso Directo al Lanzador Rápido"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esenciales."
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esencial."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Acceso Directo de ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Acceso Directo de Escritorio para ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Lanzador Rápido de Accesos Director para ${APPLICATION_NAME}."
--- a/admin/win/nsi/page_header.bmp
+++ b/admin/win/nsi/page_header.bmp
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -27,9 +27,11 @@
        <key>CFBundleShortVersionString</key>
        <string>@MIRALL_VERSION_STRING@</string>
        <key>NSHumanReadableCopyright</key>
-        <string>(C) 2014-2018 @APPLICATION_VENDOR@</string>
+        <string>(C) 2014-2016 @APPLICATION_VENDOR@</string>
        <key>SUShowReleaseNotes</key>
        <false/>
        <key>LSMinimumBundleVersion</key>
        <string>10.7.0</string>
        <key>SUPublicDSAKeyFile</key>
        <string>dsa_pub.pem</string>
 </dict>
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -4,6 +4,7 @@ if(SPHINX_FOUND)
    set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
    # HTML output directory
    set(SPHINX_HTML_DIR     "${CMAKE_CURRENT_BINARY_DIR}/html")
    set(SPHINX_MAN_DIR      "${CMAKE_CURRENT_BINARY_DIR}/man1")
    set(SPHINX_PDF_DIR      "${CMAKE_CURRENT_BINARY_DIR}/latex")
    set(SPHINX_QCH_DIR      "${CMAKE_CURRENT_BINARY_DIR}/qthelp")
    set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp")
@@ -16,6 +17,8 @@ if(SPHINX_FOUND)
    install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
    install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
    install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR} OPTIONAL)
    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
    if(WITH_DOC)
@@ -70,6 +73,11 @@ if(SPHINX_FOUND)
                                -D html_theme=owncloud_com
 				${CMAKE_CURRENT_SOURCE_DIR}
 				${SPHINX_HTML_DIR}/com )
    add_custom_target( doc-man  ${SPHINX_EXECUTABLE}
 	                        -q -c . -b man
 				-d ${SPHINX_CACHE_DIR}/man
 				${CMAKE_CURRENT_SOURCE_DIR}
 				${SPHINX_MAN_DIR} )
    ## Building CHM files requires HTML Help Workshop. Since it requires wine
    ## with special dependencies, it's impossible to write a cmake check for it.
@@ -84,4 +92,4 @@ if(SPHINX_FOUND)
                                       ${SPHINX_HTMLHELP_DIR} )
    add_custom_target( doc-chm pushd ${SPHINX_HTMLHELP_DIR}; ${MSHTML_COMPILER} *.hhp; popd
 				   DEPENDS doc-chm-sphinx )
-endif(SPHINX_FOUND)
+endif(SPHINX_FOUND)
--- a/doc/advancedusage.rst
+++ b/doc/advancedusage.rst
@@ -15,7 +15,7 @@ Configuration File
 .. include:: conffile.rst
 Environment Variables
---------------------
+------------------
 .. index:: env vars
 .. include:: envvars.rst
--- a/doc/conffile.rst
+++ b/doc/conffile.rst
@@ -62,4 +62,4 @@ Some interesting values that can be set on the configuration file are:
 |                                 |               | ``2`` for No Proxy.                                                                                    |
 +                                 +               +--------------------------------------------------------------------------------------------------------+
 |                                 |               | ``3`` for HTTP(S) Proxy.                                                                               |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -1,7 +1,7 @@
 FAQ
 ===
-Some Files Are Continuously Uploaded to the Server, Even When They Are Not Modified.
+Some files are continuously uploaded to the server, even when they are not modified.
 ------------------------------------------------------------------------------------
 It is possible that another program is changing the modification date of the file.
@@ -11,17 +11,15 @@ continually changes all files, unless you remove
 from the windows registry.
 See http://petersteier.wordpress.com/2011/10/22/windows-indexer-changes-modification-dates-of-eml-files/ for more information.
-Syncing Stops When Attempting To Sync Deeper Than 100 Sub-directories.
+Syncing breaks when attempting to sync deeper than 50 sub-directories, but the sync client does not report an error (RC=0)
----------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------------------------------
-The sync client has been intentionally limited to sync no deeper than 100
+The sync client has been intentionally limited to sync no deeper than
-sub-directories. The hard limit exists to guard against bugs with cycles
+fifty sub-directories, to help prevent memory problems. 
-like symbolic link loops.
+Unfortunately, it, *currently*, does not report an error when this occurs. 
-When a deeply nested directory is excluded from synchronization it will be
+However, a UI notification is planned for a future release of ownCloud.
 listed with other ignored files and directories in the "Not synced" tab of
 the "Activity" pane.
-I Want To Move My Local Sync Folder
+I want to move my local sync folder
 -----------------------------------
 The ownCloud desktop client does not provide a way to change the local sync directory. 
@@ -31,20 +29,20 @@ Specifically, you have to:
 1. Remove the existing connection which syncs to the wrong directory
 2. Add a new connection which syncs to the desired directory
-.. figure:: images/setup/ownCloud-remove_existing_connection.png
+.. image:: images/setup/ownCloud-remove_existing_connection.png
   :alt: Remove an existing connection
 To do so, in the client UI, which you can see above, click the "**Account**" drop-down menu and then click "Remove". 
 This will display a "**Confirm Account Removal**" dialog window.
-.. figure:: images/setup/ownCloud-remove_existing_connection_confirmation_dialog.png
+.. image:: images/setup/ownCloud-remove_existing_connection_confirmation_dialog.png
   :alt: Remove existing connection confirmation dialog
 If you're sure, click "**Remove connection**".
 Then, click the Account drop-down menu again, and this time click "**Add new**".
-.. figure:: images/setup/ownCloud-replacement_connection_wizard.png
+.. image:: images/setup/ownCloud-replacement_connection_wizard.png
   :alt: Replacement connection wizard
 This opens the ownCloud Connection Wizard, which you can see above, *but* with an extra option.
--- a/doc/installing.rst
+++ b/doc/installing.rst
@@ -3,7 +3,7 @@ Installing the Desktop Synchronization Client
 =============================================
 You can download the  latest version of the ownCloud Desktop Synchronization 
-Client from the `ownCloud download page`_. 
+Client from the `ownCloud download page <https://owncloud.org/install/>`_. 
 There are clients for Linux, Mac OS X, and Microsoft Windows.
 Installation on Mac OS X and Windows is the same as for any software 
@@ -58,7 +58,3 @@ synchronizing your files.
    Web GUI, and one to open your local ownCloud folder
 Click the Finish button, and you're all done. 
 .. Links
 .. _ownCloud download page: https://owncloud.com/download/#desktop-clients
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -1,14 +0,0 @@
 if(SPHINX_FOUND)
    # Sphinx cache with pickled ReST documents
    set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
    # HTML output directory
    set(SPHINX_MAN_DIR      "${CMAKE_CURRENT_BINARY_DIR}/man1")
    install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR} OPTIONAL)
    add_custom_target( doc-man  ${SPHINX_EXECUTABLE}
       -c ${CMAKE_SOURCE_DIR}/doc -b man
       -d ${SPHINX_CACHE_DIR}/man
       ${CMAKE_CURRENT_SOURCE_DIR}
       ${SPHINX_MAN_DIR} )
 endif(SPHINX_FOUND)
--- a/man/index.rst
+++ b/man/index.rst
@@ -1 +0,0 @@
--- a/man/owncloud.1.rst
+++ b/man/owncloud.1.rst
@@ -1,33 +0,0 @@
 :orphan:
 owncloud(1)
 ————
 SYNOPSIS
 ========
 *owncloud* [`OPTIONS`...]
 DESCRIPTION
 ===========
 The ownCloud Client is a file synchronization desktop utility. It synchronizes files on your local computer, tablet, or handheld device with an ownCloud Server. If you make a change to the files on one device, the change is propagated to all other synchronized devices using the desktop synchronization clients.
 Normally, you start the client by clicking on the desktop icon or by starting it from the client application menu. After starting, an ownCloud icon appears in the computer system tray or on your tablet or handheld device.
 Options
 =======
 .. include:: ../doc/options.rst
 Config File
 ===========
 .. include:: ../doc/conffile.rst
 BUGS
 ====
 Please report bugs at https://github.com/owncloud/client/issues.
 SEE ALSO
 ========
 :manpage:`owncloudcmd(1)`
--- a/man/owncloudcmd.1.rst
+++ b/man/owncloudcmd.1.rst
@@ -1,97 +0,0 @@
 :orphan:
 owncloudcmd(1)
 —————
 SYNOPSIS
 ========
 *owncloudcmd* [`OPTIONS`...] sourcedir owncloudurl
 DESCRIPTION
 ===========
 owncloudcmd is the command line tool used for the ownCloud file synchronization
 desktop utility.
 Contrary to the :manpage:`owncloud(1)` GUI client, `owncloudcmd` only performs
 a single sync run and then exits. In so doing, `owncloudcmd` replaces the
 `ocsync` binary used for the same purpose in earlier releases.
 A *sync run* synchronizes a single local directory using a WebDAV share on a
 remote ownCloud server.
 To invoke the command line client, provide the local and the remote repository:
 The first parameter is the local directory. The second parameter is
 the server URL.
 .. note:: Prior to the 1.6 release of owncloudcmd, the tool only accepted
   ``owncloud://`` or ``ownclouds://`` in place of ``http://`` and ``https://`` as
   a scheme. See ``Examples`` for details.
 OPTIONS
 =======
 ``—user``, ``-u`` ``[user]``
       Use ``user`` as the login name.
 ``—password``, ``-p`` ``[password]``
       Use ``password`` as the password.
 ``-n``
       Use ``netrc (5)`` for login.
 ``—non-interactive``
       Do not prompt for questions.
 ``—silent``, ``—s``
       Inhibits verbose log output.
 ``—trust``
       Trust any SSL certificate, including invalid ones.
 ``—httpproxy  http://[user@pass:]<server>:<port>``
      Uses ``server`` as HTTP proxy.
 ``—nonshib``
      Uses Non Shibboleth WebDAV Authentication
 ``—davpath [path]``
      Overrides the WebDAV Path with ``path``
 ``—exclude [file]``
      Exclude list file
 ``—unsyncedfolders [file]``
      File containing the list of unsynced folders (selective sync)
 ``—max-sync-retries [n]``
      Retries maximum n times (defaults to 3)
 ``-h``
      Sync hidden files,do not ignore them
 Example
 =======
 To synchronize the ownCloud directory ``Music`` to the local directory ``media/music``
 through a proxy listening on port ``8080`` on the gateway machine ``192.168.178.1``,
 the command line would be::
  $ owncloudcmd —httpproxy http://192.168.178.1:8080 \
                $HOME/media/music \
                https://server/owncloud/remote.php/webdav/Music
 ``owncloudcmd`` will enquire user name and password, unless they have
 been specified on the command line or ``-n`` (see `netrc(5)`) has been passed.
 Using the legacy scheme, it would be::
  $ owncloudcmd —httpproxy http://192.168.178.1:8080 \
                $HOME/media/music \
                ownclouds://server/owncloud/remote.php/webdav/Music
 BUGS
 ====
 Please report bugs at https://github.com/owncloud/client/issues.
 SEE ALSO
 ========
 :manpage:`owncloud(1)`
--- a/mirall.desktop.in
+++ b/mirall.desktop.in
@@ -8,185 +8,6 @@ GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # 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
@@ -445,11 +266,6 @@ Icon[it]=@APPLICATION_EXECUTABLE@
 Comment[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
 GenericName[ko]=폴더 동기화
 Name[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
 Icon[ko]=@APPLICATION_EXECUTABLE@
 Comment[lo]=@APPLICATION_NAME@ ການປະສານຂໍ້ມູນຄອມພິວເຕີລູກຂ່າຍ
 GenericName[lo]=ໂຟນເດີຊິງ
 Name[lo]=@APPLICATION_NAME@ ຊິງຄອມພິວເຕີລູກຂ່າຍ 
 Icon[lo]=@APPLICATION_EXECUTABLE@
 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
--- a/shell_integration/nautilus/syncstate.py
+++ b/shell_integration/nautilus/syncstate.py
@@ -15,13 +15,8 @@
 # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
 # for more details.
 import sys
 python3 = sys.version_info[0] >= 3
 import os
 import urllib
 if python3:
    import urllib.parse
 import socket
 import tempfile
@@ -34,15 +29,12 @@ from gi.repository import GObject, Nautilus
 appname = 'ownCloud'
 print("Initializing "+appname+"-client-nautilus extension")
-print("Using python version {}".format(sys.version_info))
+
 def get_local_path(url):
    if url[0:7] == 'file://':
        url = url[7:]
-    if python3:
+    return urllib.unquote(url)
        return urllib.parse.unquote(url)
    else:
        return urllib.unquote(url).decode('utf-8')
 def get_runtime_dir():
    """Returns the value of $XDG_RUNTIME_DIR, a directory path.
@@ -64,7 +56,7 @@ class SocketConnect(GObject.GObject):
        self._watch_id = 0
        self._sock = None
        self._listeners = [self._update_registered_paths]
-        self._remainder = ''.encode('utf-8')
+        self._remainder = ''
        self.nautilusVFSFile_table = {}  # not needed in this object actually but shared 
                                         # all over the other objects.
@@ -82,7 +74,7 @@ class SocketConnect(GObject.GObject):
        # print("Server command: " + cmd)
        if self.connected:
            try:
-                self._sock.send(cmd.encode('utf-8'))
+                self._sock.send(cmd)
            except:
                print("Sending failed.")
                self.reconnect()
@@ -97,15 +89,18 @@ class SocketConnect(GObject.GObject):
            self._sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
            sock_file = os.path.join(get_runtime_dir(), appname, "socket")
            try:
                print("Socket File: " + sock_file)
                self._sock.connect(sock_file) # fails if sock_file doesn't exist
                self.connected = True
                print("Setting connected to %r." % self.connected )
                self._watch_id = GObject.io_add_watch(self._sock, GObject.IO_IN, self._handle_notify)
                print("Socket watch id: " + str(self._watch_id))
                self.sendCommand('GET_STRINGS:\n')
                return False  # Don't run again
            except Exception as e:
-                print("Could not connect to unix socket " + sock_file + ". " + str(e))
+                print("Could not connect to unix socket. " + str(e))
        except Exception as e:  # Bad habbit
            print("Connect could not be established, try again later.")
            self._sock.close()
@@ -118,24 +113,24 @@ class SocketConnect(GObject.GObject):
        # Prepend the remaining data from last call
        if len(self._remainder) > 0:
            data = self._remainder + data
-            self._remainder = ''.encode('utf-8')
+            self._remainder = ''
        if len(data) > 0:
            # Remember the remainder for next round
-            lastNL = data.rfind('\n'.encode('utf-8'));
+            lastNL = data.rfind('\n');
            if lastNL > -1 and lastNL < len(data):
                self._remainder = data[lastNL+1:]
                data = data[:lastNL]
-            for l in data.split('\n'.encode('utf-8')):
+            for l in data.split('\n'):
-                self._handle_server_response(l.decode('utf-8'))
+                self._handle_server_response(l)
        else:
            return False
        return True  # Run again
    def _handle_server_response(self, line):
-        # print("Server response: " + line)
+        print("Server response: " + line)
        parts = line.split(':')
        action = parts[0]
        args = parts[1:]
@@ -214,8 +209,8 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
        # and we definitely don't want to show them for IGNORED.
        shareable = False
        state = entry['state']
-        state_ok = state and state.startswith('OK')
+        state_ok = state.startswith('OK')
-        state_sync = state and state.startswith('SYNC')
+        state_sync = state.startswith('SYNC')
        if state_ok:
            shareable = True
        elif state_sync and isDir:
@@ -262,11 +257,11 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
    def context_menu_action(self, menu, action, file):
        filename = get_local_path(file.get_uri())
-        # print("Context menu: " + action + ' ' + filename)
+        print("Context menu: " + action + ' ' + filename)
        socketConnect.sendCommand(action + ":" + filename + "\n")
-class SyncStateExtension(GObject.GObject, Nautilus.InfoProvider):
+class SyncStateExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoProvider):
    def __init__(self):
        GObject.GObject.__init__(self)
--- a/src/3rdparty/sqlite3/sqlite3.c
+++ b/src/3rdparty/sqlite3/sqlite3.c
--- a/src/3rdparty/sqlite3/sqlite3.h
+++ b/src/3rdparty/sqlite3/sqlite3.h
@@ -115,17 +115,15 @@ extern "C" {
 ** a string which identifies a particular check-in of SQLite
 ** within its configuration management system.  ^The SQLITE_SOURCE_ID
 ** string contains the date and time of the check-in (UTC) and a SHA1
-** or SHA3-256 hash of the entire source tree.  If the source code has
+** or SHA3-256 hash of the entire source tree.
 ** been edited in any way since it was last checked in, then the last
 ** four hexadecimal digits of the hash may be modified.
 **
 ** See also: [sqlite3_libversion()],
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.21.0"
+#define SQLITE_VERSION        "3.20.1"
-#define SQLITE_VERSION_NUMBER 3021000
+#define SQLITE_VERSION_NUMBER 3020001
-#define SQLITE_SOURCE_ID      "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de48827"
+#define SQLITE_SOURCE_ID      "2017-08-24 16:21:36 8d3a7ea6c5690d6b7c3767558f4f01b511c55463e3f9e64506801fe9b74dce34"
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -141,7 +139,7 @@ extern "C" {
 **
 ** <blockquote><pre>
 ** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
-** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
+** assert( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)==0 );
 ** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
 ** </pre></blockquote>)^
 **
@@ -151,11 +149,9 @@ extern "C" {
 ** function is provided for use in DLLs since DLL users usually do not have
 ** direct access to string constants within the DLL.  ^The
 ** sqlite3_libversion_number() function returns an integer equal to
-** [SQLITE_VERSION_NUMBER].  ^(The sqlite3_sourceid() function returns 
+** [SQLITE_VERSION_NUMBER].  ^The sqlite3_sourceid() function returns 
 ** a pointer to a string constant whose value is the same as the 
-** [SQLITE_SOURCE_ID] C preprocessor macro.  Except if SQLite is built
+** [SQLITE_SOURCE_ID] C preprocessor macro.
 ** using an edited copy of [the amalgamation], then the last four characters
 ** of the hash might be different from [SQLITE_SOURCE_ID].)^
 **
 ** See also: [sqlite_version()] and [sqlite_source_id()].
 */
@@ -436,7 +432,7 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_FULL        13   /* Insertion failed because database is full */
 #define SQLITE_CANTOPEN    14   /* Unable to open the database file */
 #define SQLITE_PROTOCOL    15   /* Database lock protocol error */
-#define SQLITE_EMPTY       16   /* Internal use only */
+#define SQLITE_EMPTY       16   /* Not used */
 #define SQLITE_SCHEMA      17   /* The database schema changed */
 #define SQLITE_TOOBIG      18   /* String or BLOB exceeds size limit */
 #define SQLITE_CONSTRAINT  19   /* Abort due to constraint violation */
@@ -498,9 +494,6 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_IOERR_CONVPATH          (SQLITE_IOERR | (26<<8))
 #define SQLITE_IOERR_VNODE             (SQLITE_IOERR | (27<<8))
 #define SQLITE_IOERR_AUTH              (SQLITE_IOERR | (28<<8))
 #define SQLITE_IOERR_BEGIN_ATOMIC      (SQLITE_IOERR | (29<<8))
 #define SQLITE_IOERR_COMMIT_ATOMIC     (SQLITE_IOERR | (30<<8))
 #define SQLITE_IOERR_ROLLBACK_ATOMIC   (SQLITE_IOERR | (31<<8))
 #define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
 #define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
 #define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
@@ -587,11 +580,6 @@ SQLITE_API int sqlite3_exec(
 ** SQLITE_IOCAP_IMMUTABLE flag indicates that the file is on
 ** read-only media and cannot be changed even by processes with
 ** elevated privileges.
 **
 ** The SQLITE_IOCAP_BATCH_ATOMIC property means that the underlying
 ** filesystem supports doing multiple write operations atomically when those
 ** write operations are bracketed by [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] and
 ** [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].
 */
 #define SQLITE_IOCAP_ATOMIC                 0x00000001
 #define SQLITE_IOCAP_ATOMIC512              0x00000002
@@ -607,7 +595,6 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN  0x00000800
 #define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
 #define SQLITE_IOCAP_IMMUTABLE              0x00002000
 #define SQLITE_IOCAP_BATCH_ATOMIC           0x00004000
 /*
 ** CAPI3REF: File Locking Levels
@@ -742,7 +729,6 @@ struct sqlite3_file {
 ** <li> [SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN]
 ** <li> [SQLITE_IOCAP_POWERSAFE_OVERWRITE]
 ** <li> [SQLITE_IOCAP_IMMUTABLE]
 ** <li> [SQLITE_IOCAP_BATCH_ATOMIC]
 ** </ul>
 **
 ** The SQLITE_IOCAP_ATOMIC property means that all writes of
@@ -1026,40 +1012,6 @@ struct sqlite3_io_methods {
 ** The [SQLITE_FCNTL_RBU] opcode is implemented by the special VFS used by
 ** the RBU extension only.  All other VFS should return SQLITE_NOTFOUND for
 ** this opcode.  
 **
 ** <li>[[SQLITE_FCNTL_BEGIN_ATOMIC_WRITE]]
 ** If the [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] opcode returns SQLITE_OK, then
 ** the file descriptor is placed in "batch write mode", which
 ** means all subsequent write operations will be deferred and done
 ** atomically at the next [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].  Systems
 ** that do not support batch atomic writes will return SQLITE_NOTFOUND.
 ** ^Following a successful SQLITE_FCNTL_BEGIN_ATOMIC_WRITE and prior to
 ** the closing [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] or
 ** [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE], SQLite will make
 ** no VFS interface calls on the same [sqlite3_file] file descriptor
 ** except for calls to the xWrite method and the xFileControl method
 ** with [SQLITE_FCNTL_SIZE_HINT].
 **
 ** <li>[[SQLITE_FCNTL_COMMIT_ATOMIC_WRITE]]
 ** The [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] opcode causes all write
 ** operations since the previous successful call to 
 ** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be performed atomically.
 ** This file control returns [SQLITE_OK] if and only if the writes were
 ** all performed successfully and have been committed to persistent storage.
 ** ^Regardless of whether or not it is successful, this file control takes
 ** the file descriptor out of batch write mode so that all subsequent
 ** write operations are independent.
 ** ^SQLite will never invoke SQLITE_FCNTL_COMMIT_ATOMIC_WRITE without
 ** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
 **
 ** <li>[[SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE]]
 ** The [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE] opcode causes all write
 ** operations since the previous successful call to 
 ** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be rolled back.
 ** ^This file control takes the file descriptor out of batch write mode
 ** so that all subsequent write operations are independent.
 ** ^SQLite will never invoke SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE without
 ** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
 ** </ul>
 */
 #define SQLITE_FCNTL_LOCKSTATE               1
@@ -1091,9 +1043,6 @@ struct sqlite3_io_methods {
 #define SQLITE_FCNTL_JOURNAL_POINTER        28
 #define SQLITE_FCNTL_WIN32_GET_HANDLE       29
 #define SQLITE_FCNTL_PDB                    30
 #define SQLITE_FCNTL_BEGIN_ATOMIC_WRITE     31
 #define SQLITE_FCNTL_COMMIT_ATOMIC_WRITE    32
 #define SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE  33
 /* deprecated names */
 #define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
@@ -1664,16 +1613,6 @@ struct sqlite3_mem_methods {
 ** routines with a wrapper that simulations memory allocation failure or
 ** tracks memory usage, for example. </dd>
 **
 ** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
 ** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes single argument of
 ** type int, interpreted as a boolean, which if true provides a hint to
 ** SQLite that it should avoid large memory allocations if possible.
 ** SQLite will run faster if it is free to make large memory allocations,
 ** but some application might prefer to run slower in exchange for
 ** guarantees about memory fragmentation that are possible if large
 ** allocations are avoided.  This hint is normally off.
 ** </dd>
 **
 ** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
 ** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
 ** interpreted as a boolean, which enables or disables the collection of
@@ -1691,7 +1630,25 @@ struct sqlite3_mem_methods {
 ** </dd>
 **
 ** [[SQLITE_CONFIG_SCRATCH]] <dt>SQLITE_CONFIG_SCRATCH</dt>
-** <dd> The SQLITE_CONFIG_SCRATCH option is no longer used.
+** <dd> ^The SQLITE_CONFIG_SCRATCH option specifies a static memory buffer
 ** that SQLite can use for scratch memory.  ^(There are three arguments
 ** to SQLITE_CONFIG_SCRATCH:  A pointer an 8-byte
 ** aligned memory buffer from which the scratch allocations will be
 ** drawn, the size of each scratch allocation (sz),
 ** and the maximum number of scratch allocations (N).)^
 ** The first argument must be a pointer to an 8-byte aligned buffer
 ** of at least sz*N bytes of memory.
 ** ^SQLite will not use more than one scratch buffers per thread.
 ** ^SQLite will never request a scratch buffer that is more than 6
 ** times the database page size.
 ** ^If SQLite needs needs additional
 ** scratch memory beyond what is provided by this configuration option, then 
 ** [sqlite3_malloc()] will be used to obtain the memory needed.<p>
 ** ^When the application provides any amount of scratch memory using
 ** SQLITE_CONFIG_SCRATCH, SQLite avoids unnecessary large
 ** [sqlite3_malloc|heap allocations].
 ** This can help [Robson proof|prevent memory allocation failures] due to heap
 ** fragmentation in low-memory embedded systems.
 ** </dd>
 **
 ** [[SQLITE_CONFIG_PAGECACHE]] <dt>SQLITE_CONFIG_PAGECACHE</dt>
@@ -1727,7 +1684,8 @@ struct sqlite3_mem_methods {
 ** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
 ** <dd> ^The SQLITE_CONFIG_HEAP option specifies a static memory buffer 
 ** that SQLite will use for all of its dynamic memory allocation needs
-** beyond those provided for by [SQLITE_CONFIG_PAGECACHE].
+** beyond those provided for by [SQLITE_CONFIG_SCRATCH] and
 ** [SQLITE_CONFIG_PAGECACHE].
 ** ^The SQLITE_CONFIG_HEAP option is only available if SQLite is compiled
 ** with either [SQLITE_ENABLE_MEMSYS3] or [SQLITE_ENABLE_MEMSYS5] and returns
 ** [SQLITE_ERROR] if invoked otherwise.
@@ -1920,7 +1878,7 @@ struct sqlite3_mem_methods {
 #define SQLITE_CONFIG_SERIALIZED    3  /* nil */
 #define SQLITE_CONFIG_MALLOC        4  /* sqlite3_mem_methods* */
 #define SQLITE_CONFIG_GETMALLOC     5  /* sqlite3_mem_methods* */
-#define SQLITE_CONFIG_SCRATCH       6  /* No longer used */
+#define SQLITE_CONFIG_SCRATCH       6  /* void*, int sz, int N */
 #define SQLITE_CONFIG_PAGECACHE     7  /* void*, int sz, int N */
 #define SQLITE_CONFIG_HEAP          8  /* void*, int nByte, int min */
 #define SQLITE_CONFIG_MEMSTATUS     9  /* boolean */
@@ -1941,7 +1899,6 @@ struct sqlite3_mem_methods {
 #define SQLITE_CONFIG_PCACHE_HDRSZ        24  /* int *psz */
 #define SQLITE_CONFIG_PMASZ               25  /* unsigned int szPma */
 #define SQLITE_CONFIG_STMTJRNL_SPILL      26  /* int nByte */
 #define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
 /*
 ** CAPI3REF: Database Connection Configuration Options
@@ -3142,10 +3099,10 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 ** ^If [URI filename] interpretation is enabled, and the filename argument
 ** begins with "file:", then the filename is interpreted as a URI. ^URI
 ** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
-** set in the third argument to sqlite3_open_v2(), or if it has
+** set in the fourth argument to sqlite3_open_v2(), or if it has
 ** been enabled globally using the [SQLITE_CONFIG_URI] option with the
 ** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
-** URI filename interpretation is turned off
+** As of SQLite version 3.7.7, URI filename interpretation is turned off
 ** by default, but future releases of SQLite might enable URI filename
 ** interpretation by default.  See "[URI filenames]" for additional
 ** information.
@@ -3819,9 +3776,8 @@ SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
 ** implementation of [application-defined SQL functions] are protected.
 ** ^The sqlite3_value object returned by
 ** [sqlite3_column_value()] is unprotected.
-** Unprotected sqlite3_value objects may only be used as arguments
+** Unprotected sqlite3_value objects may only be used with
-** to [sqlite3_result_value()], [sqlite3_bind_value()], and
+** [sqlite3_result_value()] and [sqlite3_bind_value()].
 ** [sqlite3_value_dup()].
 ** The [sqlite3_value_blob | sqlite3_value_type()] family of
 ** interfaces require protected sqlite3_value objects.
 */
@@ -4243,7 +4199,7 @@ SQLITE_API const void *sqlite3_column_decltype16(sqlite3_stmt*,int);
 ** other than [SQLITE_ROW] before any subsequent invocation of
 ** sqlite3_step().  Failure to reset the prepared statement using 
 ** [sqlite3_reset()] would result in an [SQLITE_MISUSE] return from
-** sqlite3_step().  But after [version 3.6.23.1] ([dateof:3.6.23.1],
+** sqlite3_step().  But after [version 3.6.23.1] ([dateof:3.6.23.1]),
 ** sqlite3_step() began
 ** calling [sqlite3_reset()] automatically in this circumstance rather
 ** than returning [SQLITE_MISUSE].  This is not considered a compatibility
@@ -6247,20 +6203,15 @@ struct sqlite3_index_info {
 ** an operator that is part of a constraint term in the wHERE clause of
 ** a query that uses a [virtual table].
 */
-#define SQLITE_INDEX_CONSTRAINT_EQ         2
+#define SQLITE_INDEX_CONSTRAINT_EQ      2
-#define SQLITE_INDEX_CONSTRAINT_GT         4
+#define SQLITE_INDEX_CONSTRAINT_GT      4
-#define SQLITE_INDEX_CONSTRAINT_LE         8
+#define SQLITE_INDEX_CONSTRAINT_LE      8
-#define SQLITE_INDEX_CONSTRAINT_LT        16
+#define SQLITE_INDEX_CONSTRAINT_LT     16
-#define SQLITE_INDEX_CONSTRAINT_GE        32
+#define SQLITE_INDEX_CONSTRAINT_GE     32
-#define SQLITE_INDEX_CONSTRAINT_MATCH     64
+#define SQLITE_INDEX_CONSTRAINT_MATCH  64
-#define SQLITE_INDEX_CONSTRAINT_LIKE      65
+#define SQLITE_INDEX_CONSTRAINT_LIKE   65
-#define SQLITE_INDEX_CONSTRAINT_GLOB      66
+#define SQLITE_INDEX_CONSTRAINT_GLOB   66
-#define SQLITE_INDEX_CONSTRAINT_REGEXP    67
+#define SQLITE_INDEX_CONSTRAINT_REGEXP 67
 #define SQLITE_INDEX_CONSTRAINT_NE        68
 #define SQLITE_INDEX_CONSTRAINT_ISNOT     69
 #define SQLITE_INDEX_CONSTRAINT_ISNOTNULL 70
 #define SQLITE_INDEX_CONSTRAINT_ISNULL    71
 #define SQLITE_INDEX_CONSTRAINT_IS        72
 /*
 ** CAPI3REF: Register A Virtual Table Implementation
@@ -7012,7 +6963,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_RESERVE                 14
 #define SQLITE_TESTCTRL_OPTIMIZATIONS           15
 #define SQLITE_TESTCTRL_ISKEYWORD               16
-#define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
+#define SQLITE_TESTCTRL_SCRATCHMALLOC           17
 #define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
 #define SQLITE_TESTCTRL_EXPLAIN_STMT            19  /* NOT USED */
 #define SQLITE_TESTCTRL_ONCE_RESET_THRESHOLD    19
@@ -7071,7 +7022,8 @@ SQLITE_API int sqlite3_status64(
 ** <dd>This parameter is the current amount of memory checked out
 ** using [sqlite3_malloc()], either directly or indirectly.  The
 ** figure includes calls made to [sqlite3_malloc()] by the application
-** and internal memory usage by the SQLite library.  Auxiliary page-cache
+** and internal memory usage by the SQLite library.  Scratch memory
 ** controlled by [SQLITE_CONFIG_SCRATCH] and auxiliary page-cache
 ** memory controlled by [SQLITE_CONFIG_PAGECACHE] is not included in
 ** this parameter.  The amount returned is the sum of the allocation
 ** sizes as reported by the xSize method in [sqlite3_mem_methods].</dd>)^
@@ -7109,14 +7061,29 @@ SQLITE_API int sqlite3_status64(
 ** *pHighwater parameter to [sqlite3_status()] is of interest.  
 ** The value written into the *pCurrent parameter is undefined.</dd>)^
 **
-** [[SQLITE_STATUS_SCRATCH_USED]] <dt>SQLITE_STATUS_SCRATCH_USED</dt>
+** [[SQLITE_STATUS_SCRATCH_USED]] ^(<dt>SQLITE_STATUS_SCRATCH_USED</dt>
-** <dd>No longer used.</dd>
+** <dd>This parameter returns the number of allocations used out of the
 ** [scratch memory allocator] configured using
 ** [SQLITE_CONFIG_SCRATCH].  The value returned is in allocations, not
 ** in bytes.  Since a single thread may only have one scratch allocation
 ** outstanding at time, this parameter also reports the number of threads
 ** using scratch memory at the same time.</dd>)^
 **
 ** [[SQLITE_STATUS_SCRATCH_OVERFLOW]] ^(<dt>SQLITE_STATUS_SCRATCH_OVERFLOW</dt>
-** <dd>No longer used.</dd>
+** <dd>This parameter returns the number of bytes of scratch memory
 ** allocation which could not be satisfied by the [SQLITE_CONFIG_SCRATCH]
 ** buffer and where forced to overflow to [sqlite3_malloc()].  The values
 ** returned include overflows because the requested allocation was too
 ** larger (that is, because the requested allocation was larger than the
 ** "sz" parameter to [SQLITE_CONFIG_SCRATCH]) and because no scratch buffer
 ** slots were available.
 ** </dd>)^
 **
-** [[SQLITE_STATUS_SCRATCH_SIZE]] <dt>SQLITE_STATUS_SCRATCH_SIZE</dt>
+** [[SQLITE_STATUS_SCRATCH_SIZE]] ^(<dt>SQLITE_STATUS_SCRATCH_SIZE</dt>
-** <dd>No longer used.</dd>
+** <dd>This parameter records the largest memory allocation request
 ** handed to [scratch memory allocator].  Only the value returned in the
 ** *pHighwater parameter to [sqlite3_status()] is of interest.  
 ** The value written into the *pCurrent parameter is undefined.</dd>)^
 **
 ** [[SQLITE_STATUS_PARSER_STACK]] ^(<dt>SQLITE_STATUS_PARSER_STACK</dt>
 ** <dd>The *pHighwater parameter records the deepest parser stack. 
@@ -7129,12 +7096,12 @@ SQLITE_API int sqlite3_status64(
 #define SQLITE_STATUS_MEMORY_USED          0
 #define SQLITE_STATUS_PAGECACHE_USED       1
 #define SQLITE_STATUS_PAGECACHE_OVERFLOW   2
-#define SQLITE_STATUS_SCRATCH_USED         3  /* NOT USED */
+#define SQLITE_STATUS_SCRATCH_USED         3
-#define SQLITE_STATUS_SCRATCH_OVERFLOW     4  /* NOT USED */
+#define SQLITE_STATUS_SCRATCH_OVERFLOW     4
 #define SQLITE_STATUS_MALLOC_SIZE          5
 #define SQLITE_STATUS_PARSER_STACK         6
 #define SQLITE_STATUS_PAGECACHE_SIZE       7
-#define SQLITE_STATUS_SCRATCH_SIZE         8  /* NOT USED */
+#define SQLITE_STATUS_SCRATCH_SIZE         8
 #define SQLITE_STATUS_MALLOC_COUNT         9
 /*
@@ -9231,8 +9198,8 @@ SQLITE_API int sqlite3session_diff(
 */
 SQLITE_API int sqlite3session_patchset(
  sqlite3_session *pSession,      /* Session object */
-  int *pnPatchset,                /* OUT: Size of buffer at *ppPatchset */
+  int *pnPatchset,                /* OUT: Size of buffer at *ppChangeset */
-  void **ppPatchset               /* OUT: Buffer containing patchset */
+  void **ppPatchset               /* OUT: Buffer containing changeset */
 );
 /*
@@ -9999,12 +9966,12 @@ SQLITE_API int sqlite3changeset_apply(
 **
 ** <table border=1 style="margin-left:8ex;margin-right:8ex">
 **   <tr><th>Streaming function<th>Non-streaming equivalent</th>
-**   <tr><td>sqlite3changeset_apply_strm<td>[sqlite3changeset_apply] 
+**   <tr><td>sqlite3changeset_apply_str<td>[sqlite3changeset_apply] 
-**   <tr><td>sqlite3changeset_concat_strm<td>[sqlite3changeset_concat] 
+**   <tr><td>sqlite3changeset_concat_str<td>[sqlite3changeset_concat] 
-**   <tr><td>sqlite3changeset_invert_strm<td>[sqlite3changeset_invert] 
+**   <tr><td>sqlite3changeset_invert_str<td>[sqlite3changeset_invert] 
-**   <tr><td>sqlite3changeset_start_strm<td>[sqlite3changeset_start] 
+**   <tr><td>sqlite3changeset_start_str<td>[sqlite3changeset_start] 
-**   <tr><td>sqlite3session_changeset_strm<td>[sqlite3session_changeset] 
+**   <tr><td>sqlite3session_changeset_str<td>[sqlite3session_changeset] 
-**   <tr><td>sqlite3session_patchset_strm<td>[sqlite3session_patchset] 
+**   <tr><td>sqlite3session_patchset_str<td>[sqlite3session_patchset] 
 ** </table>
 **
 ** Non-streaming functions that accept changesets (or patchsets) as input
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,29 +8,20 @@ if(NOT TOKEN_AUTH_ONLY)
    find_package(Qt5Keychain REQUIRED)
 endif()
-if(NOT WIN32)
+if(WIN32)
-  if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "^(alpha|parisc|hppa)"))
+  # Enable DEP & ASLR
-    if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9))
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector --param=ssp-buffer-size=4")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector --param=ssp-buffer-size=4")
+elseif(UNIX AND NOT APPLE)
-    else()
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong")
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
    endif()
  endif()
  string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
  if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
  endif()
 endif()
 if(WIN32)
  # Enable DEP & ASLR
  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
 elseif(UNIX AND NOT APPLE)
  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now")
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now")
 endif()
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -20,14 +20,13 @@ include_directories(${CMAKE_SOURCE_DIR}/src/csync
 include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer)
 if(UNIX AND NOT APPLE)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pie -fPIE")
  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 endif()
 if(NOT BUILD_LIBRARIES_ONLY)
   add_executable(${cmd_NAME}  ${cmd_SRC})
-	qt5_use_modules(${cmd_NAME} Network )
+	qt5_use_modules(${cmd_NAME} Network Sql)
 	set_target_properties(${cmd_NAME} PROPERTIES
 	        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
        set_target_properties(${cmd_NAME} PROPERTIES
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -39,7 +39,6 @@
 #include "theme.h"
 #include "netrcparser.h"
 #include "libsync/logger.h"
 #include "config.h"
@@ -190,7 +189,7 @@ void help()
    std::cout << "  --downlimit [n]        Limit the download speed of files to n KB/s" << std::endl;
    std::cout << "  -h                     Sync hidden files,do not ignore them" << std::endl;
    std::cout << "  --version, -v          Display version and exit" << std::endl;
-    std::cout << "  --logdebug             More verbose logging" << std::endl;
+    std::cout << "  --debug                More verbose logging" << std::endl;
    std::cout << "" << std::endl;
    exit(0);
 }
@@ -268,9 +267,6 @@ void parseOptions(const QStringList &app_args, CmdOptions *options)
            options->uplimit = it.next().toInt() * 1000;
        } else if (option == "--downlimit" && !it.peekNext().startsWith("-")) {
            options->downlimit = it.next().toInt() * 1000;
        } else if (option == "--logdebug") {
            Logger::instance()->setLogFile("-");
            Logger::instance()->setLogDebug(true);
        } else {
            help();
        }
@@ -334,8 +330,6 @@ int main(int argc, char **argv)
    csync_set_log_level(options.silent ? 1 : 11);
    if (options.silent) {
        qInstallMsgHandler(nullMessageHandler);
    } else {
        qSetMessagePattern("%{time MM-dd hh:mm:ss:zzz} [ %{type} %{category} ]%{if-debug}\t[ %{function} ]%{endif}:\t%{message}");
    }
    AccountPtr account = Account::create();
@@ -420,6 +414,46 @@ int main(int argc, char **argv)
        folder.chop(1);
    }
    SimpleSslErrorHandler *sslErrorHandler = new SimpleSslErrorHandler;
    HttpCredentialsText *cred = new HttpCredentialsText(user, password);
    if (options.trustSSL) {
        cred->setSSLTrusted(true);
    }
    account->setUrl(url);
    account->setCredentials(cred);
    account->setSslErrorHandler(sslErrorHandler);
    //obtain capabilities using event loop
    QEventLoop loop;
    JsonApiJob *job = new JsonApiJob(account, QLatin1String("ocs/v1.php/cloud/capabilities"));
    job->setTimeout(timeoutToUseMsec);
    QObject::connect(job, &JsonApiJob::jsonReceived, [&](const QJsonDocument &json) {
        auto caps = json.object().value("ocs").toObject().value("data").toObject().value("capabilities").toObject();
        qDebug() << "Server capabilities" << caps;
        account->setCapabilities(caps.toVariantMap());
        loop.quit();
    });
    job->start();
    loop.exec();
    if (job->reply()->error() != QNetworkReply::NoError){
        std::cout<<"Error connecting to server\n";
        return EXIT_FAILURE;
    }
    // much lower age than the default since this utility is usually made to be run right after a change in the tests
    SyncEngine::minimumFileAgeForUpload = 0;
    int restartCount = 0;
 restart_sync:
    opts = &options;
    if (!options.proxy.isNull()) {
        QString host;
        int port = 0;
@@ -437,58 +471,16 @@ int main(int argc, char **argv)
            QNetworkProxyFactory::setUseSystemConfiguration(false);
            QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy, host, port));
        } else {
            qFatal("Could not read httpproxy. The proxy should have the format \"http://hostname:port\".");
        }
    } else {
        clientProxy.setupQtProxyFromConfig();
-    }
+        QString url(options.target_url);
-
+        if (url.startsWith("owncloud")) {
-    SimpleSslErrorHandler *sslErrorHandler = new SimpleSslErrorHandler;
+            url.remove(0, 8);
-
+            url = QString("http%1").arg(url);
    HttpCredentialsText *cred = new HttpCredentialsText(user, password);
    if (options.trustSSL) {
        cred->setSSLTrusted(true);
    }
    account->setUrl(url);
    account->setCredentials(cred);
    account->setSslErrorHandler(sslErrorHandler);
    // Perform a call to get the capabilities.
    if (!options.nonShib) {
        // Do not do it if '--nonshib' was passed. This mean we should only connect to the 'nonshib'
        // dav endpoint. Since we do not get the capabilities, in that case, this has the additional
        // side effect that chunking-ng will be disabled. (because otherwise it would use the new
        // 'dav' endpoint instead of the nonshib one (which still use the old chunking)
        QEventLoop loop;
        JsonApiJob *job = new JsonApiJob(account, QLatin1String("ocs/v1.php/cloud/capabilities"));
        job->setTimeout(timeoutToUseMsec);
        QObject::connect(job, &JsonApiJob::jsonReceived, [&](const QJsonDocument &json) {
            auto caps = json.object().value("ocs").toObject().value("data").toObject().value("capabilities").toObject();
            qDebug() << "Server capabilities" << caps;
            account->setCapabilities(caps.toVariantMap());
            loop.quit();
        });
        job->start();
        loop.exec();
        if (job->reply()->error() != QNetworkReply::NoError){
            std::cout<<"Error connecting to server\n";
            return EXIT_FAILURE;
        }
    }
    // much lower age than the default since this utility is usually made to be run right after a change in the tests
    SyncEngine::minimumFileAgeForUpload = 0;
    int restartCount = 0;
 restart_sync:
    opts = &options;
    QStringList selectiveSyncList;
    if (!options.unsyncedfolders.isEmpty()) {
        QFile f(options.unsyncedfolders);
--- a/src/common/checksums.cpp
+++ b/src/common/checksums.cpp
@@ -90,21 +90,6 @@ QByteArray makeChecksumHeader(const QByteArray &checksumType, const QByteArray &
    return header;
 }
 QByteArray findBestChecksum(const QByteArray &checksums)
 {
    int i = 0;
    // The order of the searches here defines the preference ordering.
    if (-1 != (i = checksums.indexOf("SHA1:"))
        || -1 != (i = checksums.indexOf("MD5:"))
        || -1 != (i = checksums.indexOf("Adler32:"))) {
        // Now i is the start of the best checksum
        // Grab it until the next space or end of string.
        auto checksum = checksums.mid(i);
        return checksum.mid(0, checksum.indexOf(" "));
    }
    return QByteArray();
 }
 bool parseChecksumHeader(const QByteArray &header, QByteArray *type, QByteArray *checksum)
 {
    if (header.isEmpty()) {
@@ -135,7 +120,7 @@ QByteArray parseChecksumHeaderType(const QByteArray &header)
 bool uploadChecksumEnabled()
 {
-    static bool enabled = qEnvironmentVariableIsEmpty("OWNCLOUD_DISABLE_CHECKSUM_UPLOAD");
+    static bool enabled = qgetenv("OWNCLOUD_DISABLE_CHECKSUM_UPLOAD").isEmpty();
    return enabled;
 }
@@ -148,12 +133,6 @@ QByteArray contentChecksumType()
    return type;
 }
 static bool checksumComputationEnabled()
 {
    static bool enabled = qgetenv("OWNCLOUD_DISABLE_CHECKSUM_COMPUTATIONS").isEmpty();
    return enabled;
 }
 ComputeChecksum::ComputeChecksum(QObject *parent)
    : QObject(parent)
 {
@@ -171,8 +150,6 @@ QByteArray ComputeChecksum::checksumType() const
 void ComputeChecksum::start(const QString &filePath)
 {
    qCInfo(lcChecksums) << "Computing" << checksumType() << "checksum of" << filePath << "in a thread";
    // Calculate the checksum in a different thread first.
    connect(&_watcher, &QFutureWatcherBase::finished,
        this, &ComputeChecksum::slotCalculationDone,
@@ -182,11 +159,6 @@ void ComputeChecksum::start(const QString &filePath)
 QByteArray ComputeChecksum::computeNow(const QString &filePath, const QByteArray &checksumType)
 {
    if (!checksumComputationEnabled()) {
        qCWarning(lcChecksums) << "Checksum computation disabled by environment variable";
        return QByteArray();
    }
    if (checksumType == checkSumMD5C) {
        return FileSystem::calcMd5(filePath);
    } else if (checksumType == checkSumSHA1C) {
@@ -265,7 +237,6 @@ QByteArray CSyncChecksumHook::hook(const QByteArray &path, const QByteArray &oth
    if (type.isEmpty())
        return NULL;
    qCInfo(lcChecksums) << "Computing" << type << "checksum of" << path << "in the csync hook";
    QByteArray checksum = ComputeChecksum::computeNow(QString::fromUtf8(path), type);
    if (checksum.isNull()) {
        qCWarning(lcChecksums) << "Failed to compute checksum" << type << "for" << path;
--- a/src/common/checksums.h
+++ b/src/common/checksums.h
@@ -36,16 +36,6 @@ static const char checkSumAdlerC[] = "Adler32";
 class SyncJournalDb;
 /**
 * Returns the highest-quality checksum in a 'checksums'
 * property retrieved from the server.
 *
 * Example: "ADLER32:1231 SHA1:ab124124 MD5:2131affa21"
 *       -> "SHA1:ab124124"
 */
 OCSYNC_EXPORT QByteArray findBestChecksum(const QByteArray &checksums);
 /// Creates a checksum header from type and value.
 OCSYNC_EXPORT QByteArray makeChecksumHeader(const QByteArray &checksumType, const QByteArray &checksum);
--- a/src/common/filesystembase.cpp
+++ b/src/common/filesystembase.cpp
@@ -358,19 +358,26 @@ QString FileSystem::fileSystemForPath(const QString &path)
 #define BUFSIZE qint64(500 * 1024) // 500 KiB
-static QByteArray readToCrypto( const QString& filename, QCryptographicHash::Algorithm algo )
+static QByteArray readToCrypto(const QString &filename, QCryptographicHash::Algorithm algo)
- {
+{
-     QFile file(filename);
+    QFile file(filename);
-     QByteArray arr;
+    const qint64 bufSize = qMin(BUFSIZE, file.size() + 1);
-     QCryptographicHash crypto( algo );
+    QByteArray buf(bufSize, Qt::Uninitialized);
    QByteArray arr;
    QCryptographicHash crypto(algo);
-     if (file.open(QIODevice::ReadOnly)) {
+    if (file.open(QIODevice::ReadOnly)) {
-         if (crypto.addData(&file)) {
+        qint64 size;
-             arr = crypto.result().toHex();
+        while (!file.atEnd()) {
-         }
+            size = file.read(buf.data(), bufSize);
-     }
+            if (size > 0) {
-     return arr;
+                crypto.addData(buf.data(), size);
- }
+            }
        }
        arr = crypto.result().toHex();
    }
    return arr;
 }
 QByteArray FileSystem::calcMd5(const QString &filename)
 {
@@ -478,22 +485,4 @@ bool FileSystem::isLnkFile(const QString &filename)
    return filename.endsWith(".lnk");
 }
 bool FileSystem::isJunction(const QString &filename)
 {
 #ifdef Q_OS_WIN
    WIN32_FIND_DATA findData;
    HANDLE hFind = FindFirstFileEx((const wchar_t *)filename.utf16(), FindExInfoBasic, &findData, FindExSearchNameMatch, NULL, 0);
    if (hFind != INVALID_HANDLE_VALUE) {
        FindClose(hFind);
        return false;
    }
    return findData.dwFileAttributes != INVALID_FILE_ATTRIBUTES
        && findData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT
        && findData.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT;
 #else
    Q_UNUSED(filename);
    return false;
 #endif
 }
 } // namespace OCC
--- a/src/common/filesystembase.h
+++ b/src/common/filesystembase.h
@@ -141,16 +141,8 @@ namespace FileSystem {
     */
    bool OCSYNC_EXPORT isFileLocked(const QString &fileName);
    /**
     * Returns whether the file is a shortcut file (ends with .lnk)
     */
    bool OCSYNC_EXPORT isLnkFile(const QString &filename);
    /**
     * Returns whether the file is a junction (windows only)
     */
    bool OCSYNC_EXPORT isJunction(const QString &filename);
    /*
     * This function takes a path and converts it to a UNC representation of the
     * string. That means that it prepends a \\?\ (unless already UNC) and converts
--- a/src/common/ownsql.cpp
+++ b/src/common/ownsql.cpp
@@ -85,32 +85,24 @@ bool SqlDatabase::openHelper(const QString &filename, int sqliteFlags)
    return true;
 }
-SqlDatabase::CheckDbResult SqlDatabase::checkDb()
+bool SqlDatabase::checkDb()
 {
    // quick_check can fail with a disk IO error when diskspace is low
    SqlQuery quick_check(*this);
-
+    quick_check.prepare("PRAGMA quick_check;", /*allow_failure=*/true);
    if (quick_check.prepare("PRAGMA quick_check;", /*allow_failure=*/true) != SQLITE_OK) {
        qCWarning(lcSql) << "Error preparing quick_check on database";
        _errId = quick_check.errorId();
        _error = quick_check.error();
        return CheckDbResult::CantPrepare;
    }
    if (!quick_check.exec()) {
        qCWarning(lcSql) << "Error running quick_check on database";
-        _errId = quick_check.errorId();
+        return false;
        _error = quick_check.error();
        return CheckDbResult::CantExec;
    }
    quick_check.next();
    QString result = quick_check.stringValue(0);
    if (result != "ok") {
        qCWarning(lcSql) << "quick_check returned failure:" << result;
-        return CheckDbResult::NotOk;
+        return false;
    }
-    return CheckDbResult::Ok;
+    return true;
 }
 bool SqlDatabase::openOrCreateReadWrite(const QString &filename)
@@ -123,25 +115,13 @@ bool SqlDatabase::openOrCreateReadWrite(const QString &filename)
        return false;
    }
-    auto checkResult = checkDb();
+    if (!checkDb()) {
-    if (checkResult != CheckDbResult::Ok) {
+        // When disk space is low, checking the db may fail even though it's fine.
-        if (checkResult == CheckDbResult::CantPrepare) {
+        qint64 freeSpace = Utility::freeDiskSpace(QFileInfo(filename).dir().absolutePath());
-            // When disk space is low, preparing may fail even though the db is fine.
+        if (freeSpace != -1 && freeSpace < 1000000) {
-            // Typically CANTOPEN or IOERR.
+            qCWarning(lcSql) << "Consistency check failed, disk space is low, aborting" << freeSpace;
-            qint64 freeSpace = Utility::freeDiskSpace(QFileInfo(filename).dir().absolutePath());
+            close();
-            if (freeSpace != -1 && freeSpace < 1000000) {
+            return false;
                qCWarning(lcSql) << "Can't prepare consistency check and disk space is low:" << freeSpace;
                close();
                return false;
            }
            // Even when there's enough disk space, it might very well be that the
            // file is on a read-only filesystem and can't be opened because of that.
            if (_errId == SQLITE_CANTOPEN) {
                qCWarning(lcSql) << "Can't open db to prepare consistency check, aborting";
                close();
                return false;
            }
        }
        qCCritical(lcSql) << "Consistency check failed, removing broken db" << filename;
@@ -164,7 +144,7 @@ bool SqlDatabase::openReadOnly(const QString &filename)
        return false;
    }
-    if (checkDb() != CheckDbResult::Ok) {
+    if (!checkDb()) {
        qCWarning(lcSql) << "Consistency check failed in readonly mode, giving up" << filename;
        close();
        return false;
@@ -184,8 +164,8 @@ void SqlDatabase::close()
 {
    if (_db) {
        SQLITE_DO(sqlite3_close(_db));
-        if (_errId != SQLITE_OK)
+        // Fatal because reopening an unclosed db might be problematic.
-            qCWarning(lcSql) << "Closing database failed" << _error;
+        ENFORCE(_errId == SQLITE_OK, "Error when closing DB");
        _db = 0;
    }
 }
@@ -344,7 +324,6 @@ void SqlQuery::bindValue(int pos, const QVariant &value)
        break;
    case QVariant::UInt:
    case QVariant::LongLong:
    case QVariant::ULongLong:
        res = sqlite3_bind_int64(_stmt, pos, value.toLongLong());
        break;
    case QVariant::DateTime: {
--- a/src/common/ownsql.h
+++ b/src/common/ownsql.h
@@ -48,15 +48,8 @@ public:
    sqlite3 *sqliteDb();
 private:
    enum class CheckDbResult {
        Ok,
        CantPrepare,
        CantExec,
        NotOk,
    };
    bool openHelper(const QString &filename, int sqliteFlags);
-    CheckDbResult checkDb();
+    bool checkDb();
    sqlite3 *_db;
    QString _error; // last error string
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -32,13 +32,6 @@
 #include "common/c_jhash.h"
 // SQL expression to check whether path.startswith(prefix + '/')
 // Note: '/' + 1 == '0'
 #define IS_PREFIX_PATH_OF(prefix, path) \
    "(" path " > (" prefix "||'/') AND " path " < (" prefix "||'0'))"
 #define IS_PREFIX_PATH_OR_EQUAL(prefix, path) \
    "(" path " == " prefix " OR " IS_PREFIX_PATH_OF(prefix, path) ")"
 namespace OCC {
 Q_LOGGING_CATEGORY(lcDb, "sync.database", QtInfoMsg)
@@ -52,7 +45,7 @@ Q_LOGGING_CATEGORY(lcDb, "sync.database", QtInfoMsg)
 static void fillFileRecordFromGetQuery(SyncJournalFileRecord &rec, SqlQuery &query)
 {
    rec._path = query.baValue(0);
-    rec._inode = query.int64Value(1);
+    rec._inode = query.intValue(1);
    rec._modtime = query.int64Value(2);
    rec._type = query.intValue(3);
    rec._etag = query.baValue(4);
@@ -65,7 +58,7 @@ static void fillFileRecordFromGetQuery(SyncJournalFileRecord &rec, SqlQuery &que
 static QString defaultJournalMode(const QString &dbPath)
 {
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
    // See #2693: Some exFAT file systems seem unable to cope with the
    // WAL journaling mode. They work fine with DELETE.
    QString fileSystem = FileSystem::fileSystemForPath(dbPath);
@@ -74,11 +67,6 @@ static QString defaultJournalMode(const QString &dbPath)
        qCInfo(lcDb) << "Filesystem contains FAT - using DELETE journal mode";
        return "DELETE";
    }
 #elif defined(Q_OS_MAC)
    if (dbPath.startsWith("/Volumes/")) {
        qCInfo(lcDb) << "Mounted sync dir, do not use WAL for" << dbPath;
        return "DELETE";
    }
 #else
    Q_UNUSED(dbPath)
 #endif
@@ -276,11 +264,6 @@ bool SyncJournalDb::sqlFail(const QString &log, const SqlQuery &query)
 bool SyncJournalDb::checkConnect()
 {
    if (_db.isOpen()) {
        if (!QFile::exists(_dbFile)) {
            qCWarning(lcDb) << "Database open, but file file" + _dbFile + " does not exist";
            close();
            return false;
        }
        return true;
    }
@@ -567,7 +550,7 @@ bool SyncJournalDb::checkConnect()
    _getFilesBelowPathQuery.reset(new SqlQuery(_db));
    if (_getFilesBelowPathQuery->prepare(
            GET_FILE_RECORD_QUERY
-            " WHERE " IS_PREFIX_PATH_OF("?1", "path") " ORDER BY path||'/' ASC")) {
+            " WHERE path > (?1||'/') AND path < (?1||'0') ORDER BY path||'/' ASC")) {
        return sqlFail("prepare _getFilesBelowPathQuery", *_getFilesBelowPathQuery);
    }
@@ -637,7 +620,7 @@ bool SyncJournalDb::checkConnect()
    }
    _deleteFileRecordRecursively.reset(new SqlQuery(_db));
-    if (_deleteFileRecordRecursively->prepare("DELETE FROM metadata WHERE " IS_PREFIX_PATH_OF("?1", "path"))) {
+    if (_deleteFileRecordRecursively->prepare("DELETE FROM metadata WHERE path LIKE(?||'/%')")) {
        return sqlFail("prepare _deleteFileRecordRecursively", *_deleteFileRecordRecursively);
    }
@@ -1111,10 +1094,15 @@ bool SyncJournalDb::getFileRecordByInode(quint64 inode, SyncJournalFileRecord *r
    return true;
 }
-bool SyncJournalDb::getFileRecordsByFileId(const QByteArray &fileId, const std::function<void(const SyncJournalFileRecord &)> &rowCallback)
+bool SyncJournalDb::getFileRecordByFileId(const QByteArray &fileId, SyncJournalFileRecord *rec)
 {
    QMutexLocker locker(&_mutex);
    // Reset the output var in case the caller is reusing it.
    Q_ASSERT(rec);
    rec->_path.clear();
    Q_ASSERT(!rec->isValid());
    if (fileId.isEmpty() || _metadataTableIsEmpty)
        return true; // no error, yet nothing found (rec->isValid() == false)
@@ -1128,10 +1116,8 @@ bool SyncJournalDb::getFileRecordsByFileId(const QByteArray &fileId, const std::
        return false;
    }
-    while (_getFileRecordQueryByFileId->next()) {
+    if (_getFileRecordQueryByFileId->next()) {
-        SyncJournalFileRecord rec;
+        fillFileRecordFromGetQuery(*rec, *_getFileRecordQueryByFileId);
        fillFileRecordFromGetQuery(rec, *_getFileRecordQueryByFileId);
        rowCallback(rec);
    }
    return true;
@@ -1797,8 +1783,9 @@ void SyncJournalDb::avoidRenamesOnNextSync(const QByteArray &path)
    }
    SqlQuery query(_db);
-    query.prepare("UPDATE metadata SET fileid = '', inode = '0' WHERE " IS_PREFIX_PATH_OR_EQUAL("?1", "path"));
+    query.prepare("UPDATE metadata SET fileid = '', inode = '0' WHERE path == ?1 OR path LIKE(?2||'/%')");
    query.bindValue(1, path);
    query.bindValue(2, path);
    query.exec();
    // We also need to remove the ETags so the update phase refreshes the directory paths
@@ -1808,28 +1795,25 @@ void SyncJournalDb::avoidRenamesOnNextSync(const QByteArray &path)
 void SyncJournalDb::avoidReadFromDbOnNextSync(const QByteArray &fileName)
 {
    // Make sure that on the next sync, fileName is not read from the DB but uses the PROPFIND to
    // get the info from the server
    // We achieve that by clearing the etag of the parents directory recursively
    QMutexLocker locker(&_mutex);
    if (!checkConnect()) {
        return;
    }
    // Remove trailing slash
    auto argument = fileName;
    if (argument.endsWith('/'))
        argument.chop(1);
    SqlQuery query(_db);
    // This query will match entries for which the path is a prefix of fileName
    // Note: CSYNC_FTW_TYPE_DIR == 2
-    query.prepare("UPDATE metadata SET md5='_invalid_' WHERE " IS_PREFIX_PATH_OR_EQUAL("path", "?1") " AND type == 2;");
+    query.prepare("UPDATE metadata SET md5='_invalid_' WHERE ?1 LIKE(path||'/%') AND type == 2;");
-    query.bindValue(1, argument);
+    query.bindValue(1, fileName);
    query.exec();
-    // Prevent future overwrite of the etags of this folder and all
+    // Prevent future overwrite of the etag for this sync
-    // parent folders for this sync
+    _avoidReadFromDbOnNextSyncFilter.append(fileName);
    argument.append('/');
    _avoidReadFromDbOnNextSyncFilter.append(argument);
 }
 void SyncJournalDb::forceRemoteDiscoveryNextSync()
--- a/src/common/syncjournaldb.h
+++ b/src/common/syncjournaldb.h
@@ -58,7 +58,7 @@ public:
    bool getFileRecord(const QString &filename, SyncJournalFileRecord *rec) { return getFileRecord(filename.toUtf8(), rec); }
    bool getFileRecord(const QByteArray &filename, SyncJournalFileRecord *rec);
    bool getFileRecordByInode(quint64 inode, SyncJournalFileRecord *rec);
-    bool getFileRecordsByFileId(const QByteArray &fileId, const std::function<void(const SyncJournalFileRecord &)> &rowCallback);
+    bool getFileRecordByFileId(const QByteArray &fileId, SyncJournalFileRecord *rec);
    bool getFilesBelowPath(const QByteArray &path, const std::function<void(const SyncJournalFileRecord&)> &rowCallback);
    bool setFileRecord(const SyncJournalFileRecord &record);
@@ -158,16 +158,15 @@ public:
    void setSelectiveSyncList(SelectiveSyncListType type, const QStringList &list);
    /**
-     * Make sure that on the next sync fileName and its parents are discovered from the server.
+     * Make sure that on the next sync, fileName is not read from the DB but uses the PROPFIND to
     * get the info from the server
     *
-     * That means its metadata and, if it's a directory, its direct contents.
+     * Specifically, this sets the md5 field of fileName and all its parents to _invalid_.
     *
     * Specifically, etag (md5 field) of fileName and all its parents are set to _invalid_.
     * That causes a metadata difference and a resulting discovery from the remote for the
     * affected folders.
     *
     * Since folders in the selective sync list will not be rediscovered (csync_ftw,
-     * _csync_detect_update skip them), the _invalid_ marker will stay. And any
+     * _csync_detect_update skip them), the _invalid_ marker will stay and it. And any
     * child items in the db will be ignored when reading a remote tree from the database.
     */
    void avoidReadFromDbOnNextSync(const QString &fileName) { avoidReadFromDbOnNextSync(fileName.toUtf8()); }
@@ -269,8 +268,6 @@ private:
    /* This is the list of paths we called avoidReadFromDbOnNextSync on.
     * It means that they should not be written to the DB in any case since doing
     * that would write the etag and would void the purpose of avoidReadFromDbOnNextSync
     *
     * The contained paths have a trailing /.
     */
    QList<QByteArray> _avoidReadFromDbOnNextSyncFilter;
--- a/src/common/utility.cpp
+++ b/src/common/utility.cpp
@@ -579,7 +579,7 @@ bool Utility::isConflictFile(const char *name)
 bool Utility::shouldUploadConflictFiles()
 {
-    static bool uploadConflictFiles = qEnvironmentVariableIntValue("OWNCLOUD_UPLOAD_CONFLICT_FILES") != 0;
+    static bool uploadConflictFiles = qgetenv("OWNCLOUD_UPLOAD_CONFLICT_FILES").toInt() != 0;
    return uploadConflictFiles;
 }
--- a/src/common/utility_mac.cpp
+++ b/src/common/utility_mac.cpp
@@ -58,7 +58,7 @@ bool hasLaunchOnStartup_private(const QString &)
            LSSharedFileListItemRef item = (LSSharedFileListItemRef)CFArrayGetValueAtIndex(itemsArray, i);
            CFURLRef itemUrlRef = NULL;
-            if (LSSharedFileListItemResolve(item, 0, &itemUrlRef, NULL) == noErr && itemUrlRef) {
+            if (LSSharedFileListItemResolve(item, 0, &itemUrlRef, NULL) == noErr) {
                CFStringRef itemUrlString = CFURLGetString(itemUrlRef);
                if (CFStringCompare(itemUrlString, appUrlRefString, 0) == kCFCompareEqualTo) {
                    returnValue = true;
@@ -100,7 +100,7 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName,
            LSSharedFileListItemRef item = (LSSharedFileListItemRef)CFArrayGetValueAtIndex(itemsArray, i);
            CFURLRef itemUrlRef = NULL;
-            if (LSSharedFileListItemResolve(item, 0, &itemUrlRef, NULL) == noErr && itemUrlRef) {
+            if (LSSharedFileListItemResolve(item, 0, &itemUrlRef, NULL) == noErr) {
                CFStringRef itemUrlString = CFURLGetString(itemUrlRef);
                if (CFStringCompare(itemUrlString, appUrlRefString, 0) == kCFCompareEqualTo) {
                    LSSharedFileListItemRemove(loginItems, item); // remove it!
--- a/src/crashreporter/CMakeLists.txt
+++ b/src/crashreporter/CMakeLists.txt
@@ -1,6 +1,13 @@
 PROJECT( CrashReporter )
 cmake_policy(SET CMP0017 NEW)
 list(APPEND crashreporter_SOURCES main.cpp)
 list(APPEND crashreporter_RC resources.qrc)
 qt_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} )
 qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} )
 # TODO: differentiate release channel
 # if(BUILD_RELEASE)
 #     set(CRASHREPORTER_RELEASE_CHANNEL "release")
@@ -8,30 +15,9 @@ cmake_policy(SET CMP0017 NEW)
     set(CRASHREPORTER_RELEASE_CHANNEL "nightly")
 # endif()
 # Theme
 if(DEFINED OEM_THEME_DIR AND EXISTS "${OEM_THEME_DIR}/theme/colored")
    set(CRASHREPORTER_ICON_DIR "${OEM_THEME_DIR}/theme/colored")
 else()
    set(CRASHREPORTER_ICON_DIR "${CMAKE_SOURCE_DIR}/theme/colored")
 endif()
 set(CRASHREPORTER_ICON_FILENAME "${APPLICATION_ICON_NAME}-icon.png")
 set(CRASHREPORTER_ICON ":/${CRASHREPORTER_ICON_FILENAME}")
 set(CRASHREPORTER_ICON_SIZE "128")
 set(CRASHREPORTER_ICON_PATH "${CRASHREPORTER_ICON_DIR}/${APPLICATION_ICON_NAME}-icon-${CRASHREPORTER_ICON_SIZE}.png")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources.qrc.in
               ${CMAKE_CURRENT_BINARY_DIR}/resources.qrc)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CrashReporterConfig.h.in
               ${CMAKE_CURRENT_BINARY_DIR}/CrashReporterConfig.h)
 # Sources
 list(APPEND crashreporter_SOURCES main.cpp)
 list(APPEND crashreporter_RC "${CMAKE_CURRENT_BINARY_DIR}/resources.qrc")
 qt_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} )
 qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} )
 include_directories(${CMAKE_CURRENT_BINARY_DIR}
    "../3rdparty/libcrashreporter-qt/src/"
--- a/src/crashreporter/resources.qrc
+++ b/src/crashreporter/resources.qrc
@@ -0,0 +1,5 @@
 <RCC>
    <qresource prefix="/">
        <file alias="owncloud-icon.png">../../theme/colored/owncloud-icon-128.png</file>
    </qresource>
 </RCC>
--- a/src/crashreporter/resources.qrc.in
+++ b/src/crashreporter/resources.qrc.in
@@ -1,5 +0,0 @@
 <RCC>
    <qresource prefix="/">
        <file alias="@CRASHREPORTER_ICON_FILENAME@">@CRASHREPORTER_ICON_PATH@</file>
    </qresource>
 </RCC>
--- a/src/csync/csync.cpp
+++ b/src/csync/csync.cpp
@@ -85,8 +85,6 @@ int csync_update(CSYNC *ctx) {
  csync_gettime(&start);
  ctx->current = LOCAL_REPLICA;
  CSYNC_LOG(CSYNC_LOG_PRIORITY_INFO, "## Starting local discovery ##");
  rc = csync_ftw(ctx, ctx->local.uri, csync_walker, MAX_DEPTH);
  if (rc < 0) {
    if(ctx->status_code == CSYNC_STATUS_OK) {
@@ -106,8 +104,6 @@ int csync_update(CSYNC *ctx) {
  csync_gettime(&start);
  ctx->current = REMOTE_REPLICA;
  CSYNC_LOG(CSYNC_LOG_PRIORITY_INFO, "## Starting remote discovery ##");
  rc = csync_ftw(ctx, "", csync_walker, MAX_DEPTH);
  if (rc < 0) {
      if(ctx->status_code == CSYNC_STATUS_OK) {
@@ -215,14 +211,14 @@ static int _csync_treewalk_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
    if (other_file_it == other_tree->cend()) {
        /* Check the renamed path as well. */
-        QByteArray renamed_path = csync_rename_adjust_parent_path(ctx, cur->path);
+        QByteArray renamed_path = csync_rename_adjust_path(ctx, cur->path);
        if (renamed_path != cur->path)
            other_file_it = other_tree->find(renamed_path);
    }
    if (other_file_it == other_tree->cend()) {
        /* Check the source path as well. */
-        QByteArray renamed_path = csync_rename_adjust_parent_path_source(ctx, cur->path);
+        QByteArray renamed_path = csync_rename_adjust_path_source(ctx, cur->path);
        if (renamed_path != cur->path)
            other_file_it = other_tree->find(renamed_path);
    }
@@ -318,9 +314,6 @@ int csync_s::reinitialize() {
  local.files.clear();
  remote.files.clear();
  renames.folder_renamed_from.clear();
  renames.folder_renamed_to.clear();
  status = CSYNC_STATUS_INIT;
  SAFE_FREE(error_string);
--- a/src/csync/csync.h
+++ b/src/csync/csync.h
@@ -108,8 +108,7 @@ enum csync_status_codes_e {
    CSYNC_STATUS_INDIVIDUAL_STAT_FAILED,
    CSYNC_STATUS_FORBIDDEN,
    CSYNC_STATUS_INDIVIDUAL_TOO_DEEP,
-    CSYNC_STATUS_INDIVIDUAL_IS_CONFLICT_FILE,
+    CSYNC_STATUS_INDIVIDUAL_IS_CONFLICT_FILE
    CSYNC_STATUS_INDIVIDUAL_CANNOT_ENCODE
 };
 typedef enum csync_status_codes_e CSYNC_STATUS;
--- a/src/csync/csync_exclude.h
+++ b/src/csync/csync_exclude.h
@@ -33,8 +33,7 @@ enum csync_exclude_type_e {
  CSYNC_FILE_EXCLUDE_LONG_FILENAME,
  CSYNC_FILE_EXCLUDE_HIDDEN,
  CSYNC_FILE_EXCLUDE_STAT_FAILED,
-  CSYNC_FILE_EXCLUDE_CONFLICT,
+  CSYNC_FILE_EXCLUDE_CONFLICT
  CSYNC_FILE_EXCLUDE_CANNOT_ENCODE
 };
 typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE;
--- a/src/csync/csync_reconcile.cpp
+++ b/src/csync/csync_reconcile.cpp
@@ -63,6 +63,18 @@ static csync_file_stat_t *_csync_check_ignored(csync_s::FileMap *tree, const Byt
    }
 }
 /* Returns true if we're reasonably certain that hash equality
 * for the header means content equality.
 *
 * Cryptographic safety is not required - this is mainly
 * intended to rule out checksums like Adler32 that are not intended for
 * hashing and have high likelihood of collision with particular inputs.
 */
 static bool _csync_is_collision_safe_hash(const char *checksum_header)
 {
    return strncmp(checksum_header, "SHA1:", 5) == 0
        || strncmp(checksum_header, "MD5:", 4) == 0;
 }
 /**
 * The main function in the reconcile pass.
@@ -92,17 +104,14 @@ static csync_file_stat_t *_csync_check_ignored(csync_s::FileMap *tree, const Byt
 * source and the destination, have been changed, the newer file wins.
 */
 static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
    csync_s::FileMap *our_tree = nullptr;
    csync_s::FileMap *other_tree = nullptr;
    /* we need the opposite tree! */
    switch (ctx->current) {
    case LOCAL_REPLICA:
        our_tree = &ctx->local.files;
        other_tree = &ctx->remote.files;
        break;
    case REMOTE_REPLICA:
        our_tree = &ctx->remote.files;
        other_tree = &ctx->local.files;
        break;
    default:
@@ -113,7 +122,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
    if (!other) {
        /* Check the renamed path as well. */
-        other = other_tree->findFile(csync_rename_adjust_parent_path(ctx, cur->path));
+        other = other_tree->findFile(csync_rename_adjust_path(ctx, cur->path));
    }
    if (!other) {
        /* Check if it is ignored */
@@ -143,123 +152,65 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
            cur->instruction = CSYNC_INSTRUCTION_REMOVE;
            break;
        case CSYNC_INSTRUCTION_EVAL_RENAME: {
-            // By default, the EVAL_RENAME decays into a NEW
+            OCC::SyncJournalFileRecord base;
-            cur->instruction = CSYNC_INSTRUCTION_NEW;
+            if(ctx->current == LOCAL_REPLICA ) {
-
+                /* use the old name to find the "other" node */
-            bool processedRename = false;
+                ctx->statedb->getFileRecordByInode(cur->inode, &base);
-            auto renameCandidateProcessing = [&](const QByteArray &basePath) {
+                qCDebug(lcReconcile, "Finding opposite temp through inode %" PRIu64 ": %s",
-                if (processedRename)
+                          cur->inode, base.isValid() ? "true":"false");
-                    return;
+            } else {
-                if (basePath.isEmpty())
+                ASSERT( ctx->current == REMOTE_REPLICA );
-                    return;
+                ctx->statedb->getFileRecordByFileId(cur->file_id, &base);
                qCDebug(lcReconcile, "Finding opposite temp through file ID %s: %s",
                          cur->file_id.constData(), base.isValid() ? "true":"false");
            }
            if( base.isValid() ) {
                /* First, check that the file is NOT in our tree (another file with the same name was added) */
-                if (our_tree->findFile(basePath)) {
+                csync_s::FileMap *our_tree = ctx->current == REMOTE_REPLICA ? &ctx->remote.files : &ctx->local.files;
-                    other = nullptr;
+	                if (our_tree->findFile(base._path)) {
-                    qCInfo(lcReconcile, "Origin found in our tree : %s", basePath.constData());
+                        qCDebug(lcReconcile, "Origin found in our tree : %s", base._path.constData());
                } else {
-                    /* Find the potential rename source file in the other tree.
+                    /* Find the temporar file in the other tree.
                    * If the renamed file could not be found in the opposite tree, that is because it
                    * is not longer existing there, maybe because it was renamed or deleted.
                    * The journal is cleaned up later after propagation.
                    */
-                    other = other_tree->findFile(basePath);
+                    other = other_tree->findFile(base._path);
-                    qCInfo(lcReconcile, "Rename origin in other tree (%s) %s",
+                    qCDebug(lcReconcile, "Temporary opposite (%s) %s",
-                        basePath.constData(), other ? "found" : "not found");
+                            base._path.constData() , other ? "found": "not found" );
                }
                if(!other) {
-                    // Stick with the NEW
+                    cur->instruction = CSYNC_INSTRUCTION_NEW;
-                    return;
+                } else if (other->instruction == CSYNC_INSTRUCTION_NONE
-                } else if (other->instruction == CSYNC_INSTRUCTION_RENAME) {
+                           || other->instruction == CSYNC_INSTRUCTION_UPDATE_METADATA
-                    // Some other EVAL_RENAME already claimed other.
+                           || cur->type == CSYNC_FTW_TYPE_DIR) {
                    // We do nothing: maybe a different candidate for
                    // other is found as well?
                    qCInfo(lcReconcile, "Other has already been renamed to %s",
                        other->rename_path.constData());
                } else if (cur->type == CSYNC_FTW_TYPE_DIR
                    // The local replica is reconciled first, so the remote tree would
                    // have either NONE or UPDATE_METADATA if the remote file is safe to
                    // move.
                    // In the remote replica, REMOVE is also valid (local has already
                    // been reconciled). NONE can still happen if the whole parent dir
                    // was set to REMOVE by the local reconcile.
                    || other->instruction == CSYNC_INSTRUCTION_NONE
                    || other->instruction == CSYNC_INSTRUCTION_UPDATE_METADATA
                    || other->instruction == CSYNC_INSTRUCTION_REMOVE) {
                    qCInfo(lcReconcile, "Switching %s to RENAME to %s",
                        other->path.constData(), cur->path.constData());
                    other->instruction = CSYNC_INSTRUCTION_RENAME;
                    other->rename_path = cur->path;
                    if( !cur->file_id.isEmpty() ) {
                        other->file_id = cur->file_id;
                    }
-                    if (ctx->current == LOCAL_REPLICA) {
+                    other->inode = cur->inode;
-                        // Keep the local mtime.
+                    cur->instruction = CSYNC_INSTRUCTION_NONE;
-                        other->modtime = cur->modtime;
+                } else if (other->instruction == CSYNC_INSTRUCTION_REMOVE) {
                    other->instruction = CSYNC_INSTRUCTION_RENAME;
                    other->rename_path = cur->path;
                    if( !cur->file_id.isEmpty() ) {
                        other->file_id = cur->file_id;
                    }
                    other->inode = cur->inode;
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
-                    // We have consumed 'other': exit this loop to not consume another one.
+                } else if (other->instruction == CSYNC_INSTRUCTION_NEW) {
-                    processedRename = true;
+                    qCDebug(lcReconcile, "OOOO=> NEW detected in other tree!");
-                } else if (our_tree->findFile(csync_rename_adjust_parent_path(ctx, other->path)) == cur) {
+                    cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
                    // If we're here, that means that the other side's reconcile will be able
                    // to work against cur: The filename itself didn't change, only a parent
                    // directory was renamed! In that case it's safe to ignore the rename
                    // since the parent directory rename will already deal with it.
                    // Local: The remote reconcile will be able to deal with this.
                    // Remote: The local replica has already dealt with this.
                    //         See the EVAL_RENAME case when other was found directly.
                    qCInfo(lcReconcile, "File in a renamed directory, other side's instruction: %d",
                        other->instruction);
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                } else {
-                    // This can, for instance, happen when there was a local change in other
+                    assert(other->type != CSYNC_FTW_TYPE_DIR);
-                    // and the instruction in the local tree is NEW while cur has EVAL_RENAME
+                    cur->instruction = CSYNC_INSTRUCTION_NONE;
-                    // due to a remote move of the same file. In these scenarios we just
+                    other->instruction = CSYNC_INSTRUCTION_SYNC;
                    // want the instruction to stay NEW.
                    qCInfo(lcReconcile, "Other already has instruction %d",
                        other->instruction);
                }
            };
            if (ctx->current == LOCAL_REPLICA) {
                /* use the old name to find the "other" node */
                OCC::SyncJournalFileRecord base;
                qCInfo(lcReconcile, "Finding rename origin through inode %" PRIu64 "",
                    cur->inode);
                ctx->statedb->getFileRecordByInode(cur->inode, &base);
                renameCandidateProcessing(base._path);
            } else {
                ASSERT(ctx->current == REMOTE_REPLICA);
                // The update phase has already mapped out all dir->dir renames, check the
                // path that is consistent with that first. Otherwise update mappings and
                // reconcile mappings might disagree, leading to odd situations down the
                // line.
                auto basePath = csync_rename_adjust_full_path_source(ctx, cur->path);
                if (basePath != cur->path) {
                    qCInfo(lcReconcile, "Trying rename origin by csync_rename mapping %s",
                        basePath.constData());
                    // We go through getFileRecordsByFileId to ensure the basePath
                    // computed in this way also has the expected fileid.
                    ctx->statedb->getFileRecordsByFileId(cur->file_id,
                        [&](const OCC::SyncJournalFileRecord &base) {
                            if (base._path == basePath)
                                renameCandidateProcessing(basePath);
                        });
                }
                // Also feed all the other files with the same fileid if necessary
                if (!processedRename) {
                    qCInfo(lcReconcile, "Finding rename origin through file ID %s",
                        cur->file_id.constData());
                    ctx->statedb->getFileRecordsByFileId(cur->file_id,
                        [&](const OCC::SyncJournalFileRecord &base) { renameCandidateProcessing(base._path); });
                }
            }
            break;
        }
        default:
@@ -312,14 +263,14 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                    //
                    // In older client versions we always treated these cases as a
                    // non-conflict. This behavior is preserved in case the server
-                    // doesn't provide a content checksum.
+                    // doesn't provide a suitable content hash.
                    //
                    // When it does have one, however, we do create a job, but the job
-                    // will compare hashes and avoid the download if possible.
+                    // will compare hashes and avoid the download if they are equal.
-                    QByteArray remoteChecksumHeader =
+                    const char *remoteChecksumHeader =
                        (ctx->current == REMOTE_REPLICA ? cur->checksumHeader : other->checksumHeader);
-                    if (!remoteChecksumHeader.isEmpty()) {
+                    if (remoteChecksumHeader) {
-                        is_conflict = true;
+                        is_conflict |= _csync_is_collision_safe_hash(remoteChecksumHeader);
                    }
                    // SO: If there is no checksum, we can have !is_conflict here
@@ -359,19 +310,10 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                break;
            case CSYNC_INSTRUCTION_IGNORE:
                cur->instruction = CSYNC_INSTRUCTION_IGNORE;
-                break;
+            break;
            default:
                break;
            }
            // Ensure we're not leaving discovery-only instructions
            // in place. This can happen, for instance, when other's
            // instruction is EVAL_RENAME because the parent dir was renamed.
            // NEW is safer than EVAL because it will end up with
            // propagation unless it's changed by something, and EVAL and
            // NEW are treated equivalently during reconcile.
            if (cur->instruction == CSYNC_INSTRUCTION_EVAL)
                cur->instruction = CSYNC_INSTRUCTION_NEW;
            break;
        default:
            break;
        }
--- a/src/csync/csync_rename.cpp
+++ b/src/csync/csync_rename.cpp
@@ -36,7 +36,7 @@ void csync_rename_record(CSYNC* ctx, const QByteArray &from, const QByteArray &t
    ctx->renames.folder_renamed_from[to] = from;
 }
-QByteArray csync_rename_adjust_parent_path(CSYNC *ctx, const QByteArray &path)
+QByteArray csync_rename_adjust_path(CSYNC* ctx, const QByteArray &path)
 {
    if (ctx->renames.folder_renamed_to.empty())
        return path;
@@ -50,25 +50,11 @@ QByteArray csync_rename_adjust_parent_path(CSYNC *ctx, const QByteArray &path)
    return path;
 }
-QByteArray csync_rename_adjust_parent_path_source(CSYNC *ctx, const QByteArray &path)
+QByteArray csync_rename_adjust_path_source(CSYNC* ctx, const QByteArray &path)
 {
    if (ctx->renames.folder_renamed_from.empty())
        return path;
-    for (ByteArrayRef p = _parentDir(path); !p.isEmpty(); p = _parentDir(p)) {
+    for (auto p = _parentDir(path); !p.isEmpty(); p = _parentDir(p)) {
        auto it = ctx->renames.folder_renamed_from.find(p);
        if (it != ctx->renames.folder_renamed_from.end()) {
            QByteArray rep = it->second + path.mid(p.length());
            return rep;
        }
    }
    return path;
 }
 QByteArray csync_rename_adjust_full_path_source(CSYNC *ctx, const QByteArray &path)
 {
    if (ctx->renames.folder_renamed_from.empty())
        return path;
    for (ByteArrayRef p = path; !p.isEmpty(); p = _parentDir(p)) {
        auto it = ctx->renames.folder_renamed_from.find(p);
        if (it != ctx->renames.folder_renamed_from.end()) {
            QByteArray rep = it->second + path.mid(p.length());
--- a/src/csync/csync_rename.h
+++ b/src/csync/csync_rename.h
@@ -22,19 +22,10 @@
 #include "csync.h"
-/* Return the final destination path of a given patch in case of renames
+/* Return the final destination path of a given patch in case of renames */
- *
+QByteArray OCSYNC_EXPORT csync_rename_adjust_path(CSYNC *ctx, const QByteArray &path);
 * Does only map the parent directories. If the directory "A" is renamed to
 * "B" then this function will not map "A" to "B". Only "A/foo" -> "B/foo".
 */
 QByteArray OCSYNC_EXPORT csync_rename_adjust_parent_path(CSYNC *ctx, const QByteArray &path);
 /* Return the source of a given path in case of renames */
-QByteArray OCSYNC_EXPORT csync_rename_adjust_parent_path_source(CSYNC *ctx, const QByteArray &path);
+QByteArray OCSYNC_EXPORT csync_rename_adjust_path_source(CSYNC *ctx, const QByteArray &path);
 /* like the parent_path variant, but applying to the full path */
 QByteArray OCSYNC_EXPORT csync_rename_adjust_full_path_source(CSYNC *ctx, const QByteArray &path);
 void OCSYNC_EXPORT csync_rename_record(CSYNC *ctx, const QByteArray &from, const QByteArray &to);
 /*  Return the amount of renamed item recorded */
 bool OCSYNC_EXPORT csync_rename_count(CSYNC *ctx);
--- a/src/csync/csync_update.cpp
+++ b/src/csync/csync_update.cpp
@@ -46,8 +46,6 @@
 #include "common/utility.h"
 #include "common/asserts.h"
 #include <QtCore/QTextCodec>
 // Needed for PRIu64 on MinGW in C++ mode.
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
@@ -130,12 +128,12 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
       * This code should probably be in csync_exclude, but it does not have the fs parameter.
       * Keep it here for now */
      if (ctx->ignore_hidden_files && (fs->is_hidden)) {
-          qCInfo(lcUpdate, "file excluded because it is a hidden file: %s", fs->path.constData());
+          qCDebug(lcUpdate, "file excluded because it is a hidden file: %s", fs->path.constData());
          excluded = CSYNC_FILE_EXCLUDE_HIDDEN;
      }
  } else {
      /* File is ignored because it's matched by a user- or system exclude pattern. */
-      qCInfo(lcUpdate, "%s excluded  (%d)", fs->path.constData(), excluded);
+      qCDebug(lcUpdate, "%s excluded  (%d)", fs->path.constData(), excluded);
      if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE) {
          return 1;
      }
@@ -150,25 +148,9 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
      }
  }
  auto localCodec = QTextCodec::codecForLocale();
  if (ctx->current == REMOTE_REPLICA && localCodec->mibEnum() != 106) {
      /* If the locale codec is not UTF-8, we must check that the filename from the server can
       * be encoded in the local file system.
       *
       * We cannot use QTextCodec::canEncode() since that can incorrectly return true, see
       * https://bugreports.qt.io/browse/QTBUG-6925.
       */
      QTextEncoder encoder(localCodec, QTextCodec::ConvertInvalidToNull);
      if (encoder.fromUnicode(QString::fromUtf8(fs->path)).contains('\0')) {
          qCInfo(lcUpdate, "cannot encode %s to local encoding %d",
              fs->path.constData(), localCodec->mibEnum());
          excluded = CSYNC_FILE_EXCLUDE_CANNOT_ENCODE;
      }
  }
  if (fs->type == CSYNC_FTW_TYPE_FILE ) {
    if (fs->modtime == 0) {
-      qCInfo(lcUpdate, "file: %s - mtime is zero!", fs->path.constData());
+      qCDebug(lcUpdate, "file: %s - mtime is zero!", fs->path.constData());
    }
  }
@@ -195,12 +177,10 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
      /* we have an update! */
      qCInfo(lcUpdate, "Database entry found, compare: %" PRId64 " <-> %" PRId64
                                          ", etag: %s <-> %s, inode: %" PRId64 " <-> %" PRId64
-                                          ", size: %" PRId64 " <-> %" PRId64 ", perms: %x <-> %x"
+                                          ", size: %" PRId64 " <-> %" PRId64 ", perms: %x <-> %x, ignore: %d",
                                          ", checksum: %s <-> %s , ignore: %d",
                ((int64_t) fs->modtime), ((int64_t) base._modtime),
                fs->etag.constData(), base._etag.constData(), (uint64_t) fs->inode, (uint64_t) base._inode,
-                (uint64_t) fs->size, (uint64_t) base._fileSize, *reinterpret_cast<short*>(&fs->remotePerm), *reinterpret_cast<short*>(&base._remotePerm), fs->checksumHeader.constData(),
+                (uint64_t) fs->size, (uint64_t) base._fileSize, *reinterpret_cast<short*>(&fs->remotePerm), *reinterpret_cast<short*>(&base._remotePerm), base._serverHasIgnoredFiles );
                base._checksumHeader.constData(), base._serverHasIgnoredFiles);
      if (ctx->current == REMOTE_REPLICA && fs->etag != base._etag) {
          fs->instruction = CSYNC_INSTRUCTION_EVAL;
@@ -230,7 +210,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
                  checksumIdentical = fs->checksumHeader == base._checksumHeader;
              }
              if (checksumIdentical) {
-                  qCInfo(lcUpdate, "NOTE: Checksums are identical, file did not actually change: %s", fs->path.constData());
+                  qCDebug(lcUpdate, "NOTE: Checksums are identical, file did not actually change: %s", fs->path.constData());
                  fs->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
                  goto out;
              }
@@ -254,7 +234,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
           * The metadata comparison ensure that we fetch all the file id or permission when
           * upgrading owncloud
           */
-          qCInfo(lcUpdate, "Reading from database: %s", fs->path.constData());
+          qCDebug(lcUpdate, "Reading from database: %s", fs->path.constData());
          ctx->remote.read_from_db = true;
      }
      /* If it was remembered in the db that the remote dir has ignored files, store
@@ -265,7 +245,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
      }
      if (metadata_differ) {
          /* file id or permissions has changed. Which means we need to update them in the DB. */
-          qCInfo(lcUpdate, "Need to update metadata for: %s", fs->path.constData());
+          qCDebug(lcUpdate, "Need to update metadata for: %s", fs->path.constData());
          fs->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
      } else {
          fs->instruction = CSYNC_INSTRUCTION_NONE;
@@ -273,7 +253,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
  } else {
      /* check if it's a file and has been renamed */
      if (ctx->current == LOCAL_REPLICA) {
-          qCInfo(lcUpdate, "Checking for rename based on inode # %" PRId64 "", (uint64_t) fs->inode);
+          qCDebug(lcUpdate, "Checking for rename based on inode # %" PRId64 "", (uint64_t) fs->inode);
          OCC::SyncJournalFileRecord base;
          if(!ctx->statedb->getFileRecordByInode(fs->inode, &base)) {
@@ -285,8 +265,8 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
          fs->instruction = CSYNC_INSTRUCTION_NEW;
          bool isRename =
-              base.isValid() && base._type == fs->type
+              base.isValid() && base._inode == fs->inode && base._type == fs->type
-                  && ((base._modtime == fs->modtime && base._fileSize == fs->size) || fs->type == CSYNC_FTW_TYPE_DIR)
+                  && (base._modtime == fs->modtime || fs->type == CSYNC_FTW_TYPE_DIR)
 #ifdef NO_RENAME_EXTENSION
                  && _csync_sameextension(base._path, fs->path)
 #endif
@@ -300,13 +280,13 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
                      _rel_to_abs(ctx, fs->path), base._checksumHeader,
                      ctx->callbacks.checksum_userdata);
              if (!fs->checksumHeader.isEmpty()) {
-                  qCInfo(lcUpdate, "checking checksum of potential rename %s %s <-> %s", fs->path.constData(), fs->checksumHeader.constData(), base._checksumHeader.constData());
+                  qCDebug(lcUpdate, "checking checksum of potential rename %s %s <-> %s", fs->path.constData(), fs->checksumHeader.constData(), base._checksumHeader.constData());
                  isRename = fs->checksumHeader == base._checksumHeader;
              }
          }
          if (isRename) {
-              qCInfo(lcUpdate, "pot rename detected based on inode # %" PRId64 "", (uint64_t) fs->inode);
+              qCDebug(lcUpdate, "pot rename detected based on inode # %" PRId64 "", (uint64_t) fs->inode);
              /* inode found so the file has been renamed */
              fs->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
              if (fs->type == CSYNC_FTW_TYPE_DIR) {
@@ -316,63 +296,42 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
          goto out;
      } else {
          qCInfo(lcUpdate, "Checking for rename based on fileid %s", fs->file_id.constData());
          /* Remote Replica Rename check */
-          fs->instruction = CSYNC_INSTRUCTION_NEW;
+          OCC::SyncJournalFileRecord base;
-
+          if(!ctx->statedb->getFileRecordByFileId(fs->file_id, &base)) {
          bool done = false;
          auto renameCandidateProcessing = [&](const OCC::SyncJournalFileRecord &base) {
              if (done)
                  return;
              if (!base.isValid())
                  return;
              // Some things prohibit rename detection entirely.
              // Since we don't do the same checks again in reconcile, we can't
              // just skip the candidate, but have to give up completely.
              if (base._type != fs->type) {
                  qCWarning(lcUpdate, "file types different, not a rename");
                  done = true;
                  return;
              }
              if (fs->type != CSYNC_FTW_TYPE_DIR && base._etag != fs->etag) {
                  /* File with different etag, don't do a rename, but download the file again */
                  qCWarning(lcUpdate, "file etag different, not a rename");
                  done = true;
                  return;
              }
              // Record directory renames
              if (fs->type == CSYNC_FTW_TYPE_DIR) {
                  // If the same folder was already renamed by a different entry,
                  // skip to the next candidate
                  if (ctx->renames.folder_renamed_to.count(base._path) > 0) {
                      qCWarning(lcUpdate, "folder already has a rename entry, skipping");
                      return;
                  }
                  csync_rename_record(ctx, base._path, fs->path);
              }
              qCInfo(lcUpdate, "remote rename detected based on fileid %s --> %s", base._path.constData(), fs->path.constData());
              fs->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
              done = true;
          };
          if (!ctx->statedb->getFileRecordsByFileId(fs->file_id, renameCandidateProcessing)) {
              ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
              return -1;
          }
-
+          if (base.isValid()) {                           /* tmp existing at all */
-          if (fs->instruction == CSYNC_INSTRUCTION_NEW
+              if (base._type != fs->type) {
-              && fs->type == CSYNC_FTW_TYPE_DIR
+                  qCWarning(lcUpdate, "file types different is not!");
-              && ctx->current == REMOTE_REPLICA
+                  fs->instruction = CSYNC_INSTRUCTION_NEW;
-              && ctx->callbacks.checkSelectiveSyncNewFolderHook) {
+                  goto out;
              if (ctx->callbacks.checkSelectiveSyncNewFolderHook(ctx->callbacks.update_callback_userdata, fs->path, fs->remotePerm)) {
                  return 1;
              }
              qCDebug(lcUpdate, "remote rename detected based on fileid %s --> %s", base._path.constData(), fs->path.constData());
              fs->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
              if (fs->type == CSYNC_FTW_TYPE_DIR) {
                  csync_rename_record(ctx, base._path, fs->path);
              } else {
                  if( base._etag != fs->etag ) {
                      /* CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "ETags are different!"); */
                      /* File with different etag, don't do a rename, but download the file again */
                      fs->instruction = CSYNC_INSTRUCTION_NEW;
                  }
              }
              goto out;
          } else {
              /* file not found in statedb */
              fs->instruction = CSYNC_INSTRUCTION_NEW;
              if (fs->type == CSYNC_FTW_TYPE_DIR && ctx->current == REMOTE_REPLICA && ctx->callbacks.checkSelectiveSyncNewFolderHook) {
                  if (ctx->callbacks.checkSelectiveSyncNewFolderHook(ctx->callbacks.update_callback_userdata, fs->path, fs->remotePerm)) {
                      return 1;
                  }
              }
              goto out;
          }
          goto out;
      }
  }
@@ -397,8 +356,6 @@ out:
              fs->error_status = CSYNC_STATUS_INDIVIDUAL_STAT_FAILED;
          } else if (excluded == CSYNC_FILE_EXCLUDE_CONFLICT) {
              fs->error_status = CSYNC_STATUS_INDIVIDUAL_IS_CONFLICT_FILE;
          } else if (excluded == CSYNC_FILE_EXCLUDE_CANNOT_ENCODE) {
              fs->error_status = CSYNC_STATUS_INDIVIDUAL_CANNOT_ENCODE;
          }
      }
  }
@@ -462,11 +419,11 @@ int csync_walker(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> fs) {
      }
      break;
  case CSYNC_FTW_TYPE_SLINK:
-    qCInfo(lcUpdate, "symlink: %s - not supported", fs->path.constData());
+    qCDebug(lcUpdate, "symlink: %s - not supported", fs->path.constData());
    break;
  default:
    qCInfo(lcUpdate, "item: %s - item type %d not iterated", fs->path.constData(), fs->type);
    return 0;
    break;
  }
  rc = _csync_detect_update(ctx, std::move(fs));
@@ -487,7 +444,7 @@ static bool fill_tree_from_db(CSYNC *ctx, const char *uri)
         * their correct etags again and we don't run into this case.
         */
        if( rec._etag == "_invalid_") {
-            qCInfo(lcUpdate, "%s selective sync excluded", rec._path.constData());
+            qCDebug(lcUpdate, "%s selective sync excluded", rec._path.constData());
            skipbase = rec._path;
            skipbase += '/';
            return;
@@ -509,7 +466,7 @@ static bool fill_tree_from_db(CSYNC *ctx, const char *uri)
         * without a full remote discovery being triggered. */
        CSYNC_EXCLUDE_TYPE excluded = csync_excluded_traversal(ctx, st->path, st->type);
        if (excluded != CSYNC_NOT_EXCLUDED) {
-            qInfo(lcUpdate, "%s excluded from db read (%d)", st->path.constData(), excluded);
+            qDebug(lcUpdate, "%s excluded (%d)", st->path.constData(), excluded);
            if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE
                    || excluded == CSYNC_FILE_SILENTLY_EXCLUDED) {
@@ -528,7 +485,7 @@ static bool fill_tree_from_db(CSYNC *ctx, const char *uri)
        ctx->status_code = CSYNC_STATUS_STATEDB_LOAD_ERROR;
        return false;
    }
-    qInfo(lcUpdate, "%" PRId64 " entries read below path %s from db.", count, uri);
+    qDebug(lcUpdate, "%" PRId64 " entries read below path %s from db.", count, uri);
    return true;
 }
@@ -659,7 +616,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
     * local stat function.
     */
    if( filename[0] == '.' ) {
-        if (filename != ".sys.admin#recall#") { /* recall file shall not be ignored (#4420) */
+        if (filename == ".sys.admin#recall#") { /* recall file shall not be ignored (#4420) */
            dirent->is_hidden = true;
        }
    }
@@ -724,7 +681,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
  }
  csync_vio_closedir(ctx, dh);
-  qCInfo(lcUpdate, " <= Closing walk for %s with read_from_db %d", uri, read_from_db);
+  qCDebug(lcUpdate, " <= Closing walk for %s with read_from_db %d", uri, read_from_db);
  return rc;
--- a/src/csync/csync_util.cpp
+++ b/src/csync/csync_util.cpp
@@ -211,10 +211,3 @@ time_t oc_httpdate_parse( const char *date ) {
    result = timegm(&gmt);
    return result;
 }
 bool csync_is_collision_safe_hash(const QByteArray &checksum_header)
 {
    return checksum_header.startsWith("SHA1:")
        || checksum_header.startsWith("MD5:");
 }
--- a/src/csync/csync_util.h
+++ b/src/csync/csync_util.h
@@ -31,14 +31,4 @@ const char OCSYNC_EXPORT *csync_instruction_str(enum csync_instructions_e instr)
 void OCSYNC_EXPORT csync_memstat_check(void);
 bool OCSYNC_EXPORT csync_file_locked_or_open( const char *dir, const char *fname);
 /* Returns true if we're reasonably certain that hash equality
 * for the header means content equality.
 *
 * Cryptographic safety is not required - this is mainly
 * intended to rule out checksums like Adler32 that are not intended for
 * hashing and have high likelihood of collision with particular inputs.
 */
 bool OCSYNC_EXPORT csync_is_collision_safe_hash(const QByteArray &checksum_header);
 #endif /* _CSYNC_UTIL_H */
--- a/src/csync/vio/csync_vio_local_win.cpp
+++ b/src/csync/vio/csync_vio_local_win.cpp
@@ -181,7 +181,7 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *d
      }
    } else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DEVICE
                || handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_OFFLINE
-              ) {
+                || handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY) {
        file_stat->type = CSYNC_FTW_TYPE_SKIP;
    } else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
        file_stat->type = CSYNC_FTW_TYPE_DIR;
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -129,14 +129,13 @@ set(updater_SRCS
 IF( APPLE )
    list(APPEND client_SRCS cocoainitializer_mac.mm)
    list(APPEND client_SRCS settingsdialogmac.cpp)
    list(REMOVE_ITEM client_SRCS settingsdialog.cpp)
    list(APPEND client_SRCS socketapisocket_mac.mm)
    list(APPEND client_SRCS systray.mm)
    if(SPARKLE_FOUND)
       # Define this, we need to check in updater.cpp
       add_definitions( -DHAVE_SPARKLE )
-       list(APPEND updater_SRCS updater/sparkleupdater_mac.mm updater/sparkleupdater.h)
+       list(APPEND updater_SRCS updater/sparkleupdater_mac.mm)
   endif()
 ENDIF()
@@ -243,9 +242,8 @@ if (NOT NO_SHIBBOLETH)
 endif()
 if(UNIX AND NOT APPLE)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pie -fPIE")
  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 endif()
 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -263,6 +263,7 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
    }
    if (_model->classify(index) == FolderStatusModel::SubFolder) {
        QTreeView *tv = ui->_folderList;
        QMenu *menu = new QMenu(tv);
        menu->setAttribute(Qt::WA_DeleteOnClose);
@@ -274,7 +275,8 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
            ac->setEnabled(false);
        }
-        menu->popup(tv->mapToGlobal(pos));
+        menu->exec(QCursor::pos());
        return;
    }
@@ -289,7 +291,6 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
    auto folderMan = FolderMan::instance();
    QMenu *menu = new QMenu(tv);
    menu->setAttribute(Qt::WA_DeleteOnClose);
    QAction *ac = menu->addAction(tr("Open folder"));
@@ -315,7 +316,7 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
    ac = menu->addAction(tr("Remove folder sync connection"));
    connect(ac, &QAction::triggered, this, &AccountSettings::slotRemoveCurrentFolder);
-    menu->popup(tv->mapToGlobal(pos));
+    menu->exec(tv->mapToGlobal(pos));
 }
 void AccountSettings::slotFolderListClicked(const QModelIndex &indx)
@@ -637,11 +638,7 @@ void AccountSettings::slotAccountStateChanged()
                                 Utility::escape(safeUrl.toString()));
        QString serverWithUser = server;
        if (AbstractCredentials *cred = account->credentials()) {
-            QString user = account->davDisplayName();
+            serverWithUser = tr("%1 as <i>%2</i>").arg(server, Utility::escape(cred->user()));
            if (user.isEmpty()) {
                user = cred->user();
            }
            serverWithUser = tr("%1 as <i>%2</i>").arg(server, Utility::escape(user));
        }
        if (state == AccountState::Connected) {
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -312,10 +312,10 @@ void AccountState::slotInvalidCredentials()
    if (account()->credentials()->ready()) {
        account()->credentials()->invalidateToken();
-    }
+        if (auto creds = qobject_cast<HttpCredentials *>(account()->credentials())) {
-    if (auto creds = qobject_cast<HttpCredentials *>(account()->credentials())) {
+            if (creds->refreshAccessToken())
-        if (creds->refreshAccessToken())
+                return;
-            return;
+        }
    }
    account()->credentials()->askFromUser();
 }
@@ -361,4 +361,23 @@ std::unique_ptr<QSettings> AccountState::settings()
    return s;
 }
 QString AccountState::shortDisplayNameForSettings(int width) const
 {
    QString user = account()->credentials()->user();
    QString host = account()->url().host();
    int port = account()->url().port();
    if (port > 0 && port != 80 && port != 443) {
        host.append(QLatin1Char(':'));
        host.append(QString::number(port));
    }
    if (width > 0) {
        QFont f;
        QFontMetrics fm(f);
        host = fm.elidedText(host, Qt::ElideMiddle, width);
        user = fm.elidedText(user, Qt::ElideRight, width);
    }
    return user + QLatin1String("\n") + host;
 }
 } // namespace OCC
--- a/src/gui/accountstate.h
+++ b/src/gui/accountstate.h
@@ -113,6 +113,11 @@ public:
    /** Returns a new settings object for this account, already in the right groups. */
    std::unique_ptr<QSettings> settings();
    /** display name with two lines that is displayed in the settings
     * If width is bigger than 0, the string will be ellided so it does not exceed that width
     */
    QString shortDisplayNameForSettings(int width = 0) const;
    /** Mark the timestamp when the last successful ETag check happened for
     *  this account.
     *  The checkConnectivity() method uses the timestamp to save a call to
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -429,13 +429,14 @@ void ActivityWidget::slotNotifyServerFinished(const QString &reply, int replyCod
    }
    endNotificationRequest(job->widget(), replyCode);
    // FIXME: remove the  widget after a couple of seconds
    qCInfo(lcActivity) << "Server Notification reply code" << replyCode << reply;
    // if the notification was successful start a timer that triggers
    // removal of the done widgets in a few seconds
    // Add 200 millisecs to the predefined value to make sure that the timer in
    // widget's method readyToClose() has elapsed.
-    if (replyCode == OCS_SUCCESS_STATUS_CODE || replyCode == OCS_SUCCESS_STATUS_CODE_V2) {
+    if (replyCode == OCS_SUCCESS_STATUS_CODE) {
        scheduleWidgetToRemove(job->widget());
    }
 }
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -338,9 +338,7 @@ void Application::slotownCloudWizardDone(int res)
        shouldSetAutoStart = shouldSetAutoStart
            && QCoreApplication::applicationDirPath().startsWith("/Applications/");
 #endif
-        if (shouldSetAutoStart) {
+        Utility::setLaunchOnStartup(_theme->appName(), _theme->appNameGUI(), shouldSetAutoStart);
            Utility::setLaunchOnStartup(_theme->appName(), _theme->appNameGUI(), true);
        }
        _gui->slotShowSettings();
    }
--- a/src/gui/creds/httpcredentialsgui.cpp
+++ b/src/gui/creds/httpcredentialsgui.cpp
@@ -30,21 +30,19 @@ using namespace QKeychain;
 namespace OCC {
 Q_LOGGING_CATEGORY(lcHttpCredentialsGui, "sync.credentials.http.gui", QtInfoMsg)
 void HttpCredentialsGui::askFromUser()
 {
-    // This function can be called from AccountState::slotInvalidCredentials,
+    // Unfortunately there's a bug that doesn't allow us to send the "is this
-    // which (indirectly, through HttpCredentials::invalidateToken) schedules
+    // OAuth2 or Basic auth?" GET request directly. Scheduling it for the event
-    // a cache wipe of the qnam. We can only execute a network job again once
+    // loop works though. See #5989.
-    // the cache has been cleared, otherwise we'd interfere with the job.
+    QMetaObject::invokeMethod(this, "askFromUserAsync", Qt::QueuedConnection);
    QTimer::singleShot(100, this, &HttpCredentialsGui::askFromUserAsync);
 }
 void HttpCredentialsGui::askFromUserAsync()
 {
    // First, we will check what kind of auth we need.
    auto job = new DetermineAuthTypeJob(_account->sharedFromThis(), this);
    job->setTimeout(30 * 1000);
    QObject::connect(job, &DetermineAuthTypeJob::authType, this, [this](DetermineAuthTypeJob::AuthType type) {
        if (type == DetermineAuthTypeJob::OAuth) {
            _asyncAuth.reset(new OAuth(_account, this));
@@ -60,8 +58,7 @@ void HttpCredentialsGui::askFromUserAsync()
            // We will re-enter the event loop, so better wait the next iteration
            QMetaObject::invokeMethod(this, "showDialog", Qt::QueuedConnection);
        } else {
-            // Shibboleth?
+            // Network error? Unsupported auth type?
            qCWarning(lcHttpCredentialsGui) << "Bad http auth type:" << type;
            emit asked();
        }
    });
--- a/src/gui/creds/httpcredentialsgui.h
+++ b/src/gui/creds/httpcredentialsgui.h
@@ -60,12 +60,12 @@ public:
 private slots:
    void asyncAuthResult(OAuth::Result, const QString &user, const QString &accessToken, const QString &refreshToken);
    void showDialog();
    void askFromUserAsync();
 signals:
    void authorisationLinkChanged();
 private:
    Q_INVOKABLE void askFromUserAsync();
    QScopedPointer<OAuth, QScopedPointerObjectDeleteLater<OAuth>> _asyncAuth;
 };
--- a/src/gui/creds/shibboleth/shibbolethwebview.cpp
+++ b/src/gui/creds/shibboleth/shibbolethwebview.cpp
@@ -43,7 +43,7 @@ public:
    UserAgentWebPage(QObject *parent)
        : QWebPage(parent)
    {
-        if (!qEnvironmentVariableIsEmpty("OWNCLOUD_SHIBBOLETH_DEBUG")) {
+        if (!qgetenv("OWNCLOUD_SHIBBOLETH_DEBUG").isEmpty()) {
            settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
        }
    }
@@ -83,7 +83,7 @@ ShibbolethWebView::ShibbolethWebView(AccountPtr account, QWidget *parent)
    setWindowTitle(tr("%1 - Authenticate").arg(Theme::instance()->appNameGUI()));
    // Debug view to display the cipher suite
-    if (!qEnvironmentVariableIsEmpty("OWNCLOUD_SHIBBOLETH_DEBUG")) {
+    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/"));
--- a/src/gui/creds/shibbolethcredentials.cpp
+++ b/src/gui/creds/shibbolethcredentials.cpp
@@ -23,7 +23,6 @@
 #include "creds/shibbolethcredentials.h"
 #include "shibboleth/shibbolethuserjob.h"
 #include "creds/credentialscommon.h"
 #include "creds/httpcredentialsgui.h"
 #include "accessmanager.h"
 #include "account.h"
@@ -152,31 +151,7 @@ void ShibbolethCredentials::fetchFromKeychainHelper()
 void ShibbolethCredentials::askFromUser()
 {
-    // First, we do a DetermineAuthTypeJob to make sure that the server is still using shibboleth and did not upgrade to oauth
+    showLoginWindow();
    DetermineAuthTypeJob *job = new DetermineAuthTypeJob(_account->sharedFromThis(), this);
    connect(job, &DetermineAuthTypeJob::authType, [this, job](DetermineAuthTypeJob::AuthType type) {
        if (type == DetermineAuthTypeJob::Shibboleth) {
            // Normal case, still shibboleth
            showLoginWindow();
        } else if (type == DetermineAuthTypeJob::OAuth) {
            // Hack: upgrade to oauth
            auto newCred = new HttpCredentialsGui;
            job->setParent(0);
            job->deleteLater();
            auto account = this->_account;
            auto user = this->_user;
            account->setCredentials(newCred); // delete this
            account->setCredentialSetting(QLatin1String("user"), user);
            newCred->fetchUser();
            newCred->askFromUser();
        } else {
            // Basic auth or unkown. Since it may be unkown it might be a temporary failure, don't replace the credentials here
            // Still show the login window in that case not to break the flow.
            showLoginWindow();
        }
    });
    job->start();
 }
 bool ShibbolethCredentials::stillValid(QNetworkReply *reply)
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -121,10 +121,6 @@ void Folder::checkLocalPath()
 {
    const QFileInfo fi(_definition.localPath);
    _canonicalLocalPath = fi.canonicalFilePath();
 #ifdef Q_OS_MAC
    // Workaround QTBUG-55896  (Should be fixed in Qt 5.8)
    _canonicalLocalPath = _canonicalLocalPath.normalized(QString::NormalizationForm_C);
 #endif
    if (_canonicalLocalPath.isEmpty()) {
        qCWarning(lcFolder) << "Broken symlink:" << _definition.localPath;
        _canonicalLocalPath = _definition.localPath;
@@ -845,11 +841,6 @@ void Folder::slotTransmissionProgress(const ProgressInfo &pi)
 // a item is completed: count the errors and forward to the ProgressDispatcher
 void Folder::slotItemCompleted(const SyncFileItemPtr &item)
 {
    if (item->_instruction == CSYNC_INSTRUCTION_NONE || item->_instruction == CSYNC_INSTRUCTION_UPDATE_METADATA) {
        // We only care about the updates that deserve to be shown in the UI
        return;
    }
    // add new directories or remove gone away dirs to the watcher
    if (item->isDirectory() && item->_instruction == CSYNC_INSTRUCTION_NEW) {
        FolderMan::instance()->addMonitorPath(alias(), path() + item->_file);
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -59,7 +59,7 @@ QSize FolderStatusDelegate::sizeHint(const QStyleOptionViewItem &option,
    auto classif = static_cast<const FolderStatusModel *>(index.model())->classify(index);
    if (classif == FolderStatusModel::AddButton) {
        const int margins = aliasFm.height(); // same as 2*aliasMargin of paint
-        QFontMetrics fm(qApp->font("QPushButton"));
+        QFontMetrics fm(option.font);
        QStyleOptionButton opt;
        static_cast<QStyleOption &>(opt) = option;
        opt.text = addFolderText();
@@ -138,10 +138,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
        opt.rect.setWidth(qMin(opt.rect.width(), hint.width()));
        opt.rect.adjust(0, aliasMargin, 0, -aliasMargin);
        opt.rect = QStyle::visualRect(option.direction, option.rect, opt.rect);
        painter->save();
        painter->setFont(qApp->font("QPushButton"));
        QApplication::style()->drawControl(QStyle::CE_PushButton, &opt, painter, option.widget);
        painter->restore();
        return;
    }
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -35,7 +35,6 @@
 #include <QWizardPage>
 #include <QTreeWidget>
 #include <QVBoxLayout>
 #include <QEvent>
 #include <stdlib.h>
@@ -537,11 +536,9 @@ FolderWizard::FolderWizard(AccountPtr account, QWidget *parent)
 {
    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
    setPage(Page_Source, _folderWizardSourcePage);
    _folderWizardSourcePage->installEventFilter(this);
    if (!Theme::instance()->singleSyncFolder()) {
        _folderWizardTargetPage = new FolderWizardRemotePath(account);
        setPage(Page_Target, _folderWizardTargetPage);
        _folderWizardTargetPage->installEventFilter(this);
    }
    setPage(Page_SelectiveSync, _folderWizardSelectiveSyncPage);
@@ -554,27 +551,5 @@ FolderWizard::~FolderWizard()
 {
 }
 bool FolderWizard::eventFilter(QObject *watched, QEvent *event)
 {
    if (event->type() == QEvent::LayoutRequest) {
        // Workaround QTBUG-3396:  forces QWizardPrivate::updateLayout()
        QTimer::singleShot(0, this, [this] { setTitleFormat(titleFormat()); });
    }
    return QWizard::eventFilter(watched, event);
 }
 void FolderWizard::resizeEvent(QResizeEvent *event)
 {
    QWizard::resizeEvent(event);
    // workaround for QTBUG-22819: when the error label word wrap, the minimum height is not adjusted
    if (auto page = currentPage()) {
        int hfw = page->heightForWidth(page->width());
        if (page->height() < hfw) {
            page->setMinimumSize(page->minimumSizeHint().width(), hfw);
            setTitleFormat(titleFormat()); // And another workaround for QTBUG-3396
        }
    }
 }
 } // end namespace
--- a/src/gui/folderwizard.h
+++ b/src/gui/folderwizard.h
@@ -149,9 +149,6 @@ public:
    explicit FolderWizard(AccountPtr account, QWidget *parent = 0);
    ~FolderWizard();
    bool eventFilter(QObject *watched, QEvent *event) override;
    void resizeEvent(QResizeEvent *event) override;
 private:
    FolderWizardLocalPath *_folderWizardSourcePage;
    FolderWizardRemotePath *_folderWizardTargetPage;
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -25,10 +25,6 @@
 #include "updater/updater.h"
 #include "updater/ocupdater.h"
 #ifdef Q_OS_MAC
 // FIXME We should unify those, but Sparkle does everything behind the scene transparently
 #include "updater/sparkleupdater.h"
 #endif
 #include "ignorelisteditor.h"
 #include "config.h"
@@ -36,7 +32,6 @@
 #include <QNetworkProxy>
 #include <QDir>
 #include <QScopedValueRollback>
 #include <QMessageBox>
 namespace OCC {
@@ -93,18 +88,6 @@ GeneralSettings::GeneralSettings(QWidget *parent)
    // accountAdded means the wizard was finished and the wizard might change some options.
    connect(AccountManager::instance(), &AccountManager::accountAdded, this, &GeneralSettings::loadMiscSettings);
    // Only our standard brandings currently support beta channel
    Theme *theme = Theme::instance();
    if (theme->appName() != QLatin1String("ownCloud") && theme->appName() != QLatin1String("testpilotcloud") ) {
 #ifdef Q_OS_MAC
        // Because we don't have any statusString from the SparkleUpdater anyway we can hide the whole thing
        _ui->updatesGroupBox->hide();
 #else
        _ui->updateChannelLabel->hide();
        _ui->updateChannel->hide();
 #endif
    }
 }
 GeneralSettings::~GeneralSettings()
@@ -134,79 +117,22 @@ void GeneralSettings::loadMiscSettings()
 void GeneralSettings::slotUpdateInfo()
 {
    if (ConfigFile().skipUpdateCheck() || !Updater::instance()) {
        // updater disabled on compile
        _ui->updatesGroupBox->setVisible(false);
        return;
    }
    // Note: the sparkle-updater is not an OCUpdater
-    OCUpdater *ocupdater = qobject_cast<OCUpdater *>(Updater::instance());
+    OCUpdater *updater = qobject_cast<OCUpdater *>(Updater::instance());
-    if (ocupdater) {
+    if (ConfigFile().skipUpdateCheck()) {
-        connect(ocupdater, &OCUpdater::downloadStateChanged, this, &GeneralSettings::slotUpdateInfo, Qt::UniqueConnection);
+        updater = 0; // don't show update info if updates are disabled
-        connect(_ui->restartButton, &QAbstractButton::clicked, ocupdater, &OCUpdater::slotStartInstaller, Qt::UniqueConnection);
+    }
    if (updater) {
        connect(updater, &OCUpdater::downloadStateChanged, this, &GeneralSettings::slotUpdateInfo, Qt::UniqueConnection);
        connect(_ui->restartButton, &QAbstractButton::clicked, updater, &OCUpdater::slotStartInstaller, Qt::UniqueConnection);
        connect(_ui->restartButton, &QAbstractButton::clicked, qApp, &QApplication::quit, Qt::UniqueConnection);
-
+        _ui->updateStateLabel->setText(updater->statusString());
-        _ui->updateStateLabel->setText(ocupdater->statusString());
+        _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
-        _ui->restartButton->setVisible(ocupdater->downloadState() == OCUpdater::DownloadComplete);
+    } else {
-
+        // can't have those infos from sparkle currently
        _ui->updatesGroupBox->setVisible(false);
    }
 #ifdef Q_OS_MAC
    else if (SparkleUpdater *sparkleUpdater = qobject_cast<SparkleUpdater *>(Updater::instance())) {
        _ui->updateStateLabel->setText(sparkleUpdater->statusString());
        _ui->restartButton->setVisible(false);
    }
 #endif
    // Channel selection
    _ui->updateChannel->setCurrentIndex(ConfigFile().updateChannel() == "beta" ? 1 : 0);
    connect(_ui->updateChannel, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
        this, &GeneralSettings::slotUpdateChannelChanged, Qt::UniqueConnection);
 }
 void GeneralSettings::slotUpdateChannelChanged(int index)
 {
    QString channel = index == 0 ? QStringLiteral("stable") : QStringLiteral("beta");
    if (channel == ConfigFile().updateChannel())
        return;
    auto msgBox = new QMessageBox(
        QMessageBox::Warning,
        tr("Change update channel?"),
        tr("The update channel determines which client updates will be offered "
           "for installation. The \"stable\" channel contains only upgrades that "
           "are considered reliable, while the versions in the \"beta\" channel "
           "may contain newer features and bugfixes, but have not yet been tested "
           "thoroughly."
           "\n\n"
           "Note that this selects only what pool upgrades are taken from, and that "
           "there are no downgrades: So going back from the beta channel to "
           "the stable channel usually cannot be done immediately and means waiting "
           "for a stable version that is newer than the currently installed beta "
           "version."),
        QMessageBox::NoButton,
        this);
    msgBox->addButton(tr("Change update channel"), QMessageBox::AcceptRole);
    msgBox->addButton(tr("Cancel"), QMessageBox::RejectRole);
    connect(msgBox, &QMessageBox::finished, msgBox, [this, channel, msgBox](int result) {
        msgBox->deleteLater();
        if (result == QMessageBox::AcceptRole) {
            ConfigFile().setUpdateChannel(channel);
            if (OCUpdater *updater = qobject_cast<OCUpdater *>(Updater::instance())) {
                updater->setUpdateUrl(Updater::updateUrl());
                updater->checkForUpdate();
            }
 #ifdef Q_OS_MAC
            else if (SparkleUpdater *updater = qobject_cast<SparkleUpdater *>(Updater::instance())) {
                updater->setUpdateUrl(Updater::updateUrl());
                updater->checkForUpdate();
            }
 #endif
        } else {
            _ui->updateChannel->setCurrentText(ConfigFile().updateChannel());
        }
    });
    msgBox->open();
 }
 void GeneralSettings::saveMiscSettings()
--- a/src/gui/generalsettings.h
+++ b/src/gui/generalsettings.h
@@ -44,7 +44,6 @@ private slots:
    void slotToggleLaunchOnStartup(bool);
    void slotToggleOptionalDesktopNotifications(bool);
    void slotUpdateInfo();
    void slotUpdateChannelChanged(int index);
    void slotIgnoreFilesEditor();
    void loadMiscSettings();
--- a/src/gui/generalsettings.ui
+++ b/src/gui/generalsettings.ui
@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>785</width>
-    <height>533</height>
+    <height>523</height>
   </rect>
  </property>
  <property name="windowTitle">
@@ -74,88 +74,48 @@
     <property name="title">
      <string>Updates</string>
     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
+     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
+       <widget class="QLabel" name="updateStateLabel">
-        <item>
+        <property name="text">
-         <widget class="QLabel" name="updateChannelLabel">
+         <string/>
-          <property name="sizePolicy">
+        </property>
-           <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+        <property name="wordWrap">
-            <horstretch>0</horstretch>
+         <bool>true</bool>
-            <verstretch>0</verstretch>
+        </property>
-           </sizepolicy>
+        <property name="openExternalLinks">
-          </property>
+         <bool>true</bool>
-          <property name="text">
+        </property>
-           <string>&amp;Channel</string>
+       </widget>
-          </property>
+      </item>
-          <property name="buddy">
+      <item>
-           <cstring>updateChannel</cstring>
+       <widget class="QPushButton" name="restartButton">
-          </property>
+        <property name="sizePolicy">
-         </widget>
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-        </item>
+          <horstretch>0</horstretch>
-        <item>
+          <verstretch>0</verstretch>
-         <widget class="QComboBox" name="updateChannel">
+         </sizepolicy>
-          <property name="sizePolicy">
+        </property>
-           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+        <property name="text">
-            <horstretch>0</horstretch>
+         <string>&amp;Restart &amp;&amp; Update</string>
-            <verstretch>0</verstretch>
+        </property>
-           </sizepolicy>
+       </widget>
-          </property>
+      </item>
-          <item>
+      <item>
-           <property name="text">
+       <spacer name="horizontalSpacer">
-            <string>stable</string>
+        <property name="orientation">
-           </property>
+         <enum>Qt::Horizontal</enum>
-          </item>
+        </property>
-          <item>
+        <property name="sizeType">
-           <property name="text">
+         <enum>QSizePolicy::Preferred</enum>
-            <string>beta</string>
+        </property>
-           </property>
+        <property name="sizeHint" stdset="0">
-          </item>
+         <size>
-         </widget>
+          <width>40</width>
-        </item>
+          <height>20</height>
-        <item>
+         </size>
-         <widget class="QLabel" name="updateStateLabel">
+        </property>
-          <property name="text">
+       </spacer>
           <string/>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
          <property name="openExternalLinks">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="restartButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="text">
           <string>&amp;Restart &amp;&amp; Update</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="horizontalSpacer">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Preferred</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </item>
     </layout>
    </widget>
@@ -287,10 +247,7 @@
  <tabstop>ignoredFilesButton</tabstop>
  <tabstop>newFolderLimitCheckBox</tabstop>
  <tabstop>newFolderLimitSpinBox</tabstop>
  <tabstop>newExternalStorage</tabstop>
  <tabstop>showInExplorerNavigationPaneCheckBox</tabstop>
  <tabstop>crashreporterCheckBox</tabstop>
  <tabstop>updateChannel</tabstop>
  <tabstop>restartButton</tabstop>
 </tabstops>
 <resources/>
--- a/src/gui/issueswidget.cpp
+++ b/src/gui/issueswidget.cpp
@@ -38,12 +38,6 @@
 namespace OCC {
 /**
 * If more issues are reported than this they will not show up
 * to avoid performance issues around sorting this many issues.
 */
 static const int maxIssueCount = 50000;
 IssuesWidget::IssuesWidget(QWidget *parent)
    : QWidget(parent)
    , _ui(new Ui::IssuesWidget)
@@ -102,14 +96,6 @@ IssuesWidget::IssuesWidget(QWidget *parent)
 #if defined(Q_OS_MAC)
    _ui->_treeWidget->setMinimumWidth(400);
 #endif
    _reenableSorting.setInterval(5000);
    connect(&_reenableSorting, &QTimer::timeout, this,
        [this]() { _ui->_treeWidget->setSortingEnabled(true); });
    _ui->_tooManyIssuesWarning->hide();
    connect(this, &IssuesWidget::issueCountUpdated, this,
        [this](int count) { _ui->_tooManyIssuesWarning->setVisible(count >= maxIssueCount); });
 }
 IssuesWidget::~IssuesWidget()
@@ -121,16 +107,6 @@ void IssuesWidget::showEvent(QShowEvent *ev)
 {
    ConfigFile cfg;
    cfg.restoreGeometryHeader(_ui->_treeWidget->header());
    // Sorting by section was newly enabled. But if we restore the header
    // from a state where sorting was disabled, both of these flags will be
    // false and sorting will be impossible!
    _ui->_treeWidget->header()->setSectionsClickable(true);
    _ui->_treeWidget->header()->setSortIndicatorShown(true);
    // Switch back to "first important, then by time" ordering
    _ui->_treeWidget->sortByColumn(0, Qt::DescendingOrder);
    QWidget::showEvent(ev);
 }
@@ -143,8 +119,6 @@ void IssuesWidget::hideEvent(QHideEvent *ev)
 void IssuesWidget::cleanItems(const QString &folder)
 {
    _ui->_treeWidget->setSortingEnabled(false);
    // The issue list is a state, clear it and let the next sync fill it
    // with ignored files and propagation errors.
    int itemCnt = _ui->_treeWidget->topLevelItemCount();
@@ -155,9 +129,6 @@ void IssuesWidget::cleanItems(const QString &folder)
            delete item;
        }
    }
    _ui->_treeWidget->setSortingEnabled(true);
    // update the tabtext
    emit(issueCountUpdated(_ui->_treeWidget->topLevelItemCount()));
 }
@@ -167,17 +138,11 @@ void IssuesWidget::addItem(QTreeWidgetItem *item)
    if (!item)
        return;
-    int count = _ui->_treeWidget->topLevelItemCount();
+    int insertLoc = 0;
    if (count >= maxIssueCount)
        return;
    _ui->_treeWidget->setSortingEnabled(false);
    _reenableSorting.start();
    // Insert item specific errors behind the others
    int insertLoc = 0;
    if (!item->text(1).isEmpty()) {
-        for (int i = 0; i < count; ++i) {
+        for (int i = 0; i < _ui->_treeWidget->topLevelItemCount(); ++i) {
            if (_ui->_treeWidget->topLevelItem(i)->text(1).isEmpty()) {
                insertLoc = i + 1;
            } else {
@@ -216,7 +181,7 @@ void IssuesWidget::slotProgressInfo(const QString &folder, const ProgressInfo &p
 void IssuesWidget::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item)
 {
-    if (!item->showInIssuesTab())
+    if (!item->hasErrorStatus())
        return;
    QTreeWidgetItem *line = ProtocolWidget::createCompletedTreewidgetItem(folder, *item);
    if (!line)
@@ -275,7 +240,7 @@ bool IssuesWidget::shouldBeVisible(QTreeWidgetItem *item, AccountState *filterAc
    const QString &filterFolderAlias) const
 {
    bool visible = true;
-    auto status = item->data(3, Qt::UserRole);
+    auto status = item->data(0, Qt::UserRole);
    visible &= (_ui->showIgnores->isChecked() || status != SyncFileItem::FileIgnored);
    visible &= (_ui->showWarnings->isChecked()
        || (status != SyncFileItem::SoftError
@@ -403,14 +368,13 @@ void IssuesWidget::addError(const QString &folderAlias, const QString &message,
    QIcon icon = Theme::instance()->syncStateIcon(SyncResult::Error);
-    QTreeWidgetItem *twitem = new SortedTreeWidgetItem(columns);
+    QTreeWidgetItem *twitem = new QTreeWidgetItem(columns);
    twitem->setData(0, Qt::SizeHintRole, QSize(0, ActivityItemDelegate::rowHeight()));
    twitem->setData(0, Qt::UserRole, timestamp);
    twitem->setIcon(0, icon);
    twitem->setToolTip(0, longTimeStr);
    twitem->setData(2, Qt::UserRole, folderAlias);
    twitem->setToolTip(3, message);
-    twitem->setData(3, Qt::UserRole, SyncFileItem::NormalError);
+    twitem->setData(0, Qt::UserRole, SyncFileItem::NormalError);
    twitem->setData(2, Qt::UserRole, folderAlias);
    addItem(twitem);
    addErrorWidget(twitem, message, category);
--- a/src/gui/issueswidget.h
+++ b/src/gui/issueswidget.h
@@ -18,7 +18,6 @@
 #include <QDialog>
 #include <QDateTime>
 #include <QLocale>
 #include <QTimer>
 #include "progressdispatcher.h"
 #include "owncloudgui.h"
@@ -85,9 +84,6 @@ private:
    /// Wipes all insufficient remote storgage blacklist entries
    void retryInsufficentRemoteStorageErrors(const QString &folderAlias);
    /// Each insert disables sorting, this timer reenables it
    QTimer _reenableSorting;
    Ui::IssuesWidget *_ui;
 };
 }
--- a/src/gui/issueswidget.ui
+++ b/src/gui/issueswidget.ui
@@ -99,9 +99,6 @@
     <property name="rootIsDecorated">
      <bool>false</bool>
     </property>
     <property name="sortingEnabled">
      <bool>true</bool>
     </property>
     <property name="columnCount">
      <number>4</number>
     </property>
@@ -127,13 +124,6 @@
     </column>
    </widget>
   </item>
   <item>
    <widget class="QLabel" name="_tooManyIssuesWarning">
     <property name="text">
      <string>There were too many issues. Not all will be visible here.</string>
     </property>
    </widget>
   </item>
   <item>
    <layout class="QHBoxLayout" name="horizontalLayout">
     <item>
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
 // check a environment variable for core dumps
 #ifdef Q_OS_UNIX
-    if (!qEnvironmentVariableIsEmpty("OWNCLOUD_CORE_DUMP")) {
+    if (!qgetenv("OWNCLOUD_CORE_DUMP").isEmpty()) {
        struct rlimit core_limit;
        core_limit.rlim_cur = RLIM_INFINITY;
        core_limit.rlim_max = RLIM_INFINITY;
--- a/src/gui/notificationwidget.cpp
+++ b/src/gui/notificationwidget.cpp
@@ -128,8 +128,8 @@ void NotificationWidget::slotNotificationRequestFinished(int statusCode)
    QString timeStr = locale.toString(QTime::currentTime());
-    // the ocs API returns stat code 100 or 200 inside the xml if it succeeded.
+    // the ocs API returns stat code 100 if it succeeded.
-    if (statusCode != OCS_SUCCESS_STATUS_CODE && statusCode != OCS_SUCCESS_STATUS_CODE_V2) {
+    if (statusCode != OCS_SUCCESS_STATUS_CODE) {
        qCWarning(lcNotifications) << "Notification Request to Server failed, leave button visible.";
        for (i = 0; i < _buttons.count(); i++) {
            _buttons.at(i)->setEnabled(true);
--- a/src/gui/ocsjob.cpp
+++ b/src/gui/ocsjob.cpp
@@ -28,7 +28,6 @@ OcsJob::OcsJob(AccountPtr account)
    : AbstractNetworkJob(account, "")
 {
    _passStatusCodes.append(OCS_SUCCESS_STATUS_CODE);
    _passStatusCodes.append(OCS_SUCCESS_STATUS_CODE_V2);
    setIgnoreCredentialFailure(true);
 }
--- a/src/gui/ocsjob.h
+++ b/src/gui/ocsjob.h
@@ -24,8 +24,6 @@
 #include <QUrl>
 #define OCS_SUCCESS_STATUS_CODE 100
 // Apparantly the v2.php URLs can return that
 #define OCS_SUCCESS_STATUS_CODE_V2 200
 class QJsonDocument;
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -50,13 +50,18 @@ const char propertyAccountC[] = "oc_account";
 ownCloudGui::ownCloudGui(Application *parent)
    : QObject(parent)
    , _tray(0)
    ,
 #if defined(Q_OS_MAC)
-    , _settingsDialog(new SettingsDialogMac(this))
+    _settingsDialog(new SettingsDialogMac(this))
    ,
 #else
-    , _settingsDialog(new SettingsDialog(this))
+    _settingsDialog(new SettingsDialog(this))
    ,
 #endif
-    , _logBrowser(0)
+    _logBrowser(0)
    , _contextMenuVisibleOsx(false)
    , _recentActionsMenu(0)
    , _qdbusmenuWorkaround(false)
    , _app(parent)
 {
    _tray = new Systray();
@@ -112,7 +117,7 @@ void ownCloudGui::slotOpenSettingsDialog()
 void ownCloudGui::slotTrayClicked(QSystemTrayIcon::ActivationReason reason)
 {
-    if (_workaroundFakeDoubleClick) {
+    if (_qdbusmenuWorkaround) {
        static QElapsedTimer last_click;
        if (last_click.isValid() && last_click.elapsed() < 200) {
            return;
@@ -202,23 +207,13 @@ void ownCloudGui::slotComputeOverallSyncStatus()
 {
    bool allSignedOut = true;
    bool allPaused = true;
    bool allDisconnected = true;
    QVector<AccountStatePtr> problemAccounts;
    auto setStatusText = [&](const QString &text) {
        // Don't overwrite the status if we're currently syncing
        if (FolderMan::instance()->currentSyncFolder())
            return;
        _actionStatus->setText(text);
    };
    foreach (auto a, AccountManager::instance()->accounts()) {
        if (!a->isSignedOut()) {
            allSignedOut = false;
        }
        if (!a->isConnected()) {
            problemAccounts.append(a);
        } else {
            allDisconnected = false;
        }
    }
    foreach (Folder *f, FolderMan::instance()->map()) {
@@ -229,11 +224,6 @@ void ownCloudGui::slotComputeOverallSyncStatus()
    if (!problemAccounts.empty()) {
        _tray->setIcon(Theme::instance()->folderOfflineIcon(true, contextMenuVisible()));
        if (allDisconnected) {
            setStatusText(tr("Disconnected"));
        } else {
            setStatusText(tr("Disconnected from some accounts"));
        }
 #ifdef Q_OS_WIN
        // Windows has a 128-char tray tooltip length limit.
        QStringList accountNames;
@@ -260,12 +250,10 @@ void ownCloudGui::slotComputeOverallSyncStatus()
    if (allSignedOut) {
        _tray->setIcon(Theme::instance()->folderOfflineIcon(true, contextMenuVisible()));
        _tray->setToolTip(tr("Please sign in"));
        setStatusText(tr("Signed out"));
        return;
    } else if (allPaused) {
        _tray->setIcon(Theme::instance()->syncStateIcon(SyncResult::Paused, true, contextMenuVisible()));
        _tray->setToolTip(tr("Account synchronization is disabled"));
        setStatusText(tr("Synchronization is paused"));
        return;
    }
@@ -273,40 +261,34 @@ void ownCloudGui::slotComputeOverallSyncStatus()
    QString trayMessage;
    FolderMan *folderMan = FolderMan::instance();
    Folder::Map map = folderMan->map();
-    SyncResult::Status overallResult = FolderMan::accountStatus(map.values()).status();
+    SyncResult overallResult = FolderMan::accountStatus(map.values());
    // create the tray blob message, check if we have an defined state
-    if (overallResult != SyncResult::Undefined && map.count() > 0) {
+    if (overallResult.status() != SyncResult::Undefined) {
        if (map.count() > 0) {
 #ifdef Q_OS_WIN
-        // Windows has a 128-char tray tooltip length limit.
+            // Windows has a 128-char tray tooltip length limit.
-        trayMessage = folderMan->statusToString(overallResult, false);
+            trayMessage = folderMan->statusToString(overallResult.status(), false);
 #else
-        QStringList allStatusStrings;
+            QStringList allStatusStrings;
-        foreach (Folder *folder, map.values()) {
+            foreach (Folder *folder, map.values()) {
-            QString folderMessage = folderMan->statusToString(folder->syncResult().status(), folder->syncPaused());
+                QString folderMessage = folderMan->statusToString(folder->syncResult().status(), folder->syncPaused());
-            allStatusStrings += tr("Folder %1: %2").arg(folder->shortGuiLocalPath(), folderMessage);
+                allStatusStrings += tr("Folder %1: %2").arg(folder->shortGuiLocalPath(), folderMessage);
-        }
+            }
-        trayMessage = allStatusStrings.join(QLatin1String("\n"));
+            trayMessage = allStatusStrings.join(QLatin1String("\n"));
 #endif
        } else {
            trayMessage = tr("No sync folders configured.");
        }
-        QIcon statusIcon = Theme::instance()->syncStateIcon(overallResult, true, contextMenuVisible());
+        QIcon statusIcon = Theme::instance()->syncStateIcon(overallResult.status(), true, contextMenuVisible());
        _tray->setIcon(statusIcon);
        _tray->setToolTip(trayMessage);
        if (overallResult == SyncResult::Success || overallResult == SyncResult::Problem) {
            setStatusText(tr("Up to date"));
        } else if (overallResult == SyncResult::Paused) {
            setStatusText(tr("Synchronization is paused"));
        } else {
            setStatusText(tr("Error during synchronization"));
        }
    } else {
-        if (overallResult == SyncResult::Undefined)
+        // undefined because there are no folders.
-            overallResult = SyncResult::Problem;
+        QIcon icon = Theme::instance()->syncStateIcon(SyncResult::Problem, true, contextMenuVisible());
        QIcon icon = Theme::instance()->syncStateIcon(overallResult, true, contextMenuVisible());
        _tray->setIcon(icon);
        _tray->setToolTip(tr("There are no sync folders configured."));
        setStatusText(tr("No sync folders configured"));
    }
 }
@@ -344,7 +326,7 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
            menu->addAction(tr("Managed Folders:"))->setDisabled(true);
        }
-        QAction *action = menu->addAction(tr("Open folder '%1'").arg(folder->shortGuiLocalPath()));
+        QAction *action = new QAction(tr("Open folder '%1'").arg(folder->shortGuiLocalPath()), menu);
        auto alias = folder->alias();
        connect(action, &QAction::triggered, this, [this, alias] { this->slotFolderOpenAction(alias); });
    }
@@ -376,19 +358,17 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
 void ownCloudGui::slotContextMenuAboutToShow()
 {
-    _contextMenuVisibleManual = true;
+    // For some reason on OS X _contextMenu->isVisible returns always false
    _contextMenuVisibleOsx = true;
    // Update icon in sys tray, as it might change depending on the context menu state
    slotComputeOverallSyncStatus();
    if (!_workaroundNoAboutToShowUpdate) {
        updateContextMenu();
    }
 }
 void ownCloudGui::slotContextMenuAboutToHide()
 {
-    _contextMenuVisibleManual = false;
+    // For some reason on OS X _contextMenu->isVisible returns always false
    _contextMenuVisibleOsx = false;
    // Update icon in sys tray, as it might change depending on the context menu state
    slotComputeOverallSyncStatus();
@@ -396,11 +376,11 @@ void ownCloudGui::slotContextMenuAboutToHide()
 bool ownCloudGui::contextMenuVisible() const
 {
-    // On some platforms isVisible doesn't work and always returns false,
+#ifdef Q_OS_MAC
-    // elsewhere aboutToHide is unreliable.
+    return _contextMenuVisibleOsx;
-    if (_workaroundManualVisibility)
+#else
        return _contextMenuVisibleManual;
    return _contextMenu->isVisible();
 #endif
 }
 static bool minimalTrayMenu()
@@ -423,36 +403,12 @@ static bool updateWhileVisible()
    }
 }
-static QByteArray envForceQDBusTrayWorkaround()
+static QByteArray forceQDBusTrayWorkaround()
 {
    static QByteArray var = qgetenv("OWNCLOUD_FORCE_QDBUS_TRAY_WORKAROUND");
    return var;
 }
 static QByteArray envForceWorkaroundShowAndHideTray()
 {
    static QByteArray var = qgetenv("OWNCLOUD_FORCE_TRAY_SHOW_HIDE");
    return var;
 }
 static QByteArray envForceWorkaroundNoAboutToShowUpdate()
 {
    static QByteArray var = qgetenv("OWNCLOUD_FORCE_TRAY_NO_ABOUT_TO_SHOW");
    return var;
 }
 static QByteArray envForceWorkaroundFakeDoubleClick()
 {
    static QByteArray var = qgetenv("OWNCLOUD_FORCE_TRAY_FAKE_DOUBLE_CLICK");
    return var;
 }
 static QByteArray envForceWorkaroundManualVisibility()
 {
    static QByteArray var = qgetenv("OWNCLOUD_FORCE_TRAY_MANUAL_VISIBILITY");
    return var;
 }
 void ownCloudGui::setupContextMenu()
 {
    if (_contextMenu) {
@@ -475,65 +431,51 @@ void ownCloudGui::setupContextMenu()
        return;
    }
-    auto applyEnvVariable = [](bool *sw, const QByteArray &value) {
+// Enables workarounds for bugs introduced in Qt 5.5.0
-        if (value == "1")
+// In particular QTBUG-47863 #3672 (tray menu fails to update and
-            *sw = true;
+// becomes unresponsive) and QTBUG-48068 #3722 (click signal is
-        if (value == "0")
+// emitted several times)
-            *sw = false;
+// The Qt version check intentionally uses 5.0.0 (where platformMenu()
-    };
+// was introduced) instead of 5.5.0 to avoid issues where the Qt
-
+// version used to build is different from the one used at runtime.
-    // This is an old compound flag that people might still depend on
+// If we build with 5.6.1 or newer, we can skip this because the
-    bool qdbusmenuWorkarounds = false;
+// bugs should be fixed there.
    applyEnvVariable(&qdbusmenuWorkarounds, envForceQDBusTrayWorkaround());
    if (qdbusmenuWorkarounds) {
        _workaroundFakeDoubleClick = true;
        _workaroundNoAboutToShowUpdate = true;
        _workaroundShowAndHideTray = true;
    }
 #ifdef Q_OS_MAC
    // https://bugreports.qt.io/browse/QTBUG-54633
    _workaroundNoAboutToShowUpdate = true;
    _workaroundManualVisibility = true;
 #endif
 #ifdef Q_OS_LINUX
-    // For KDE sessions if the platform plugin is missing,
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) && (QT_VERSION < QT_VERSION_CHECK(5, 6, 0))
-    // neither aboutToShow() updates nor the isVisible() call
+    if (qVersion() == QByteArray("5.5.0")) {
-    // work. At least aboutToHide is reliable.
+        QObject *platformMenu = reinterpret_cast<QObject *>(_tray->contextMenu()->platformMenu());
-    // https://github.com/owncloud/client/issues/6545
+        if (platformMenu
-    static QByteArray xdgCurrentDesktop = qgetenv("XDG_CURRENT_DESKTOP");
+            && platformMenu->metaObject()->className() == QLatin1String("QDBusPlatformMenu")) {
-    static QByteArray desktopSession = qgetenv("DESKTOP_SESSION");
+            _qdbusmenuWorkaround = true;
-    bool isKde =
+            qCWarning(lcApplication) << "Enabled QDBusPlatformMenu workaround";
-        xdgCurrentDesktop.contains("KDE")
+        }
        || desktopSession.contains("plasma")
        || desktopSession.contains("kde");
    QObject *platformMenu = reinterpret_cast<QObject *>(_tray->contextMenu()->platformMenu());
    if (isKde && platformMenu && platformMenu->metaObject()->className() == QLatin1String("QDBusPlatformMenu")) {
        _workaroundManualVisibility = true;
        _workaroundNoAboutToShowUpdate = true;
    }
 #endif
 #endif
-    applyEnvVariable(&_workaroundNoAboutToShowUpdate, envForceWorkaroundNoAboutToShowUpdate());
+    if (forceQDBusTrayWorkaround() == "1") {
-    applyEnvVariable(&_workaroundFakeDoubleClick, envForceWorkaroundFakeDoubleClick());
+        _qdbusmenuWorkaround = true;
-    applyEnvVariable(&_workaroundShowAndHideTray, envForceWorkaroundShowAndHideTray());
+    } else if (forceQDBusTrayWorkaround() == "0") {
-    applyEnvVariable(&_workaroundManualVisibility, envForceWorkaroundManualVisibility());
+        _qdbusmenuWorkaround = false;
    }
-    qCInfo(lcApplication) << "Tray menu workarounds:"
+    // When the qdbusmenuWorkaround is necessary, we can't do on-demand updates
-                          << "noabouttoshow:" << _workaroundNoAboutToShowUpdate
+    // because the workaround is to hide and show the tray icon.
-                          << "fakedoubleclick:" << _workaroundFakeDoubleClick
+    if (_qdbusmenuWorkaround) {
-                          << "showhide:" << _workaroundShowAndHideTray
+        connect(&_workaroundBatchTrayUpdate, &QTimer::timeout, this, &ownCloudGui::updateContextMenu);
-                          << "manualvisibility:" << _workaroundManualVisibility;
+        _workaroundBatchTrayUpdate.setInterval(30 * 1000);
-
+        _workaroundBatchTrayUpdate.setSingleShot(true);
-
+    } else {
-    connect(&_delayedTrayUpdateTimer, &QTimer::timeout, this, &ownCloudGui::updateContextMenu);
+// Update the context menu whenever we're about to show it
-    _delayedTrayUpdateTimer.setInterval(2 * 1000);
+// to the user.
-    _delayedTrayUpdateTimer.setSingleShot(true);
+#ifdef Q_OS_MAC
-
+        // https://bugreports.qt.io/browse/QTBUG-54633
-    connect(_contextMenu.data(), SIGNAL(aboutToShow()), SLOT(slotContextMenuAboutToShow()));
+        connect(_contextMenu.data(), SIGNAL(aboutToShow()), SLOT(slotContextMenuAboutToShow()));
-    // unfortunately aboutToHide is unreliable, it seems to work on OSX though
+        connect(_contextMenu.data(), SIGNAL(aboutToHide()), SLOT(slotContextMenuAboutToHide()));
-    connect(_contextMenu.data(), SIGNAL(aboutToHide()), SLOT(slotContextMenuAboutToHide()));
+#else
        connect(_contextMenu.data(), &QMenu::aboutToShow, this, &ownCloudGui::updateContextMenu);
 #endif
    }
    // Populate the context menu now.
    updateContextMenu();
@@ -545,21 +487,13 @@ void ownCloudGui::updateContextMenu()
        return;
    }
-    // If it's visible, we can't update live, and it won't be updated lazily: reschedule
+    if (_qdbusmenuWorkaround) {
    if (contextMenuVisible() && !updateWhileVisible() && _workaroundNoAboutToShowUpdate) {
        if (!_delayedTrayUpdateTimer.isActive()) {
            _delayedTrayUpdateTimer.start();
        }
        return;
    }
    if (_workaroundShowAndHideTray) {
        // To make tray menu updates work with these bugs (see setupContextMenu)
        // we need to hide and show the tray icon. We don't want to do that
        // while it's visible!
        if (contextMenuVisible()) {
-            if (!_delayedTrayUpdateTimer.isActive()) {
+            if (!_workaroundBatchTrayUpdate.isActive()) {
-                _delayedTrayUpdateTimer.start();
+                _workaroundBatchTrayUpdate.start();
            }
            return;
        }
@@ -616,13 +550,11 @@ void ownCloudGui::updateContextMenu()
    _contextMenu->addSeparator();
    _contextMenu->addAction(_actionStatus);
    if (isConfigured && atLeastOneConnected) {
        _contextMenu->addAction(_actionStatus);
        _contextMenu->addMenu(_recentActionsMenu);
        _contextMenu->addSeparator();
    }
    _contextMenu->addSeparator();
    if (accountList.isEmpty()) {
        _contextMenu->addAction(_actionNewAccountWizard);
    }
@@ -674,30 +606,35 @@ void ownCloudGui::updateContextMenu()
    }
    _contextMenu->addAction(_actionQuit);
-    if (_workaroundShowAndHideTray) {
+    if (_qdbusmenuWorkaround) {
        _tray->show();
    }
 }
 void ownCloudGui::updateContextMenuNeeded()
 {
-    // if it's visible and we can update live: update now
+    // For the workaround case updating while visible is impossible. Instead
-    if (contextMenuVisible() && updateWhileVisible()) {
+    // occasionally update the menu when it's invisible.
-        // Note: don't update while visible on OSX
+    if (_qdbusmenuWorkaround) {
-        // https://bugreports.qt.io/browse/QTBUG-54845
+        if (!_workaroundBatchTrayUpdate.isActive()) {
-        updateContextMenu();
+            _workaroundBatchTrayUpdate.start();
        return;
    }
    // if we can't lazily update: update later
    if (_workaroundNoAboutToShowUpdate) {
        // Note: don't update immediately even in the invisible case
        // as that can lead to extremely frequent menu updates
        if (!_delayedTrayUpdateTimer.isActive()) {
            _delayedTrayUpdateTimer.start();
        }
        return;
    }
 #ifdef Q_OS_MAC
    // https://bugreports.qt.io/browse/QTBUG-54845
    // We cannot update on demand or while visible -> update when invisible.
    if (!contextMenuVisible()) {
        updateContextMenu();
    }
 #else
    if (updateWhileVisible() && contextMenuVisible())
        updateContextMenu();
 #endif
    // If no update was done here, we might update it on-demand due to
    // the aboutToShow() signal.
 }
 void ownCloudGui::slotShowTrayMessage(const QString &title, const QString &msg)
@@ -805,7 +742,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo &
                                       .arg(progress._currentDiscoveredFolder));
        }
    } else if (progress.status() == ProgressInfo::Done) {
-        QTimer::singleShot(2000, this, &ownCloudGui::slotComputeOverallSyncStatus);
+        QTimer::singleShot(2000, this, &ownCloudGui::slotDisplayIdle);
    }
    if (progress.status() != ProgressInfo::Propagation) {
        return;
@@ -875,6 +812,11 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo &
    }
 }
 void ownCloudGui::slotDisplayIdle()
 {
    _actionStatus->setText(tr("Up to date"));
 }
 void ownCloudGui::slotLogin()
 {
    if (auto account = qvariant_cast<AccountStatePtr>(sender()->property(propertyAccountC))) {
--- a/src/gui/owncloudgui.h
+++ b/src/gui/owncloudgui.h
@@ -98,6 +98,7 @@ public slots:
    void slotRemoveDestroyedShareDialogs();
 private slots:
    void slotDisplayIdle();
    void slotLogin();
    void slotLogout();
    void slotUnpauseAllFolders();
@@ -119,19 +120,14 @@ private:
    // tray's menu
    QScopedPointer<QMenu> _contextMenu;
-    // Manually tracking whether the context menu is visible via aboutToShow
+    // Manually tracking whether the context menu is visible, but only works
-    // and aboutToHide. Unfortunately aboutToHide isn't reliable everywhere
+    // on OSX because aboutToHide is not reliable everywhere.
-    // so this only gets used with _workaroundManualVisibility (when the tray's
+    bool _contextMenuVisibleOsx;
    // isVisible() is unreliable)
    bool _contextMenuVisibleManual = false;
    QMenu *_recentActionsMenu;
    QVector<QMenu *> _accountMenus;
-    bool _workaroundShowAndHideTray = false;
+    bool _qdbusmenuWorkaround;
-    bool _workaroundNoAboutToShowUpdate = false;
+    QTimer _workaroundBatchTrayUpdate;
    bool _workaroundFakeDoubleClick = false;
    bool _workaroundManualVisibility = false;
    QTimer _delayedTrayUpdateTimer;
    QMap<QString, QPointer<ShareDialog>> _shareDialogs;
    QAction *_actionLogin;
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -18,7 +18,6 @@
 #include <QProcess>
 #include <QMessageBox>
 #include <QDesktopServices>
 #include <QApplication>
 #include "wizard/owncloudwizardcommon.h"
 #include "wizard/owncloudwizard.h"
@@ -46,7 +45,7 @@ OwncloudSetupWizard::OwncloudSetupWizard(QObject *parent)
    , _remoteFolder()
 {
    connect(_ocWizard, &OwncloudWizard::determineAuthType,
-        this, &OwncloudSetupWizard::slotCheckServer);
+        this, &OwncloudSetupWizard::slotDetermineAuthType);
    connect(_ocWizard, &OwncloudWizard::connectToOCUrl,
        this, &OwncloudSetupWizard::slotConnectToOCUrl);
    connect(_ocWizard, &OwncloudWizard::createLocalAndRemoteFolders,
@@ -70,7 +69,6 @@ static QPointer<OwncloudSetupWizard> wiz = 0;
 void OwncloudSetupWizard::runWizard(QObject *obj, const char *amember, QWidget *parent)
 {
    if (!wiz.isNull()) {
        bringWizardToFrontIfVisible();
        return;
    }
@@ -86,17 +84,6 @@ bool OwncloudSetupWizard::bringWizardToFrontIfVisible()
        return false;
    }
    if (wiz->_ocWizard->currentId() == WizardCommon::Page_ShibbolethCreds) {
        // Try to find if there is a browser open and raise that instead (Issue #6105)
        const auto allWindow = qApp->topLevelWidgets();
        auto it = std::find_if(allWindow.cbegin(), allWindow.cend(), [](QWidget *w)
            { return QLatin1String(w->metaObject()->className()) == QLatin1String("OCC::ShibbolethWebView"); });
        if (it != allWindow.cend()) {
            ownCloudGui::raiseDialog(*it);
            return true;
        }
    }
    ownCloudGui::raiseDialog(wiz->_ocWizard);
    return true;
 }
@@ -140,7 +127,7 @@ void OwncloudSetupWizard::startWizard()
 }
 // also checks if an installation is valid and determines auth type in a second step
-void OwncloudSetupWizard::slotCheckServer(const QString &urlString)
+void OwncloudSetupWizard::slotDetermineAuthType(const QString &urlString)
 {
    QString fixedUrl = urlString;
    QUrl url = QUrl::fromUserInput(fixedUrl);
@@ -163,7 +150,7 @@ void OwncloudSetupWizard::slotCheckServer(const QString &urlString)
        // We want to reset the QNAM proxy so that the global proxy settings are used (via ClientProxy settings)
        account->networkAccessManager()->setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy));
        // use a queued invocation so we're as asynchronous as with the other code path
-        QMetaObject::invokeMethod(this, "slotFindServer", Qt::QueuedConnection);
+        QMetaObject::invokeMethod(this, "slotContinueDetermineAuth", Qt::QueuedConnection);
    }
 }
@@ -177,40 +164,20 @@ void OwncloudSetupWizard::slotSystemProxyLookupDone(const QNetworkProxy &proxy)
    AccountPtr account = _ocWizard->account();
    account->networkAccessManager()->setProxy(proxy);
-    slotFindServer();
+    slotContinueDetermineAuth();
 }
-void OwncloudSetupWizard::slotFindServer()
+void OwncloudSetupWizard::slotContinueDetermineAuth()
 {
    AccountPtr account = _ocWizard->account();
    // Set fake credentials before we check what credential it actually is.
    account->setCredentials(CredentialsFactory::create("dummy"));
-    // Determining the actual server URL can be a multi-stage process
+    // Before we check the auth type, resolve any permanent redirect
-    // 1. Check url/status.php with CheckServerJob
+    // chain there might be. We cannot do this only on url/status.php
-    //    If that works we're done. In that case we don't check the
+    // in CheckServerJob, because things like url shorteners don't
-    //    url directly for redirects, see #5954.
+    // redirect subpaths.
    // 2. Check the url for permanent redirects (like url shorteners)
    // 3. Check redirected-url/status.php with CheckServerJob
    // Step 1: Check url/status.php
    CheckServerJob *job = new CheckServerJob(account, this);
    job->setIgnoreCredentialFailure(true);
    connect(job, &CheckServerJob::instanceFound, this, &OwncloudSetupWizard::slotFoundServer);
    connect(job, &CheckServerJob::instanceNotFound, this, &OwncloudSetupWizard::slotFindServerBehindRedirect);
    connect(job, &CheckServerJob::timeout, this, &OwncloudSetupWizard::slotNoServerFoundTimeout);
    job->setTimeout((account->url().scheme() == "https") ? 30 * 1000 : 10 * 1000);
    job->start();
    // Step 2 and 3 are in slotFindServerBehindRedirect()
 }
 void OwncloudSetupWizard::slotFindServerBehindRedirect()
 {
    AccountPtr account = _ocWizard->account();
    // Step 2: Resolve any permanent redirect chains on the base url
    auto redirectCheckJob = account->sendRequest("GET", account->url());
    // Use a significantly reduced timeout for this redirect check:
@@ -230,20 +197,20 @@ void OwncloudSetupWizard::slotFindServerBehindRedirect()
            }
        });
-    // Step 3: When done, start checking status.php.
+    // When done, start checking status.php.
    connect(redirectCheckJob, &SimpleNetworkJob::finishedSignal, this,
        [this, account]() {
            CheckServerJob *job = new CheckServerJob(account, this);
            job->setIgnoreCredentialFailure(true);
-            connect(job, &CheckServerJob::instanceFound, this, &OwncloudSetupWizard::slotFoundServer);
+            connect(job, &CheckServerJob::instanceFound, this, &OwncloudSetupWizard::slotOwnCloudFoundAuth);
-            connect(job, &CheckServerJob::instanceNotFound, this, &OwncloudSetupWizard::slotNoServerFound);
+            connect(job, &CheckServerJob::instanceNotFound, this, &OwncloudSetupWizard::slotNoOwnCloudFoundAuth);
-            connect(job, &CheckServerJob::timeout, this, &OwncloudSetupWizard::slotNoServerFoundTimeout);
+            connect(job, &CheckServerJob::timeout, this, &OwncloudSetupWizard::slotNoOwnCloudFoundAuthTimeout);
            job->setTimeout((account->url().scheme() == "https") ? 30 * 1000 : 10 * 1000);
            job->start();
-    });
+        });
 }
-void OwncloudSetupWizard::slotFoundServer(const QUrl &url, const QJsonObject &info)
+void OwncloudSetupWizard::slotOwnCloudFoundAuth(const QUrl &url, const QJsonObject &info)
 {
    auto serverVersion = CheckServerJob::version(info);
@@ -263,10 +230,14 @@ void OwncloudSetupWizard::slotFoundServer(const QUrl &url, const QJsonObject &in
        qCInfo(lcWizard) << " was redirected to" << url.toString();
    }
-    slotDetermineAuthType();
+    DetermineAuthTypeJob *job = new DetermineAuthTypeJob(_ocWizard->account(), this);
    job->setIgnoreCredentialFailure(true);
    connect(job, &DetermineAuthTypeJob::authType,
        _ocWizard, &OwncloudWizard::setAuthType);
    job->start();
 }
-void OwncloudSetupWizard::slotNoServerFound(QNetworkReply *reply)
+void OwncloudSetupWizard::slotNoOwnCloudFoundAuth(QNetworkReply *reply)
 {
    auto job = qobject_cast<CheckServerJob *>(sender());
    int resultCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
@@ -279,7 +250,7 @@ void OwncloudSetupWizard::slotNoServerFound(QNetworkReply *reply)
    } else {
        msg = tr("Failed to connect to %1 at %2:<br/>%3")
                  .arg(Utility::escape(Theme::instance()->appNameGUI()),
-                      Utility::escape(_ocWizard->account()->url().toString()),
+                      Utility::escape(reply->url().toString()),
                      Utility::escape(job->errorString()));
    }
    bool isDowngradeAdvised = checkDowngradeAdvised(reply);
@@ -294,8 +265,7 @@ void OwncloudSetupWizard::slotNoServerFound(QNetworkReply *reply)
        QString serverError = reply->peek(1024 * 20);
        qCDebug(lcWizard) << serverError;
        QMessageBox messageBox(_ocWizard);
-        messageBox.setText(tr("The server reported the following error:"));
+        messageBox.setText(serverError);
        messageBox.setInformativeText(serverError);
        messageBox.addButton(QMessageBox::Ok);
        messageBox.setTextFormat(Qt::RichText);
        messageBox.exec();
@@ -309,20 +279,12 @@ void OwncloudSetupWizard::slotNoServerFound(QNetworkReply *reply)
    _ocWizard->account()->resetRejectedCertificates();
 }
-void OwncloudSetupWizard::slotNoServerFoundTimeout(const QUrl &url)
+void OwncloudSetupWizard::slotNoOwnCloudFoundAuthTimeout(const QUrl &url)
 {
    _ocWizard->displayError(
        tr("Timeout while trying to connect to %1 at %2.")
            .arg(Utility::escape(Theme::instance()->appNameGUI()), Utility::escape(url.toString())),
-                false);
+        false);
 }
 void OwncloudSetupWizard::slotDetermineAuthType()
 {
    DetermineAuthTypeJob *job = new DetermineAuthTypeJob(_ocWizard->account(), this);
    connect(job, &DetermineAuthTypeJob::authType,
        _ocWizard, &OwncloudWizard::setAuthType);
    job->start();
 }
 void OwncloudSetupWizard::slotConnectToOCUrl(const QString &url)
--- a/src/gui/owncloudsetupwizard.h
+++ b/src/gui/owncloudsetupwizard.h
@@ -49,16 +49,12 @@ signals:
    void ownCloudWizardDone(int);
 private slots:
-    void slotCheckServer(const QString &);
+    void slotDetermineAuthType(const QString &);
    void slotSystemProxyLookupDone(const QNetworkProxy &proxy);
-
+    void slotContinueDetermineAuth();
-    void slotFindServer();
+    void slotOwnCloudFoundAuth(const QUrl &, const QJsonObject &);
-    void slotFindServerBehindRedirect();
+    void slotNoOwnCloudFoundAuth(QNetworkReply *reply);
-    void slotFoundServer(const QUrl &, const QJsonObject &);
+    void slotNoOwnCloudFoundAuthTimeout(const QUrl &url);
    void slotNoServerFound(QNetworkReply *reply);
    void slotNoServerFoundTimeout(const QUrl &url);
    void slotDetermineAuthType();
    void slotConnectToOCUrl(const QString &);
    void slotAuthError();
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -32,19 +32,6 @@
 namespace OCC {
 bool SortedTreeWidgetItem::operator<(const QTreeWidgetItem &other) const
 {
    int column = treeWidget()->sortColumn();
    if (column != 0) {
        return QTreeWidgetItem::operator<(other);
    }
    // Items with empty "File" column are larger than others,
    // otherwise sort by time (this uses lexicographic ordering)
    return std::forward_as_tuple(text(1).isEmpty(), data(0, Qt::UserRole).toDateTime())
        < std::forward_as_tuple(other.text(1).isEmpty(), other.data(0, Qt::UserRole).toDateTime());
 }
 ProtocolWidget::ProtocolWidget(QWidget *parent)
    : QWidget(parent)
    , _ui(new Ui::ProtocolWidget)
@@ -99,16 +86,6 @@ void ProtocolWidget::showEvent(QShowEvent *ev)
 {
    ConfigFile cfg;
    cfg.restoreGeometryHeader(_ui->_treeWidget->header());
    // Sorting by section was newly enabled. But if we restore the header
    // from a state where sorting was disabled, both of these flags will be
    // false and sorting will be impossible!
    _ui->_treeWidget->header()->setSectionsClickable(true);
    _ui->_treeWidget->header()->setSortIndicatorShown(true);
    // Switch back to "by time" ordering
    _ui->_treeWidget->sortByColumn(0, Qt::DescendingOrder);
    QWidget::showEvent(ev);
 }
@@ -181,21 +158,20 @@ QTreeWidgetItem *ProtocolWidget::createCompletedTreewidgetItem(const QString &fo
        columns << Utility::octetsToString(item._size);
    }
-    QTreeWidgetItem *twitem = new SortedTreeWidgetItem(columns);
+    QTreeWidgetItem *twitem = new QTreeWidgetItem(columns);
    twitem->setData(0, Qt::SizeHintRole, QSize(0, ActivityItemDelegate::rowHeight()));
    twitem->setData(0, Qt::UserRole, timestamp);
    twitem->setIcon(0, icon);
    twitem->setToolTip(0, longTimeStr);
    twitem->setToolTip(1, item._file);
    twitem->setData(2, Qt::UserRole, folder);
    twitem->setToolTip(3, message);
-    twitem->setData(3, Qt::UserRole, item._status);
+    twitem->setData(0, Qt::UserRole, item._status);
    twitem->setData(2, Qt::UserRole, folder);
    return twitem;
 }
 void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item)
 {
-    if (!item->showInProtocolTab())
+    if (item->hasErrorStatus())
        return;
    QTreeWidgetItem *line = createCompletedTreewidgetItem(folder, *item);
    if (line) {
--- a/src/gui/protocolwidget.h
+++ b/src/gui/protocolwidget.h
@@ -34,21 +34,6 @@ namespace Ui {
 }
 class Application;
 /**
 * A QTreeWidgetItem with special sorting.
 *
 * It allows items for global entries to be moved to the top if the
 * sorting section is the "Time" column.
 */
 class SortedTreeWidgetItem : public QTreeWidgetItem
 {
 public:
    using QTreeWidgetItem::QTreeWidgetItem;
 private:
    bool operator<(const QTreeWidgetItem &other) const override;
 };
 /**
 * @brief The ProtocolWidget class
 * @ingroup gui
--- a/src/gui/protocolwidget.ui
+++ b/src/gui/protocolwidget.ui
@@ -35,9 +35,6 @@
     <property name="uniformRowHeights">
      <bool>true</bool>
     </property>
     <property name="sortingEnabled">
      <bool>true</bool>
     </property>
     <property name="columnCount">
      <number>4</number>
     </property>
--- a/src/gui/servernotificationhandler.cpp
+++ b/src/gui/servernotificationhandler.cpp
@@ -24,8 +24,6 @@ namespace OCC {
 Q_LOGGING_CATEGORY(lcServerNotification, "gui.servernotification", QtInfoMsg)
 const QString notificationsPath = QLatin1String("ocs/v2.php/apps/notifications/api/v1/notifications");
 ServerNotificationHandler::ServerNotificationHandler(QObject *parent)
    : QObject(parent)
 {
@@ -49,7 +47,7 @@ void ServerNotificationHandler::slotFetchNotifications(AccountState *ptr)
    }
    // if the previous notification job has finished, start next.
-    _notificationJob = new JsonApiJob(ptr->account(), notificationsPath, this);
+    _notificationJob = new JsonApiJob(ptr->account(), QLatin1String("ocs/v2.php/apps/notifications/api/v1/notifications"), this);
    QObject::connect(_notificationJob.data(), &JsonApiJob::jsonReceived,
        this, &ServerNotificationHandler::slotNotificationsReceived);
    _notificationJob->setProperty("AccountStatePtr", QVariant::fromValue<AccountState *>(ptr));
@@ -96,16 +94,6 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
            a._links.append(al);
        }
        // Add another action to dismiss notification on server
        // https://github.com/owncloud/notifications/blob/master/docs/ocs-endpoint-v1.md#deleting-a-notification-for-a-user
        ActivityLink al;
        al._label = tr("Dismiss");
        al._link  = Utility::concatUrlPath(ai->account()->url(), notificationsPath + "/" + QString::number(a._id)).toString();
        al._verb  = "DELETE";
        al._isPrimary = false;
        a._links.append(al);
        list.append(a);
    }
    emit newNotificationList(list);
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -55,8 +55,6 @@ static const float buttonSizeRatio = 1.618; // golden ratio
 namespace OCC {
 #include "settingsdialogcommon.cpp"
 static QIcon circleMask(const QImage &avatar)
 {
    int dim = avatar.width();
@@ -238,7 +236,7 @@ void SettingsDialog::accountAdded(AccountState *s)
    if (!brandingSingleAccount) {
        accountAction->setToolTip(s->account()->displayName());
-        accountAction->setIconText(SettingsDialogCommon::shortDisplayNameForSettings(s->account().data(),  height * buttonSizeRatio));
+        accountAction->setIconText(s->shortDisplayNameForSettings(height * buttonSizeRatio));
    }
    _toolBar->insertAction(_toolBar->actions().at(0), accountAction);
    auto accountSettings = new AccountSettings(s, this);
@@ -252,10 +250,6 @@ void SettingsDialog::accountAdded(AccountState *s)
        _gui, &ownCloudGui::slotFolderOpenAction);
    connect(accountSettings, &AccountSettings::showIssuesList, this, &SettingsDialog::showIssuesList);
    connect(s->account().data(), &Account::accountChangedAvatar, this, &SettingsDialog::slotAccountAvatarChanged);
    connect(s->account().data(), &Account::accountChangedDisplayName, this, &SettingsDialog::slotAccountDisplayNameChanged);
    // Refresh immediatly when getting online
    connect(s, &AccountState::isConnectedChanged, this, &SettingsDialog::slotRefreshActivityAccountStateSender);
    slotRefreshActivity(s);
 }
@@ -274,20 +268,6 @@ void SettingsDialog::slotAccountAvatarChanged()
    }
 }
 void SettingsDialog::slotAccountDisplayNameChanged()
 {
    Account *account = static_cast<Account *>(sender());
    if (account && _actionForAccount.contains(account)) {
        QAction *action = _actionForAccount[account];
        if (action) {
            QString displayName = account->displayName();
            action->setText(displayName);
            auto height = _toolBar->sizeHint().height();
            action->setIconText(SettingsDialogCommon::shortDisplayNameForSettings(account, height * buttonSizeRatio));
        }
    }
 }
 void SettingsDialog::accountRemoved(AccountState *s)
 {
    for (auto it = _actionGroupWidgets.begin(); it != _actionGroupWidgets.end(); ++it) {
@@ -399,11 +379,6 @@ QAction *SettingsDialog::createColorAwareAction(const QString &iconPath, const Q
    return createActionWithIcon(coloredIcon, text, iconPath);
 }
 void SettingsDialog::slotRefreshActivityAccountStateSender()
 {
    slotRefreshActivity(qobject_cast<AccountState*>(sender()));
 }
 void SettingsDialog::slotRefreshActivity(AccountState *accountState)
 {
    if (accountState) {
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -59,9 +59,7 @@ public slots:
    void showIssuesList(const QString &folderAlias);
    void slotSwitchPage(QAction *action);
    void slotRefreshActivity(AccountState *accountState);
    void slotRefreshActivityAccountStateSender();
    void slotAccountAvatarChanged();
    void slotAccountDisplayNameChanged();
 protected:
    void reject() Q_DECL_OVERRIDE;
--- a/src/gui/settingsdialogcommon.cpp
+++ b/src/gui/settingsdialogcommon.cpp
@@ -1,28 +0,0 @@
 namespace SettingsDialogCommon
 {
 /** display name with two lines that is displayed in the settings
 * If width is bigger than 0, the string will be ellided so it does not exceed that width
 */
 QString shortDisplayNameForSettings(Account* account, int width)
 {
    QString user = account->davDisplayName();
    if (user.isEmpty()) {
        user = account->credentials()->user();
    }
    QString host = account->url().host();
    int port = account->url().port();
    if (port > 0 && port != 80 && port != 443) {
        host.append(QLatin1Char(':'));
        host.append(QString::number(port));
    }
    if (width > 0) {
        QFont f;
        QFontMetrics fm(f);
        host = fm.elidedText(host, Qt::ElideMiddle, width);
        user = fm.elidedText(user, Qt::ElideRight, width);
    }
    return user + QLatin1String("\n") + host;
 }
 }
--- a/src/gui/settingsdialogmac.cpp
+++ b/src/gui/settingsdialogmac.cpp
@@ -21,7 +21,6 @@
 #include "generalsettings.h"
 #include "networksettings.h"
 #include "accountsettings.h"
 #include "accountstate.h"
 #include "creds/abstractcredentials.h"
 #include "configfile.h"
 #include "progressdispatcher.h"
@@ -39,9 +38,6 @@
 namespace OCC {
 #include "settingsdialogcommon.cpp"
 // Duplicate in settingsdialog.cpp
 static QIcon circleMask(const QImage &avatar)
 {
@@ -122,7 +118,6 @@ SettingsDialogMac::SettingsDialogMac(ownCloudGui *gui, QWidget *parent)
    ConfigFile cfg;
    cfg.restoreGeometry(this);
    _activitySettings->setNotificationRefreshInterval(cfg.notificationRefreshInterval());
 }
 void SettingsDialogMac::closeEvent(QCloseEvent *event)
@@ -151,7 +146,7 @@ void SettingsDialogMac::accountAdded(AccountState *s)
    QIcon accountIcon = MacStandardIcon::icon(MacStandardIcon::UserAccounts);
    auto accountSettings = new AccountSettings(s, this);
-    QString displayName = Theme::instance()->multiAccount() ? SettingsDialogCommon::shortDisplayNameForSettings(s->account().data(), 0) : tr("Account");
+    QString displayName = Theme::instance()->multiAccount() ? s->shortDisplayNameForSettings() : tr("Account");
    insertPreferencesPanel(0, accountIcon, displayName, accountSettings);
@@ -159,11 +154,7 @@ void SettingsDialogMac::accountAdded(AccountState *s)
    connect(accountSettings, &AccountSettings::openFolderAlias, _gui, &ownCloudGui::slotFolderOpenAction);
    connect(accountSettings, &AccountSettings::showIssuesList, this, &SettingsDialogMac::showIssuesList);
-    connect(s->account().data(), &Account::accountChangedAvatar, this, &SettingsDialogMac::slotAccountAvatarChanged);
+    connect(s->account().data(), SIGNAL(accountChangedAvatar()), this, SLOT(slotAccountAvatarChanged()));
    connect(s->account().data(), &Account::accountChangedDisplayName, this, &SettingsDialogMac::slotAccountDisplayNameChanged);
    // Refresh immediatly when getting online
    connect(s, &AccountState::isConnectedChanged, this, &SettingsDialogMac::slotRefreshActivityAccountStateSender);
    slotRefreshActivity(s);
 }
@@ -180,11 +171,6 @@ void SettingsDialogMac::accountRemoved(AccountState *s)
    _activitySettings->slotRemoveAccount(s);
 }
 void SettingsDialogMac::slotRefreshActivityAccountStateSender()
 {
    slotRefreshActivity(qobject_cast<AccountState*>(sender()));
 }
 void SettingsDialogMac::slotRefreshActivity(AccountState *accountState)
 {
    if (accountState) {
@@ -206,23 +192,4 @@ void SettingsDialogMac::slotAccountAvatarChanged()
        }
    }
 }
 void SettingsDialogMac::slotAccountDisplayNameChanged()
 {
    Account *account = static_cast<Account *>(sender());
    auto list = findChildren<AccountSettings *>(QString());
    foreach (auto p, list) {
        if (p->accountsState()->account() == account) {
            int idx = indexForPanel(p);
            QString displayName = account->displayName();
            if (!displayName.isNull()) {
                displayName = Theme::instance()->multiAccount()
                        ? SettingsDialogCommon::shortDisplayNameForSettings(account, 0)
                        : tr("Account");
                setPreferencesPanelTitle(idx, displayName);
            }
        }
    }
 }
 }
--- a/src/gui/settingsdialogmac.h
+++ b/src/gui/settingsdialogmac.h
@@ -49,13 +49,11 @@ public slots:
    void showActivityPage();
    void showIssuesList(const QString &folderAlias);
    void slotRefreshActivity(AccountState *accountState);
    void slotRefreshActivityAccountStateSender();
 private slots:
    void accountAdded(AccountState *);
    void accountRemoved(AccountState *);
    void slotAccountAvatarChanged();
    void slotAccountDisplayNameChanged();
 private:
    void closeEvent(QCloseEvent *event);
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -133,7 +133,6 @@ ShareDialog::ShareDialog(QPointer<AccountState> accountState,
    job->setProperties(
        QList<QByteArray>()
        << "http://open-collaboration-services.org/ns:share-permissions"
        << "http://owncloud.org/ns:fileid" // numeric file id for fallback private link generation
        << "http://owncloud.org/ns:privatelink");
    job->setTimeout(10 * 1000);
    connect(job, &PropfindJob::result, this, &ShareDialog::slotPropfindReceived);
@@ -161,13 +160,9 @@ void ShareDialog::slotPropfindReceived(const QVariantMap &result)
        qCInfo(lcSharing) << "Received sharing permissions for" << _sharePath << _maxSharingPermissions;
    }
    auto privateLinkUrl = result["privatelink"].toString();
    auto numericFileId = result["fileid"].toByteArray();
    if (!privateLinkUrl.isEmpty()) {
        qCInfo(lcSharing) << "Received private link url for" << _sharePath << privateLinkUrl;
        _privateLinkUrl = privateLinkUrl;
    } else if (!numericFileId.isEmpty()) {
        qCInfo(lcSharing) << "Received numeric file id for" << _sharePath << numericFileId;
        _privateLinkUrl = _accountState->account()->deprecatedPrivateLinkUrl(numericFileId).toString(QUrl::FullyEncoded);
    }
    showSharingUi();
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -58,9 +58,7 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
    //Is this a file or folder?
    QFileInfo fi(localPath);
    _isFile = fi.isFile();
-
+    _ui->nameLineEdit->setText(tr("%1 link").arg(fi.fileName()));
    // Note: the share name cannot be longer than 64 characters
    _ui->nameLineEdit->setText(tr("Public link"));
    // the following progress indicator widgets are added to layouts which makes them
    // automatically deleted once the dialog dies.
@@ -157,15 +155,14 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
    // Prepare sharing menu
-    _linkContextMenu = new QMenu(this);
+    _shareLinkMenu = new QMenu(this);
-    connect(_linkContextMenu, &QMenu::triggered,
+    connect(_shareLinkMenu, &QMenu::triggered,
-        this, &ShareLinkWidget::slotLinkContextMenuActionTriggered);
+        this, &ShareLinkWidget::slotShareLinkActionTriggered);
-    _openLinkAction = _linkContextMenu->addAction(tr("Open link in browser"));
+    _openLinkAction = _shareLinkMenu->addAction(tr("Open link in browser"));
-    _copyLinkAction = _linkContextMenu->addAction(tr("Copy link to clipboard"));
+    _copyLinkAction = _shareLinkMenu->addAction(tr("Copy link to clipboard"));
-    _copyDirectLinkAction = _linkContextMenu->addAction(tr("Copy link to clipboard (direct download)"));
+    _copyDirectLinkAction = _shareLinkMenu->addAction(tr("Copy link to clipboard (direct download)"));
-    _emailLinkAction = _linkContextMenu->addAction(tr("Send link by email"));
+    _emailLinkAction = _shareLinkMenu->addAction(tr("Send link by email"));
-    _emailDirectLinkAction = _linkContextMenu->addAction(tr("Send link by email (direct download)"));
+    _emailDirectLinkAction = _shareLinkMenu->addAction(tr("Send link by email (direct download)"));
    _deleteLinkAction = _linkContextMenu->addAction(tr("Delete"));
    /*
     * Create the share manager and connect it properly
@@ -223,34 +220,39 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
        // Connect all shares signals to gui slots
        connect(share.data(), &Share::serverError, this, &ShareLinkWidget::slotServerError);
        connect(share.data(), &Share::shareDeleted, this, &ShareLinkWidget::slotDeleteShareFetched);
        connect(share.data(), SIGNAL(expireDateSet()), SLOT(slotExpireSet()));
        connect(share.data(), SIGNAL(publicUploadSet()), SLOT(slotPermissionsSet()));
        connect(share.data(), SIGNAL(passwordSet()), SLOT(slotPasswordSet()));
        connect(share.data(), SIGNAL(passwordSetError(int, QString)), SLOT(slotPasswordSetError(int, QString)));
        connect(share.data(), &Share::permissionsSet, this, &ShareLinkWidget::slotPermissionsSet);
        connect(linkShare.data(), &LinkShare::expireDateSet, this, &ShareLinkWidget::slotExpireSet);
        connect(linkShare.data(), &LinkShare::passwordSet, this, &ShareLinkWidget::slotPasswordSet);
        connect(linkShare.data(), &LinkShare::passwordSetError, this, &ShareLinkWidget::slotPasswordSetError);
        // Build the table row
        auto row = table->rowCount();
        table->insertRow(row);
        auto nameItem = new QTableWidgetItem;
-        auto name = shareName(*linkShare);
+        QString name = linkShare->getName();
-        if (!_namesSupported) {
+        if (name.isEmpty()) {
-            nameItem->setFlags(nameItem->flags() & ~Qt::ItemIsEditable);
+            if (!_namesSupported) {
                name = tr("Public link");
                nameItem->setFlags(nameItem->flags() & ~Qt::ItemIsEditable);
            } else {
                name = linkShare->getToken();
            }
        }
        nameItem->setText(name);
        nameItem->setData(Qt::UserRole, QVariant::fromValue(linkShare));
        table->setItem(row, 0, nameItem);
-        auto dotdotdotButton = new QToolButton;
+        auto shareButton = new QToolButton;
-        dotdotdotButton->setText("...");
+        shareButton->setText("...");
-        dotdotdotButton->setProperty(propertyShareC, QVariant::fromValue(linkShare));
+        shareButton->setProperty(propertyShareC, QVariant::fromValue(linkShare));
-        connect(dotdotdotButton, &QAbstractButton::clicked, this, &ShareLinkWidget::slotContextMenuButtonClicked);
+        connect(shareButton, &QAbstractButton::clicked, this, &ShareLinkWidget::slotShareLinkButtonClicked);
-        table->setCellWidget(row, 1, dotdotdotButton);
+        table->setCellWidget(row, 1, shareButton);
        auto deleteButton = new QToolButton;
        deleteButton->setIcon(deleteIcon);
        deleteButton->setProperty(propertyShareC, QVariant::fromValue(linkShare));
        deleteButton->setToolTip(tr("Delete link share"));
        connect(deleteButton, &QAbstractButton::clicked, this, &ShareLinkWidget::slotDeleteShareClicked);
        table->setCellWidget(row, 2, deleteButton);
@@ -512,56 +514,22 @@ void ShareLinkWidget::openShareLink(const QUrl &url)
    Utility::openBrowser(url, this);
 }
-void ShareLinkWidget::confirmAndDeleteShare(const QSharedPointer<LinkShare> &share)
+void ShareLinkWidget::slotShareLinkButtonClicked()
 {
    auto messageBox = new QMessageBox(
        QMessageBox::Question,
        tr("Confirm Link Share Deletion"),
        tr("<p>Do you really want to delete the public link share <i>%1</i>?</p>"
           "<p>Note: This action cannot be undone.</p>")
            .arg(shareName(*share)),
        QMessageBox::NoButton,
        this);
    QPushButton *yesButton =
        messageBox->addButton(tr("Delete"), QMessageBox::YesRole);
    messageBox->addButton(tr("Cancel"), QMessageBox::NoRole);
    connect(messageBox, &QMessageBox::finished, this,
        [messageBox, yesButton, share]() {
        if (messageBox->clickedButton() == yesButton)
            share->deleteShare();
    });
    messageBox->open();
 }
 QString ShareLinkWidget::shareName(const LinkShare &share) const
 {
    QString name = share.getName();
    if (!name.isEmpty())
        return name;
    if (!_namesSupported)
        return tr("Public link");
    return share.getToken();
 }
 void ShareLinkWidget::slotContextMenuButtonClicked()
 {
    auto share = sender()->property(propertyShareC).value<QSharedPointer<LinkShare>>();
    bool downloadEnabled = share->getShowFileListing();
    _copyDirectLinkAction->setVisible(downloadEnabled);
    _emailDirectLinkAction->setVisible(downloadEnabled);
-    _linkContextMenu->setProperty(propertyShareC, QVariant::fromValue(share));
+    _shareLinkMenu->setProperty(propertyShareC, QVariant::fromValue(share));
-    _linkContextMenu->exec(QCursor::pos());
+    _shareLinkMenu->exec(QCursor::pos());
 }
-void ShareLinkWidget::slotLinkContextMenuActionTriggered(QAction *action)
+void ShareLinkWidget::slotShareLinkActionTriggered(QAction *action)
 {
    auto share = sender()->property(propertyShareC).value<QSharedPointer<LinkShare>>();
-    if (action == _deleteLinkAction) {
+    if (action == _copyLinkAction) {
        confirmAndDeleteShare(share);
    } else if (action == _copyLinkAction) {
        QApplication::clipboard()->setText(share->getLink().toString());
    } else if (action == _copyDirectLinkAction) {
        QApplication::clipboard()->setText(share->getDirectDownloadLink().toString());
@@ -577,7 +545,7 @@ void ShareLinkWidget::slotLinkContextMenuActionTriggered(QAction *action)
 void ShareLinkWidget::slotDeleteShareClicked()
 {
    auto share = sender()->property(propertyShareC).value<QSharedPointer<LinkShare>>();
-    confirmAndDeleteShare(share);
+    share->deleteShare();
 }
 void ShareLinkWidget::slotPermissionsCheckboxClicked()
--- a/src/gui/sharelinkwidget.h
+++ b/src/gui/sharelinkwidget.h
@@ -70,8 +70,8 @@ private slots:
    void slotPasswordChanged(const QString &newText);
    void slotNameEdited(QTableWidgetItem *item);
-    void slotContextMenuButtonClicked();
+    void slotShareLinkButtonClicked();
-    void slotLinkContextMenuActionTriggered(QAction *action);
+    void slotShareLinkActionTriggered(QAction *action);
    void slotDeleteShareFetched();
    void slotCreateShareFetched(const QSharedPointer<LinkShare> &share);
@@ -93,12 +93,6 @@ private:
    void emailShareLink(const QUrl &url);
    void openShareLink(const QUrl &url);
    /** Confirm with the user and then delete the share */
    void confirmAndDeleteShare(const QSharedPointer<LinkShare> &share);
    /** Retrieve a share's name, accounting for _namesSupported */
    QString shareName(const LinkShare &share) const;
    /**
     * Retrieve the selected share, returning 0 if none.
     */
@@ -126,13 +120,12 @@ private:
    // the next time getShares() finishes. This stores its id.
    QString _newShareOverrideSelectionId;
-    QMenu *_linkContextMenu = nullptr;
+    QMenu *_shareLinkMenu;
-    QAction *_deleteLinkAction = nullptr;
+    QAction *_openLinkAction;
-    QAction *_openLinkAction = nullptr;
+    QAction *_copyLinkAction;
-    QAction *_copyLinkAction = nullptr;
+    QAction *_copyDirectLinkAction;
-    QAction *_copyDirectLinkAction = nullptr;
+    QAction *_emailLinkAction;
-    QAction *_emailLinkAction = nullptr;
+    QAction *_emailDirectLinkAction;
    QAction *_emailDirectLinkAction = nullptr;
 };
 }
--- a/src/gui/sharemanager.cpp
+++ b/src/gui/sharemanager.cpp
@@ -15,40 +15,24 @@
 #include "sharemanager.h"
 #include "ocssharejob.h"
 #include "account.h"
 #include "folderman.h"
 #include "accountstate.h"
 #include <QUrl>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
-namespace OCC {
+namespace {
-
+struct CreateShare
 /**
 * When a share is modified, we need to tell the folders so they can adjust overlay icons
 */
 static void updateFolder(const AccountPtr &account, const QString &path)
 {
-    foreach (Folder *f, FolderMan::instance()->map()) {
+    QString path;
-        if (f->accountState()->account() != account)
+    OCC::Share::ShareType shareType;
-            continue;
+    QString shareWith;
-        auto folderPath = f->remotePath();
+    OCC::Share::Permissions permissions;
-        if (path.startsWith(folderPath) && (path == folderPath || folderPath.endsWith('/') || path[folderPath.size()] == '/')) {
+};
-            // Workaround the fact that the server does not invalidate the etags of parent directories
+} // anonymous namespace
-            // when something is shared.
+Q_DECLARE_METATYPE(CreateShare)
            auto relative = path.midRef(folderPath.size());
            if (relative.startsWith('/'))
                relative = relative.mid(1);
            f->journalDb()->avoidReadFromDbOnNextSync(relative.toString());
            // Schedule a sync so it can update the remote permission flag and let the socket API
            // know about the shared icon.
            f->scheduleThisFolderSoon();
        }
    }
 }
 namespace OCC {
 Share::Share(AccountPtr account,
    const QString &id,
@@ -70,11 +54,6 @@ AccountPtr Share::account() const
    return _account;
 }
 QString Share::path() const
 {
    return _path;
 }
 QString Share::getId() const
 {
    return _id;
@@ -120,8 +99,6 @@ void Share::deleteShare()
 void Share::slotDeleted()
 {
    emit shareDeleted();
    updateFolder(_account, _path);
 }
 void Share::slotOcsError(int statusCode, const QString &message)
@@ -281,46 +258,60 @@ void ShareManager::slotLinkShareCreated(const QJsonDocument &reply)
    QSharedPointer<LinkShare> share(parseLinkShare(data));
    emit linkShareCreated(share);
    updateFolder(_account, share->path());
 }
 void ShareManager::createShare(const QString &path,
    const Share::ShareType shareType,
    const QString shareWith,
-    const Share::Permissions desiredPermissions)
+    const Share::Permissions permissions)
 {
    auto job = new OcsShareJob(_account);
    // Store values that we need for creating this share later.
    CreateShare continuation;
    continuation.path = path;
    continuation.shareType = shareType;
    continuation.shareWith = shareWith;
    continuation.permissions = permissions;
    _jobContinuation[job] = QVariant::fromValue(continuation);
    connect(job, &OcsShareJob::shareJobFinished, this, &ShareManager::slotCreateShare);
    connect(job, &OcsJob::ocsError, this, &ShareManager::slotOcsError);
    connect(job, &OcsShareJob::shareJobFinished, this,
        [=](const QJsonDocument &reply) {
            // Find existing share permissions (if this was shared with us)
            Share::Permissions existingPermissions = SharePermissionDefault;
            foreach (const QJsonValue &element, reply.object()["ocs"].toObject()["data"].toArray()) {
                auto map = element.toObject();
                if (map["file_target"] == path)
                    existingPermissions = Share::Permissions(map["permissions"].toInt());
            }
            // Limit the permissions we request for a share to the ones the item
            // was shared with initially.
            auto validPermissions = desiredPermissions;
            if (validPermissions == SharePermissionDefault) {
                validPermissions = existingPermissions;
            }
            if (existingPermissions != SharePermissionDefault) {
                validPermissions &= existingPermissions;
            }
            OcsShareJob *job = new OcsShareJob(_account);
            connect(job, &OcsShareJob::shareJobFinished, this, &ShareManager::slotShareCreated);
            connect(job, &OcsJob::ocsError, this, &ShareManager::slotOcsError);
            job->createShare(path, shareType, shareWith, validPermissions);
        });
    job->getSharedWithMe();
 }
 void ShareManager::slotCreateShare(const QJsonDocument &reply)
 {
    if (!_jobContinuation.contains(sender()))
        return;
    CreateShare cont = _jobContinuation[sender()].value<CreateShare>();
    if (cont.path.isEmpty())
        return;
    _jobContinuation.remove(sender());
    // Find existing share permissions (if this was shared with us)
    Share::Permissions existingPermissions = SharePermissionDefault;
    foreach (const QJsonValue &element, reply.object()["ocs"].toObject()["data"].toArray()) {
        auto map = element.toObject();
        if (map["file_target"] == cont.path)
            existingPermissions = Share::Permissions(map["permissions"].toInt());
    }
    // Limit the permissions we request for a share to the ones the item
    // was shared with initially.
    if (cont.permissions == SharePermissionDefault) {
        cont.permissions = existingPermissions;
    } else if (existingPermissions != SharePermissionDefault) {
        cont.permissions &= existingPermissions;
    }
    OcsShareJob *job = new OcsShareJob(_account);
    connect(job, &OcsShareJob::shareJobFinished, this, &ShareManager::slotShareCreated);
    connect(job, &OcsJob::ocsError, this, &ShareManager::slotOcsError);
    job->createShare(cont.path, cont.shareType, cont.shareWith, cont.permissions);
 }
 void ShareManager::slotShareCreated(const QJsonDocument &reply)
 {
@@ -329,8 +320,6 @@ void ShareManager::slotShareCreated(const QJsonDocument &reply)
    QSharedPointer<Share> share(parseShare(data));
    emit shareCreated(share);
    updateFolder(_account, share->path());
 }
 void ShareManager::fetchShares(const QString &path)
--- a/src/gui/sharemanager.h
+++ b/src/gui/sharemanager.h
@@ -64,8 +64,6 @@ public:
     */
    AccountPtr account() const;
    QString path() const;
    /*
     * Get the id
     */
@@ -295,10 +293,13 @@ private slots:
    void slotLinkShareCreated(const QJsonDocument &reply);
    void slotShareCreated(const QJsonDocument &reply);
    void slotOcsError(int statusCode, const QString &message);
    void slotCreateShare(const QJsonDocument &reply);
 private:
    QSharedPointer<LinkShare> parseLinkShare(const QJsonObject &data);
    QSharedPointer<Share> parseShare(const QJsonObject &data);
    QMap<QObject *, QVariant> _jobContinuation;
    AccountPtr _account;
 };
 }
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -183,10 +183,6 @@ SocketApi::SocketApi(QObject *parent)
        // Example for developer builds (with ad-hoc signing identity): "" "com.owncloud.desktopclient" ".socketApi"
        // Example for official signed packages: "9B5WD74GWJ." "com.owncloud.desktopclient" ".socketApi"
        socketPath = SOCKETAPI_TEAM_IDENTIFIER_PREFIX APPLICATION_REV_DOMAIN ".socketApi";
 #ifdef Q_OS_MAC
        // Tell Finder to use the Extension (checking it from System Preferences -> Extensions)
        system("pluginkit -e use -i  " APPLICATION_REV_DOMAIN ".FinderSyncExt &");
 #endif
    } else if (Utility::isLinux() || Utility::isBSD()) {
        QString runtimeDir;
        runtimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
@@ -224,11 +220,6 @@ SocketApi::~SocketApi()
    // All remaining sockets will be destroyed with _localServer, their parent
    ASSERT(_listeners.isEmpty() || _listeners.first().socket->parent() == &_localServer);
    _listeners.clear();
 #ifdef Q_OS_MAC
    // Unload the extension (uncheck from System Preferences -> Extensions)
    system("pluginkit -e ignore -i  " APPLICATION_REV_DOMAIN ".FinderSyncExt &");
 #endif
 }
 void SocketApi::slotNewConnection()
@@ -512,29 +503,27 @@ void fetchPrivateLinkUrl(const QString &localFile, SocketApi *target, void (Sock
    const QString localFileClean = QDir::cleanPath(localFile);
    const QString file = localFileClean.mid(shareFolder->cleanPath().length() + 1);
    AccountPtr account = shareFolder->accountState()->account();
    // Generate private link ourselves: used as a fallback
    SyncJournalFileRecord rec;
    if (!shareFolder->journalDb()->getFileRecord(file, &rec) || !rec.isValid())
        return;
    const QString oldUrl =
-        account->deprecatedPrivateLinkUrl(rec.numericFileId()).toString(QUrl::FullyEncoded);
+        shareFolder->accountState()->account()->deprecatedPrivateLinkUrl(rec.numericFileId()).toString(QUrl::FullyEncoded);
-    // Retrieve the new link or numeric file id by PROPFIND
+    // If the server doesn't have the property, use the old url directly.
-    PropfindJob *job = new PropfindJob(account, file, target);
+    if (!shareFolder->accountState()->account()->capabilities().privateLinkPropertyAvailable()) {
-    job->setProperties(
+        (target->*targetFun)(oldUrl);
-        QList<QByteArray>()
+        return;
-        << "http://owncloud.org/ns:fileid" // numeric file id for fallback private link generation
+    }
-        << "http://owncloud.org/ns:privatelink");
+
    // Retrieve the new link by PROPFIND
    PropfindJob *job = new PropfindJob(shareFolder->accountState()->account(), file, target);
    job->setProperties(QList<QByteArray>() << "http://owncloud.org/ns:privatelink");
    job->setTimeout(10 * 1000);
    QObject::connect(job, &PropfindJob::result, target, [=](const QVariantMap &result) {
        auto privateLinkUrl = result["privatelink"].toString();
        auto numericFileId = result["fileid"].toByteArray();
        if (!privateLinkUrl.isEmpty()) {
            (target->*targetFun)(privateLinkUrl);
        } else if (!numericFileId.isEmpty()) {
            (target->*targetFun)(account->deprecatedPrivateLinkUrl(numericFileId).toString(QUrl::FullyEncoded));
        } else {
            (target->*targetFun)(oldUrl);
        }
--- a/src/gui/sslbutton.cpp
+++ b/src/gui/sslbutton.cpp
@@ -204,10 +204,6 @@ void SslButton::slotUpdateMenu()
    AccountPtr account = _accountState->account();
    if (account->isHttp2Supported()) {
        _menu->addAction("HTTP/2")->setEnabled(false);
    }
    if (account->url().scheme() == QLatin1String("https")) {
        QString sslVersion = account->_sessionCipher.protocolString()
            + ", " + account->_sessionCipher.authenticationMethod()
--- a/src/gui/updater/ocupdater.cpp
+++ b/src/gui/updater/ocupdater.cpp
@@ -92,11 +92,6 @@ OCUpdater::OCUpdater(const QUrl &url)
 {
 }
 void OCUpdater::setUpdateUrl(const QUrl &url)
 {
    _updateUrl = url;
 }
 bool OCUpdater::performUpdate()
 {
    ConfigFile cfg;
@@ -184,81 +179,6 @@ void OCUpdater::setDownloadState(DownloadState state)
    }
 }
 #if defined(Q_OS_WIN)
 // Following functions are taken from https://github.com/qt/qtbase/blob/5.8/src/corelib/io/qprocess_win.cpp
 // to make use of this fix https://github.com/qt/qtbase/commit/bec2fc19fd18768b16925597871c77a61e716abd
 // for QTBUG-53833: Without this we get an ugly powershell window on update. In 2.5/master we use Qt 5.10
 // which obviously already has the fix.
 static QString qt_create_commandline(const QString &program, const QStringList &arguments)
 {
    QString args;
    if (!program.isEmpty()) {
        QString programName = program;
        if (!programName.startsWith(QLatin1Char('\"')) && !programName.endsWith(QLatin1Char('\"')) && programName.contains(QLatin1Char(' ')))
            programName = QLatin1Char('\"') + programName + QLatin1Char('\"');
        programName.replace(QLatin1Char('/'), QLatin1Char('\\'));
        // add the prgram as the first arg ... it works better
        args = programName + QLatin1Char(' ');
    }
    for (int i=0; i<arguments.size(); ++i) {
        QString tmp = arguments.at(i);
        // Quotes are escaped and their preceding backslashes are doubled.
        tmp.replace(QRegExp(QLatin1String("(\\\\*)\"")), QLatin1String("\\1\\1\\\""));
        if (tmp.isEmpty() || tmp.contains(QLatin1Char(' ')) || tmp.contains(QLatin1Char('\t'))) {
            // The argument must not end with a \ since this would be interpreted
            // as escaping the quote -- rather put the \ behind the quote: e.g.
            // rather use "foo"\ than "foo\"
            int i = tmp.length();
            while (i > 0 && tmp.at(i - 1) == QLatin1Char('\\'))
                --i;
            tmp.insert(i, QLatin1Char('"'));
            tmp.prepend(QLatin1Char('"'));
        }
        args += QLatin1Char(' ') + tmp;
    }
    return args;
 }
 bool startDetached(const QString &program, const QStringList &arguments, const QString &workingDir = QString(), qint64 *pid = 0)
 {
    // static const DWORD errorElevationRequired = 740;
    QString args = qt_create_commandline(program, arguments);
    bool success = false;
    PROCESS_INFORMATION pinfo;
    DWORD dwCreationFlags = (GetConsoleWindow() ? 0 : CREATE_NO_WINDOW);
    dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT;
    STARTUPINFOW startupInfo = { sizeof( STARTUPINFO ), 0, 0, 0,
                                 (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
                                 (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
                                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
                               };
    success = CreateProcess(0, (wchar_t*)args.utf16(),
                            0, 0, FALSE, dwCreationFlags, 0,
                            workingDir.isEmpty() ? 0 : (wchar_t*)workingDir.utf16(),
                            &startupInfo, &pinfo);
    // if (success) {
        CloseHandle(pinfo.hThread);
        CloseHandle(pinfo.hProcess);
        if (pid)
            *pid = pinfo.dwProcessId;
    // } else if (GetLastError() == errorElevationRequired) {
    //     success = startDetachedUacPrompt(program, arguments, workingDir, pid);
    // }
    return success;
 }
 #else
 bool startDetached(const QString &program, const QStringList &arguments, const QString &workingDir = QString(), qint64 *pid = 0)
 {
    return QProcess::startDetached(program, arguments, workingDir, pid);
 }
 #endif
 void OCUpdater::slotStartInstaller()
 {
    ConfigFile cfg;
@@ -267,30 +187,8 @@ void OCUpdater::slotStartInstaller()
    settings.setValue(autoUpdateAttemptedC, true);
    settings.sync();
    qCInfo(lcUpdater) << "Running updater" << updateFile;
-
+    QProcess::startDetached(updateFile, QStringList() << "/S"
-    if(updateFile.endsWith(".exe")) {
+                                                      << "/launch");
        QProcess::startDetached(updateFile, QStringList() << "/S"
                                                          << "/launch");
    } else if(updateFile.endsWith(".msi")) {
        // When MSIs are installed without gui they cannot launch applications
        // as they lack the user context. That is why we need to run the client
        // manually here. We wrap the msiexec and client invocation in a powershell
        // script because owncloud.exe will be shut down for installation.
        // | Out-Null forces powershell to wait for msiexec to finish.
        auto preparePathForPowershell = [](QString path) {
            path.replace("'", "''");
            return QDir::toNativeSeparators(path);
        };
        QString msiLogFile = cfg.configPath() + "msi.log";
        QString command = QString("&{msiexec /norestart /passive /i '%1' /L*V '%2'| Out-Null ; &'%3'}")
             .arg(preparePathForPowershell(updateFile))
             .arg(preparePathForPowershell(msiLogFile))
             .arg(preparePathForPowershell(QCoreApplication::applicationFilePath()));
        startDetached("powershell.exe", QStringList{"-Command", command});
    }
 }
 void OCUpdater::checkForUpdate()
@@ -400,7 +298,7 @@ void NSISUpdater::versionInfoArrived(const UpdateInfo &info)
            showDialog(info);
        }
        if (!url.isEmpty()) {
-            _targetFile = cfg.configPath() + url.mid(url.lastIndexOf('/')+1);
+            _targetFile = cfg.configPath() + url.mid(url.lastIndexOf('/'));
            if (QFile(_targetFile).exists()) {
                setDownloadState(DownloadComplete);
            } else {
--- a/src/gui/updater/ocupdater.h
+++ b/src/gui/updater/ocupdater.h
@@ -99,8 +99,6 @@ public:
        UpdateOnlyAvailableThroughSystem };
    explicit OCUpdater(const QUrl &url);
    void setUpdateUrl(const QUrl &url);
    bool performUpdate();
    void checkForUpdate() Q_DECL_OVERRIDE;
--- a/Show More
+++ b/Show More