VERSION.cmake: 2.2.3 beta1

2016-07-26 17:02:24 +02:00
@@ -1,8 +1,7 @@
 ChangeLog
 =========

-version 2.2.3 (release 2016-08-08)
-* SyncEngine: Fix detection of backup (#5104)
+version 2.2.3 (release 2016-07-xx)
 * Fix bug with overriding URL in config (#5016)
 * Sharing: Fix bug with file names containing percent encodes (#5042, #5043)
 * Sharing: Permissions for federated shares on servers >=9.1 (#4996, #5001)
@@ -17,6 +16,7 @@ version 2.2.3 (release 2016-08-08)
 * Fix small QAction memleak (#5008)
 * Fix crash on shutting down during propagation (#4979)
 * Decrease memory usage during sync #4979
+* Fix a deadlock when shutting down during discovery (#4993)
 * Setup csync logging earlier to get all log output (#4991)
 * Enable Shibboleth debug view with OWNCLOUD_SHIBBOLETH_DEBUG env

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

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "beta1") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

 if( NOT DEFINED MIRALL_VERSION_BUILD )
@@ -33,11 +33,11 @@ StrCpy $UNINSTALL_MESSAGEBOX "Ez dirudi ${APPLICATION_NAME} '$INSTDIR'.$ direkto
 StrCpy $UNINSTALL_ABORT "Desinstalazioak erabiltzaileak bertan behera utzi du"
 StrCpy $INIT_NO_QUICK_LAUNCH "Abiarazle Bizkorreko Lasterbidea (E/E)"
 StrCpy $INIT_NO_DESKTOP "Mahaigaineko Lasterbidea (dagoena berridazten du)"
-StrCpy $UAC_ERROR_ELEVATE "Ezin izan da goratu, errorea:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Instalatzaileak administratzaile baimenak behar ditu, saiatu berriro"
 StrCpy $INIT_INSTALLER_RUNNING "Instalatzailea dagoeneko martxan da."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Desinstalatzaile honek administratzaile baimenak behar ditu, saiatu berriro"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Saioa hasteko zerbitzua ez dago martxan, bertan behera uzten!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Desinstalatzailea dagoeneko martxan da."
 StrCpy $SectionGroup_Shortcuts "Lasterbideak"
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -30,7 +30,7 @@ StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Z
 StrCpy $UNINSTALLER_FILE_Detail "Zapisuji odinstal tor"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Zapisuji instal tor do registr…"
 StrCpy $UNINSTALLER_FINISHED_Detail "DokonŸeno"
-StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na v adres ýi '$INSTDIR'.$\n$\nChcete pokraŸovat (nedoporuŸuje se)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na ve slo§ce '$INSTDIR'.$\n$\nChcete pokraŸovat (nedoporuŸuje se)?"
 StrCpy $UNINSTALL_ABORT "Odinstalace zruçena u§ivatelem"
 StrCpy $INIT_NO_QUICK_LAUNCH "Z stupce rychl‚ho spuçtØn¡ (nen¡ k dispozici)"
 StrCpy $INIT_NO_DESKTOP "Z stupce na ploçe (pýep¡çe existuj¡c¡)"
@@ -9,7 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "インストール済"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "${APPLICATION_NAME} のインストール方法を選択する"
 StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME} の最新バージョンがすでにインストールされています。$\n旧バージョンのインストールはお勧めしません。旧バージョンのインストールが本当に必要な場合は、まず最新バージョンをアンインストールしてから、旧バージョンをインストールしてください。$\nオペレーションを選択し、次へをクリックする。"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} は、${VERSION} がすでにインストールされています。$\n$\n実行したい操作を選択して、次へをクリックしてください。"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} は、${VERSION} が既にインストールされています。$\n$\n実行したい操作を選択し、次へをクリックする。"
 StrCpy $PageReinstall_SAME_Field_2 "追加/再インストールコンポーネント"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} をアンインストール"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} をアンインストール"
@@ -1,14 +1,14 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Encontrados ${APPLICATION_EXECUTABLE} processo(s) em execução que precisa(m) de ser interrompido(s).$\nDeseja que o instalador o(s) termine por si?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar os processos de ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Não foi encontrado nenhum processo para terminar!"
-StrCpy $PageReinstall_NEW_Field_1 "Está instalada no sistema uma versão antiga de ${APPLICATION_NAME}. É recomendado que desinstale a versão atual antes de instalar a mais recente. Selecione a operação que deseja executar e clique em $\"Seguinte$\" para continuar."
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Existem ${APPLICATION_EXECUTABLE} processo(s) em execução que precisa(m) de ser interrompido(s).$\nDeseja que o instalador o(s) termine automaticamente?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar os processos ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Não foi encontrado o processo a terminar!"
+StrCpy $PageReinstall_NEW_Field_1 "Uma versão antiga de ${APPLICATION_NAME} está instalada no sistema. É recomendado que você desinstale a versão atual antes de instalar a mais recente. Selecione a operação que deseja executar e clique em $\"Avançar$\" para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "Não desinstale"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como pretende instalar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Uma versão mais recente da aplicação ${APPLICATION_NAME}  já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão, aconselha-se a desinstalação da versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
+StrCpy $PageReinstall_OLD_Field_1 "Uma versão mais recente do ${APPLICATION_NAME}  já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão, aconselha-se a desinstalação da versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalada.$\nSelecione a operação que deseja realizar e clique em 'Seguinte' para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Adicionar/Reinstalar Componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
@@ -20,17 +20,17 @@ StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "A instalar integração para Wi
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu Inicial"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A adicionar o atalho de ${APPLICATION_NAME} ao Menu Inicial."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho da área de trabalho"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos na área de trabalho"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos da área de trabalho"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atalho de início rápido"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "A criar atalho de início rápido"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "O essencial de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Atalho de ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho do ambiente de trabalho para ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho no ambiente de trabalho de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Atalho de início rápido de ${APPLICATION_NAME}."
 StrCpy $UNINSTALLER_FILE_Detail "A escrever o Desinstalador"
 StrCpy $UNINSTALLER_REGISTRY_Detail "A escrever chaves de registo do instalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
-StrCpy $UNINSTALL_MESSAGEBOX "Não parece que a aplicação ${APPLICATION_NAME} esteja instalada no diretório '$INSTDIR'.$\n$\nContinuar na mesma (não recomendado)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Não parece que ${APPLICATION_NAME} esteja instalado no diretório '$INSTDIR'.$\n$\nContinuar na mesma (não recomendado)?"
 StrCpy $UNINSTALL_ABORT "Desinstalação cancelada pelo utilizador"
 StrCpy $INIT_NO_QUICK_LAUNCH "Atalho de Início Rápido (N/A)"
 StrCpy $INIT_NO_DESKTOP "Atalho do Ambiente de Trabalho (sobrepõe o existente)"
@@ -9,7 +9,6 @@ StrCpy $PageReinstall_NEW_Field_3 "Neodin
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Už je nainštalovaný"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vyberte si, ako chcete nainštalova� ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Novšia verzia ${APPLICATION_NAME} je už nainštalovaná! Neodporúèam vám nainštalova� staršiu verziu. Ak naozaj chcete nainštalova� túto staršiu verziu, je lepšie najprv odinštalova� aktuálnu verziu. Vyberte operáciu, ktorú chcete vykona�, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je už nainštalovaná.$\n$\nVyberte operáciu, ktorú chcete vykona�, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
 StrCpy $PageReinstall_SAME_Field_2 "Prida�/Preinštalova� komponenty"
 StrCpy $PageReinstall_SAME_Field_3 "Odinštalova� ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinštalova� ${APPLICATION_NAME}"
@@ -38,6 +37,7 @@ StrCpy $UAC_ERROR_ELEVATE "Nemo
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tento inštalátor vyžaduje admin prístup, skúste to znova"
 StrCpy $INIT_INSTALLER_RUNNING "Inštalátor je už spustený."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinštalátor vyžaduje admin prístup, skúste to znova"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Prihlasovacia služba nebeží! Prerušuje sa."
 StrCpy $INIT_UNINSTALLER_RUNNING "Odinštalátor je už spustený."
 StrCpy $SectionGroup_Shortcuts "Zástupcovia"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -2,7 +2,7 @@
 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 detenidos.$\n¿Quiere que el instalador lo haga por usted?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Deteniendo el/los proceso/s ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso para finalizar no encontrado!"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso para detener no encontrado!"
 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"
@@ -9,7 +9,6 @@ StrCpy $PageReinstall_NEW_Field_3 "Avinstallera inte"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Redan installerad"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Välj hur du vill installera ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "En nyare version av ${APPLICATION_NAME} är redan installerad! Det rekommenderas inte att du installerar en äldre version. Om du verkligen vill installera denna äldre versionen, är det bättre att du avinstallerar den nuvarande versionen först. Välj den åtgärd du vill utföra och klicka Nästa för att fortsätta."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} är redan installerad.$\n$\nVälj den åtgärd du vill utföra och klicka på Nästa för att fortsätta."
 StrCpy $PageReinstall_SAME_Field_2 "Lägg till/Ominstallera komponenter"
 StrCpy $PageReinstall_SAME_Field_3 "Avinstallera ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstallera ${APPLICATION_NAME}"
@@ -41,3 +40,4 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver adm
 StrCpy $UAC_ERROR_LOGON_SERVICE "Login-service körs inte, avbryter!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
 StrCpy $SectionGroup_Shortcuts "Genvägar"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
@@ -1,5 +1,5 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "แสดงบันทึกที่มี"
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "แสดงบันทึกประจำรุ่น"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "พบว่ากระบวนการ ${APPLICATION_EXECUTABLE} จะต้องหยุดทำงาน$\nคุณต้องการติดตั้งเพื่อหยุดการทำงานเหล่านี้ของคุณ?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "ฆ่ากระบวนการทำงาน ${APPLICATION_EXECUTABLE}"
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "ไม่พบการฆ่ากระบวนการ!"
@@ -2,27 +2,27 @@
 !insertmacro MUI_LANGUAGE "Swedish"
 !insertmacro MUI_LANGUAGE "Estonian"
 !insertmacro MUI_LANGUAGE "Turkish"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
 !insertmacro MUI_LANGUAGE "Slovenian"
 !insertmacro MUI_LANGUAGE "SpanishInternational"
 !insertmacro MUI_LANGUAGE "Dutch"
-!insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Hungarian"
 !insertmacro MUI_LANGUAGE "Ukrainian"
 !insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Russian"
 !insertmacro MUI_LANGUAGE "Thai"
 !insertmacro MUI_LANGUAGE "Finnish"
 !insertmacro MUI_LANGUAGE "Basque"
 !insertmacro MUI_LANGUAGE "Greek"
 !insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Catalan"
 !insertmacro MUI_LANGUAGE "Italian"
 !insertmacro MUI_LANGUAGE "Portuguese"
-!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "German"
 !insertmacro MUI_LANGUAGE "Japanese"
 !insertmacro MUI_LANGUAGE "Galician"
-!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Czech"
 !insertmacro MUI_LANGUAGE "Slovak"
 !insertmacro MUI_LANGUAGE "Spanish"
 !insertmacro MUI_LANGUAGE "Polish"
@@ -1,7 +0,0 @@
-[Paths]
-Prefix = .
-Plugins = .
-Binaries = .
-Imports = .
-Qml2Imports = .
-LibraryExecutables = .
@@ -411,9 +411,6 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "@CPACK_RESOURCE_FILE_LICENSE@"
   ;File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt

-   ;Qt config:
-   File "${NSI_PATH}\qt.conf"
-
   ;Qt stuff:
   File "${QT_DLL_PATH}\Qt5Core.dll"
   File "${QT_DLL_PATH}\Qt5Gui.dll"
@@ -23,6 +23,4 @@
 #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
 #cmakedefine SHAREDIR "@SHAREDIR@"

-#cmakedefine WITH_UNIT_TESTING 1
-
 #endif
@@ -41,8 +41,6 @@ endif (MEM_NULL_TESTS)
 add_subdirectory(src)

 if (UNIT_TESTING)
-    set(WITH_UNIT_TESTING ON)
-
    find_package(CMocka)
    if (CMOCKA_FOUND)
        include(AddCMockaTest)
@@ -62,4 +62,8 @@ if (WIN32)
  check_function_exists(__mingw_asprintf HAVE___MINGW_ASPRINTF)
 endif(WIN32)

+if (UNIT_TESTING)
+    set(WITH_UNIT_TESTING ON)
+endif (UNIT_TESTING)
+
 set(CSYNC_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "csync required system libraries")
@@ -387,6 +387,7 @@ static int _csync_treewalk_visitor(void *obj, void *data) {
      trav.inode        = cur->inode;

      trav.error_status = cur->error_status;
+      trav.should_update_metadata = cur->should_update_metadata;
      trav.has_ignored_files = cur->has_ignored_files;
      trav.checksum = cur->checksum;
      trav.checksumTypeId = cur->checksumTypeId;
@@ -98,7 +98,6 @@ enum csync_status_codes_e {
    CSYNC_STATUS_INDIVIDUAL_IS_SYMLINK,
    CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST,
    CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS,
-    CSYNC_STATUS_INDIVIDUAL_TRAILING_SPACE,
    CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME,
    CYSNC_STATUS_FILE_LOCKED_OR_OPEN,
    CSYNC_STATUS_INDIVIDUAL_EXCLUDE_HIDDEN,
@@ -125,22 +124,20 @@ typedef enum csync_status_codes_e CSYNC_STATUS;
  * the csync state of a file.
  */
 enum csync_instructions_e {
-  CSYNC_INSTRUCTION_NONE            = 0x00000000,  /* Nothing to do (UPDATE|RECONCILE) */
-  CSYNC_INSTRUCTION_EVAL            = 0x00000001,  /* There was changed compared to the DB (UPDATE) */
-  CSYNC_INSTRUCTION_REMOVE          = 0x00000002,  /* The file need to be removed (RECONCILE) */
-  CSYNC_INSTRUCTION_RENAME          = 0x00000004,  /* The file need to be renamed (RECONCILE) */
-  CSYNC_INSTRUCTION_EVAL_RENAME     = 0x00000800,  /* The file is new, it is the destination of a rename (UPDATE) */
-  CSYNC_INSTRUCTION_NEW             = 0x00000008,  /* The file is new compared to the db (UPDATE) */
-  CSYNC_INSTRUCTION_CONFLICT        = 0x00000010,  /* The file need to be downloaded because it is a conflict (RECONCILE) */
-  CSYNC_INSTRUCTION_IGNORE          = 0x00000020,  /* The file is ignored (UPDATE|RECONCILE) */
-  CSYNC_INSTRUCTION_SYNC            = 0x00000040,  /* The file need to be pushed to the other remote (RECONCILE) */
-  CSYNC_INSTRUCTION_STAT_ERROR      = 0x00000080,
-  CSYNC_INSTRUCTION_ERROR           = 0x00000100,
-  CSYNC_INSTRUCTION_TYPE_CHANGE     = 0x00000200,  /* Like NEW, but deletes the old entity first (RECONCILE)
-                                                      Used when the type of something changes from directory to file
-                                                      or back. */
-  CSYNC_INSTRUCTION_UPDATE_METADATA = 0x00000400,  /* If the etag has been updated and need to be writen to the db,
-                                                      but without any propagation (UPDATE|RECONCILE) */
+  CSYNC_INSTRUCTION_NONE       = 0x00000000,  /* Nothing to do (UPDATE|RECONCILE) */
+  CSYNC_INSTRUCTION_EVAL       = 0x00000001,  /* There was changed compared to the DB (UPDATE) */
+  CSYNC_INSTRUCTION_REMOVE     = 0x00000002,  /* The file need to be removed (RECONCILE) */
+  CSYNC_INSTRUCTION_RENAME     = 0x00000004,  /* The file need to be renamed (RECONCILE) */
+  CSYNC_INSTRUCTION_EVAL_RENAME= 0x00000800,  /* The file is new, it is the destination of a rename (UPDATE) */
+  CSYNC_INSTRUCTION_NEW        = 0x00000008,  /* The file is new compared to the db (UPDATE) */
+  CSYNC_INSTRUCTION_CONFLICT   = 0x00000010,  /* The file need to be downloaded because it is a conflict (RECONCILE) */
+  CSYNC_INSTRUCTION_IGNORE     = 0x00000020,  /* The file is ignored (UPDATE|RECONCILE) */
+  CSYNC_INSTRUCTION_SYNC       = 0x00000040,  /* The file need to be pushed to the other remote (RECONCILE) */
+  CSYNC_INSTRUCTION_STAT_ERROR = 0x00000080,
+  CSYNC_INSTRUCTION_ERROR      = 0x00000100,
+  CSYNC_INSTRUCTION_TYPE_CHANGE = 0x0000200,  /* Like NEW, but deletes the old entity first (RECONCILE)
+                                                 Used when the type of something changes from directory to file
+                                                 or back. */
 };

 enum csync_ftw_type_e {
@@ -256,6 +253,9 @@ struct csync_tree_walk_file_s {
    enum csync_ftw_type_e     type;
    enum csync_instructions_e instruction;

+    /* For directories: If the etag has been updated and need to be writen on the db */
+    int         should_update_metadata;
+
    /* For directories: Does it have children that were ignored (hidden or ignore pattern) */
    int         has_ignored_files;

@@ -40,7 +40,7 @@
 #define CSYNC_LOG_CATEGORY_NAME "csync.exclude"
 #include "csync_log.h"

-#ifndef WITH_UNIT_TESTING
+#ifndef NDEBUG
 static
 #endif
 int _csync_exclude_add(c_strlist_t **inList, const char *string) {
@@ -243,14 +243,9 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
    // distinguish files ending in '.' from files without an ending,
    // as '.' is a separator that is not stored internally, so let's
    // not allow to sync those to avoid file loss/ambiguities (#416)
-    if (blen > 1) {
-        if (bname[blen-1]== ' ') {
-            match = CSYNC_FILE_EXCLUDE_TRAILING_SPACE;
-            goto out;
-        } else if (bname[blen-1]== '.' ) {
-            match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
-            goto out;
-        }
+    if (blen > 1 && (bname[blen-1]== ' ' || bname[blen-1]== '.' )) {
+        match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
+        goto out;
    }

    if (csync_is_windows_reserved_word(bname)) {
@@ -27,14 +27,13 @@ enum csync_exclude_type_e {
  CSYNC_FILE_EXCLUDE_AND_REMOVE,
  CSYNC_FILE_EXCLUDE_LIST,
  CSYNC_FILE_EXCLUDE_INVALID_CHAR,
-  CSYNC_FILE_EXCLUDE_TRAILING_SPACE,
  CSYNC_FILE_EXCLUDE_LONG_FILENAME,
  CSYNC_FILE_EXCLUDE_HIDDEN,
  CSYNC_FILE_EXCLUDE_STAT_FAILED
 };
 typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE;

-#ifdef WITH_UNIT_TESTING
+#ifdef NDEBUG
 int _csync_exclude_add(c_strlist_t **inList, const char *string);
 #endif

@@ -186,6 +186,8 @@ struct csync_file_stat_s {
  mode_t mode;      /* u32 */
  unsigned int type                   : 4;
  unsigned int child_modified         : 1;
+  unsigned int should_update_metadata : 1; /*specify that the etag, or the remote perm or fileid has
+                                changed and need to be updated on the db even for INSTRUCTION_NONE */
  unsigned int has_ignored_files      : 1; /* specify that a directory, or child directory contains ignored files */

  char *destpath;   /* for renames */
@@ -20,7 +20,6 @@

 #include "config_csync.h"

-#include <assert.h>
 #include "csync_private.h"
 #include "csync_reconcile.h"
 #include "csync_util.h"
@@ -131,7 +130,6 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
            break;
            /* file has been removed on the opposite replica */
        case CSYNC_INSTRUCTION_NONE:
-        case CSYNC_INSTRUCTION_UPDATE_METADATA:
            if (cur->has_ignored_files) {
                /* Do not remove a directory that has ignored files */
                break;
@@ -183,8 +181,13 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {

                if(!other) {
                    cur->instruction = CSYNC_INSTRUCTION_NEW;
+                    if (cur->type == CSYNC_FTW_TYPE_DIR) {
+                        // For new directories we always want to update the etag once
+                        // the directory has been propagated. Otherwise the directory
+                        // could appear locally without being added to the database.
+                        cur->should_update_metadata = true;
+                    }
                } else if (other->instruction == CSYNC_INSTRUCTION_NONE
-                           || other->instruction == CSYNC_INSTRUCTION_UPDATE_METADATA
                           || cur->type == CSYNC_FTW_TYPE_DIR) {
                    other->instruction = CSYNC_INSTRUCTION_RENAME;
                    other->destpath = c_strdup( cur->path );
@@ -192,6 +195,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                        csync_vio_set_file_id( other->file_id, cur->file_id );
                    }
                    other->inode = cur->inode;
+                    other->should_update_metadata = true;
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                } else if (other->instruction == CSYNC_INSTRUCTION_REMOVE) {
                    other->instruction = CSYNC_INSTRUCTION_RENAME;
@@ -201,12 +205,12 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                        csync_vio_set_file_id( other->file_id, cur->file_id );
                    }
                    other->inode = cur->inode;
+                    other->should_update_metadata = true;
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                } else if (other->instruction == CSYNC_INSTRUCTION_NEW) {
                    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "OOOO=> NEW detected in other tree!");
                    cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
                } else {
-                    assert(other->type != CSYNC_FTW_TYPE_DIR);
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                    other->instruction = CSYNC_INSTRUCTION_SYNC;
                }
@@ -218,19 +222,13 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
            break;
        }
    } else {
-        bool is_conflict = true;
+        bool is_equal_files = false;
        /*
     * file found on the other replica
     */
        other = (csync_file_stat_t *) node->data;

        switch (cur->instruction) {
-        case CSYNC_INSTRUCTION_UPDATE_METADATA:
-            if (other->instruction == CSYNC_INSTRUCTION_UPDATE_METADATA && ctx->current == LOCAL_REPLICA) {
-                // Remote wins, the SyncEngine will pick relevant local metadata since the remote tree is walked last.
-                cur->instruction = CSYNC_INSTRUCTION_NONE;
-            }
-            break;
        case CSYNC_INSTRUCTION_EVAL_RENAME:
            /* If the file already exist on the other side, we have a conflict.
               Abort the rename and consider it is a new file. */
@@ -255,39 +253,42 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
            case CSYNC_INSTRUCTION_EVAL:
                if (other->type == CSYNC_FTW_TYPE_DIR &&
                        cur->type == CSYNC_FTW_TYPE_DIR) {
-                    // Folders of the same path are always considered equals
-                    is_conflict = false;
+                    is_equal_files = (other->modtime == cur->modtime);
                } else {
-                    is_conflict = ((other->size != cur->size) || (other->modtime != cur->modtime));
+                    is_equal_files = ((other->size == cur->size) && (other->modtime == cur->modtime));
                    // FIXME: do a binary comparision of the file here because of the following
                    // edge case:
                    // The files could still have different content, even though the mtime
                    // and size are the same.
                }
-                if (ctx->current == REMOTE_REPLICA) {
-                    // If the files are considered equal, only update the DB with the etag from remote
-                    cur->instruction = is_conflict ? CSYNC_INSTRUCTION_CONFLICT : CSYNC_INSTRUCTION_UPDATE_METADATA;
-                    other->instruction = CSYNC_INSTRUCTION_NONE;
-                } else {
+                if (is_equal_files) {
+                    /* The files are considered equal. */
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
-                    other->instruction = is_conflict ? CSYNC_INSTRUCTION_CONFLICT : CSYNC_INSTRUCTION_UPDATE_METADATA;
+                    other->instruction = CSYNC_INSTRUCTION_NONE;
+
+                    /* update DB with new etag from remote */
+                    if (ctx->current == LOCAL_REPLICA) {
+                        other->should_update_metadata = true;
+                    } else {
+                        cur->should_update_metadata = true;
+                    }
+                } else if(ctx->current == REMOTE_REPLICA) {
+                        cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
+                        other->instruction = CSYNC_INSTRUCTION_NONE;
+                } else {
+                        cur->instruction = CSYNC_INSTRUCTION_NONE;
+                        other->instruction = CSYNC_INSTRUCTION_CONFLICT;
                }

                break;
                /* file on the other replica has not been modified */
            case CSYNC_INSTRUCTION_NONE:
-            case CSYNC_INSTRUCTION_UPDATE_METADATA:
                if (cur->type != other->type) {
                    // If the type of the entity changed, it's like NEW, but
                    // needs to delete the other entity first.
                    cur->instruction = CSYNC_INSTRUCTION_TYPE_CHANGE;
-                    other->instruction = CSYNC_INSTRUCTION_NONE;
-                } else if (cur->type == CSYNC_FTW_TYPE_DIR) {
-                    cur->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
-                    other->instruction = CSYNC_INSTRUCTION_NONE;
                } else {
                    cur->instruction = CSYNC_INSTRUCTION_SYNC;
-                    other->instruction = CSYNC_INSTRUCTION_NONE;
                }
                break;
            case CSYNC_INSTRUCTION_IGNORE:
@@ -309,7 +310,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
        if(cur->type == CSYNC_FTW_TYPE_DIR)
        {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
-                      "%-30s %s dir:  %s",
+                      "%-20s %s dir:  %s",
                      csync_instruction_str(cur->instruction),
                      repo,
                      cur->path);
@@ -317,7 +318,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
        else
        {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
-                      "%-30s %s file: %s",
+                      "%-20s %s file: %s",
                      csync_instruction_str(cur->instruction),
                      repo,
                      cur->path);
@@ -328,7 +329,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
        if(cur->type == CSYNC_FTW_TYPE_DIR)
        {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-                      "%-30s %s dir:  %s",
+                      "%-20s %s dir:  %s",
                      csync_instruction_str(cur->instruction),
                      repo,
                      cur->path);
@@ -336,7 +337,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
        else
        {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-                      "%-30s %s file: %s",
+                      "%-20s %s file: %s",
                      csync_instruction_str(cur->instruction),
                      repo,
                      cur->path);
@@ -314,7 +314,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
                }
                if (checksumIdentical) {
                    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "NOTE: Checksums are identical, file did not actually change: %s", path);
-                    st->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
+                    st->instruction = CSYNC_INSTRUCTION_NONE;
+                    st->should_update_metadata = true;
                    goto out;
                }
            }
@@ -340,19 +341,18 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Reading from database: %s", path);
            ctx->remote.read_from_db = true;
        }
+        if (metadata_differ) {
+            /* file id or permissions has changed. Which means we need to update them in the DB. */
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Need to update metadata for: %s", path);
+            st->should_update_metadata = true;
+        }
        /* If it was remembered in the db that the remote dir has ignored files, store
         * that so that the reconciler can make advantage of.
         */
        if( ctx->current == REMOTE_REPLICA ) {
            st->has_ignored_files = tmp->has_ignored_files;
        }
-        if (metadata_differ) {
-            /* file id or permissions has changed. Which means we need to update them in the DB. */
-            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Need to update metadata for: %s", path);
-            st->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
-        } else {
-            st->instruction = CSYNC_INSTRUCTION_NONE;
-        }
+        st->instruction = CSYNC_INSTRUCTION_NONE;
    } else {
        enum csync_vio_file_type_e tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;

@@ -477,8 +477,6 @@ out:
              st->error_status = CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST; /* File listed on ignore list. */
          } else if (excluded == CSYNC_FILE_EXCLUDE_INVALID_CHAR) {
              st->error_status = CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS;  /* File contains invalid characters. */
-          } else if (excluded == CSYNC_FILE_EXCLUDE_TRAILING_SPACE) {
-              st->error_status = CSYNC_STATUS_INDIVIDUAL_TRAILING_SPACE; /* File ends with a trailing space. */
          } else if (excluded == CSYNC_FILE_EXCLUDE_LONG_FILENAME) {
              st->error_status = CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME; /* File name is too long. */
          } else if (excluded == CSYNC_FILE_EXCLUDE_HIDDEN ) {
@@ -488,9 +486,7 @@ out:
          }
      }
  }
-  if (st->instruction != CSYNC_INSTRUCTION_NONE
-      && st->instruction != CSYNC_INSTRUCTION_IGNORE
-      && st->instruction != CSYNC_INSTRUCTION_UPDATE_METADATA
+  if (st->instruction != CSYNC_INSTRUCTION_NONE && st->instruction != CSYNC_INSTRUCTION_IGNORE
      && type != CSYNC_FTW_TYPE_DIR) {
    st->child_modified = 1;
  }
@@ -879,11 +875,10 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,

      if (ctx->current_fs && !ctx->current_fs->child_modified
          && ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL) {
-          if (ctx->current == REMOTE_REPLICA) {
-              ctx->current_fs->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
-          } else {
-              ctx->current_fs->instruction = CSYNC_INSTRUCTION_NONE;
-          }
+        ctx->current_fs->instruction = CSYNC_INSTRUCTION_NONE;
+        if (ctx->current == REMOTE_REPLICA) {
+          ctx->current_fs->should_update_metadata = true;
+        }
      }

      if (ctx->current_fs && previous_fs && ctx->current_fs->has_ignored_files) {
@@ -897,6 +892,12 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
        previous_fs->child_modified = ctx->current_fs->child_modified;
    }

+    if (flag == CSYNC_FTW_FLAG_DIR && ctx->current_fs
+        && (ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL ||
+            ctx->current_fs->instruction == CSYNC_INSTRUCTION_NEW)) {
+        ctx->current_fs->should_update_metadata = true;
+    }
+
    ctx->current_fs = previous_fs;
    ctx->remote.read_from_db = read_from_db;
    SAFE_FREE(filename);
@@ -56,7 +56,6 @@ static const _instr_code_struct _instr[] =
  { "INSTRUCTION_STAT_ERR", CSYNC_INSTRUCTION_STAT_ERROR },
  { "INSTRUCTION_ERROR", CSYNC_INSTRUCTION_ERROR },
  { "INSTRUCTION_TYPE_CHANGE", CSYNC_INSTRUCTION_TYPE_CHANGE },
-  { "INSTRUCTION_UPDATE_METADATA", CSYNC_INSTRUCTION_UPDATE_METADATA },
  { NULL, CSYNC_INSTRUCTION_ERROR }
 };

@@ -30,6 +30,7 @@

 static void setup(void **state) {
    CSYNC *csync;
+    int rc;

    csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");

@@ -178,20 +179,6 @@ static void check_csync_excluded(void **state)

    rc = csync_excluded_no_ctx(csync->excludes, "latex/songbook/my_manuscript.tex.tmp", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-#ifdef _WIN32
-    rc = csync_excluded_no_ctx(csync->excludes, "file_trailing_space ", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_TRAILING_SPACE);
-
-    rc = csync_excluded_no_ctx(csync->excludes, "file_trailing_dot.", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-
-    rc = csync_excluded_no_ctx(csync->excludes, "AUX", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-
-    rc = csync_excluded_no_ctx(csync->excludes, "file_invalid_char<", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-#endif
 }

 static void check_csync_excluded_traversal(void **state)
@@ -318,14 +305,13 @@ static void check_csync_excluded_performance(void **state)

    const int N = 10000;
    int totalRc = 0;
-    int i = 0;

    // Being able to use QElapsedTimer for measurement would be nice...
    {
        struct timeval before, after;
        gettimeofday(&before, 0);

-        for (i = 0; i < N; ++i) {
+        for (int i = 0; i < N; ++i) {
            totalRc += csync_excluded_no_ctx(csync->excludes, "/this/is/quite/a/long/path/with/many/components", CSYNC_FTW_TYPE_DIR);
            totalRc += csync_excluded_no_ctx(csync->excludes, "/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/29", CSYNC_FTW_TYPE_FILE);
        }
@@ -343,7 +329,7 @@ static void check_csync_excluded_performance(void **state)
        struct timeval before, after;
        gettimeofday(&before, 0);

-        for (i = 0; i < N; ++i) {
+        for (int i = 0; i < N; ++i) {
            totalRc += csync_excluded_traversal(csync->excludes, "/this/is/quite/a/long/path/with/many/components", CSYNC_FTW_TYPE_DIR);
            totalRc += csync_excluded_traversal(csync->excludes, "/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/29", CSYNC_FTW_TYPE_FILE);
        }
@@ -74,6 +74,7 @@ static void teardown(void **state) {
 static void check_csync_init(void **state)
 {
    CSYNC *csync = *state;
+    int rc;

    csync_init(csync);

@@ -520,7 +520,7 @@ sub put_to_dir( $$;$ )
 	    $targetUrl = $optionsRef->{url};
 	}
    }
-    $d->open($targetUrl . $dir);
+    $d->open($dir);

    my $filename = $file;
    $filename =~ s/^.*\///;
@@ -31,13 +31,6 @@ use strict;

 print "Hello, this is t6, a tester for csync with ownCloud.\n";

-# Checking CURL is installed to avoid misleading errors later...
-system(("curl", "--help", ">", "/dev/null"));
-if ($? != 0) {
-   print "CURL is needed for this script, aborting with error\n";
-   exit 1;
-}
-
 initTesting();

 sub createPostUpdateScript($)
@@ -64,10 +64,6 @@ csync();
 assert( -e glob(localDir().'dir/file2_.sys.admin#recall#-*.dat' ) );
 assert( -e glob(localDir().'dir/file3_.sys.admin#recall#-*.dat' ) );

-# verify that the original files still exist
-assert( -e glob(localDir().'dir/file2.dat' ) );
-assert( -e glob(localDir().'dir/file3.dat' ) );
-
 #Remove the recall file
 unlink(localDir() . ".sys.admin#recall#");

@@ -7,7 +7,7 @@ On Microsoft Windows systems:
        ``%LOCALAPPDATA%\ownCloud\owncloud.cfg``

 On MAC OS X systems:
-        ``$HOME/Library/Application Support/ownCloud/owncloud.cfg``
+        ``$HOME/Library/Application Support/ownCloud``


 The configuration file contains settings using the Microsoft Windows .ini file
@@ -1,11 +1,3 @@
-<!--- 
-Please try to only report a bug if it happens with the latest version
-The latest version can be seen by checking the ChangeLog: https://owncloud.org/changelog/desktop/
-
-For support try: https://central.owncloud.org/c/help/desktop-file-sync
--->
-
-
 ### Expected behaviour
 Tell us what should happen

@@ -28,7 +20,7 @@ PHP version:

 ownCloud version:

-Storage backend (external storage):
+Storage backend:

 ### Client configuration
 Client version:
@@ -46,11 +38,11 @@ logs.

 ```Template for output < 10 lines```

-1. Client logfile: Output of `owncloud --logwindow` or `owncloud --logfile log.txt`
+1. Output of `owncloud --logwindow` or `owncloud --logfile log.txt`
 (On Windows using `cmd.exe`, you might need to first `cd` into the ownCloud directory)
-(See also http://doc.owncloud.org/desktop/2.2/troubleshooting.html#client-logfile )
+(See also http://doc.owncloud.org/desktop/1.8/troubleshooting.html#client-logfile )

 2. Web server error log:

-3. Server logfile: ownCloud log (data/owncloud.log):
+3. ownCloud log (data/owncloud.log):

@@ -205,93 +205,6 @@ 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
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
@@ -314,11 +227,9 @@ GenericName[de]=Ordner-Synchronisation
 Name[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
 Icon[de]=@APPLICATION_EXECUTABLE@
 Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-GenericName[ja_JP]=フォルダー同期
+GenericName[ja_JP]=フォルダ同期
 Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
 Icon[ja_JP]=@APPLICATION_EXECUTABLE@
-GenericName[el]=Συγχρονισμός φακέλου
-Icon[el]=@APPLICATION_EXECUTABLE@
 Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
 GenericName[en_GB]=Folder Sync
 Name[en_GB]=@APPLICATION_NAME@ desktop sync client 
@@ -331,10 +242,10 @@ Comment[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
 GenericName[de_DE]=Ordner-Synchronisation
 Name[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
 Icon[de_DE]=@APPLICATION_EXECUTABLE@
-Comment[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
-GenericName[pl]=Folder Synchronizacji
-Name[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
-Icon[pl]=@APPLICATION_EXECUTABLE@
+Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация
+GenericName[bg_BG]=Синхронизиране на папката
+Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация
+Icon[bg_BG]=@APPLICATION_EXECUTABLE@
 Comment[fr]=@APPLICATION_NAME@ synchronisation du client
 GenericName[fr]=Dossier de Synchronisation
 Name[fr]=@APPLICATION_NAME@ synchronisation du client
@@ -370,10 +281,10 @@ Comment[et_EE]=@APPLICATION_NAME@ sünkroonimise klient töölauale
 GenericName[et_EE]=Kaustade sünkroonimine
 Name[et_EE]=@APPLICATION_NAME@ sünkroonimise klient töölauale
 Icon[et_EE]=@APPLICATION_EXECUTABLE@
-Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация
-GenericName[bg_BG]=Синхронизиране на папката
-Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация
-Icon[bg_BG]=@APPLICATION_EXECUTABLE@
+Comment[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
+GenericName[pl]=Folder Synchronizacji
+Name[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
+Icon[pl]=@APPLICATION_EXECUTABLE@
 Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização do computador
 GenericName[pt_BR]=Sincronização de Pasta
 Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização de desktop
@@ -394,17 +305,13 @@ Comment[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
 GenericName[sq]=Njëkohësim Dosjesh
 Name[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
 Icon[sq]=@APPLICATION_EXECUTABLE@
-Comment[fi_FI]=@APPLICATION_NAME@ työpöytäsynkronointisovellus
-GenericName[fi_FI]=Kansion synkronointi
-Name[fi_FI]=@APPLICATION_NAME@ työpöytäsynkronointisovellus
-Icon[fi_FI]=@APPLICATION_EXECUTABLE@
 Comment[sv]=@APPLICATION_NAME@ desktop synkroniseringsklient
 GenericName[sv]=Mappsynk
 Name[sv]=@APPLICATION_NAME@ desktop synk-klient
 Icon[sv]=@APPLICATION_EXECUTABLE@
-Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
-GenericName[tr]=Dosya Eşitleme
-Name[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
+Comment[tr]=@APPLICATION_NAME@ masaüstü senkronizasyon istemcisi
+GenericName[tr]=Dosya Senkronizasyonu
+Name[tr]=@APPLICATION_NAME@ masaüstü senkronizasyon istemcisi
 Icon[tr]=@APPLICATION_EXECUTABLE@
 Comment[uk]=Настільний клієнт синхронізації @APPLICATION_NAME@
 GenericName[uk]=Синхронізація теки
@@ -18,7 +18,6 @@
 #include <QStringList>
 #include <QUrl>
 #include <QFile>
-#include <QFileInfo>
 #include <qdebug.h>

 #include "account.h"
@@ -197,12 +196,10 @@ void parseOptions( const QStringList& app_args, CmdOptions *options )
    if (!options->source_dir.endsWith('/')) {
        options->source_dir.append('/');
    }
-    QFileInfo fi(options->source_dir);
-    if( !fi.exists() ) {
+    if( !QFile::exists( options->source_dir )) {
        std::cerr << "Source dir '" << qPrintable(options->source_dir) << "' does not exist." << std::endl;
        exit(1);
    }
-    options->source_dir = fi.absoluteFilePath();

    QStringListIterator it(args);
    // skip file name;
@@ -275,12 +272,6 @@ void selectiveSyncFixup(OCC::SyncJournalDb *journal, const QStringList &newList)
 int main(int argc, char **argv) {
    QCoreApplication app(argc, argv);

-#ifdef Q_OS_WIN
-    // Ensure OpenSSL config file is only loaded from app directory
-    QString opensslConf = QCoreApplication::applicationDirPath()+QString("/openssl.cnf");
-    qputenv("OPENSSL_CONF", opensslConf.toLocal8Bit());
-#endif
-
    qsrand(QTime::currentTime().msec() * QCoreApplication::applicationPid());

    CmdOptions options;
@@ -68,7 +68,6 @@ set(client_SRCS
    activitylistmodel.cpp
    activitywidget.cpp
    activityitemdelegate.cpp
-    activityfetcher.cpp
    selectivesyncdialog.cpp
    settingsdialog.cpp
    share.cpp
@@ -15,45 +15,10 @@

 #include "activitydata.h"

+
 namespace OCC
 {

-ActivityFile::ActivityFile()
-    :_type(Unknown)
-{
-
-}
-
-ActivityFile::ActivityFile( const QString& file )
-    :_relFileName(file),
-      _type(File)
-{
-
-}
-
-void ActivityFile::setType( FileType type )
-{
-    _type = type;
-}
-
-QString ActivityFile::relativePath() const
-{
-    return _relFileName;
-}
-
-QString ActivityFile::fullPath( const QString _accountName ) const
-{
-    QString fullPath(_relFileName);
-    // FIXME: get the account and prepend the base path.
-
-    if( _type == Directory && !fullPath.endsWith('/')) {
-        fullPath.append('/');
-    }
-    return fullPath;
-}
-
-/* ==================================================================== */
-
 bool operator<( const Activity& rhs, const Activity& lhs ) {
    return rhs._dateTime.toMSecsSinceEpoch() > lhs._dateTime.toMSecsSinceEpoch();
 }
@@ -66,39 +31,5 @@ Activity::Identifier Activity::ident() const {
    return Identifier( _id, _accName );
 }

-void Activity::addFile( const QString& file )
-{
-    ActivityFile f(file);
-    _files.append(f);
-}
-
-void Activity::addDirectory( const QString& dir )
-{
-    ActivityFile f(dir);
-    f.setType(ActivityFile::Directory);
-    _files.append(f);
-}
-
-QVector<ActivityFile> Activity::files()
-{
-    return _files;
-}
-
-
-/* ==================================================================== */
-
-ActivityList::ActivityList()
-{
-}
-
-void ActivityList::setAccountState(AccountState *ast)
-{
-    _ast = ast;
-}
-
-AccountState* ActivityList::accountState()
-{
-    return _ast;
-}

 }
@@ -16,8 +16,6 @@

 #include <QtCore>

-#include "accountstate.h"
-
 namespace OCC {
 /**
 * @brief The ActivityLink class describes actions of an activity
@@ -35,32 +33,6 @@ public:
 };

 /* ==================================================================== */
-
-/**
- * @brief ActivityFile Structure
- * @ingroup gui
- *
- * contains information about a file of an activity.
- * Can handle the thumbnail and stuff later.
- */
-class ActivityFile
-{
-public:
-    enum FileType {Unknown, File, Directory};
-    explicit ActivityFile();
-    explicit ActivityFile( const QString& file );
-
-    void setType( FileType type );
-    QString relativePath() const;
-    QString fullPath( const QString _accountName ) const;
-
-private:
-    QString _relFileName;
-    FileType _type;
-};
-
-/* ==================================================================== */
-
 /**
 * @brief Activity Structure
 * @ingroup gui
@@ -78,11 +50,6 @@ public:
        NotificationType
    };

-    void addFile( const QString& file );
-    void addDirectory( const QString& dir );
-
-    QVector<ActivityFile> files();
-
    Type      _type;
    qlonglong _id;
    QString   _subject;
@@ -101,10 +68,6 @@ public:


    Identifier ident() const;
-
-private:
-
-    QVector<ActivityFile> _files;
 };

 bool operator==( const Activity& rhs, const Activity& lhs );
@@ -118,22 +81,8 @@ bool operator<( const Activity& rhs, const Activity& lhs );
 * A QList based list of Activities
 */

-/**
- * @brief The ActivityList
- * @ingroup gui
- *
- * A QList based list of Activities
- */
-class ActivityList:public QList<Activity>
-{
-public:
-    ActivityList();
-    void setAccountState(AccountState *ast);
-    AccountState* accountState();
+typedef QList<Activity> ActivityList;

-private:
-    AccountState *_ast;
-};

 }

@@ -1,245 +0,0 @@
-/*
- * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-#include "activityfetcher.h"
-#include "activitydata.h"
-#include "account.h"
-#include "accountstate.h"
-#include "json.h"
-#include "networkjobs.h"
-
-namespace OCC {
-
-ActivityFetcher::ActivityFetcher(QObject *parent) : QObject(parent)
-{
-
-}
-
-void ActivityFetcher::slotFetch(AccountState* s)
-{
-    if( !(s && s->isConnected() )) {
-        return;
-    }
-    JsonApiJob *job = new JsonApiJob(s->account(), QLatin1String("ocs/v1.php/cloud/activity"), this);
-    QObject::connect(job, SIGNAL(jsonReceived(QVariantMap, int)),
-                     this, SLOT(slotActivitiesReceived(QVariantMap, int)));
-    job->setProperty("AccountStatePtr", QVariant::fromValue<AccountState*>(s));
-
-    QList< QPair<QString,QString> > params;
-    params.append(qMakePair(QString::fromLatin1("page"),     QString::fromLatin1("0")));
-    params.append(qMakePair(QString::fromLatin1("pagesize"), QString::fromLatin1("100")));
-    job->addQueryParams(params);
-
-    qDebug() << "Start fetching activities for " << s->account()->displayName();
-    job->start();
-
-}
-
-void ActivityFetcher::slotActivitiesReceived(const QVariantMap& json, int statusCode)
-{
-    auto activities = json.value("ocs").toMap().value("data").toList();
-    qDebug() << "*** activities" << activities;
-
-    ActivityList list;
-    AccountState* ai = qvariant_cast<AccountState*>(sender()->property("AccountStatePtr"));
-    list.setAccountState( ai );
-
-    foreach( auto activ, activities ) {
-        auto json = activ.toMap();
-
-        Activity a;
-        a._accName  = ai->account()->displayName();
-        a._id       = json.value("id").toLongLong();
-        a._subject  = json.value("subject").toString();
-        a._message  = json.value("message").toString();
-        const QString f = json.value("file").toString();
-        a.addFile(f);
-        a._link     = json.value("link").toUrl();
-        a._dateTime = json.value("date").toDateTime();
-        list.append(a);
-    }
-    // activity app is not enabled, signalling.
-    if( statusCode == 999 ) {
-        emit accountWithoutActivityApp(ai);
-    }
-
-    emit newActivityList(list);
-}
-
-/* ==================================================================== */
-
-ActivityFetcherV2::ActivityFetcherV2()
-    : ActivityFetcher()
-{
-
-}
-
-ActivityList ActivityFetcherV2::fetchFromDb( const QString& accountId )
-{
-    // TODO fetch from database
-    ActivityList dbActivities;
-
-    return dbActivities;
-}
-
-int ActivityFetcherV2::lastSeenId()
-{
-    int lastId = 0;
-
-    return lastId;
-}
-
-void ActivityFetcherV2::slotFetch(AccountState* s)
-{
-    if( !(s && s->isConnected() )) {
-        return;
-    }
-
-    JsonApiJob *job = new JsonApiJob(s->account(), QLatin1String("ocs/v2.php/apps/activity/api/v2/activity"), this);
-    QObject::connect(job, SIGNAL(jsonReceived(QVariantMap, int)),
-                     this, SLOT(slotActivitiesReceived(QVariantMap, int)));
-    job->setProperty("AccountStatePtr", QVariant::fromValue<AccountState*>(s));
-
-    QList< QPair<QString,QString> > params;
-
-    int lastId = lastSeenId();
-    if( lastId > 0 ) {
-        params.append(qMakePair(QString::fromLatin1("since"),  QString::number(lastId)));
-        job->addQueryParams(params);
-    }
-    qDebug() << "Start fetching V2 activities for " << s->account()->displayName();
-    job->start();
-}
-
-#define QL1(X) QLatin1String(X)
-
-bool ActivityFetcherV2::parseActionString( Activity *activity, const QString& subject, const QVariantList& params)
-{
-    // the action contains a string describing what happened
-    bool re = true;
-
-    if( subject == QL1("shared_user_self") ) {
-
-    } else if( subject == QL1("reshared_user_by") ) {
-
-    } else if( subject == QL1("shared_group_self") ) {
-
-    } else if( subject == QL1("reshared_group_by") ) {
-
-    } else if( subject == QL1("reshared_link_by") ) {
-
-    } else if( subject == QL1("shared_user_self") ) {
-
-    } else if( subject == QL1("created_self") ) {
-
-    } else if( subject == QL1("created_by") ) {
-
-    } else if( subject == QL1("created_public") ) {
-
-    } else if( subject == QL1("changed_self") ) {
-
-    } else if( subject == QL1("changed_by") ) {
-
-    } else if( subject == QL1("deleted_self") ) {
-
-    } else if( subject == QL1("deleted_by") ) {
-
-    } else if( subject == QL1("restored_self") ) {
-
-    } else if( subject == QL1("restored_by") ) {
-
-    } else {
-        // unknown action.
-        re = false;
-    }
-
-    // parse the params
-    foreach( QVariant v, params ) {
-        QVariantMap vm = v.toMap();
-
-        if( vm.contains("type") ) {
-            const QString type = vm.value("type").toString();
-            const QString val = vm.value("value").toString();
-
-            if( type == QL1("collection") ) {
-                QVariantList items = vm.value("value").toList();
-
-                foreach( QVariant vFile, items ) {
-                    QVariantMap vMap = vFile.toMap();
-                    const QString fileType = vMap.value("type").toString();
-                    const QString relFileName = vMap.value("value").toString();
-
-                    if( fileType != QL1("file")) {
-                        activity->addDirectory(relFileName);
-                    } else {
-                        activity->addFile(relFileName);
-                    }
-                }
-            } else if( type == QL1("file")) {
-                const QString relFileName = val;
-                activity->addFile(relFileName);
-            } else if( type == QL1("dir")) {
-                const QString relFileName = val;
-                activity->addDirectory(relFileName);
-                // needs verification!
-            } else if( type == QL1("username")) {
-                const QString user = val;
-            } else if( type == QL1("typeicon")) {
-                const QString icon = val;
-            } else {
-
-            }
-        }
-    }
-    return re;
-}
-
-void ActivityFetcherV2::slotActivitiesReceived(const QVariantMap& json, int statusCode)
-{
-    auto activities = json.value("ocs").toMap().value("data").toList();
-    qDebug() << "*** activities" << activities;
-
-    AccountState* ai = qvariant_cast<AccountState*>(sender()->property("AccountStatePtr"));
-    ActivityList list;
-
-    if( ai ) {
-        list = fetchFromDb(ai->account()->id());
-        list.setAccountState( ai );
-
-        foreach( auto activ, activities ) {
-            auto json = activ.toMap();
-
-            Activity a;
-            a._accName  = ai->account()->displayName();
-            a._id       = json.value("activity_id").toLongLong();
-            QString subject = json.value("subject").toString();
-            QVariantList subjectParams = json.value("subjectparams").toList();
-            bool knownAction = parseActionString( &a, subject, subjectParams );
-
-            a._subject  = json.value("subject").toString();
-
-            a._message  = json.value("message_prepared").toString();
-            // a._file     = json.value("file").toString();
-            // a._link     = json.value("link").toUrl();
-            a._dateTime = json.value("datetime").toDateTime();
-            list.append(a);
-        }
-        // activity app is not enabled, signalling.
-        if( statusCode == 999 ) {
-            emit accountWithoutActivityApp(ai);
-        }
-    }
-    emit newActivityList(list);
-}
-
-}
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-#ifndef ACTIVITYFETCHER_H
-#define ACTIVITYFETCHER_H
-
-#include <QtCore>
-
-#include "activitydata.h"
-#include "accountstate.h"
-
-/**
- * @brief The ActivityFetcher class
- *
- * Used to fetch the list of server acitivities from the server. Accesses
- * the old ocs based API.
- */
-
-namespace OCC {
-
-class ActivityFetcher : public QObject
-{
-    Q_OBJECT
-public:
-    explicit ActivityFetcher(QObject *parent = 0);
-
-public slots:
-    virtual void slotFetch(AccountState* s);
-
-private slots:
-    virtual void slotActivitiesReceived(const QVariantMap& json, int statusCode);
-
-signals:
-    void newActivityList( ActivityList list );
-    void accountWithoutActivityApp(AccountState*);
-
-};
-
-/* ==================================================================== */
-
-/**
- * @brief The ActivityFetcherV2 class
- *
- * To be used with the next version of the activity API. By now, it is
- * completely unused.
- */
-
-class ActivityFetcherV2 : public ActivityFetcher
-{
-    Q_OBJECT
-public:
-    explicit ActivityFetcherV2();
-
-public slots:
-    virtual void slotFetch(AccountState* s);
-
-private slots:
-    virtual void slotActivitiesReceived(const QVariantMap& json, int statusCode);
-
-private:
-    bool parseActionString( Activity *activity, const QString& subject, const QVariantList& params);
-    ActivityList fetchFromDb(const QString &accountId );
-    int lastSeenId();
-
-};
-
-}
-
-#endif // ACTIVITYFETCHER_H
@@ -26,35 +26,10 @@
 #include "activitydata.h"
 #include "activitylistmodel.h"

-#define FETCH_ACTIVITIES_AMOUNT 1000
-
 namespace OCC {

-/* ==================================================================== */
-ActivitySortProxyModel::ActivitySortProxyModel(QObject *parent)
-    :QSortFilterProxyModel(parent)
-{
-    setFilterRole(ActivityItemDelegate::ActionTextRole);
-}
-
-bool ActivitySortProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
-{
-    QVariant leftData = sourceModel()->data(left);
-    QVariant rightData = sourceModel()->data(right);
-
-    if (leftData.type() == QVariant::DateTime) {
-        return leftData.toDateTime() < rightData.toDateTime();
-    } else {
-        qDebug() << "OOOOO " << endl;
-    }
-    return true;
-}
-
-/* ==================================================================== */
-
 ActivityListModel::ActivityListModel(QWidget *parent)
-    :QAbstractListModel(parent),
-      _fetchEntriesAmount(FETCH_ACTIVITIES_AMOUNT)
+    :QAbstractListModel(parent)
 {
 }

@@ -65,8 +40,7 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
    if (!index.isValid())
        return QVariant();

-    a = findItem(index.row());
-
+    a = _finalList.at(index.row());
    AccountStatePtr ast = AccountManager::instance()->account(a._accName);
    QStringList list;

@@ -115,48 +89,47 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const

 int ActivityListModel::rowCount(const QModelIndex&) const
 {
-    int cnt = 0;
-
-    foreach( ActivityList al, _activityLists) {
-        cnt += al.count();
-    }
-    return cnt;
+    return _finalList.count();
 }

-void ActivityListModel::startFetchJob(AccountState* ast)
+// current strategy: Fetch 100 items per Account
+// ATTENTION: This method is const and thus it is not possible to modify
+// the _activityLists hash or so. Doesn't make it easier...
+bool ActivityListModel::canFetchMore(const QModelIndex& ) const
 {
-    if( !ast->isConnected() || _currentlyFetching.contains(ast)) {
+    if( _activityLists.count() == 0 ) return true;
+
+    for(auto i = _activityLists.begin() ; i != _activityLists.end(); ++i) {
+        AccountState *ast = i.key();
+        if( ast && ast->isConnected() ) {
+            ActivityList activities = i.value();
+            if( activities.count() == 0 &&
+                    ! _currentlyFetching.contains(ast) ) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+void ActivityListModel::startFetchJob(AccountState* s)
+{
+    if( !s->isConnected() ) {
        return;
    }
-
-    int activityListIndx = activityListIndxForAccountState(ast);
-    ActivityList activityList = _activityLists.at(activityListIndx);
-
-    // remove entries that might exist in this list.
-    int startItem = 0;
-    for( int i = 0; i < activityListIndx; i++ ) {
-        ActivityList al = _activityLists.at(i);
-        startItem += al.count();
-    }
-
-    beginRemoveRows(QModelIndex(), startItem, activityList.count() );
-    activityList.clear();
-    endRemoveRows();
-
-    _activityLists[activityListIndx] = activityList;
-
-    // start a new fetch job.
-    JsonApiJob *job = new JsonApiJob(ast->account(), QLatin1String("ocs/v1.php/cloud/activity"), this);
+    JsonApiJob *job = new JsonApiJob(s->account(), QLatin1String("ocs/v1.php/cloud/activity"), this);
    QObject::connect(job, SIGNAL(jsonReceived(QVariantMap, int)),
                     this, SLOT(slotActivitiesReceived(QVariantMap, int)));
-    job->setProperty("AccountStatePtr", QVariant::fromValue<AccountState*>(ast));
+    job->setProperty("AccountStatePtr", QVariant::fromValue<AccountState*>(s));
+
    QList< QPair<QString,QString> > params;
-    params.append(qMakePair(QString::fromLatin1("start"), QLatin1String("0")));
-    params.append(qMakePair(QString::fromLatin1("count"), QString::number(_fetchEntriesAmount)));
+    params.append(qMakePair(QString::fromLatin1("page"),     QString::fromLatin1("0")));
+    params.append(qMakePair(QString::fromLatin1("pagesize"), QString::fromLatin1("100")));
    job->addQueryParams(params);

-    _currentlyFetching.insert(ast);
-    qDebug() << Q_FUNC_INFO << "Start fetching activities for " << ast->account()->displayName();
+    _currentlyFetching.insert(s);
+    qDebug() << Q_FUNC_INFO << "Start fetching activities for " << s->account()->displayName();
    job->start();
 }

@@ -164,14 +137,12 @@ void ActivityListModel::slotActivitiesReceived(const QVariantMap& json, int stat
 {
    auto activities = json.value("ocs").toMap().value("data").toList();

+    ActivityList list;
    AccountState* ast = qvariant_cast<AccountState*>(sender()->property("AccountStatePtr"));
-
    _currentlyFetching.remove(ast);

-    // Read the new entries into a temporary list
-    ActivityList list;
-    foreach( auto activity, activities ) {
-        auto json = activity.toMap();
+    foreach( auto activ, activities ) {
+        auto json = activ.toMap();

        Activity a;
        a._type = Activity::ActivityType;
@@ -185,101 +156,73 @@ void ActivityListModel::slotActivitiesReceived(const QVariantMap& json, int stat
        list.append(a);
    }

+    _activityLists[ast] = list;
+
    emit activityJobStatusCode(ast, statusCode);

-    addNewActivities(ast, list);
+    combineActivityLists();
 }


-void ActivityListModel::addNewActivities(AccountState* ast, const ActivityList& newItemsList)
+void ActivityListModel::combineActivityLists()
 {
-    int startItem = 0; // the start number of items to delete in the virtual overall list
-    int activityListIndx = activityListIndxForAccountState(ast);
-    Q_ASSERT(activityListIndx != -1);
+    ActivityList resultList;

-    ActivityList accountList = _activityLists.at(activityListIndx);
-
-    for( int i = 0; i < activityListIndx; i++ ) {
-        ActivityList li = _activityLists.at(i);
-        startItem += li.count();
+    foreach( ActivityList list, _activityLists.values() ) {
+        resultList.append(list);
    }

-    // insert the new list
-    beginInsertRows(QModelIndex(), startItem, newItemsList.count() );
-    accountList.append(newItemsList);
+    std::sort( resultList.begin(), resultList.end() );
+
+    beginResetModel();
+    _finalList.clear();
+    endResetModel();
+
+    beginInsertRows(QModelIndex(), 0, resultList.count());
+    _finalList = resultList;
    endInsertRows();
-
-    _activityLists[activityListIndx] = accountList;
 }

-int ActivityListModel::activityListIndxForAccountState(AccountState *ast)
+void ActivityListModel::fetchMore(const QModelIndex &)
 {
-    int i;
+    QList<AccountStatePtr> accounts = AccountManager::instance()->accounts();

-    for( i = 0; i < _activityLists.count(); i++ ) {
-        ActivityList li = _activityLists.at(i);
-        if( li.accountState() == ast )
-            return i;
+    foreach (const AccountStatePtr& asp, accounts) {
+
+        if( !_activityLists.contains(asp.data()) && asp->isConnected() ) {
+            _activityLists[asp.data()] = ActivityList();
+            startFetchJob(asp.data());
+        }
    }
-    // if the AccountState was not found yet, add it to the list
-    if( i == _activityLists.count() ) {
-        ActivityList li;
-        li.setAccountState(ast);
-        _activityLists.append(li);
-    }
-    return i;
 }

 void ActivityListModel::slotRefreshActivity(AccountState *ast)
 {
-    if(ast ) {
-        qDebug() << "**** Refreshing Activity list for" << ast->account()->displayName();
-        startFetchJob(ast);
+    if(ast && _activityLists.contains(ast)) {
+        _activityLists.remove(ast);
    }
+    startFetchJob(ast);
 }

 void ActivityListModel::slotRemoveAccount(AccountState *ast )
 {
-    int removeIndx = activityListIndxForAccountState(ast);
+    if( _activityLists.contains(ast) ) {
+        int i = 0;
+        const QString accountToRemove = ast->account()->displayName();

-    int startRow = 0;
-    for( int i = 0; i < removeIndx; i++) {
-        ActivityList al = _activityLists.at(i);
-        startRow += al.count();
-    }
+        QMutableListIterator<Activity> it(_finalList);

-    beginRemoveRows(QModelIndex(), startRow, startRow+_activityLists.at(removeIndx).count());
-    _activityLists.removeAt(removeIndx);
-    endRemoveRows();
-    _currentlyFetching.remove(ast);
-}
-
-// combine all activities into one big result list
-ActivityList ActivityListModel::activityList()
-{
-    ActivityList all;
-    int i;
-
-    for( i = 0; i < _activityLists.count(); i++) {
-        ActivityList al = _activityLists.at(i);
-        all.append(al);
-    }
-    return all;
-}
-
-Activity ActivityListModel::findItem(int indx) const
-{
-    Activity a;
-
-    foreach( ActivityList al, _activityLists ) {
-        if( indx < al.count() ) {
-            a = al.at(indx);
-            break;
+        while (it.hasNext()) {
+            Activity activity = it.next();
+            if( activity._accName == accountToRemove ) {
+                beginRemoveRows(QModelIndex(), i, i+1);
+                it.remove();
+                endRemoveRows();
+            }
        }
-        indx -= al.count();
+        _activityLists.remove(ast);
+        _currentlyFetching.remove(ast);
    }
-
-    return a;
 }

 }
@@ -17,21 +17,10 @@
 #include <QtCore>

 #include "activitydata.h"
-#include "accountstate.h"

 namespace OCC {

-class ActivitySortProxyModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-public:
-    ActivitySortProxyModel(QObject *parent = 0);
-
-protected:
-    bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
-
-};
+class AccountState;

 /**
 * @brief The ActivityListModel
@@ -49,8 +38,10 @@ public:
    QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
    int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;

-    ActivityList activityList();
-    Activity findItem(int indx) const;
+    bool canFetchMore(const QModelIndex& ) const Q_DECL_OVERRIDE;
+    void fetchMore(const QModelIndex&) Q_DECL_OVERRIDE;
+
+    ActivityList activityList() { return _finalList; }

 public slots:
    void slotRefreshActivity(AccountState* ast);
@@ -63,16 +54,14 @@ signals:
    void activityJobStatusCode(AccountState* ast, int statusCode);

 private:
-    void addNewActivities(AccountState* ast, const ActivityList& newItemsList);
-    void startFetchJob(AccountState *ast);
+    void startFetchJob(AccountState* s);
    void combineActivityLists();
-    int activityListIndxForAccountState(AccountState *ast );

-    QList<ActivityList> _activityLists;
+    QMap<AccountState*, ActivityList> _activityLists;
    ActivityList _finalList;
    QSet<AccountState*> _currentlyFetching;
-    int _fetchEntriesAmount;
 };

+
 }
 #endif // ACTIVITYLISTMODEL_H
@@ -63,19 +63,15 @@ ActivityWidget::ActivityWidget(QWidget *parent) :
    _ui->_activityList->setMinimumWidth(400);
 #endif

-    _model = new ActivitySortProxyModel(this);
-    ActivityListModel *rawModel = new ActivityListModel;
-    _model->setSourceModel(rawModel);
-
+    _model = new ActivityListModel(this);
    ActivityItemDelegate *delegate = new ActivityItemDelegate;
    delegate->setParent(this);
    _ui->_activityList->setItemDelegate(delegate);
    _ui->_activityList->setAlternatingRowColors(true);
    _ui->_activityList->setModel(_model);

-    _ui->_filterEdit->setClearButtonEnabled(true);
-    connect(_ui->_filterEdit, SIGNAL(textChanged(QString)),
-            SLOT(slotFilterTextChanged(QString)));
+    _ui->_notifyLabel->hide();
+    _ui->_notifyScroll->hide();

    // Create a widget container for the notifications. The ui file defines
    // a scroll area that get a widget with a layout as children
@@ -83,10 +79,12 @@ ActivityWidget::ActivityWidget(QWidget *parent) :
    _notificationsLayout = new QVBoxLayout;
    w->setLayout(_notificationsLayout);
    _notificationsLayout->setAlignment(Qt::AlignTop);
+    _ui->_notifyScroll->setAlignment(Qt::AlignTop);
+    _ui->_notifyScroll->setWidget(w);

    showLabels();

-    connect(rawModel, SIGNAL(activityJobStatusCode(AccountState*,int)),
+    connect(_model, SIGNAL(activityJobStatusCode(AccountState*,int)),
            this, SLOT(slotAccountActivityStatus(AccountState*,int)));

    _copyBtn = _ui->_dialogButtonBox->addButton(tr("Copy"), QDialogButtonBox::ActionRole);
@@ -107,17 +105,11 @@ ActivityWidget::~ActivityWidget()
    delete _ui;
 }

-void ActivityWidget::slotFilterTextChanged(const QString& exp)
-{
-    _model->setFilterRegExp(QRegExp(exp, Qt::CaseInsensitive, QRegExp::RegExp));
-}
-
 void ActivityWidget::slotRefreshActivities(AccountState *ptr)
 {
-    qobject_cast<ActivityListModel*>(_model->sourceModel())->slotRefreshActivity(ptr);
+    _model->slotRefreshActivity(ptr);
 }

-
 void ActivityWidget::slotRefreshNotifications(AccountState *ptr)
 {
    // start a server notification handler if no notification requests
@@ -127,7 +119,7 @@ void ActivityWidget::slotRefreshNotifications(AccountState *ptr)
        connect(snh, SIGNAL(newNotificationList(ActivityList)), this,
                SLOT(slotBuildNotificationDisplay(ActivityList)));

-        snh->fetchNotifications(ptr);
+        snh->slotFetchNotifications(ptr);
    } else {
        qDebug() << Q_FUNC_INFO << "========> notification request counter not zero.";
    }
@@ -135,20 +127,24 @@ void ActivityWidget::slotRefreshNotifications(AccountState *ptr)

 void ActivityWidget::slotRemoveAccount( AccountState *ptr )
 {
-    qobject_cast<ActivityListModel*>(_model->sourceModel())->slotRemoveAccount(ptr);
+    _model->slotRemoveAccount(ptr);
 }

 void ActivityWidget::showLabels()
 {
-    QString t;
+    QString t = tr("Server Activities");
+    _ui->_headerLabel->setTextFormat(Qt::RichText);
+    _ui->_headerLabel->setText(t);

+    _ui->_notifyLabel->setText(tr("Action Required: Notifications"));
+
+    t.clear();
    QSetIterator<QString> i(_accountsWithoutActivities);
    while (i.hasNext() ) {
        t.append( tr("<br/>Account %1 does not have activities enabled.").arg(i.next()));
    }
    _ui->_bottomLabel->setTextFormat(Qt::RichText);
    _ui->_bottomLabel->setText(t);
-    _ui->_bottomLabel->setVisible(!t.isEmpty());
 }

 void ActivityWidget::slotAccountActivityStatus(AccountState *ast, int statusCode)
@@ -178,7 +174,7 @@ QString ActivityWidget::timeString(QDateTime dt, QLocale::FormatType format) con

 void ActivityWidget::storeActivityList( QTextStream& ts )
 {
-    ActivityList activities = qobject_cast<ActivityListModel*>(_model->sourceModel())->activityList();
+    ActivityList activities = _model->activityList();

    foreach( Activity activity, activities ) {
        ts << right
@@ -222,9 +218,11 @@ void ActivityWidget::checkActivityTabVisibility()
            _accountsWithoutActivities.count() != accountCount;
    bool hasNotifications = !_widgetForNotifId.isEmpty();

-    _ui->_filterLabel->setVisible( hasAccountsWithActivity );
+    _ui->_headerLabel->setVisible( hasAccountsWithActivity );
    _ui->_activityList->setVisible( hasAccountsWithActivity );
-    _ui->_filterEdit->setVisible(hasAccountsWithActivity);
+
+    _ui->_notifyLabel->setVisible( hasNotifications );
+    _ui->_notifyScroll->setVisible( hasNotifications );

    emit hideActivityTab(!hasAccountsWithActivity && !hasNotifications);
 }
@@ -250,9 +248,6 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list)
    QHash<QString, int> accNotified;
    QString listAccountName;

-    // Whether a new notification widget was added to the notificationLayout.
-    bool newNotificationShown = false;
-
    foreach( auto activity, list ) {
        if( _blacklistedNotifications.contains(activity)) {
            qDebug() << Q_FUNC_INFO << "Activity in blacklist, skip";
@@ -271,8 +266,11 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list)
                    this, SLOT(slotRequestCleanupAndBlacklist(Activity)));

            _notificationsLayout->addWidget(widget);
+            // _ui->_notifyScroll->setMinimumHeight( widget->height());
+#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
+            _ui->_notifyScroll->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContentsOnFirstShow);
+#endif
            _widgetForNotifId[activity.ident()] = widget;
-            newNotificationShown = true;
        }

        widget->setActivity( activity );
@@ -367,10 +365,6 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list)
        const QString log = tr("%1 Notifications - Action Required").arg(Theme::instance()->appNameGUI());
        emit guiLog( log, msg);
    }
-
-    if (newNotificationShown) {
-        emit newNotification();
-    }
 }

 void ActivityWidget::slotSendNotificationRequest(const QString& accountName, const QString& link, const QByteArray& verb)
@@ -498,6 +492,12 @@ void ActivityWidget::slotCheckToCleanWidgets()
    if( _widgetsToRemove.isEmpty() ) {
        _removeTimer.stop();
    }
+
+    // check to see if the whole notification pane should be hidden
+    if( _widgetForNotifId.isEmpty() ) {
+        _ui->_notifyLabel->setHidden(true);
+        _ui->_notifyScroll->setHidden(true);
+    }
 }


@@ -517,7 +517,6 @@ ActivitySettings::ActivitySettings(QWidget *parent)
    connect(_activityWidget, SIGNAL(copyToClipboard()), this, SLOT(slotCopyToClipboard()));
    connect(_activityWidget, SIGNAL(hideActivityTab(bool)), this, SLOT(setActivityTabHidden(bool)));
    connect(_activityWidget, SIGNAL(guiLog(QString,QString)), this, SIGNAL(guiLog(QString,QString)));
-    connect(_activityWidget, SIGNAL(newNotification()), SLOT(slotShowActivityTab()));

    _protocolWidget = new ProtocolWidget(this);
    _tab->insertTab(1, _protocolWidget, Theme::instance()->syncStateIcon(SyncResult::Success), tr("Sync Protocol"));
@@ -583,13 +582,6 @@ void ActivitySettings::slotShowIssueItemCount(int cnt)
    _tab->setTabText(_syncIssueTabId, cntText);
 }

-void ActivitySettings::slotShowActivityTab()
-{
-    if (_activityTabId != -1) {
-        _tab->setCurrentIndex(_activityTabId);
-    }
-}
-
 void ActivitySettings::slotCopyToClipboard()
 {
    QString text;
@@ -42,7 +42,6 @@ namespace Ui {
  class ActivityWidget;
 }
 class Application;
-class ActivitySortProxyModel;

 /**
 * @brief The ActivityWidget class
@@ -82,10 +81,9 @@ signals:
    void copyToClipboard();
    void rowsInserted();
    void hideActivityTab(bool);
-    void newNotification();
+    void newNotificationList(const ActivityList& list);

 private slots:
-    void slotFilterTextChanged(const QString& exp);
    void slotBuildNotificationDisplay(const ActivityList& list);
    void slotSendNotificationRequest(const QString &accountName, const QString& link, const QByteArray &verb);
    void slotNotifyNetworkError( QNetworkReply* );
@@ -113,7 +111,7 @@ private:
    // no query for notifications is started.
    int _notificationRequestsRunning;

-    ActivitySortProxyModel *_model;
+    ActivityListModel *_model;
    QVBoxLayout *_notificationsLayout;

 };
@@ -145,7 +143,6 @@ private slots:
    void setActivityTabHidden(bool hidden);
    void slotRegularNotificationCheck();
    void slotShowIssueItemCount(int cnt);
-    void slotShowActivityTab();

 signals:
    void guiLog(const QString&, const QString&);
@@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>690</width>
-    <height>513</height>
+    <width>693</width>
+    <height>556</height>
   </rect>
  </property>
  <property name="windowTitle">
@@ -15,53 +15,81 @@
  </property>
  <layout class="QGridLayout" name="gridLayout">
   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="_filterLabel">
-       <property name="text">
-        <string>&amp;Filter</string>
-       </property>
-       <property name="buddy">
-        <cstring>_filterEdit</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="_filterEdit">
-       <property name="maximumSize">
-        <size>
-         <width>180</width>
-         <height>16777215</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QLabel" name="_notifyLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
   </item>
   <item row="1" column="0">
-    <widget class="QListView" name="_activityList"/>
+    <widget class="QScrollArea" name="_notifyScroll">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <widget class="QWidget" name="_scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>677</width>
+        <height>70</height>
+       </rect>
+      </property>
+     </widget>
+    </widget>
   </item>
   <item row="2" column="0">
-    <widget class="QLabel" name="_bottomLabel">
+    <widget class="QLabel" name="_headerLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
     <property name="text">
      <string>TextLabel</string>
     </property>
    </widget>
   </item>
   <item row="3" column="0">
+    <widget class="QListView" name="_activityList">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="_bottomLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
    <widget class="QDialogButtonBox" name="_dialogButtonBox"/>
   </item>
  </layout>
@@ -105,12 +105,6 @@ Application::Application(int &argc, char **argv) :
 {
    _startedAt.start();

-#ifdef Q_OS_WIN
-    // Ensure OpenSSL config file is only loaded from app directory
-    QString opensslConf = QCoreApplication::applicationDirPath()+QString("/openssl.cnf");
-    qputenv("OPENSSL_CONF", opensslConf.toLocal8Bit());
-#endif
-
 // TODO: Can't set this without breaking current config paths
 //    setOrganizationName(QLatin1String(APPLICATION_VENDOR));
    setOrganizationDomain(QLatin1String(APPLICATION_REV_DOMAIN));
@@ -360,11 +354,10 @@ void Application::setupLogging()

    Logger::instance()->enterNextLogFile();

-    qDebug() << QString::fromLatin1( "################## %1 %2 (%3) %4 on %5").arg(_theme->appName())
+    qDebug() << QString::fromLatin1( "################## %1 %2 (%3) %4").arg(_theme->appName())
                .arg( QLocale::system().name() )
                .arg(property("ui_lang").toString())
-                .arg(_theme->version())
-                .arg(Utility::platformName());
+                .arg(_theme->version());

    // Setup CSYNC logging to forward to our own logger
    csync_set_log_callback( csyncLogCatcher );
@@ -14,7 +14,6 @@
 */

 #include <QInputDialog>
-#include <QLabel>
 #include "creds/httpcredentialsgui.h"
 #include "theme.h"
 #include "account.h"
@@ -32,52 +31,26 @@ void HttpCredentialsGui::askFromUser()

 void HttpCredentialsGui::askFromUserAsync()
 {
-    QString msg = tr("Please enter %1 password:<br>"
-                     "<br>"
-                     "User: %2<br>"
-                     "Account: %3<br>")
-                  .arg(Utility::escape(Theme::instance()->appNameGUI()),
-                       Utility::escape(_user),
-                       Utility::escape(_account->displayName()));
-
-    QString reqTxt = requestAppPasswordText(_account);
-    if (!reqTxt.isEmpty()) {
-        msg += QLatin1String("<br>") + reqTxt + QLatin1String("<br>");
-    }
+    QString msg = tr("Please enter %1 password:\n"
+                     "\n"
+                     "User: %2\n"
+                     "Account: %3\n")
+                  .arg(Theme::instance()->appNameGUI(), _user, _account->displayName());
    if (!_fetchErrorString.isEmpty()) {
-        msg += QLatin1String("<br>") + tr("Reading from keychain failed with error: '%1'").arg(
-                    Utility::escape(_fetchErrorString)) + QLatin1String("<br>");
+        msg += QLatin1String("\n") + tr("Reading from keychain failed with error: '%1'").arg(
+                    _fetchErrorString) + QLatin1String("\n");
    }

-    QInputDialog dialog;
-    dialog.setWindowTitle(tr("Enter Password"));
-    dialog.setLabelText(msg);
-    dialog.setTextValue(_previousPassword);
-    dialog.setTextEchoMode(QLineEdit::Password);
-    if (QLabel *dialogLabel = dialog.findChild<QLabel *>()) {
-        dialogLabel->setOpenExternalLinks(true);
-        dialogLabel->setTextFormat(Qt::RichText);
-    }
-
-    bool ok = dialog.exec();
+    bool ok = false;
+    QString pwd = QInputDialog::getText(0, tr("Enter Password"), msg,
+                                 QLineEdit::Password, _previousPassword,
+                                 &ok);
    if (ok) {
-        _password = dialog.textValue();
+        _password = pwd;
        _ready = true;
        persist();
    }
    emit asked();
 }

-QString HttpCredentialsGui::requestAppPasswordText(const Account* account)
-{
-    if (account->serverVersionInt() < 0x090100) {
-        // Older server than 9.1 does not have trhe feature to request App Password
-        return QString();
-    }
-
-    return tr("<a href=\"%1\">Click here</a> to request an app password from the web interface.")
-        .arg(account->url().toString() + QLatin1String("/index.php/settings/personal?section=apppasswords"));
-}
-
-
 } // namespace OCC
@@ -30,8 +30,6 @@ public:
    HttpCredentialsGui(const QString& user, const QString& password, const QString& certificatePath, const QString& certificatePasswd) : HttpCredentials(user, password, certificatePath, certificatePasswd) {}
    void askFromUser() Q_DECL_OVERRIDE;
    Q_INVOKABLE void askFromUserAsync();
-
-    static QString requestAppPasswordText(const Account *account);
 };

 } // namespace OCC
@@ -62,7 +62,6 @@ Folder::Folder(const FolderDefinition& definition,
      , _consecutiveFailingSyncs(0)
      , _consecutiveFollowUpSyncs(0)
      , _journal(definition.localPath)
-      , _fileLog(new SyncRunFileLog)
 {
    qRegisterMetaType<SyncFileItemVector>("SyncFileItemVector");
    qRegisterMetaType<SyncFileItem::Direction>("SyncFileItem::Direction");
@@ -110,8 +109,6 @@ Folder::Folder(const FolderDefinition& definition,
            this, SLOT(slotItemCompleted(const SyncFileItem &, const PropagatorJob &)));
    connect(_engine.data(), SIGNAL(newBigFolder(QString)), this, SLOT(slotNewBigFolderDiscovered(QString)));
    connect(_engine.data(), SIGNAL(seenLockedFile(QString)), FolderMan::instance(), SLOT(slotSyncOnceFileUnlocks(QString)));
-    connect(_engine.data(), SIGNAL(aboutToPropagate(SyncFileItemVector&)),
-            SLOT(slotLogPropagationStart()));
 }

 Folder::~Folder()
@@ -367,11 +364,18 @@ void Folder::bubbleUpSyncResult()
    SyncFileItemPtr firstConflictItem;
    SyncFileItemPtr firstItemError;

+    SyncRunFileLog syncFileLog;
+
+    syncFileLog.start(path(), _engine->isSyncRunning() ? _engine->stopWatch() : Utility::StopWatch() );
+
    QElapsedTimer timer;
    timer.start();

    foreach (const SyncFileItemPtr &item, _syncResult.syncFileItemVector() ) {
-        // Process the item to the gui
+        // Log the item
+        syncFileLog.logItem( *item );
+
+        // and process the item to the gui
        if( item->_status == SyncFileItem::FatalError || item->_status == SyncFileItem::NormalError ) {
            //: this displays an error string (%2) for a file %1
            slotSyncError( tr("%1: %2").arg(item->_file, item->_errorString) );
@@ -410,9 +414,11 @@ void Folder::bubbleUpSyncResult()
                        firstItemDeleted = item;
                    break;
                case CSYNC_INSTRUCTION_SYNC:
-                    updatedItems++;
-                    if (!firstItemUpdated)
-                        firstItemUpdated = item;
+                    if (!item->_isDirectory) {
+                        updatedItems++;
+                        if (!firstItemUpdated)
+                            firstItemUpdated = item;
+                    }
                    break;
                case CSYNC_INSTRUCTION_ERROR:
                    qDebug() << "Got Instruction ERROR. " << _syncResult.errorString();
@@ -434,6 +440,7 @@ void Folder::bubbleUpSyncResult()
            }
        }
    }
+    syncFileLog.close();

    qDebug() << "Processing result list and logging took " << timer.elapsed() << " Milliseconds.";
    _syncResult.setWarnCount(ignoredItems);
@@ -751,8 +758,6 @@ void Folder::startSync(const QStringList &pathList)

    _engine->setIgnoreHiddenFiles(_definition.ignoreHiddenFiles);

-    _fileLog->start(path());
-
    QMetaObject::invokeMethod(_engine.data(), "startSync", Qt::QueuedConnection);

    // disable events until syncing is done
@@ -816,7 +821,6 @@ void Folder::slotSyncFinished(bool success)
    } else {
        qDebug() << "-> SyncEngine finished without problem.";
    }
-    _fileLog->finish();
    bubbleUpSyncResult();

    bool anotherSyncNeeded = _engine->isAnotherSyncNeeded();
@@ -923,7 +927,6 @@ void Folder::slotItemCompleted(const SyncFileItem &item, const PropagatorJob& jo
        // Count all error conditions.
        _syncResult.setWarnCount(_syncResult.warnCount()+1);
    }
-    _fileLog->logItem(item);
    emit ProgressDispatcher::instance()->itemCompleted(alias(), item, job);
 }

@@ -961,11 +964,6 @@ void Folder::slotNewBigFolderDiscovered(const QString &newF)
    }
 }

-void Folder::slotLogPropagationStart()
-{
-    _fileLog->logLap("Propagation starts");
-}
-


 void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)
@@ -1000,7 +998,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)
 void Folder::slotAboutToRestoreBackup(bool *restore)
 {
    QString msg =
-        tr("This sync would reset the files to an earlier time in the sync folder '%1'.\n"
+        tr("This sync would reset the files to an erlier time in the sync folder '%1'.\n"
           "This might be because a backup was restored on the server.\n"
           "Continuing the sync as normal will cause all your files to be overwritten by an older "
           "file in an earlier state. "
@@ -35,7 +35,6 @@ namespace OCC {

 class SyncEngine;
 class AccountState;
-class SyncRunFileLog;

 /**
 * @brief The FolderDefinition class
@@ -264,8 +263,6 @@ private slots:

    void slotNewBigFolderDiscovered(const QString &);

-    void slotLogPropagationStart();
-
 private:
    bool setIgnoredFiles();

@@ -314,8 +311,6 @@ private:
    SyncJournalDb _journal;

    ClientProxy   _clientProxy;
-
-    QScopedPointer<SyncRunFileLog> _fileLog;
 };

 }
@@ -164,8 +164,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
        switch(role) {
            case Qt::DisplayRole:
                if (x->_hasError) {
-                    return QVariant(tr("Error while loading the list of folders from the server.")
-                                               + QString("\n") + x->_lastErrorString);
+                    return tr("Error while loading the list of folders from the server.");
                } else {
                    return tr("Fetching folder list from server...");
                }
@@ -499,10 +498,6 @@ bool FolderStatusModel::canFetchMore(const QModelIndex& parent) const
    auto info = infoForIndex(parent);
    if (!info || info->_fetched || info->_fetching)
        return false;
-    if (info->_hasError) {
-        // Keep showing the error to the user, it will be hidden when the account reconnects
-        return false;
-    }
    return true;
 }

@@ -553,7 +548,6 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list)

    if (parentInfo->hasLabel()) {
        beginRemoveRows(idx, 0 ,0);
-        parentInfo->_lastErrorString.clear();
        parentInfo->_hasError = false;
        parentInfo->_fetchingLabel = false;
        endRemoveRows();
@@ -590,7 +584,7 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list)
    QStringList sortedSubfolders = list;
    // skip the parent item (first in the list)
    sortedSubfolders.erase(sortedSubfolders.begin());
-    Utility::sortFilenames(sortedSubfolders);
+    sortedSubfolders.sort();

    QVarLengthArray<int, 10> undecidedIndexes;

@@ -681,9 +675,6 @@ void FolderStatusModel::slotLscolFinishedWithError(QNetworkReply* r)
    }
    auto parentInfo = infoForIndex(idx);
    if (parentInfo) {
-        qDebug() << r->errorString();
-        parentInfo->_lastErrorString = r->errorString();
-
        if (r->error() == QNetworkReply::ContentNotFoundError) {
            parentInfo->_fetched = true;
        } else {
@@ -943,20 +934,11 @@ void FolderStatusModel::slotSetProgress(const ProgressInfo &progress)
    if (totalSize > 0) {
        QString s1 = Utility::octetsToString( completedSize );
        QString s2 = Utility::octetsToString( totalSize );
-
-        if (progress.trustEta()) {
-            //: Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"
-            overallSyncString = tr("%5 left, %1 of %2, file %3 of %4")
-                .arg(s1, s2)
-                .arg(currentFile).arg(totalFileCount)
-                .arg( Utility::durationToDescriptiveString1(progress.totalProgress().estimatedEta) );
-
-        } else {
-            //: Example text: "12 MB of 345 MB, file 6 of 7"
-            overallSyncString = tr("%1 of %2, file %3 of %4")
-                .arg(s1, s2)
-                .arg(currentFile).arg(totalFileCount);
-        }
+        //: Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"
+        overallSyncString = tr("%5 left, %1 of %2, file %3 of %4")
+            .arg(s1, s2)
+            .arg(currentFile).arg(totalFileCount)
+            .arg( Utility::durationToDescriptiveString1(progress.totalProgress().estimatedEta) );
    } else if (totalFileCount > 0) {
        // Don't attempt to estimate the time left if there is no kb to transfer.
        overallSyncString = tr("file %1 of %2") .arg(currentFile).arg(totalFileCount);
@@ -63,7 +63,6 @@ public:
        bool _fetched; // If we did the LSCOL for this folder already
        bool _fetching; // Whether a LSCOL job is currently running
        bool _hasError; // If the last fetching job ended in an error
-        QString _lastErrorString;
        bool _fetchingLabel; // Whether a 'fetching in progress' label is shown.

        bool _isUndecided; // undecided folders are the big folders that the user has not accepted yet
@@ -308,7 +308,7 @@ void FolderWizardRemotePath::slotUpdateDirectories(const QStringList &list)
        root->setData(0, Qt::UserRole, "/");
    }
    QStringList sortedList = list;
-    Utility::sortFilenames(sortedList);
+    sortedList.sort();
    foreach (QString path, sortedList) {
        path.remove(webdavFolder);
        QStringList paths = path.split('/');
@@ -92,9 +92,9 @@ ownCloudGui::ownCloudGui(Application *parent) :
             this,SLOT(slotSyncStateChange(Folder*)));

    connect( AccountManager::instance(), SIGNAL(accountAdded(AccountState*)),
-             SLOT(setupContextMenuIfVisible()));
+             SLOT(setupContextMenu()));
    connect( AccountManager::instance(), SIGNAL(accountRemoved(AccountState*)),
-             SLOT(setupContextMenuIfVisible()));
+             SLOT(setupContextMenu()));

    connect( Logger::instance(), SIGNAL(guiLog(QString,QString)),
             SLOT(slotShowTrayMessage(QString,QString)));
@@ -193,7 +193,7 @@ void ownCloudGui::slotTrayClicked( QSystemTrayIcon::ActivationReason reason )
 void ownCloudGui::slotSyncStateChange( Folder* folder )
 {
    slotComputeOverallSyncStatus();
-    setupContextMenuIfVisible();
+    setupContextMenu();

    if( !folder ) {
        return; // Valid, just a general GUI redraw was needed.
@@ -215,7 +215,7 @@ void ownCloudGui::slotSyncStateChange( Folder* folder )
 void ownCloudGui::slotFoldersChanged()
 {
    slotComputeOverallSyncStatus();
-    setupContextMenuIfVisible();
+    setupContextMenu();
 }

 void ownCloudGui::slotOpenPath(const QString &path)
@@ -225,7 +225,7 @@ void ownCloudGui::slotOpenPath(const QString &path)

 void ownCloudGui::slotAccountStateChanged()
 {
-    setupContextMenuIfVisible();
+    setupContextMenu();
    slotComputeOverallSyncStatus();
 }

@@ -450,13 +450,9 @@ void ownCloudGui::setupContextMenu()
            _tray->hide();
        }
        _contextMenu->clear();
+        slotRebuildRecentMenus();
    } else {
        _contextMenu.reset(new QMenu());
-
-        // Update the context menu whenever we're about to show it
-        // to the user.
-        connect(_contextMenu.data(), SIGNAL(aboutToShow()), SLOT(setupContextMenu()));
-
        _recentActionsMenu = new QMenu(tr("Recent Changes"), _contextMenu.data());
        // this must be called only once after creating the context menu, or
        // it will trigger a bug in Ubuntu's SNI bridge patch (11.10, 12.04).
@@ -481,8 +477,6 @@ void ownCloudGui::setupContextMenu()
 #endif
    }
    _contextMenu->setTitle(Theme::instance()->appNameGUI() );
-    slotRebuildRecentMenus();
-
    // We must call deleteLater because we might be called from the press in one of the actions.
    foreach (auto menu, _accountMenus) { menu->deleteLater(); }
    _accountMenus.clear();
@@ -558,11 +552,6 @@ void ownCloudGui::setupContextMenu()
    }
 }

-void ownCloudGui::setupContextMenuIfVisible()
-{
-    if (_contextMenu && _contextMenu->isVisible())
-        setupContextMenu();
-}

 void ownCloudGui::slotShowTrayMessage(const QString &title, const QString &msg)
 {
@@ -669,29 +658,18 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo&
    } else if (progress.totalSize() == 0 ) {
        quint64 currentFile = progress.currentFile();
        quint64 totalFileCount = qMax(progress.totalFiles(), currentFile);
-        QString msg;
-        if (progress.trustEta()) {
-            msg = tr("Syncing %1 of %2  (%3 left)")
-                    .arg( currentFile ).arg( totalFileCount )
-                    .arg( Utility::durationToDescriptiveString2(progress.totalProgress().estimatedEta) );
-        } else {
-            msg = tr("Syncing %1 of %2")
-                    .arg( currentFile ).arg( totalFileCount );
-        }
-        _actionStatus->setText( msg );
+        _actionStatus->setText( tr("Syncing %1 of %2  (%3 left)")
+            .arg( currentFile ).arg( totalFileCount )
+            .arg( Utility::durationToDescriptiveString2(progress.totalProgress().estimatedEta) ) );
    } else {
        QString totalSizeStr = Utility::octetsToString( progress.totalSize() );
-        QString msg;
-        if (progress.trustEta()) {
-            msg = tr("Syncing %1 (%2 left)")
-                .arg( totalSizeStr, Utility::durationToDescriptiveString2(progress.totalProgress().estimatedEta) );
-        } else {
-            msg = tr("Syncing %1")
-                .arg( totalSizeStr );
-        }
-        _actionStatus->setText( msg );
+        _actionStatus->setText( tr("Syncing %1 (%2 left)")
+            .arg( totalSizeStr, Utility::durationToDescriptiveString2(progress.totalProgress().estimatedEta) ) );
    }

+
+
+
    _actionRecent->setIcon( QIcon() ); // Fixme: Set a "in-progress"-item eventually.

    if (!progress._lastCompletedItem.isEmpty()
@@ -722,11 +700,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo&
        }
        _recentItemsActions.append(action);

-        // Update the "Recent" menu if the context menu is being shown,
-        // otherwise it'll be updated later, when the context menu is opened.
-        if (_contextMenu && _contextMenu->isVisible()) {
-            slotRebuildRecentMenus();
-        }
+        slotRebuildRecentMenus();
    }

    if (progress.isUpdatingEstimates()
@@ -57,7 +57,6 @@ signals:

 public slots:
    void setupContextMenu();
-    void setupContextMenuIfVisible();
    void slotComputeOverallSyncStatus();
    void slotShowTrayMessage(const QString &title, const QString &msg);
    void slotShowOptionalTrayMessage(const QString &title, const QString &msg);
@@ -142,15 +142,11 @@ void OwncloudSetupWizard::slotDetermineAuthType(const QString &urlString)

 void OwncloudSetupWizard::slotOwnCloudFoundAuth(const QUrl& url, const QVariantMap &info)
 {
-    auto serverVersion = CheckServerJob::version(info);
-
    _ocWizard->appendToConfigurationLog(tr("<font color=\"green\">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/>")
                                        .arg(url.toString())
                                        .arg(Theme::instance()->appNameGUI())
                                        .arg(CheckServerJob::versionString(info))
-                                        .arg(serverVersion));
-
-    _ocWizard->account()->setServerVersion(serverVersion);
+                                        .arg(CheckServerJob::version(info)));

    QString p = url.path();
    if (p.endsWith("/status.php")) {
@@ -508,10 +504,6 @@ DetermineAuthTypeJob::DetermineAuthTypeJob(AccountPtr account, QObject *parent)
    : AbstractNetworkJob(account, QString(), parent)
    , _redirects(0)
 {
-    // This job implements special redirect handling to detect redirections
-    // to pages that are indicative of Shibboleth-using servers. Hence we
-    // disable the standard job redirection handling here.
-    _followRedirects = false;
 }

 void DetermineAuthTypeJob::start()
@@ -93,6 +93,7 @@ private:
    OwncloudWizard* _ocWizard;
    QString _initLocalFolder;
    QString _remoteFolder;
+
 };

 }
@@ -222,7 +222,7 @@ void SelectiveSyncTreeView::slotUpdateDirectories(QStringList list)
        }
    }

-    Utility::sortFilenames(list);
+    list.sort();
    foreach (QString path, list) {
        auto size = job ? job->_sizes.value(path) : 0;
        path.remove(pathToRemove);
@@ -26,14 +26,14 @@ ServerNotificationHandler::ServerNotificationHandler(QObject *parent)

 }

-bool ServerNotificationHandler::fetchNotifications(AccountState *ptr)
+void ServerNotificationHandler::slotFetchNotifications(AccountState *ptr)
 {
    // check connectivity and credentials
    if( !( ptr && ptr->isConnected() && ptr->account() &&
           ptr->account()->credentials() &&
           ptr->account()->credentials()->ready() ) ) {
        deleteLater();
-        return false;
+        return;
    }
    // check if the account has notifications enabled. If the capabilities are
    // not yet valid, its assumed that notifications are available.
@@ -41,7 +41,7 @@ bool ServerNotificationHandler::fetchNotifications(AccountState *ptr)
        if( ! ptr->account()->capabilities().notificationsAvailable() ) {
            qDebug() << Q_FUNC_INFO << "Account" << ptr->account()->displayName() << "does not have notifications enabled.";
            deleteLater();
-            return false;
+            return;
        }
    }

@@ -52,7 +52,6 @@ bool ServerNotificationHandler::fetchNotifications(AccountState *ptr)
    _notificationJob->setProperty("AccountStatePtr", QVariant::fromValue<AccountState*>(ptr));

    _notificationJob->start();
-    return true;
 }

 void ServerNotificationHandler::slotNotificationsReceived(const QVariantMap& json, int statusCode)
@@ -26,12 +26,12 @@ class ServerNotificationHandler : public QObject
    Q_OBJECT
 public:
    explicit ServerNotificationHandler(QObject *parent = 0);
-    bool fetchNotifications(AccountState *ptr);

 signals:
    void newNotificationList(ActivityList);

 public slots:
+    void slotFetchNotifications(AccountState *ptr);

 private slots:
    void slotNotificationsReceived(const QVariantMap& json, int statusCode);
@@ -23,7 +23,6 @@
 #include <QBuffer>
 #include <QClipboard>
 #include <QFileInfo>
-#include <QDesktopServices>

 namespace OCC {

@@ -54,10 +53,6 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
    _ui->pushButton_copy->setEnabled(false);
    connect(_ui->pushButton_copy, SIGNAL(clicked(bool)), SLOT(slotPushButtonCopyLinkPressed()));

-    _ui->pushButton_mail->setIcon(QIcon::fromTheme("mail-send"));
-    _ui->pushButton_mail->setEnabled(false);
-    connect(_ui->pushButton_mail, SIGNAL(clicked(bool)), SLOT(slotPushButtonMailLinkPressed()));
-
    // the following progress indicator widgets are added to layouts which makes them
    // automatically deleted once the dialog dies.
    _pi_link     = new QProgressIndicator();
@@ -229,7 +224,6 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
        if (share->getShareType() == Share::TypeLink) {
            _share = qSharedPointerDynamicCast<LinkShare>(share);
            _ui->pushButton_copy->show();
-            _ui->pushButton_mail->show();

            _ui->widget_shareLink->show();
            _ui->checkBox_shareLink->setChecked(true);
@@ -274,7 +268,6 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
            }

            setShareLink(_share->getLink().toString());
-            _ui->pushButton_mail->setEnabled(true);
            _ui->pushButton_copy->setEnabled(true);

            // Connect all shares signals to gui slots
@@ -331,7 +324,6 @@ void ShareLinkWidget::setShareLink( const QString& url )
    if( realUrl.isValid() ) {
        _shareUrl = url;
        _ui->pushButton_copy->setEnabled(true);
-        _ui->pushButton_mail->setEnabled(true);
    } else {
        _shareUrl.clear();
        _ui->_labelShareLink->setText(QString::null);
@@ -347,7 +339,6 @@ void ShareLinkWidget::slotDeleteShareFetched()
    _ui->lineEdit_password->clear();
    _ui->_labelShareLink->clear();
    _ui->pushButton_copy->setEnabled(false);
-    _ui->pushButton_mail->setEnabled(false);
    _ui->widget_shareLink->hide();
    _ui->lineEdit_password->hide();
    _ui->pushButton_setPassword->setEnabled(false);
@@ -375,10 +366,8 @@ void ShareLinkWidget::slotCheckBoxShareLinkClicked()
            _ui->checkBox_password->setText(tr("Public sh&aring requires a password"));
            _ui->checkBox_expire->setEnabled(false);
            _ui->checkBox_editing->setEnabled(false);
-            _ui->lineEdit_password->setEnabled(true);
            _ui->lineEdit_password->setFocus();
            _ui->pushButton_copy->hide();
-            _ui->pushButton_mail->hide();
            _ui->widget_shareLink->show();

            slotCheckBoxPasswordClicked();
@@ -424,7 +413,6 @@ void ShareLinkWidget::slotCreateShareRequiresPassword(const QString& message)
    _ui->lineEdit_password->setEnabled(true);
    _ui->lineEdit_password->setFocus();
    _ui->pushButton_copy->hide();
-    _ui->pushButton_mail->hide();
    _ui->widget_shareLink->show();
    _ui->checkBox_expire->setEnabled(false);
    _ui->checkBox_editing->setEnabled(false);
@@ -444,7 +432,6 @@ void ShareLinkWidget::slotCheckBoxPasswordClicked()
        _ui->lineEdit_password->show();
        _ui->pushButton_setPassword->show();
        _ui->lineEdit_password->setPlaceholderText(tr("Please Set Password"));
-        _ui->lineEdit_password->setEnabled(true);
        _ui->lineEdit_password->setFocus();
    } else {
        setPassword(QString());
@@ -486,19 +473,6 @@ void ShareLinkWidget::slotPushButtonCopyLinkPressed()
 #endif
 }

-void ShareLinkWidget::slotPushButtonMailLinkPressed()
-{
-    QString fileName = _sharePath.mid(_sharePath.lastIndexOf('/') + 1);
-
-    QDesktopServices::openUrl(QUrl(QString(
-            "mailto: "
-            "?subject=I shared %1 with you"
-            "&body=%2").arg(
-            fileName,
-            _shareUrl),
-        QUrl::TolerantMode));
-}
-
 void ShareLinkWidget::slotCheckBoxEditingClicked()
 {
    ShareLinkWidget::setPublicUpload(_ui->checkBox_editing->checkState() == Qt::Checked);
@@ -68,7 +68,6 @@ private slots:
    void slotPasswordReturnPressed();
    void slotPasswordChanged(const QString& newText);
    void slotPushButtonCopyLinkPressed();
-    void slotPushButtonMailLinkPressed();
    void slotCheckBoxEditingClicked();
    void slotPublicUploadSet();

@@ -195,13 +195,6 @@
          </property>
         </widget>
        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_mail">
-          <property name="text">
-           <string>&amp;Mail link</string>
-          </property>
-         </widget>
-        </item>
        <item>
         <widget class="QPushButton" name="pushButton_copy">
          <property name="text">
@@ -171,9 +171,7 @@ void SocketApi::slotReadSocket()
    Q_ASSERT(socket);

    while(socket->canReadLine()) {
-        // Make sure to normalize the input from the socket to
-        // make sure that the path will match, especially on OS X.
-        QString line = QString::fromUtf8(socket->readLine()).normalized(QString::NormalizationForm_C);
+        QString line = QString::fromUtf8(socket->readLine());
        line.chop(1); // remove the '\n'
        QString command = line.split(":").value(0);
        QString function = QString(QLatin1String("command_")).append(command);
@@ -81,16 +81,13 @@ QString SyncRunFileLog::instructionToStr( csync_instructions_e inst )
    case CSYNC_INSTRUCTION_TYPE_CHANGE:
        re = "INST_TYPE_CHANGE";
        break;
-    case CSYNC_INSTRUCTION_UPDATE_METADATA:
-        re = "INST_METADATA";
-        break;
    }

    return re;
 }


-void SyncRunFileLog::start(const QString &folderPath)
+void SyncRunFileLog::start(const QString &folderPath,  const Utility::StopWatch &stopWatch )
 {
    const qint64 logfileMaxSize = 1024*1024; // 1MiB

@@ -111,6 +108,8 @@ void SyncRunFileLog::start(const QString &folderPath)
    _file->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text);
    _out.setDevice( _file.data() );

+    QDateTime dt = stopWatch.startTime();
+    QDateTime de = stopWatch.timeOfLap(QLatin1String("Sync Finished"));

    if (!exists) {
        // We are creating a new file, add the note.
@@ -123,9 +122,8 @@ void SyncRunFileLog::start(const QString &folderPath)
    }


-    _totalDuration.start();
-    _lapDuration.start();
-    _out << "#=#=#=# Syncrun started " << dateTimeStr(QDateTime::currentDateTime()) << endl;
+    _out << "#=#=#=# Syncrun started " << dateTimeStr(dt) << " until " << dateTimeStr(de) << " ("
+            << stopWatch.durationOfLap(QLatin1String("Sync Finished")) << " msec)" << endl;
 }

 void SyncRunFileLog::logItem( const SyncFileItem& item )
@@ -145,11 +143,7 @@ void SyncRunFileLog::logItem( const SyncFileItem& item )
    const QChar L = QLatin1Char('|');
    _out << ts << L;
    _out << QString::number(item._requestDuration) << L;
-    if( item.log._instruction != CSYNC_INSTRUCTION_RENAME ) {
-        _out << item._file << L;
-    } else {
-        _out << item._file << QLatin1String(" -> ") << item._renameTarget << L;
-    }
+    _out << item._file << L;
    _out << instructionToStr( item.log._instruction ) << L;
    _out << directionToStr( item._direction ) << L;
    _out << QString::number(item.log._modtime) << L;
@@ -168,18 +162,8 @@ void SyncRunFileLog::logItem( const SyncFileItem& item )
    _out << endl;
 }

-void SyncRunFileLog::logLap(const QString& name)
+void SyncRunFileLog::close()
 {
-    _out << "#=#=#=#=# " << name << " " << dateTimeStr(QDateTime::currentDateTime())
-         << " (last step: " << _lapDuration.restart() << " msec"
-         << ", total: " << _totalDuration.elapsed() << " msec)" << endl;
-}
-
-void SyncRunFileLog::finish()
-{
-    _out << "#=#=#=# Syncrun finished " << dateTimeStr(QDateTime::currentDateTime())
-         << " (last step: " << _lapDuration.elapsed() << " msec"
-         << ", total: " << _totalDuration.elapsed() << " msec)" << endl;
    _file->close();
 }

@@ -17,9 +17,9 @@
 #include <QFile>
 #include <QTextStream>
 #include <QScopedPointer>
-#include <QElapsedTimer>

 #include "syncfileitem.h"
+#include "utility.h"

 namespace OCC {
 class SyncFileItem;
@@ -32,10 +32,9 @@ class SyncRunFileLog
 {
 public:
    SyncRunFileLog();
-    void start( const QString& folderPath );
+    void start( const QString& folderPath, const Utility::StopWatch& stopWatch );
    void logItem( const SyncFileItem& item );
-    void logLap( const QString& name );
-    void finish();
+    void close();

 protected:

@@ -46,8 +45,7 @@ private:

    QScopedPointer<QFile> _file;
    QTextStream _out;
-    QElapsedTimer _totalDuration;
-    QElapsedTimer _lapDuration;
+
 };
 }

@@ -30,6 +30,7 @@ OwncloudHttpCredsPage::OwncloudHttpCredsPage(QWidget* parent)
  : AbstractCredentialsWizardPage(),
    _ui(),
    _connected(false),
+    _checking(false),
    _progressIndi(new QProgressIndicator (this))
 {
    _ui.setupUi(this);
@@ -113,8 +114,6 @@ void OwncloudHttpCredsPage::initializePage()
            _ui.lePassword->setText(password);
        }
    }
-    _ui.tokenLabel->setText(HttpCredentialsGui::requestAppPasswordText(ocWizard->account().data()));
-    _ui.tokenLabel->setVisible(!_ui.tokenLabel->text().isEmpty());
    _ui.leUsername->setFocus();
 }

@@ -132,20 +131,14 @@ bool OwncloudHttpCredsPage::validatePage()

    if (!_connected) {
        _ui.errorLabel->setVisible(false);
+        _checking = true;
        startSpinner();
-
-        // Reset cookies to ensure the username / password is actually used
-        OwncloudWizard* ocWizard = qobject_cast< OwncloudWizard* >(wizard());
-        ocWizard->account()->clearCookieJar();
-
        emit completeChanged();
        emit connectToOCUrl(field("OCUrl").toString().simplified());

        return false;
    } else {
-        // Reset, to require another connection attempt next time
-        _connected = false;
-
+        _checking = false;
        emit completeChanged();
        stopSpinner();
        return true;
@@ -158,9 +151,9 @@ int OwncloudHttpCredsPage::nextId() const
    return WizardCommon::Page_AdvancedSetup;
 }

-void OwncloudHttpCredsPage::setConnected()
+void OwncloudHttpCredsPage::setConnected( bool comp )
 {
-    _connected = true;
+    _connected = comp;
    stopSpinner ();
 }

@@ -186,6 +179,7 @@ void OwncloudHttpCredsPage::setErrorString(const QString& err)
        _ui.errorLabel->setVisible(true);
        _ui.errorLabel->setText(err);
    }
+    _checking = false;
    emit completeChanged();
    stopSpinner();
 }
@@ -40,7 +40,7 @@ public:
  void cleanupPage() Q_DECL_OVERRIDE;
  bool validatePage() Q_DECL_OVERRIDE;
  int nextId() const Q_DECL_OVERRIDE;
-  void setConnected();
+  void setConnected(bool connected);
  void setErrorString( const QString& err );

 Q_SIGNALS:
@@ -53,6 +53,7 @@ private:

  Ui_OwncloudHttpCredsPage _ui;
  bool _connected;
+  bool _checking;
  QProgressIndicator* _progressIndi;
  OwncloudWizard* _ocWizard;
 };
@@ -7,30 +7,14 @@
    <x>0</x>
    <y>0</y>
    <width>350</width>
-    <height>248</height>
+    <height>196</height>
   </rect>
  </property>
  <property name="windowTitle">
   <string>Form</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <item row="5" column="1">
-    <layout class="QHBoxLayout" name="resultLayout"/>
-   </item>
-   <item row="0" column="0" colspan="3">
-    <widget class="QLabel" name="topLabel">
-     <property name="text">
-      <string notr="true">TextLabel</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
+   <item row="1" column="0">
    <spacer name="horizontalSpacer">
     <property name="orientation">
      <enum>Qt::Horizontal</enum>
@@ -46,23 +30,7 @@
     </property>
    </spacer>
   </item>
-   <item row="3" column="2">
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>48</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="1">
+   <item row="1" column="1">
    <layout class="QFormLayout" name="formLayout">
     <item row="0" column="0">
      <widget class="QLabel" name="usernameLabel">
@@ -75,7 +43,7 @@
      </widget>
     </item>
     <item row="1" column="0">
-      <widget class="QLabel" name="passwordLabel">
+      <widget class="QLabel" name="label_2">
       <property name="text">
        <string>&amp;Password</string>
       </property>
@@ -87,7 +55,7 @@
     <item row="2" column="0" colspan="2">
      <widget class="QLabel" name="errorLabel">
       <property name="text">
-        <string notr="true">Error Label</string>
+        <string>Error Label</string>
       </property>
       <property name="openExternalLinks">
        <bool>true</bool>
@@ -106,7 +74,7 @@
     </item>
    </layout>
   </item>
-   <item row="4" column="1">
+   <item row="2" column="1">
    <spacer name="verticalSpacer">
     <property name="orientation">
      <enum>Qt::Vertical</enum>
@@ -119,23 +87,42 @@
     </property>
    </spacer>
   </item>
-   <item row="6" column="0" colspan="3">
-    <widget class="QLabel" name="bottomLabel">
-     <property name="text">
-      <string notr="true">TextLabel</string>
+   <item row="1" column="2">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
     </property>
-    </widget>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>48</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
   </item>
-   <item row="1" column="1">
-    <widget class="QLabel" name="tokenLabel">
+   <item row="3" column="1">
+    <layout class="QHBoxLayout" name="resultLayout"/>
+   </item>
+   <item row="0" column="0" colspan="3">
+    <widget class="QLabel" name="topLabel">
     <property name="text">
-      <string notr="true">TextLabel</string>
+      <string>TextLabel</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
     </property>
     <property name="wordWrap">
      <bool>true</bool>
     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3">
+    <widget class="QLabel" name="bottomLabel">
+     <property name="text">
+      <string>TextLabel</string>
     </property>
    </widget>
   </item>
@@ -125,7 +125,7 @@ void OwncloudWizard::successfulStep()

    switch (id) {
    case WizardCommon::Page_HttpCreds:
-        _httpCredsPage->setConnected();
+        _httpCredsPage->setConnected(true);
        break;

    case WizardCommon::Page_ShibbolethCreds:
@@ -172,6 +172,12 @@ void OwncloudWizard::slotCurrentPageChanged( int id )
    }

    setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup);
+
+    if (id == WizardCommon::Page_AdvancedSetup) {
+        // Going back from this page messes the state as the account is created already
+        button(QWizard::BackButton)->setDisabled(true);
+    }
+
 }

 void OwncloudWizard::displayError( const QString& msg, bool retryHTTPonly )
@@ -43,7 +43,7 @@ namespace OCC {
 AbstractNetworkJob::AbstractNetworkJob(AccountPtr account, const QString &path, QObject *parent)
    : QObject(parent)
    , _timedout(false)
-    , _followRedirects(true)
+    , _followRedirects(false)
    , _account(account)
    , _ignoreCredentialFailure(false)
    , _reply(0)
@@ -210,7 +210,7 @@ int get_errno_from_http_errcode( int err, const QString & reason ) {


 DiscoverySingleDirectoryJob::DiscoverySingleDirectoryJob(const AccountPtr &account, const QString &path, QObject *parent)
-    : QObject(parent), _subPath(path), _account(account), _ignoredFirst(false), _isRootPath(false)
+    : QObject(parent), _subPath(path), _account(account), _ignoredFirst(false)
 {
 }

@@ -218,15 +218,10 @@ void DiscoverySingleDirectoryJob::start()
 {
    // Start the actual HTTP job
    LsColJob *lsColJob = new LsColJob(_account, _subPath, this);
-
-    QList<QByteArray> props;
-    props << "resourcetype" << "getlastmodified" << "getcontentlength" << "getetag"
-          << "http://owncloud.org/ns:id" << "http://owncloud.org/ns:downloadURL"
-          << "http://owncloud.org/ns:dDC" << "http://owncloud.org/ns:permissions";
-    if (_isRootPath)
-        props << "http://owncloud.org/ns:data-fingerprint";
-
-    lsColJob->setProperties(props);
+    lsColJob->setProperties(QList<QByteArray>() << "resourcetype" << "getlastmodified"
+                        << "getcontentlength" << "getetag" << "http://owncloud.org/ns:id"
+                        << "http://owncloud.org/ns:downloadURL" << "http://owncloud.org/ns:dDC"
+                        << "http://owncloud.org/ns:permissions");

    QObject::connect(lsColJob, SIGNAL(directoryListingIterated(QString,QMap<QString,QString>)),
                     this, SLOT(directoryListingIteratedSlot(QString,QMap<QString,QString>)));
@@ -304,14 +299,12 @@ void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(QString file, con
 {
    //qDebug() << Q_FUNC_INFO << _subPath << file << map.count() << map.keys() << _account->davPath() << _lsColJob->reply()->request().url().path();
    if (!_ignoredFirst) {
-        // The first entry is for the folder itself, we should process it differently.
+        // First result is the directory itself. Maybe should have a better check for that? FIXME
        _ignoredFirst = true;
        if (map.contains("permissions")) {
            emit firstDirectoryPermissions(map.value("permissions"));
        }
-        if (map.contains("data-fingerprint")) {
-            _dataFingerprint = map.value("data-fingerprint").toUtf8();
-        }
+
    } else {
        // Remove <webDAV-Url>/folder/ from <webDAV-Url>/folder/subfile.txt
        file.remove(0, _lsColJob->reply()->request().url().path().length());
@@ -433,11 +426,6 @@ void DiscoveryMainThread::doOpendirSlot(const QString &subPath, DiscoveryDirecto
                     this, SIGNAL(etagConcatenation(QString)));
    QObject::connect(_singleDirJob, SIGNAL(etag(QString)),
                     this, SIGNAL(etag(QString)));
-
-    if (!_firstFolderProcessed) {
-        _singleDirJob->setIsRootPath();
-    }
-
    _singleDirJob->start();
 }

@@ -453,12 +441,7 @@ void DiscoveryMainThread::singleDirectoryJobResultSlot(const QList<FileStatPoint
    _currentDiscoveryDirectoryResult->list = result;
    _currentDiscoveryDirectoryResult->code = 0;
    _currentDiscoveryDirectoryResult->listIndex = 0;
-    _currentDiscoveryDirectoryResult = 0; // the sync thread owns it now
-
-    if (!_firstFolderProcessed) {
-        _firstFolderProcessed = true;
-        _dataFingerprint = _singleDirJob->_dataFingerprint;
-    }
+     _currentDiscoveryDirectoryResult = 0; // the sync thread owns it now

    _discoveryJob->_vioMutex.lock();
    _discoveryJob->_vioWaitCondition.wakeAll();
@@ -581,7 +564,7 @@ csync_vio_handle_t* DiscoveryJob::remote_vio_opendir_hook (const char *url,
        discoveryJob->_vioMutex.lock();
        const QString qurl = QString::fromUtf8(url);
        emit discoveryJob->doOpendirSignal(qurl, directoryResult.data());
-        discoveryJob->_vioWaitCondition.wait(&discoveryJob->_vioMutex, ULONG_MAX); // FIXME timeout?
+        discoveryJob->_vioWaitCondition.wait(&discoveryJob->_vioMutex, 30000);
        discoveryJob->_vioMutex.unlock();

        qDebug() << discoveryJob << url << "...Returned from main thread";
@@ -81,8 +81,6 @@ class DiscoverySingleDirectoryJob : public QObject {
    Q_OBJECT
 public:
    explicit DiscoverySingleDirectoryJob(const AccountPtr &account, const QString &path, QObject *parent = 0);
-    // Specify thgat this is the root and we need to check the data-fingerprint
-    void setIsRootPath() { _isRootPath = true; }
    void start();
    void abort();
    // This is not actually a network job, it is just a job
@@ -102,15 +100,8 @@ private:
    QString _etagConcatenation;
    QString _firstEtag;
    AccountPtr _account;
-    // The first result is for the directory itself and need to be ignored.
-    // This flag is true if it was already ignored.
    bool _ignoredFirst;
-    // Set to true if this is the root path and we need to check the data-fingerprint
-    bool _isRootPath;
    QPointer<LsColJob> _lsColJob;
-
-public:
-    QByteArray _dataFingerprint;
 };

 // Lives in main thread. Deleted by the SyncEngine
@@ -124,16 +115,13 @@ class DiscoveryMainThread : public QObject {
    AccountPtr _account;
    DiscoveryDirectoryResult *_currentDiscoveryDirectoryResult;
    qint64 *_currentGetSizeResult;
-    bool _firstFolderProcessed;

 public:
    DiscoveryMainThread(AccountPtr account) : QObject(), _account(account),
-        _currentDiscoveryDirectoryResult(0), _currentGetSizeResult(0), _firstFolderProcessed(false)
+        _currentDiscoveryDirectoryResult(0), _currentGetSizeResult(0)
    { }
    void abort();

-    QByteArray _dataFingerprint;
-

 public slots:
    // From DiscoveryJob:
@@ -45,13 +45,6 @@ void ExcludedFiles::addExcludeFilePath(const QString& path)
    _excludeFiles.insert(path);
 }

-#ifdef WITH_UNIT_TESTING
-void ExcludedFiles::addExcludeExpr(const QString &expr)
-{
-    _csync_exclude_add(_excludesPtr, expr.toLatin1().constData());
-}
-#endif
-
 bool ExcludedFiles::reloadExcludes()
 {
    c_strlist_destroy(*_excludesPtr);
@@ -57,10 +57,6 @@ public:
            const QString& basePath,
            bool excludeHidden) const;

-#ifdef WITH_UNIT_TESTING
-    void addExcludeExpr(const QString &expr);
-#endif
-
 public slots:
    /**
     * Reloads the exclude patterns from the registered paths.
@@ -359,6 +359,7 @@ CheckServerJob::CheckServerJob(AccountPtr account, QObject *parent)
    : AbstractNetworkJob(account, QLatin1String(statusphpC) , parent)
    , _subdirFallback(false)
 {
+	_followRedirects = true;
    setIgnoreCredentialFailure(true);
 }

@@ -201,12 +201,12 @@ bool PropagateItemJob::checkForProblemsWithShared(int httpStatusCode, const QStr
                downloadItem->_instruction = CSYNC_INSTRUCTION_SYNC;
            }
            downloadItem->_direction = SyncFileItem::Down;
-            newJob = new PropagateDownloadFile(_propagator, downloadItem);
+            newJob = new PropagateDownloadFileQNAM(_propagator, downloadItem);
        } else {
            // Directories are harder to recover.
            // But just re-create the directory, next sync will be able to recover the files
            SyncFileItemPtr mkdirItem(new SyncFileItem(*_item));
-            mkdirItem->_instruction = CSYNC_INSTRUCTION_NEW;
+            mkdirItem->_instruction = CSYNC_INSTRUCTION_SYNC;
            mkdirItem->_direction = SyncFileItem::Down;
            newJob = new PropagateLocalMkdir(_propagator, mkdirItem);
            // Also remove the inodes and fileid from the db so no further renames are tried for
@@ -265,14 +265,20 @@ PropagateItemJob* OwncloudPropagator::createJob(const SyncFileItemPtr &item) {
            }   //fall through
        case CSYNC_INSTRUCTION_SYNC:
        case CSYNC_INSTRUCTION_CONFLICT:
-            if (item->_direction != SyncFileItem::Up) {
-                auto job = new PropagateDownloadFile(this, item);
-                job->setDeleteExistingFolder(deleteExisting);
-                return job;
-            } else {
-                auto job = new PropagateUploadFile(this, item);
-                job->setDeleteExisting(deleteExisting);
-                return job;
+            if (item->_isDirectory) {
+                // Should we set the mtime?
+                return 0;
+            }
+            {
+                if (item->_direction != SyncFileItem::Up) {
+                    auto job = new PropagateDownloadFileQNAM(this, item);
+                    job->setDeleteExistingFolder(deleteExisting);
+                    return job;
+                } else {
+                    auto job = new PropagateUploadFileQNAM(this, item);
+                    job->setDeleteExisting(deleteExisting);
+                    return job;
+                }
            }
        case CSYNC_INSTRUCTION_RENAME:
            if (item->_direction == SyncFileItem::Up) {
@@ -371,8 +377,7 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
                // NOTE: Currently this means that we don't update those etag at all in this sync,
                //       but it should not be a problem, they will be updated in the next sync.
                for (int i = 0; i < directories.size(); ++i) {
-                    if (directories[i].second->_item->_instruction == CSYNC_INSTRUCTION_UPDATE_METADATA)
-                        directories[i].second->_item->_instruction = CSYNC_INSTRUCTION_NONE;
+                    directories[i].second->_item->_should_update_metadata = false;
                }
            } else {
                PropagateDirectory* currentDirJob = directories.top().second;
@@ -397,7 +402,7 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
    connect(_rootJob.data(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
            this, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
    connect(_rootJob.data(), SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64)));
-    connect(_rootJob.data(), SIGNAL(finished(SyncFileItem::Status)), this, SLOT(emitFinished(SyncFileItem::Status)));
+    connect(_rootJob.data(), SIGNAL(finished(SyncFileItem::Status)), this, SLOT(emitFinished()));
    connect(_rootJob.data(), SIGNAL(ready()), this, SLOT(scheduleNextJob()), Qt::QueuedConnection);

    qDebug() << "Using QNAM/HTTP parallel code path";
@@ -537,6 +542,27 @@ void OwncloudPropagator::scheduleNextJob()
    }
 }

+void OwncloudPropagator::addTouchedFile(const QString& fn)
+{
+    QString file = QDir::cleanPath(fn);
+
+    QElapsedTimer timer;
+    timer.start();
+
+    QMutexLocker lock(&_touchedFilesMutex);
+    _touchedFiles.insert(file, timer);
+}
+
+qint64 OwncloudPropagator::timeSinceFileTouched(const QString& fn) const
+{
+    QMutexLocker lock(&_touchedFilesMutex);
+    if (! _touchedFiles.contains(fn)) {
+        return -1;
+    }
+
+    return _touchedFiles[fn].elapsed();
+}
+
 AccountPtr OwncloudPropagator::account() const
 {
    return _account;
@@ -640,6 +666,7 @@ void PropagateDirectory::slotSubJobFinished(SyncFileItem::Status status)
            (sender() == _firstJob.data() && status != SyncFileItem::Success && status != SyncFileItem::Restoration)) {
        abort();
        _state = Finished;
+        emit itemCompleted(*_item, *this);
        emit finished(status);
        return;
    } else if (status == SyncFileItem::NormalError || status == SyncFileItem::SoftError) {
@@ -671,12 +698,7 @@ void PropagateDirectory::finalize()
            _item->_file = _item->_renameTarget;
        }

-        // For new directories we always want to update the etag once
-        // the directory has been propagated. Otherwise the directory
-        // could appear locally without being added to the database.
-        if (_item->_instruction == CSYNC_INSTRUCTION_RENAME
-            || _item->_instruction == CSYNC_INSTRUCTION_NEW
-            || _item->_instruction == CSYNC_INSTRUCTION_UPDATE_METADATA) {
+        if (_item->_should_update_metadata && _item->_instruction != CSYNC_INSTRUCTION_REMOVE) {
            if (PropagateRemoteMkdir* mkdir = qobject_cast<PropagateRemoteMkdir*>(_firstJob.data())) {
                // special case from MKDIR, get the fileId from the job there
                if (_item->_fileId.isEmpty() && !mkdir->_item->_fileId.isEmpty()) {
@@ -693,6 +715,13 @@ void PropagateDirectory::finalize()
        }
    }
    _state = Finished;
+    // Just to make sure that the SocketApi will know by looking in
+    // SyncEngine::_syncedItems that this folder is done synchronizing.
+    if (ok) {
+        _item->_status = SyncFileItem::Success;
+    }
+
+    emit itemCompleted(*_item, *this);
    emit finished(_item->_status);
 }

@@ -733,7 +762,6 @@ void CleanupPollsJob::slotPollFinished()
    Q_ASSERT(job);
    if (job->_item->_status == SyncFileItem::FatalError) {
        emit aborted(job->_item->_errorString);
-        deleteLater();
        return;
    } else if (job->_item->_status != SyncFileItem::Success) {
        qDebug() << "There was an error with file " << job->_item->_file << job->_item->_errorString;
@@ -743,7 +771,6 @@ void CleanupPollsJob::slotPollFinished()
            job->_item->_status = SyncFileItem::FatalError;
            job->_item->_errorString = tr("Error writing metadata to the database");
            emit aborted(job->_item->_errorString);
-            deleteLater();
            return;
        }
    }
@@ -321,7 +321,7 @@ public:
        if (_rootJob) {
            _rootJob->abort();
        }
-        emitFinished(SyncFileItem::NormalError);
+        emitFinished();
    }

    // timeout in seconds
@@ -330,6 +330,18 @@ public:
    /** returns the size of chunks in bytes  */
    static quint64 chunkSize();

+    /** Records that a file was touched by a job.
+     *
+     * Thread-safe.
+     */
+    void addTouchedFile(const QString& fn);
+
+    /** Get the ms since a file was touched, or -1 if it wasn't.
+     *
+     * Thread-safe.
+     */
+    qint64 timeSinceFileTouched(const QString& fn) const;
+
    AccountPtr account() const;

    enum DiskSpaceResult
@@ -349,9 +361,9 @@ public:
 private slots:

    /** Emit the finished signal and make sure it is only emitted once */
-    void emitFinished(SyncFileItem::Status status) {
+    void emitFinished() {
        if (!_finishedEmited)
-            emit finished(status == SyncFileItem::Success);
+            emit finished();
        _finishedEmited = true;
    }

@@ -360,29 +372,23 @@ private slots:
 signals:
    void itemCompleted(const SyncFileItem &, const PropagatorJob &);
    void progress(const SyncFileItem&, quint64 bytes);
-    void finished(bool success);
+    void finished();

    /** Emitted when propagation has problems with a locked file. */
    void seenLockedFile(const QString &fileName);

-    /** Emitted when propagation touches a file.
-     *
-     * Used to track our own file modifications such that notifications
-     * from the file watcher about these can be ignored.
-     */
-    void touchedFile(const QString &fileName);
-
 private:

    AccountPtr _account;

+    /** Stores the time since a job touched a file. */
+    QHash<QString, QElapsedTimer> _touchedFiles;
+    mutable QMutex _touchedFilesMutex;
+
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    // access to signals which are protected in Qt4
-    friend class PropagateDownloadFile;
-    friend class PropagateUploadFile;
-    friend class PropagateLocalMkdir;
-    friend class PropagateLocalRename;
-    friend class PropagateRemoteMove;
+    friend class PropagateDownloadFileQNAM;
+    friend class PropagateUploadFileQNAM;
 #endif
 };

@@ -404,10 +410,6 @@ public:

    ~CleanupPollsJob();

-    /**
-     * Start the job.  After the job is completed, it will emit either finished or aborted, and it
-     * will destroy itself.
-     */
    void start();
 signals:
    void finished();
@@ -47,7 +47,7 @@ QString ownCloudTheme::about() const
    devString = trUtf8("<p>Version %2. For more information visit <a href=\"%3\">%4</a></p>"
               "<p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, "
               "Olivier Goffart, Markus Götz and others.</small></p>"
-               "<p>Copyright ownCloud GmbH</p>"
+               "<p>Copyright ownCloud, Inc.</p>"
               "<p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>"
               "ownCloud and the ownCloud Logo are registered trademarks of ownCloud, "
               "Inc. in the United States, other countries, or both.</p>"
@@ -303,11 +303,6 @@ void SqlQuery::bindValue(int pos, const QVariant& value)
                res = sqlite3_bind_null(_stmt, pos);
            }
            break; }
-        case QVariant::ByteArray: {
-            auto ba = value.toByteArray();
-            res = sqlite3_bind_text(_stmt, pos, ba.constData(), ba.size(), SQLITE_TRANSIENT);
-            break;
-        }
        default: {
            QString str = value.toString();
            // SQLITE_TRANSIENT makes sure that sqlite buffers the data
@@ -317,7 +312,7 @@ void SqlQuery::bindValue(int pos, const QVariant& value)
        }
    }
    if (res != SQLITE_OK) {
-        qDebug() << Q_FUNC_INFO << "ERROR" << value << res;
+        qDebug() << Q_FUNC_INFO << "ERROR" << value.toString() << res;
    }
    Q_ASSERT( res == SQLITE_OK );
 }
@@ -46,8 +46,6 @@ QString Progress::asResultString( const SyncFileItem& item)
        return QCoreApplication::translate( "progress", "Filesystem access error");
    case CSYNC_INSTRUCTION_ERROR:
        return QCoreApplication::translate( "progress", "Error");
-    case CSYNC_INSTRUCTION_UPDATE_METADATA:
-        return QCoreApplication::translate( "progress", "Updated local metadata");
    case CSYNC_INSTRUCTION_NONE:
    case CSYNC_INSTRUCTION_EVAL:
        return QCoreApplication::translate( "progress", "Unknown");
@@ -78,8 +76,6 @@ QString Progress::asActionString( const SyncFileItem &item )
        return QCoreApplication::translate( "progress", "error");
    case CSYNC_INSTRUCTION_ERROR:
        return QCoreApplication::translate( "progress", "error");
-    case CSYNC_INSTRUCTION_UPDATE_METADATA:
-        return QCoreApplication::translate( "progress", "updating local metadata");
    case CSYNC_INSTRUCTION_NONE:
    case CSYNC_INSTRUCTION_EVAL:
        break;
@@ -163,10 +159,17 @@ static bool shouldCountProgress(const SyncFileItem &item)
 {
    const auto instruction = item._instruction;

-    // Skip any ignored, error or non-propagated files and directories.
-    if (instruction == CSYNC_INSTRUCTION_NONE
-            || instruction == CSYNC_INSTRUCTION_UPDATE_METADATA
-            || instruction == CSYNC_INSTRUCTION_IGNORE
+    // Don't worry about directories that won't have propagation
+    // jobs associated with them.
+    if (item._isDirectory
+            && (instruction == CSYNC_INSTRUCTION_NONE
+                || instruction == CSYNC_INSTRUCTION_SYNC
+                || instruction == CSYNC_INSTRUCTION_CONFLICT)) {
+        return false;
+    }
+
+    // Skip any ignored or error files, we do nothing with them.
+    if (instruction == CSYNC_INSTRUCTION_IGNORE
            || instruction == CSYNC_INSTRUCTION_ERROR) {
        return false;
    }
@@ -276,6 +279,13 @@ ProgressInfo::Estimates ProgressInfo::totalProgress() const
    // assume the remaining transfer will be done with the highest speed
    // we've seen.

+    // This assumes files and transfers finish as quickly as possible
+    // *but* note that maxPerSecond could be serious underestimates
+    // (if we never got to fully excercise transfer or files/second)
+    quint64 optimisticEta =
+            _fileProgress.remaining()  / _maxFilesPerSecond * 1000
+            + _sizeProgress.remaining() / _maxBytesPerSecond * 1000;
+
    // Compute a value that is 0 when fps is <=L*max and 1 when fps is >=U*max
    double fps = _fileProgress._progressPerSec;
    double fpsL = 0.5;
@@ -299,26 +309,11 @@ ProgressInfo::Estimates ProgressInfo::totalProgress() const

    double beOptimistic = nearMaxFps * slowTransfer;
    size.estimatedEta = (1.0 - beOptimistic) * size.estimatedEta
-                        + beOptimistic * optimisticEta();
+                        + beOptimistic * optimisticEta;

    return size;
 }

-quint64 ProgressInfo::optimisticEta() const
-{
-    // This assumes files and transfers finish as quickly as possible
-    // *but* note that maxPerSecond could be serious underestimate
-    // (if we never got to fully excercise transfer or files/second)
-
-    return _fileProgress.remaining() / _maxFilesPerSecond * 1000
-            + _sizeProgress.remaining() / _maxBytesPerSecond * 1000;
-}
-
-bool ProgressInfo::trustEta() const
-{
-    return totalProgress().estimatedEta < 100 * optimisticEta();
-}
-
 ProgressInfo::Estimates ProgressInfo::fileProgress(const SyncFileItem &item) const
 {
    return _currentItems[item._file]._progress.estimates();
@@ -164,22 +164,6 @@ public:
     */
    Estimates totalProgress() const;

-    /**
-     * Get the optimistic eta.
-     *
-     * This value is based on the highest observed transfer bandwidth
-     * and files-per-second speed.
-     */
-    quint64 optimisticEta() const;
-
-    /**
-     * Whether the remaining-time estimate is trusted.
-     *
-     * We don't trust it if it is hugely above the optimistic estimate.
-     * See #5046.
-     */
-    bool trustEta() const;
-
    /**
     * Get the current file completion estimate structure
     */
@@ -99,6 +99,7 @@ void GETFileJob::start() {
    } else {
        // Use direct URL
        setReply(davRequest("GET", _directDownloadUrl, req));
+        _followRedirects = true;  // (follow redirections for the direct download)
    }
    setupConnections(reply());

@@ -304,7 +305,7 @@ QString GETFileJob::errorString() const
    }
 }

-void PropagateDownloadFile::start()
+void PropagateDownloadFileQNAM::start()
 {
    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;
@@ -418,7 +419,7 @@ void PropagateDownloadFile::start()
    _job->start();
 }

-qint64 PropagateDownloadFile::committedDiskSpace() const
+qint64 PropagateDownloadFileQNAM::committedDiskSpace() const
 {
    if (_state == Running) {
        return qBound(0ULL, _item->_size - _resumeStart - _downloadProgress, _item->_size);
@@ -426,13 +427,13 @@ qint64 PropagateDownloadFile::committedDiskSpace() const
    return 0;
 }

-void PropagateDownloadFile::setDeleteExistingFolder(bool enabled)
+void PropagateDownloadFileQNAM::setDeleteExistingFolder(bool enabled)
 {
    _deleteExisting = enabled;
 }

 const char owncloudCustomSoftErrorStringC[] = "owncloud-custom-soft-error-string";
-void PropagateDownloadFile::slotGetFinished()
+void PropagateDownloadFileQNAM::slotGetFinished()
 {
    _propagator->_activeJobList.removeOne(this);

@@ -565,14 +566,14 @@ void PropagateDownloadFile::slotGetFinished()
    validator->start(_tmpFile.fileName(), checksumHeader);
 }

-void PropagateDownloadFile::slotChecksumFail( const QString& errMsg )
+void PropagateDownloadFileQNAM::slotChecksumFail( const QString& errMsg )
 {
    FileSystem::remove(_tmpFile.fileName());
    _propagator->_anotherSyncNeeded = true;
    done(SyncFileItem::SoftError, errMsg ); // tr("The file downloaded with a broken checksum, will be redownloaded."));
 }

-void PropagateDownloadFile::deleteExistingFolder()
+void PropagateDownloadFileQNAM::deleteExistingFolder()
 {
    QString existingDir = _propagator->getFilePath(_item->_file);
    if (!QFileInfo(existingDir).isDir()) {
@@ -591,8 +592,8 @@ void PropagateDownloadFile::deleteExistingFolder()
    QString conflictDir = FileSystem::makeConflictFileName(
            existingDir, Utility::qDateTimeFromTime_t(_item->_modtime));

-    emit _propagator->touchedFile(existingDir);
-    emit _propagator->touchedFile(conflictDir);
+    _propagator->addTouchedFile(existingDir);
+    _propagator->addTouchedFile(conflictDir);
    QString renameError;
    if (!FileSystem::rename(existingDir, conflictDir, &renameError)) {
        done(SyncFileItem::NormalError, renameError);
@@ -637,9 +638,8 @@ static void handleRecallFile(const QString &fn)
        QString rpath = makeRecallFileName(fpath);

        qDebug() << "Copy recall file: " << fpath << " -> " << rpath;
-        // Remove the target first, QFile::copy will not overwrite it.
-        FileSystem::remove(rpath);
-        QFile::copy(fpath, rpath);
+        QString error;
+        FileSystem::uncheckedRenameReplace(fpath, rpath, &error);
    }
 }

@@ -654,7 +654,7 @@ static void preserveGroupOwnership(const QString& fileName, const QFileInfo& fi)
 }
 } // end namespace

-void PropagateDownloadFile::transmissionChecksumValidated(const QByteArray &checksumType, const QByteArray &checksum)
+void PropagateDownloadFileQNAM::transmissionChecksumValidated(const QByteArray &checksumType, const QByteArray &checksum)
 {
    const auto theContentChecksumType = contentChecksumType();

@@ -675,7 +675,7 @@ void PropagateDownloadFile::transmissionChecksumValidated(const QByteArray &chec
    computeChecksum->start(_tmpFile.fileName());
 }

-void PropagateDownloadFile::contentChecksumComputed(const QByteArray &checksumType, const QByteArray &checksum)
+void PropagateDownloadFileQNAM::contentChecksumComputed(const QByteArray &checksumType, const QByteArray &checksum)
 {
    _item->_contentChecksum = checksum;
    _item->_contentChecksumType = checksumType;
@@ -683,7 +683,7 @@ void PropagateDownloadFile::contentChecksumComputed(const QByteArray &checksumTy
    downloadFinished();
 }

-void PropagateDownloadFile::downloadFinished()
+void PropagateDownloadFileQNAM::downloadFinished()
 {
    QString fn = _propagator->getFilePath(_item->_file);

@@ -753,7 +753,7 @@ void PropagateDownloadFile::downloadFinished()
    }

    QString error;
-    emit _propagator->touchedFile(fn);
+    _propagator->addTouchedFile(fn);
    // The fileChanged() check is done above to generate better error messages.
    if (!FileSystem::uncheckedRenameReplace(_tmpFile.fileName(), fn, &error)) {
        qDebug() << Q_FUNC_INFO << QString("Rename failed: %1 => %2").arg(_tmpFile.fileName()).arg(fn);
@@ -806,7 +806,7 @@ void PropagateDownloadFile::downloadFinished()
    }
 }

-void PropagateDownloadFile::slotDownloadProgress(qint64 received, qint64)
+void PropagateDownloadFileQNAM::slotDownloadProgress(qint64 received, qint64)
 {
    if (!_job) return;
    _downloadProgress = received;
@@ -814,7 +814,7 @@ void PropagateDownloadFile::slotDownloadProgress(qint64 received, qint64)
 }


-void PropagateDownloadFile::abort()
+void PropagateDownloadFileQNAM::abort()
 {
    if (_job &&  _job->reply())
        _job->reply()->abort();
@@ -103,13 +103,13 @@ private slots:
 };

 /**
- * @brief The PropagateDownloadFile class
+ * @brief The PropagateDownloadFileQNAM class
 * @ingroup libsync
 */
-class PropagateDownloadFile : public PropagateItemJob {
+class PropagateDownloadFileQNAM : public PropagateItemJob {
    Q_OBJECT
 public:
-    PropagateDownloadFile(OwncloudPropagator* propagator,const SyncFileItemPtr& item)
+    PropagateDownloadFileQNAM(OwncloudPropagator* propagator,const SyncFileItemPtr& item)
        : PropagateItemJob(propagator, item), _resumeStart(0), _downloadProgress(0), _deleteExisting(false) {}
    void start() Q_DECL_OVERRIDE;
    qint64 committedDiskSpace() const Q_DECL_OVERRIDE;
@@ -80,8 +80,8 @@ void PropagateRemoteMove::start()
        QString versionString = _propagator->account()->serverVersion();
        if (versionString.contains('.') && versionString.split('.')[0].toInt() < 7) {
            QString originalFile(_propagator->getFilePath(QLatin1String("Shared")));
-            emit _propagator->touchedFile(originalFile);
-            emit _propagator->touchedFile(targetFile);
+            _propagator->addTouchedFile(originalFile);
+            _propagator->addTouchedFile(targetFile);
            QString renameError;
            if( FileSystem::rename(targetFile, originalFile, &renameError) ) {
                done(SyncFileItem::NormalError, tr("This folder must not be renamed. It is renamed back to its original name."));
@@ -184,7 +184,7 @@ bool PollJob::finished()
    return true;
 }

-void PropagateUploadFile::start()
+void PropagateUploadFileQNAM::start()
 {
    if (_propagator->_abortRequested.fetchAndAddRelaxed(0)) {
        return;
@@ -205,7 +205,7 @@ void PropagateUploadFile::start()
    job->start();
 }

-void PropagateUploadFile::slotComputeContentChecksum()
+void PropagateUploadFileQNAM::slotComputeContentChecksum()
 {
    if (_propagator->_abortRequested.fetchAndAddRelaxed(0)) {
        return;
@@ -239,12 +239,12 @@ void PropagateUploadFile::slotComputeContentChecksum()
    computeChecksum->start(filePath);
 }

-void PropagateUploadFile::setDeleteExisting(bool enabled)
+void PropagateUploadFileQNAM::setDeleteExisting(bool enabled)
 {
    _deleteExisting = enabled;
 }

-void PropagateUploadFile::slotComputeTransmissionChecksum(const QByteArray& contentChecksumType, const QByteArray& contentChecksum)
+void PropagateUploadFileQNAM::slotComputeTransmissionChecksum(const QByteArray& contentChecksumType, const QByteArray& contentChecksum)
 {
    _item->_contentChecksum = contentChecksum;
    _item->_contentChecksumType = contentChecksumType;
@@ -276,7 +276,7 @@ void PropagateUploadFile::slotComputeTransmissionChecksum(const QByteArray& cont
    computeChecksum->start(filePath);
 }

-void PropagateUploadFile::slotStartUpload(const QByteArray& transmissionChecksumType, const QByteArray& transmissionChecksum)
+void PropagateUploadFileQNAM::slotStartUpload(const QByteArray& transmissionChecksumType, const QByteArray& transmissionChecksum)
 {
    // Remove ourselfs from the list of active job, before any posible call to done()
    // When we start chunks, we will add it again, once for every chunks.
@@ -299,7 +299,7 @@ void PropagateUploadFile::slotStartUpload(const QByteArray& transmissionChecksum
    }
    _stopWatch.addLapTime(QLatin1String("TransmissionChecksum"));

-    time_t prevModtime = _item->_modtime; // the _item value was set in PropagateUploadFile::start()
+    time_t prevModtime = _item->_modtime; // the _item value was set in PropagateUploadFileQNAM::start()
    // but a potential checksum calculation could have taken some time during which the file could
    // have been changed again, so better check again here.

@@ -476,7 +476,7 @@ void UploadDevice::setChoked(bool b) {
    }
 }

-void PropagateUploadFile::startNextChunk()
+void PropagateUploadFileQNAM::startNextChunk()
 {
    if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
        return;
@@ -607,7 +607,7 @@ void PropagateUploadFile::startNextChunk()
    }
 }

-void PropagateUploadFile::slotPutFinished()
+void PropagateUploadFileQNAM::slotPutFinished()
 {
    PUTFileJob *job = qobject_cast<PUTFileJob *>(sender());
    Q_ASSERT(job);
@@ -785,7 +785,7 @@ void PropagateUploadFile::slotPutFinished()
    finalize(*_item);
 }

-void PropagateUploadFile::finalize(const SyncFileItem &copy)
+void PropagateUploadFileQNAM::finalize(const SyncFileItem &copy)
 {
    // Normally, copy == _item,   but when it comes from the UpdateMTimeAndETagJob, we need to do
    // some updates
@@ -807,7 +807,7 @@ void PropagateUploadFile::finalize(const SyncFileItem &copy)
    done(SyncFileItem::Success);
 }

-void PropagateUploadFile::slotUploadProgress(qint64 sent, qint64 total)
+void PropagateUploadFileQNAM::slotUploadProgress(qint64 sent, qint64 total)
 {
    // Completion is signaled with sent=0, total=0; avoid accidentally
    // resetting progress due to the sent being zero by ignoring it.
@@ -840,7 +840,7 @@ void PropagateUploadFile::slotUploadProgress(qint64 sent, qint64 total)
    emit progress(*_item, amount);
 }

-void PropagateUploadFile::startPollJob(const QString& path)
+void PropagateUploadFileQNAM::startPollJob(const QString& path)
 {
    PollJob* job = new PollJob(_propagator->account(), path, _item,
                               _propagator->_journal, _propagator->_localDir, this);
@@ -855,7 +855,7 @@ void PropagateUploadFile::startPollJob(const QString& path)
    job->start();
 }

-void PropagateUploadFile::slotPollFinished()
+void PropagateUploadFileQNAM::slotPollFinished()
 {
    PollJob *job = qobject_cast<PollJob *>(sender());
    Q_ASSERT(job);
@@ -871,12 +871,12 @@ void PropagateUploadFile::slotPollFinished()
    finalize(*job->_item);
 }

-void PropagateUploadFile::slotJobDestroyed(QObject* job)
+void PropagateUploadFileQNAM::slotJobDestroyed(QObject* job)
 {
    _jobs.erase(std::remove(_jobs.begin(), _jobs.end(), job) , _jobs.end());
 }

-void PropagateUploadFile::abort()
+void PropagateUploadFileQNAM::abort()
 {
    foreach(auto *job, _jobs) {
        if (job->reply()) {
@@ -887,7 +887,7 @@ void PropagateUploadFile::abort()
 }

 // This function is used whenever there is an error occuring and jobs might be in progress
-void PropagateUploadFile::abortWithError(SyncFileItem::Status status, const QString &error)
+void PropagateUploadFileQNAM::abortWithError(SyncFileItem::Status status, const QString &error)
 {
    _finished = true;
    abort();
@@ -155,10 +155,10 @@ signals:
 };

 /**
- * @brief The PropagateUploadFile class
+ * @brief The PropagateUploadFileQNAM class
 * @ingroup libsync
 */
-class PropagateUploadFile : public PropagateItemJob {
+class PropagateUploadFileQNAM : public PropagateItemJob {
    Q_OBJECT

 private:
@@ -191,7 +191,7 @@ private:
    quint64 chunkSize() const { return _propagator->chunkSize(); }

 public:
-    PropagateUploadFile(OwncloudPropagator* propagator,const SyncFileItemPtr& item)
+    PropagateUploadFileQNAM(OwncloudPropagator* propagator,const SyncFileItemPtr& item)
        : PropagateItemJob(propagator, item), _startChunk(0), _currentChunk(0), _chunkCount(0), _transferId(0), _finished(false), _deleteExisting(false) {}
    void start() Q_DECL_OVERRIDE;

@@ -163,7 +163,7 @@ void PropagateLocalMkdir::start()
        done( SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirStr) );
        return;
    }
-    emit _propagator->touchedFile(newDirStr);
+    _propagator->addTouchedFile(newDirStr);
    QDir localDir(_propagator->_localDir);
    if (!localDir.mkpath(_item->_file)) {
        done( SyncFileItem::NormalError, tr("could not create folder %1").arg(newDirStr) );
@@ -217,8 +217,8 @@ void PropagateLocalRename::start()
            return;
        }

-        emit _propagator->touchedFile(existingFile);
-        emit _propagator->touchedFile(targetFile);
+        _propagator->addTouchedFile(existingFile);
+        _propagator->addTouchedFile(targetFile);
        QString renameError;
        if (!FileSystem::rename(existingFile, targetFile, &renameError)) {
            done(SyncFileItem::NormalError, renameError);
@@ -78,10 +78,6 @@ SyncEngine::SyncEngine(AccountPtr account, const QString& localPath,
 {
    qRegisterMetaType<SyncFileItem>("SyncFileItem");
    qRegisterMetaType<SyncFileItem::Status>("SyncFileItem::Status");
-    qRegisterMetaType<SyncFileStatus>("SyncFileStatus");
-
-    // Everything in the SyncEngine expects a trailing slash for the localPath.
-    Q_ASSERT(localPath.endsWith(QLatin1Char('/')));

    // We need to reconstruct the url because the path needs to be fully decoded, as csync will re-encode the path:
    //  Remember that csync will just append the filename to the path and pass it to the vio plugin.
@@ -99,10 +95,6 @@ SyncEngine::SyncEngine(AccountPtr account, const QString& localPath,
    _excludedFiles.reset(new ExcludedFiles(&_csync_ctx->excludes));
    _syncFileStatusTracker.reset(new SyncFileStatusTracker(this));

-    _clearTouchedFilesTimer.setSingleShot(true);
-    _clearTouchedFilesTimer.setInterval(30*1000);
-    connect(&_clearTouchedFilesTimer, SIGNAL(timeout()), SLOT(slotClearTouchedFiles()));
-
    _thread.setObjectName("SyncEngine_Thread");
 }

@@ -395,6 +387,8 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
        item->_remotePerm = QByteArray(file->remotePerm);
    }

+    item->_should_update_metadata = item->_should_update_metadata || file->should_update_metadata;
+
    /* The flag "serverHasIgnoredFiles" is true if item in question is a directory
     * that has children which are ignored in sync, either because the files are
     * matched by an ignore pattern, or because they are hidden.
@@ -439,9 +433,6 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
    case CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS:
        item->_errorString = tr("Filename contains invalid characters that can not be synced cross platform.");
        break;
-    case CSYNC_STATUS_INDIVIDUAL_TRAILING_SPACE:
-        item->_errorString = tr("Filename contains trailing spaces.");
-        break;
    case CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME:
        item->_errorString = tr("Filename is too long.");
        break;
@@ -512,23 +503,10 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
    int re = 0;
    switch(file->instruction) {
    case CSYNC_INSTRUCTION_NONE: {
-        // Any files that are instruction NONE?
-        if (!isDirectory && file->other.instruction == CSYNC_INSTRUCTION_NONE) {
-            _hasNoneFiles = true;
-        }
-        // No syncing or update to be done.
-        return re;
-    }
-    case CSYNC_INSTRUCTION_UPDATE_METADATA:
-        dir = SyncFileItem::None;
-        // For directories, metadata-only updates will be done after all their files are propagated.
-        if (!isDirectory) {
-            item->_isDirectory = isDirectory;
-            emit syncItemDiscovered(*item);
-
+        if (remote && item->_should_update_metadata && !isDirectory && item->_instruction == CSYNC_INSTRUCTION_NONE) {
            // Update the database now already:  New remote fileid or Etag or RemotePerm
            // Or for files that were detected as "resolved conflict".
-            // Or a local inode/mtime change
+            // Or a local inode/mtime change (see localMetadataUpdate below)

            // In case of "resolved conflict": there should have been a conflict because they
            // both were new, or both had their local mtime or remote etag modified, but the
@@ -540,33 +518,47 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
            // quick to do and we don't want to create a potentially large number of
            // mini-jobs later on, we just update metadata right now.

-            if (remote) {
-                QString filePath = _localPath + item->_file;
+            QString filePath = _localPath + item->_file;

-                // Even if the mtime is different on the server, we always want to keep the mtime from
-                // the file system in the DB, this is to avoid spurious upload on the next sync
-                item->_modtime = file->other.modtime;
-                // same for the size
-                item->_size = file->other.size;
+            // Even if the mtime is different on the server, we always want to keep the mtime from
+            // the file system in the DB, this is to avoid spurious upload on the next sync
+            item->_modtime = file->other.modtime;
+            // same for the size
+            item->_size = file->other.size;

-                // If the 'W' remote permission changed, update the local filesystem
-                SyncJournalFileRecord prev = _journal->getFileRecord(item->_file);
-                if (prev.isValid() && prev._remotePerm.contains('W') != item->_remotePerm.contains('W')) {
-                    const bool isReadOnly = !item->_remotePerm.contains('W');
-                    FileSystem::setFileReadOnlyWeak(filePath, isReadOnly);
-                }
-
-                _journal->setFileRecordMetadata(SyncJournalFileRecord(*item, filePath));
-            } else {
-                // The local tree is walked first and doesn't have all the info from the server.
-                // Update only outdated data from the disk.
-                _journal->updateLocalMetadata(item->_file, item->_modtime, item->_size, item->_inode);
+            // If the 'W' remote permission changed, update the local filesystem
+            SyncJournalFileRecord prev = _journal->getFileRecord(item->_file);
+            if (prev.isValid() && prev._remotePerm.contains('W') != item->_remotePerm.contains('W')) {
+                const bool isReadOnly = !item->_remotePerm.contains('W');
+                FileSystem::setFileReadOnlyWeak(filePath, isReadOnly);
            }

-            // Technically we're done with this item.
+            _journal->setFileRecordMetadata(SyncJournalFileRecord(*item, filePath));
+            item->_should_update_metadata = false;
+
+            // Technically we're done with this item. See localMetadataUpdate hack below.
+            _syncItemMap.remove(key);
+        }
+        // Any files that are instruction NONE?
+        if (!isDirectory && file->other.instruction == CSYNC_INSTRUCTION_NONE) {
+            _hasNoneFiles = true;
+        }
+        // We want to still update etags of directories, other NONE
+        // items can be ignored.
+        bool directoryEtagUpdate = isDirectory && file->should_update_metadata;
+        bool localMetadataUpdate = !remote && file->should_update_metadata;
+        if (!directoryEtagUpdate) {
+            item->_isDirectory = isDirectory;
+            if (localMetadataUpdate) {
+                // Hack, we want a local metadata update to happen, but only if the
+                // remote tree doesn't ask us to do some kind of propagation.
+                _syncItemMap.insert(key, item);
+            }
+            emit syncItemDiscovered(*item);
            return re;
        }
        break;
+    }
    case CSYNC_INSTRUCTION_RENAME:
        dir = !remote ? SyncFileItem::Down : SyncFileItem::Up;
        item->_renameTarget = renameTarget;
@@ -689,7 +681,6 @@ void SyncEngine::startSync()
    s_anySyncRunning = true;
    _syncRunning = true;
    _anotherSyncNeeded = false;
-    _clearTouchedFilesTimer.stop();

    _progressInfo->reset();

@@ -726,19 +717,16 @@ void SyncEngine::startSync()

    int fileRecordCount = -1;
    if (!_journal->exists()) {
-        qDebug() << "===== new sync (no sync journal exists)";
+        qDebug() << "=====sync looks new (no DB exists)";
    } else {
-        qDebug() << "===== sync with existing sync journal";
+        qDebug() << "=====sync with existing DB";
    }

-    QString verStr("===== Using Qt ");
-    verStr.append( qVersion() );
-
+    qDebug() <<  "=====Using Qt" << qVersion();
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-    verStr.append( " SSL library " ).append(QSslSocket::sslLibraryVersionString().toUtf8().data());
+    qDebug() <<  "=====Using SSL library version"
+             <<  QSslSocket::sslLibraryVersionString().toUtf8().data();
 #endif
-    verStr.append( " on ").append(Utility::platformName());
-    qDebug() << verStr;

    fileRecordCount = _journal->getFileRecordCount(); // this creates the DB if it does not exist yet

@@ -777,11 +765,7 @@ void SyncEngine::startSync()

    qDebug() << "#### Discovery start #################################################### >>";

-    // Usually the discovery runs in the background: We want to avoid
-    // stealing too much time from other processes that the user might
-    // be interacting with at the time.
-    _thread.start(QThread::LowPriority);
-
+    _thread.start();
    _discoveryMainThread = new DiscoveryMainThread(account());
    _discoveryMainThread->setParent(this);
    connect(this, SIGNAL(finished(bool)), _discoveryMainThread, SLOT(deleteLater()));
@@ -863,8 +847,6 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)

    _hasNoneFiles = false;
    _hasRemoveFile = false;
-    _hasForwardInTimeFiles = false;
-    _backInTimeFiles = 0;
    bool walkOk = true;
    _seenFiles.clear();
    _temporarilyUnavailablePaths.clear();
@@ -918,16 +900,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
            return;
        }
    }
-
-    auto databaseFingerprint = _journal->dataFingerprint();
-    // If databaseFingerprint is null, this means that there was no information in the database
-    // (for example, upgrading from a previous version, or first sync)
-    // Note that an empty ("") fingerprint is valid and means it was empty on the server before.
-    if (!databaseFingerprint.isNull()
-            && _discoveryMainThread->_dataFingerprint != databaseFingerprint) {
-        qDebug() << "data fingerprint changed, assume restore from backup" << databaseFingerprint << _discoveryMainThread->_dataFingerprint;
-        restoreOldFiles();
-    } else if (!_hasForwardInTimeFiles && _backInTimeFiles >= 2) {
+    if (!_hasForwardInTimeFiles && _backInTimeFiles >= 2) {
        qDebug() << "All the changes are bringing files in the past, asking the user";
        // this typically happen when a backup is restored on the server
        bool restore = false;
@@ -970,9 +943,8 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
            this, SLOT(slotItemCompleted(const SyncFileItem &, const PropagatorJob &)));
    connect(_propagator.data(), SIGNAL(progress(const SyncFileItem &,quint64)),
            this, SLOT(slotProgress(const SyncFileItem &,quint64)));
-    connect(_propagator.data(), SIGNAL(finished(bool)), this, SLOT(slotFinished(bool)), Qt::QueuedConnection);
+    connect(_propagator.data(), SIGNAL(finished()), this, SLOT(slotFinished()), Qt::QueuedConnection);
    connect(_propagator.data(), SIGNAL(seenLockedFile(QString)), SIGNAL(seenLockedFile(QString)));
-    connect(_propagator.data(), SIGNAL(touchedFile(QString)), SLOT(slotAddTouchedFile(QString)));

    // apply the network limits to the propagator
    setNetworkLimits(_uploadLimit, _downloadLimit);
@@ -1038,14 +1010,10 @@ void SyncEngine::slotItemCompleted(const SyncFileItem &item, const PropagatorJob
    emit itemCompleted(item, job);
 }

-void SyncEngine::slotFinished(bool success)
+void SyncEngine::slotFinished()
 {
    _anotherSyncNeeded = _anotherSyncNeeded || _propagator->_anotherSyncNeeded;

-    if (success) {
-        _journal->setDataFingerprint(_discoveryMainThread->_dataFingerprint);
-    }
-
    // emit the treewalk results.
    if( ! _journal->postSyncCleanup( _seenFiles, _temporarilyUnavailablePaths ) ) {
        qDebug() << "Cleaning of synced ";
@@ -1053,7 +1021,7 @@ void SyncEngine::slotFinished(bool success)

    _journal->commit("All Finished.", false);
    emit treeWalkResult(_syncedItems);
-    finalize(success);
+    finalize(true); // FIXME: should it be true if there was errors?
 }

 void SyncEngine::finalize(bool success)
@@ -1073,8 +1041,6 @@ void SyncEngine::finalize(bool success)

    // Delete the propagator only after emitting the signal.
    _propagator.clear();
-
-    _clearTouchedFilesTimer.start();
 }

 void SyncEngine::slotProgress(const SyncFileItem& item, quint64 current)
@@ -1179,8 +1145,9 @@ void SyncEngine::checkForPermission()
                if (perms.isNull()) {
                    // No permissions set
                    break;
-                } if (!perms.contains("W")) {
+                } if (!(*it)->_isDirectory && !perms.contains("W")) {
                    qDebug() << "checkForPermission: RESTORING" << (*it)->_file;
+                    (*it)->_should_update_metadata = true;
                    (*it)->_instruction = CSYNC_INSTRUCTION_CONFLICT;
                    (*it)->_direction = SyncFileItem::Down;
                    (*it)->_isRestoration = true;
@@ -1202,6 +1169,7 @@ void SyncEngine::checkForPermission()
                }
                if (!perms.contains("D")) {
                    qDebug() << "checkForPermission: RESTORING" << (*it)->_file;
+                    (*it)->_should_update_metadata = true;
                    (*it)->_instruction = CSYNC_INSTRUCTION_NEW;
                    (*it)->_direction = SyncFileItem::Down;
                    (*it)->_isRestoration = true;
@@ -1220,6 +1188,7 @@ void SyncEngine::checkForPermission()
                            }

                            qDebug() << "checkForPermission: RESTORING" << (*it)->_file;
+                            (*it)->_should_update_metadata = true;

                            (*it)->_instruction = CSYNC_INSTRUCTION_NEW;
                            (*it)->_direction = SyncFileItem::Down;
@@ -1368,6 +1337,7 @@ void SyncEngine::restoreOldFiles()
            break;
        case CSYNC_INSTRUCTION_REMOVE:
            qDebug() << "restoreOldFiles: RESTORING" << (*it)->_file;
+            (*it)->_should_update_metadata = true;
            (*it)->_instruction = CSYNC_INSTRUCTION_NEW;
            (*it)->_direction = SyncFileItem::Up;
            break;
@@ -1382,28 +1352,24 @@ void SyncEngine::restoreOldFiles()
    }
 }

-void SyncEngine::slotAddTouchedFile(const QString& fn)
+SyncFileItem* SyncEngine::findSyncItem(const QString &fileName) const
 {
-    QString file = QDir::cleanPath(fn);
-
-    QElapsedTimer timer;
-    timer.start();
-
-    _touchedFiles.insert(file, timer);
-}
-
-void SyncEngine::slotClearTouchedFiles()
-{
-    _touchedFiles.clear();
+    Q_FOREACH(const SyncFileItemPtr &item, _syncedItems) {
+        // Directories will appear in this list as well, and will get their status set once all children have been propagated
+        if ((item->_file == fileName || (!item->_renameTarget.isEmpty() && item->_renameTarget == fileName)))
+            return item.data();
+    }
+    return 0;
 }

 qint64 SyncEngine::timeSinceFileTouched(const QString& fn) const
 {
-    if (! _touchedFiles.contains(fn)) {
-        return -1;
+    // This copy is essential for thread safety.
+    QSharedPointer<OwncloudPropagator> prop = _propagator;
+    if (prop) {
+        return prop->timeSinceFileTouched(fn);
    }
-
-    return _touchedFiles[fn].elapsed();
+    return -1;
 }

 AccountPtr SyncEngine::account() const
@@ -85,6 +85,8 @@ public:
    /* Return true if we detected that another sync is needed to complete the sync */
    bool isAnotherSyncNeeded() { return _anotherSyncNeeded; }

+    SyncFileItem* findSyncItem(const QString &fileName) const;
+
    /** Get the ms since a file was touched, or -1 if it wasn't.
     *
     * Thread-safe.
@@ -150,17 +152,11 @@ signals:
 private slots:
    void slotRootEtagReceived(const QString &);
    void slotItemCompleted(const SyncFileItem& item, const PropagatorJob & job);
-    void slotFinished(bool success);
+    void slotFinished();
    void slotProgress(const SyncFileItem& item, quint64 curent);
    void slotDiscoveryJobFinished(int updateResult);
    void slotCleanPollsJobAborted(const QString &error);

-    /** Records that a file was touched by a job. */
-    void slotAddTouchedFile(const QString& fn);
-
-    /** Wipes the _touchedFiles hash */
-    void slotClearTouchedFiles();
-
 private:
    void handleSyncError(CSYNC *ctx, const char *state);

@@ -260,12 +256,6 @@ private:
    CSyncChecksumHook _checksum_hook;

    bool _anotherSyncNeeded;
-
-    /** Stores the time since a job touched a file. */
-    QHash<QString, QElapsedTimer> _touchedFiles;
-
-    /** For clearing the _touchedFiles variable after sync finished */
-    QTimer _clearTouchedFilesTimer;
 };

 }
@@ -66,7 +66,7 @@ public:
    SyncFileItem() : _type(UnknownType),  _direction(None), _isDirectory(false),
         _serverHasIgnoredFiles(false), _hasBlacklistEntry(false),
         _errorMayBeBlacklisted(false), _status(NoStatus),
-        _isRestoration(false),
+        _isRestoration(false), _should_update_metadata(false),
        _httpErrorCode(0), _requestDuration(0), _affectedItems(1),
        _instruction(CSYNC_INSTRUCTION_NONE), _modtime(0), _size(0), _inode(0)
    {
@@ -156,6 +156,7 @@ public:
    // Variables useful to report to the user
    Status               _status BITFIELD(4);
    bool                 _isRestoration BITFIELD(1); // The original operation was forbidden, and this is a restoration
+    bool                 _should_update_metadata BITFIELD(1);
    quint16              _httpErrorCode;
    QString              _errorString; // Contains a string only in case of error
    QByteArray           _responseTimeStamp;
@@ -32,7 +32,7 @@ void SyncFileStatus::set(SyncFileStatusTag tag)
    _tag = tag;
 }

-SyncFileStatus::SyncFileStatusTag SyncFileStatus::tag() const
+SyncFileStatus::SyncFileStatusTag SyncFileStatus::tag()
 {
    return _tag;
 }
@@ -42,7 +42,7 @@ void SyncFileStatus::setSharedWithMe(bool isShared)
    _sharedWithMe = isShared;
 }

-bool SyncFileStatus::sharedWithMe() const
+bool SyncFileStatus::sharedWithMe()
 {
    return _sharedWithMe;
 }
@@ -14,8 +14,6 @@
 #ifndef SYNCFILESTATUS_H
 #define SYNCFILESTATUS_H

-#include <QMetaType>
-#include <QObject>
 #include <QString>

 #include "owncloudlib.h"
@@ -41,10 +39,10 @@ public:
    SyncFileStatus(SyncFileStatusTag);

    void set(SyncFileStatusTag tag);
-    SyncFileStatusTag tag() const;
+    SyncFileStatusTag tag();

    void setSharedWithMe( bool isShared );
-    bool sharedWithMe() const;
+    bool sharedWithMe();

    QString toSocketAPIString() const;
 private:
@@ -52,16 +50,6 @@ private:
    bool _sharedWithMe;

 };
-
-inline bool operator==(const SyncFileStatus &a, const SyncFileStatus &b) {
-    return a.tag() == b.tag() && a.sharedWithMe() == b.sharedWithMe();
 }

-inline bool operator!=(const SyncFileStatus &a, const SyncFileStatus &b) {
-    return !(a == b);
-}
-}
-
-Q_DECLARE_METATYPE(OCC::SyncFileStatus)
-
 #endif // SYNCFILESTATUS_H
@@ -56,8 +56,7 @@ static SyncFileStatus::SyncFileStatusTag lookupProblem(const QString &pathToMatc
 static inline bool showErrorInSocketApi(const SyncFileItem& item)
 {
    const auto status = item._status;
-    return item._instruction == CSYNC_INSTRUCTION_ERROR
-        || status == SyncFileItem::NormalError
+    return status == SyncFileItem::NormalError
        || status == SyncFileItem::FatalError
        || item._hasBlacklistEntry;
 }
@@ -65,8 +64,7 @@ static inline bool showErrorInSocketApi(const SyncFileItem& item)
 static inline bool showWarningInSocketApi(const SyncFileItem& item)
 {
    const auto status = item._status;
-    return item._instruction == CSYNC_INSTRUCTION_IGNORE
-        || status == SyncFileItem::FileIgnored
+    return status == SyncFileItem::FileIgnored
        || status == SyncFileItem::Conflict
        || status == SyncFileItem::Restoration;
 }
@@ -78,18 +76,30 @@ SyncFileStatusTracker::SyncFileStatusTracker(SyncEngine *syncEngine)
            SLOT(slotAboutToPropagate(SyncFileItemVector&)));
    connect(syncEngine, SIGNAL(itemCompleted(const SyncFileItem&, const PropagatorJob&)),
            SLOT(slotItemCompleted(const SyncFileItem&)));
-    connect(syncEngine, SIGNAL(finished(bool)), SLOT(slotSyncFinished()));
    connect(syncEngine, SIGNAL(started()), SLOT(slotSyncEngineRunningChanged()));
    connect(syncEngine, SIGNAL(finished(bool)), SLOT(slotSyncEngineRunningChanged()));
 }

+SyncFileItem SyncFileStatusTracker::rootSyncFileItem()
+{
+    SyncFileItem fakeRootItem;
+    // It's is not entirely correct to use the sync's status as we'll show the root folder as
+    // syncing even though no child might end up being propagated, but will give us something
+    // better than always UpToDate for now.
+    fakeRootItem._status = _syncEngine->isSyncRunning() ? SyncFileItem::NoStatus : SyncFileItem::Success;
+    fakeRootItem._isDirectory = true;
+    return fakeRootItem;
+}
+
 SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& relativePath)
 {
-    Q_ASSERT(!relativePath.endsWith(QLatin1Char('/')));
+    // normalization is required for OS X to match file names properly
+    QString normalizedRelativePath = relativePath.normalized(QString::NormalizationForm_C);
+    Q_ASSERT(!normalizedRelativePath.endsWith(QLatin1Char('/')));

-    if (relativePath.isEmpty()) {
-        // This is the root sync folder, it doesn't have an entry in the database and won't be walked by csync, so resolve manually.
-        return resolveSyncAndErrorStatus(QString(), NotShared);
+    if (normalizedRelativePath.isEmpty()) {
+        // This is the root sync folder, it doesn't have an entry in the database and won't be walked by csync, so create one manually.
+        return syncFileItemStatus(rootSyncFileItem());
    }

    // The SyncEngine won't notify us at all for CSYNC_FILE_SILENTLY_EXCLUDED
@@ -98,23 +108,27 @@ SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& relativePath)
    // update the exclude list at runtime and doing it statically here removes
    // our ability to notify changes through the fileStatusChanged signal,
    // it's an acceptable compromize to treat all exclude types the same.
-    if( _syncEngine->excludedFiles().isExcluded(_syncEngine->localPath() + relativePath,
+    if( _syncEngine->excludedFiles().isExcluded(_syncEngine->localPath() + normalizedRelativePath,
                                                _syncEngine->localPath(),
                                                _syncEngine->ignoreHiddenFiles()) ) {
        return SyncFileStatus(SyncFileStatus::StatusWarning);
    }

-    if ( _dirtyPaths.contains(relativePath) )
+    if ( _dirtyPaths.contains(normalizedRelativePath) )
        return SyncFileStatus::StatusSync;

-    // First look it up in the database to know if it's shared
-    SyncJournalFileRecord rec = _syncEngine->journal()->getFileRecord(relativePath);
-    if (rec.isValid()) {
-        return resolveSyncAndErrorStatus(relativePath, rec._remotePerm.contains("S") ? Shared : NotShared);
+    SyncFileItem* item = _syncEngine->findSyncItem(normalizedRelativePath);
+    if (item) {
+        return syncFileItemStatus(*item);
    }

-    // Must be a new file not yet in the database, check if it's syncing or has an error.
-    return resolveSyncAndErrorStatus(relativePath, NotShared, PathUnknown);
+    // If we're not currently syncing that file, look it up in the database to know if it's shared
+    SyncJournalFileRecord rec = _syncEngine->journal()->getFileRecord(normalizedRelativePath);
+    if (rec.isValid()) {
+        return syncFileItemStatus(rec.toSyncFileItem());
+    }
+    // Must be a new file, wait for the filesystem watcher to trigger a sync
+    return SyncFileStatus();
 }

 void SyncFileStatusTracker::slotPathTouched(const QString& fileName)
@@ -128,74 +142,21 @@ void SyncFileStatusTracker::slotPathTouched(const QString& fileName)
    emit fileStatusChanged(fileName, SyncFileStatus::StatusSync);
 }

-void SyncFileStatusTracker::incSyncCount(const QString &relativePath, EmitStatusChangeFlag emitStatusChange)
-{
-    // Will return 0 (and increase to 1) if the path wasn't in the map yet
-    int count = _syncCount[relativePath]++;
-    if (!count) {
-        if (emitStatusChange)
-            emit fileStatusChanged(getSystemDestination(relativePath), fileStatus(relativePath));
-
-        // We passed from OK to SYNC, increment the parent to keep it marked as
-        // SYNC while we propagate ourselves and our own children.
-        Q_ASSERT(!relativePath.endsWith('/'));
-        int lastSlashIndex = relativePath.lastIndexOf('/');
-        if (lastSlashIndex != -1)
-            incSyncCount(relativePath.left(lastSlashIndex), EmitStatusChange);
-        else if (!relativePath.isEmpty())
-            incSyncCount(QString(), EmitStatusChange);
-    }
-}
-
-void SyncFileStatusTracker::decSyncCount(const QString &relativePath, EmitStatusChangeFlag emitStatusChange)
-{
-    int count = --_syncCount[relativePath];
-    if (!count) {
-        // Remove from the map, same as 0
-        _syncCount.remove(relativePath);
-
-        if (emitStatusChange)
-            emit fileStatusChanged(getSystemDestination(relativePath), fileStatus(relativePath));
-
-        // We passed from SYNC to OK, decrement our parent.
-        Q_ASSERT(!relativePath.endsWith('/'));
-        int lastSlashIndex = relativePath.lastIndexOf('/');
-        if (lastSlashIndex != -1)
-            decSyncCount(relativePath.left(lastSlashIndex), EmitStatusChange);
-        else if (!relativePath.isEmpty())
-            decSyncCount(QString(), EmitStatusChange);
-    }
-}
-
 void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)
 {
-    Q_ASSERT(_syncCount.isEmpty());
-
    std::map<QString, SyncFileStatus::SyncFileStatusTag> oldProblems;
    std::swap(_syncProblems, oldProblems);

    foreach (const SyncFileItemPtr &item, items) {
-        // qDebug() << Q_FUNC_INFO << "Investigating" << item->destination() << item->_status << item->_instruction;
+        // qDebug() << Q_FUNC_INFO << "Investigating" << item->destination() << item->_status;

        if (showErrorInSocketApi(*item)) {
            _syncProblems[item->_file] = SyncFileStatus::StatusError;
-            invalidateParentPaths(item->destination());
        } else if (showWarningInSocketApi(*item)) {
            _syncProblems[item->_file] = SyncFileStatus::StatusWarning;
        }
-
-        // Mark this path as syncing for instructions that will result in propagation,
-        // but DontEmitStatusChange since we're going to emit for ourselves using the
-        // info in the SyncFileItem we received, parents will still be emit if needed.
-        if (item->_instruction != CSYNC_INSTRUCTION_NONE
-            && item->_instruction != CSYNC_INSTRUCTION_UPDATE_METADATA
-            && item->_instruction != CSYNC_INSTRUCTION_IGNORE
-            && item->_instruction != CSYNC_INSTRUCTION_ERROR) {
-            incSyncCount(item->destination(), DontEmitStatusChange);
-        }
-
        _dirtyPaths.remove(item->destination());
-        emit fileStatusChanged(getSystemDestination(item->destination()), resolveSyncAndErrorStatus(item->destination(), item->_remotePerm.contains("S") ? Shared : NotShared));
+        emit fileStatusChanged(getSystemDestination(item->destination()), syncFileItemStatus(*item));
    }

    // Some metadata status won't trigger files to be synced, make sure that we
@@ -203,7 +164,7 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)
    // Swap into a copy since fileStatus() reads _dirtyPaths to determine the status
    QSet<QString> oldDirtyPaths;
    std::swap(_dirtyPaths, oldDirtyPaths);
-    for (auto it = oldDirtyPaths.constBegin(); it != oldDirtyPaths.constEnd(); ++it)
+    for (auto it = oldDirtyPaths.begin(); it != oldDirtyPaths.end(); ++it)
        emit fileStatusChanged(getSystemDestination(*it), fileStatus(*it));

    // Make sure to push any status that might have been resolved indirectly since the last sync
@@ -221,7 +182,7 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)

 void SyncFileStatusTracker::slotItemCompleted(const SyncFileItem &item)
 {
-    // qDebug() << Q_FUNC_INFO << item.destination() << item._status << item._instruction;
+    // qDebug() << Q_FUNC_INFO << item.destination() << item._status;

    if (showErrorInSocketApi(item)) {
        _syncProblems[item._file] = SyncFileStatus::StatusError;
@@ -232,46 +193,37 @@ void SyncFileStatusTracker::slotItemCompleted(const SyncFileItem &item)
        _syncProblems.erase(item._file);
    }

-    // decSyncCount calls *must* be symetric with incSyncCount calls in slotAboutToPropagate
-    if (item._instruction != CSYNC_INSTRUCTION_NONE
-        && item._instruction != CSYNC_INSTRUCTION_UPDATE_METADATA
-        && item._instruction != CSYNC_INSTRUCTION_IGNORE
-        && item._instruction != CSYNC_INSTRUCTION_ERROR) {
-        decSyncCount(item.destination(), DontEmitStatusChange);
-    }
-    emit fileStatusChanged(getSystemDestination(item.destination()), resolveSyncAndErrorStatus(item.destination(), item._remotePerm.contains("S") ? Shared : NotShared));
-}
-
-void SyncFileStatusTracker::slotSyncFinished()
-{
-    // Clear the sync counts to reduce the impact of unsymetrical inc/dec calls (e.g. when directory job abort)
-    QHash<QString, int> oldSyncCount;
-    std::swap(_syncCount, oldSyncCount);
-    for (auto it = oldSyncCount.begin(); it != oldSyncCount.end(); ++it)
-        emit fileStatusChanged(getSystemDestination(it.key()), fileStatus(it.key()));
+    emit fileStatusChanged(getSystemDestination(item.destination()), syncFileItemStatus(item));
 }

 void SyncFileStatusTracker::slotSyncEngineRunningChanged()
 {
-    emit fileStatusChanged(_syncEngine->localPath(), resolveSyncAndErrorStatus(QString(), NotShared));
+    emit fileStatusChanged(_syncEngine->localPath(), syncFileItemStatus(rootSyncFileItem()));
 }

-SyncFileStatus SyncFileStatusTracker::resolveSyncAndErrorStatus(const QString &relativePath, SharedFlag isShared, PathKnownFlag isPathKnown)
+SyncFileStatus SyncFileStatusTracker::syncFileItemStatus(const SyncFileItem& item)
 {
-    // If it's a new file and that we're not syncing it yet,
-    // don't show any icon and wait for the filesystem watcher to trigger a sync.
-    SyncFileStatus status(isPathKnown ? SyncFileStatus::StatusUpToDate : SyncFileStatus::StatusNone);
-    if (_syncCount.value(relativePath)) {
+    // Hack to know if the item was taken from the sync engine (Sync), or from the database (UpToDate)
+    // Mark any directory in the SyncEngine's items as syncing, this is currently how we mark parent directories
+    // of currently syncing items since the PropagateDirectory job will mark the directorie's SyncFileItem::_status as Success
+    // once all child jobs have been completed.
+    bool waitingForPropagation = (item._isDirectory || item._direction != SyncFileItem::None) && item._status == SyncFileItem::NoStatus;
+    SyncFileStatus status(SyncFileStatus::StatusUpToDate);
+    if (waitingForPropagation) {
        status.set(SyncFileStatus::StatusSync);
+    } else if (showErrorInSocketApi(item)) {
+        status.set(SyncFileStatus::StatusError);
+    } else if (showWarningInSocketApi(item)) {
+        status.set(SyncFileStatus::StatusWarning);
    } else {
        // After a sync finished, we need to show the users issues from that last sync like the activity list does.
        // Also used for parent directories showing a warning for an error child.
-        SyncFileStatus::SyncFileStatusTag problemStatus = lookupProblem(relativePath, _syncProblems);
+        SyncFileStatus::SyncFileStatusTag problemStatus = lookupProblem(item.destination(), _syncProblems);
        if (problemStatus != SyncFileStatus::StatusNone)
            status.set(problemStatus);
    }

-    if (isShared)
+    if (item._remotePerm.contains("S"))
        status.setSharedWithMe(true);

    return status;
@@ -46,25 +46,19 @@ signals:
 private slots:
    void slotAboutToPropagate(SyncFileItemVector& items);
    void slotItemCompleted(const SyncFileItem& item);
-    void slotSyncFinished();
    void slotSyncEngineRunningChanged();

 private:
-    enum SharedFlag { NotShared = 0, Shared };
-    enum PathKnownFlag { PathUnknown = 0, PathKnown };
-    enum EmitStatusChangeFlag { DontEmitStatusChange = 0, EmitStatusChange };
-    SyncFileStatus resolveSyncAndErrorStatus(const QString &relativePath, SharedFlag isShared, PathKnownFlag isPathKnown = PathKnown);
+    SyncFileStatus syncFileItemStatus(const SyncFileItem& item);
+    SyncFileItem rootSyncFileItem();

    void invalidateParentPaths(const QString& path);
    QString getSystemDestination(const QString& relativePath);
-    void incSyncCount(const QString &relativePath, EmitStatusChangeFlag emitStatusChange);
-    void decSyncCount(const QString &relativePath, EmitStatusChangeFlag emitStatusChange);

    SyncEngine* _syncEngine;

    std::map<QString, SyncFileStatus::SyncFileStatusTag> _syncProblems;
    QSet<QString> _dirtyPaths;
-    QHash<QString, int> _syncCount;
 };

 }
@@ -286,13 +286,6 @@ bool SyncJournalDb::checkConnect()
        return sqlFail("Create table version", createQuery);
    }

-    // create the checksumtype table.
-    createQuery.prepare("CREATE TABLE IF NOT EXISTS datafingerprint("
-                        "fingerprint TEXT UNIQUE"
-                        ");");
-    if (!createQuery.exec()) {
-        return sqlFail("Create table datafingerprint", createQuery);
-    }

    createQuery.prepare("CREATE TABLE IF NOT EXISTS version("
                               "major INTEGER(8),"
@@ -385,12 +378,6 @@ bool SyncJournalDb::checkConnect()
            " SET contentChecksum = ?2, contentChecksumTypeId = ?3"
            " WHERE phash == ?1;");

-    _setFileRecordLocalMetadataQuery.reset(new SqlQuery(_db));
-    _setFileRecordLocalMetadataQuery->prepare(
-            "UPDATE metadata"
-            " SET inode=?2, modtime=?3, filesize=?4"
-            " WHERE phash == ?1;");
- 
    _getDownloadInfoQuery.reset(new SqlQuery(_db) );
    _getDownloadInfoQuery->prepare( "SELECT tmpfile, etag, errorcount FROM "
                                    "downloadinfo WHERE path=?1" );
@@ -449,14 +436,6 @@ bool SyncJournalDb::checkConnect()
    _insertChecksumTypeQuery.reset(new SqlQuery(_db));
    _insertChecksumTypeQuery->prepare("INSERT OR IGNORE INTO checksumtype (name) VALUES (?1)");

-    _getDataFingerprintQuery.reset(new SqlQuery(_db));
-    _getDataFingerprintQuery->prepare("SELECT fingerprint FROM datafingerprint");
-
-    _setDataFingerprintQuery1.reset(new SqlQuery(_db));
-    _setDataFingerprintQuery1->prepare("DELETE FROM datafingerprint;");
-    _setDataFingerprintQuery2.reset(new SqlQuery(_db));
-    _setDataFingerprintQuery2->prepare("INSERT INTO datafingerprint (fingerprint) VALUES (?1);");
-
    // don't start a new transaction now
    commitInternal(QString("checkConnect End"), false);

@@ -479,7 +458,6 @@ void SyncJournalDb::close()
    _getFileRecordQuery.reset(0);
    _setFileRecordQuery.reset(0);
    _setFileRecordChecksumQuery.reset(0);
-    _setFileRecordLocalMetadataQuery.reset(0);
    _getDownloadInfoQuery.reset(0);
    _setDownloadInfoQuery.reset(0);
    _deleteDownloadInfoQuery.reset(0);
@@ -494,9 +472,6 @@ void SyncJournalDb::close()
    _getChecksumTypeIdQuery.reset(0);
    _getChecksumTypeQuery.reset(0);
    _insertChecksumTypeQuery.reset(0);
-    _getDataFingerprintQuery.reset(0);
-    _setDataFingerprintQuery1.reset(0);
-    _setDataFingerprintQuery2.reset(0);

    _db.close();
    _avoidReadFromDbOnNextSyncFilter.clear();
@@ -971,40 +946,6 @@ bool SyncJournalDb::updateFileRecordChecksum(const QString& filename,
    return true;
 }

-bool SyncJournalDb::updateLocalMetadata(const QString& filename,
-                                        qint64 modtime, quint64 size, quint64 inode)
-
-{
-    QMutexLocker locker(&_mutex);
-
-    qlonglong phash = getPHash(filename);
-    if( !checkConnect() ) {
-        qDebug() << "Failed to connect database.";
-        return false;
-    }
-
-    auto & query = _setFileRecordLocalMetadataQuery;
-
-    query->reset_and_clear_bindings();
-    query->bindValue(1, QString::number(phash));
-    query->bindValue(2, inode);
-    query->bindValue(3, modtime);
-    query->bindValue(4, size);
-
-    if( !query->exec() ) {
-        qWarning() << "Error SQL statement updateLocalMetadata: "
-                   << query->lastQuery() <<  " :"
-                   << query->error();
-        return false;
-    }
-
-    qDebug() << query->lastQuery() << phash << inode
-             << modtime << size;
-
-    query->reset_and_clear_bindings();
-    return true;
-}
-
 bool SyncJournalDb::setFileRecordMetadata(const SyncJournalFileRecord& record)
 {
    SyncJournalFileRecord existing = getFileRecord(record._path);
@@ -1661,49 +1602,6 @@ int SyncJournalDb::mapChecksumType(const QByteArray& checksumType)
    return _getChecksumTypeIdQuery->intValue(0);
 }

-QByteArray SyncJournalDb::dataFingerprint()
-{
-    QMutexLocker locker(&_mutex);
-    if (!checkConnect()) {
-        return QByteArray();
-    }
-
-    _getDataFingerprintQuery->reset_and_clear_bindings();
-    if (!_getDataFingerprintQuery->exec()) {
-        qWarning() << "Error SQL statement dataFingerprint: "
-                   << _getDataFingerprintQuery->lastQuery() << " :"
-                   << _getDataFingerprintQuery->error();
-        return QByteArray();
-    }
-
-    if (!_getDataFingerprintQuery->next()) {
-        return QByteArray();
-    }
-    return _getDataFingerprintQuery->baValue(0);
-}
-
-void SyncJournalDb::setDataFingerprint(const QByteArray &dataFingerprint)
-{
-    QMutexLocker locker(&_mutex);
-    if (!checkConnect()) {
-        return;
-    }
-
-    _setDataFingerprintQuery1->reset_and_clear_bindings();
-    if (!_setDataFingerprintQuery1->exec()) {
-        qWarning() << "Error SQL statement setDataFingerprint1: "
-                   << _setDataFingerprintQuery1->lastQuery() << " :"
-                   << _setDataFingerprintQuery1->error();
-    }
-
-    _setDataFingerprintQuery2->reset_and_clear_bindings();
-    _setDataFingerprintQuery2->bindValue(1, dataFingerprint);
-    if (!_setDataFingerprintQuery2->exec()) {
-        qWarning() << "Error SQL statement setDataFingerprint2: "
-                   << _setDataFingerprintQuery2->lastQuery() << " :"
-                   << _setDataFingerprintQuery2->error();
-    }
-}

 void SyncJournalDb::commit(const QString& context, bool startTrans)
 {
@@ -52,8 +52,6 @@ public:
    bool updateFileRecordChecksum(const QString& filename,
                                  const QByteArray& contentChecksum,
                                  const QByteArray& contentChecksumType);
-    bool updateLocalMetadata(const QString& filename,
-                             qint64 modtime, quint64 size, quint64 inode);
    bool exists();
    void walCheckpoint();

@@ -156,12 +154,6 @@ public:
     */
    QByteArray getChecksumType(int checksumTypeId);

-    /**
-     * The data-fingerprint used to detect backup
-     */
-    void setDataFingerprint(const QByteArray &dataFingerprint);
-    QByteArray dataFingerprint();
-
 private:
    bool updateDatabaseStructure();
    bool updateMetadataTableStructure();
@@ -190,7 +182,6 @@ private:
    QScopedPointer<SqlQuery> _getFileRecordQuery;
    QScopedPointer<SqlQuery> _setFileRecordQuery;
    QScopedPointer<SqlQuery> _setFileRecordChecksumQuery;
-    QScopedPointer<SqlQuery> _setFileRecordLocalMetadataQuery;
    QScopedPointer<SqlQuery> _getDownloadInfoQuery;
    QScopedPointer<SqlQuery> _setDownloadInfoQuery;
    QScopedPointer<SqlQuery> _deleteDownloadInfoQuery;
@@ -205,9 +196,6 @@ private:
    QScopedPointer<SqlQuery> _getChecksumTypeIdQuery;
    QScopedPointer<SqlQuery> _getChecksumTypeQuery;
    QScopedPointer<SqlQuery> _insertChecksumTypeQuery;
-    QScopedPointer<SqlQuery> _getDataFingerprintQuery;
-    QScopedPointer<SqlQuery> _setDataFingerprintQuery1;
-    QScopedPointer<SqlQuery> _setDataFingerprintQuery2;

    /* 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
@@ -286,7 +286,7 @@ QString Theme::about() const
            .arg(MIRALL_VERSION_STRING).arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))
            .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN));

-    re += tr("<p>Copyright ownCloud GmbH</p>");
+    re += tr("<p>Copyright ownCloud, Incorporated</p>");
    re += tr("<p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>"
             "%2 and the %2 logo are registered trademarks of %1 in the "
             "United States, other countries, or both.</p>")
@@ -35,13 +35,6 @@
 #else
 #include <QStandardPaths>
 #endif
-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-#include <QCollator>
-#endif
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-#include <QSysInfo>
-#endif
-

 #ifdef Q_OS_UNIX
 #include <sys/statvfs.h>
@@ -427,25 +420,6 @@ bool Utility::isBSD()
 #endif
 }

-QString Utility::platformName()
-{
-    QString re("Windows");
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-    if( isMac() ) {
-        re = QLatin1String("MacOSX");
-    } else if( isLinux() ) {
-        re = QLatin1String("Linux");
-    } else if( isBSD() ) {
-        re = QLatin1String("BSD");
-    } else if( isUnix() ) {
-        re = QLatin1String("Unix");
-    }
-#else
-    re = QSysInfo::prettyProductName();
-#endif
-    return re;
-}

 void Utility::crash()
 {
@@ -572,18 +546,4 @@ quint64 Utility::StopWatch::durationOfLap( const QString& lapName ) const
    return _lapTimes.value(lapName, 0);
 }

-void Utility::sortFilenames(QStringList& fileNames)
-{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-    QCollator collator;
-    collator.setNumericMode(true);
-    collator.setCaseSensitivity(Qt::CaseInsensitive);
-    qSort(fileNames.begin(), fileNames.end(), collator);
-#elif QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    fileNames.sort(Qt::CaseInsensitive);
-#else
-    fileNames.sort();
-#endif
-}
-
 } // namespace OCC
@@ -91,7 +91,6 @@ namespace Utility
    OWNCLOUDSYNC_EXPORT bool isLinux(); // use with care
    OWNCLOUDSYNC_EXPORT bool isBSD(); // use with care, does not match OS X

-    OWNCLOUDSYNC_EXPORT QString platformName();
    // crash helper for --debug
    OWNCLOUDSYNC_EXPORT void crash();

@@ -137,11 +136,6 @@ namespace Utility
        quint64 durationOfLap( const QString& lapName ) const;
    };

-    /**
-     * @brief Sort a QStringList in a way that's appropriate for filenames
-     */
-    OWNCLOUDSYNC_EXPORT void sortFilenames(QStringList& fileNames);
-
 }
 /** @} */ // \addtogroup

@@ -42,10 +42,6 @@ owncloud_add_test(FileSystem "")
 owncloud_add_test(ChecksumValidator "")

 owncloud_add_test(ExcludedFiles "")
-if(HAVE_QT5 AND NOT BUILD_WITH_QT4)
-    owncloud_add_test(SyncEngine "syncenginetestutils.h")
-    owncloud_add_test(SyncFileStatusTracker "syncenginetestutils.h")
-endif(HAVE_QT5 AND NOT BUILD_WITH_QT4)

 SET(FolderMan_SRC ../src/gui/folderman.cpp)
 list(APPEND FolderMan_SRC ../src/gui/folder.cpp )
--- a/Mostrar Mais
+++ b/Mostrar Mais