First step in getting share by email to work

[tx-robot] updated from transifex
Search results are filtered by server. Don't filter a second time. Also allows searching on attributes other than displayname in ldap configurations. Search results match web and mobile apps. (#4902 )
2016-06-01 15:02:13 +02:00 · 2016-06-01 01:18:50 -04:00 · 2016-05-31 09:45:38 +02:00 · 2016-05-27 18:13:05 +02:00 · 2016-05-27 11:13:18 -04:00 · 2016-05-27 01:15:50 -04:00
@@ -1,47 +1,9 @@
 ChangeLog
 =========
-
-version 2.2.4 (release 2016-09-27)
-* Dolphin Plugin: Use the Application name for the socket path (#5172)
-* SyncEngine: Fix renaming of folder when file are changed (#5195)
-* Selective Sync: Fix HTTP request loop and show error in view (#5154)
-* ConnectionValidator: properly handle error in status.php request (#5188)
-* Discovery: Set thread priority to low (#5017)
-* ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
-* ShareLink: Ensure the password line edit is enabled (#5117)
-
-version 2.2.3 (release 2016-08-08)
-* SyncEngine: Fix detection of backup (#5104)
-* Fix bug with overriding URL in config (#5016)
-* Sharing: Fix bug with file names containing percent encodes (#5042, #5043)
-* Sharing: Permissions for federated shares on servers >=9.1 (#4996, #5001)
-* Overlays: Fix issues with file name casing on OS X and Windows
-* Windows: Skip symlinks and junctions again (#5019)
-* Only accept notification API Capability if endpoint is OCS-enabled (#5034)
-* Fix windows HiDPI (#4994)
-* SocketAPI: Use different pipe name to avoid unusual delay (#4977)
-* Tray: Add minimal mode as workaround and testing tool for Linux issues (#4985, #4990)
-* owncloudcmd: Fix --exclude regression #4979
-* Small memleak: Use the full file stat destructors (#4992)
-* Fix small QAction memleak (#5008)
-* Fix crash on shutting down during propagation (#4979)
-* Decrease memory usage during sync #4979
-* Setup csync logging earlier to get all log output (#4991)
-* Enable Shibboleth debug view with OWNCLOUD_SHIBBOLETH_DEBUG env
-
-version 2.2.2 (release 2016-06-21)
-* Excludes: Don't redundantly add the same exclude files (memleak) (#4967, #4988)
-* Excludes: Only log if the pattern was really logged. (#4989)
-
-version 2.2.1 (release 2016-06-06)
+version 2.2.1 (release 2016-05-xx)
 * Fix out of memory error when too many uploads happen (#4611)
 * Fix display errors in progress display (#4803 #4856)
 * LockWatcher: Remember to upload files after they become unlocked (#4865) 
- * Fix overlay icons for files with umlauts (#4884)
- * Certs: Re-ask for different cert after rejection (#4898, #4911)
- * Progress: Don't count items without propagation jobs (#4856, #4910)
- * Utility: Fix for the translation of minutes, second (#4855)
- * SyncEngine: invalid the blacklist entry when the rename destination change

 version 2.2.0 (release 2016-05-12)
 * Overlay icons: Refactoring - mainly for performance improvements
@@ -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 .
-		'''
-	}
-}
-
-
@@ -15,7 +15,7 @@ with your computer.

 ### Binary packages

-* Refer to the download page https://owncloud.org/install/#install-clients
+* Refer to the download page http://owncloud.org/sync-clients/

 ### Source code

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

@@ -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 ve slo§ce '$INSTDIR'.$\n$\nChcete pokraŸovat (nedoporuŸuje se)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na v adres ýi '$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¡)"
@@ -3,12 +3,12 @@ StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
 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_1 "Uma versão antiga de ${APPLICATION_NAME} está instalada no sistema. É recomendado que 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 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_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_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}"
@@ -25,12 +25,12 @@ 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 no ambiente de trabalho de ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho do ambiente de trabalho para ${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 ${APPLICATION_NAME} esteja instalado no diretório '$INSTDIR'.$\n$\nContinuar na mesma (não recomendado)?"
+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_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,6 +9,7 @@ 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}"
@@ -40,4 +41,3 @@ 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,7 +0,0 @@
-[Paths]
-Prefix = .
-Plugins = .
-Binaries = .
-Imports = .
-Qml2Imports = .
-LibraryExecutables = .
@@ -0,0 +1,5 @@
+--- binary
+++ binary
+@@ -1 +1 @@
+-Subproject commit 1fb9ddfa9a9a1b4dbc447eee10dbed89172d968a
+Subproject commit 01d73965dc8b862d1b2310d3ef801c297b697ec7
@@ -1,4 +1,4 @@
-# (c) 2014 Copyright ownCloud GmbH
+# (c) 2014 Copyright ownCloud, Inc.
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -44,18 +44,6 @@
 static
 #endif
 int _csync_exclude_add(c_strlist_t **inList, const char *string) {
-    size_t i = 0;
-
-    // We never want duplicates, so check whether the string is already
-    // in the list first.
-    if (*inList) {
-        for (i = 0; i < (*inList)->count; ++i) {
-            char *pattern = (*inList)->vector[i];
-            if (c_streq(pattern, string)) {
-                return 1;
-            }
-        }
-    }
    return c_strlist_add_grow(inList, string);
 }

@@ -151,10 +139,8 @@ int csync_exclude_load(const char *fname, c_strlist_t **list) {
        buf[i] = '\0';
        if (*entry != '#') {
          const char *unescaped = csync_exclude_expand_escapes(entry);
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Adding entry: %s", unescaped);
          rc = _csync_exclude_add(list, unescaped);
-          if( rc == 0 ) {
-              CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Adding entry: %s", unescaped);
-          }
          SAFE_FREE(unescaped);
          if (rc < 0) {
              goto out;
@@ -472,7 +472,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {

                if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE
                        || excluded == CSYNC_FILE_SILENTLY_EXCLUDED) {
-                    csync_file_stat_free(st);
+                    SAFE_FREE(st);
                    continue;
                }

@@ -481,7 +481,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {

            /* store into result list. */
            if (c_rbtree_insert(ctx->remote.tree, (void *) st) < 0) {
-                csync_file_stat_free(st);
+                SAFE_FREE(st);
                ctx->status_code = CSYNC_STATUS_TREE_ERROR;
                break;
            }
@@ -269,8 +269,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
    tmp = csync_statedb_get_stat_by_hash(ctx, h);

    if(_last_db_return_error(ctx)) {
-        csync_file_stat_free(st);
-        csync_file_stat_free(tmp);
+        SAFE_FREE(st);
+        SAFE_FREE(tmp);
        ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
        return -1;
    }
@@ -357,7 +357,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
        enum csync_vio_file_type_e tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;

        /* tmp might point to malloc mem, so free it here before reusing tmp  */
-        csync_file_stat_free(tmp);
+        SAFE_FREE(tmp);

        /* check if it's a file and has been renamed */
        if (ctx->current == LOCAL_REPLICA) {
@@ -366,7 +366,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
            tmp = csync_statedb_get_stat_by_inode(ctx, fs->inode);

            if(_last_db_return_error(ctx)) {
-                csync_file_stat_free(st);
+                SAFE_FREE(st);
                ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
                return -1;
            }
@@ -422,7 +422,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
            tmp = csync_statedb_get_stat_by_file_id(ctx, fs->file_id);

            if(_last_db_return_error(ctx)) {
-                csync_file_stat_free(st);
+                SAFE_FREE(st);
                ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
                return -1;
            }
@@ -451,7 +451,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,

                if (fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY && ctx->current == REMOTE_REPLICA && ctx->callbacks.checkSelectiveSyncNewFolderHook) {
                    if (ctx->callbacks.checkSelectiveSyncNewFolderHook(ctx->callbacks.update_callback_userdata, path)) {
-                        csync_file_stat_free(st);
+                        SAFE_FREE(st);
                        return 1;
                    }
                }
@@ -461,7 +461,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
    }
  } else  {
      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb" );
-      csync_file_stat_free(st);
+      SAFE_FREE(st);
      ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
      return -1;
  }
@@ -523,14 +523,14 @@ out:
  switch (ctx->current) {
    case LOCAL_REPLICA:
      if (c_rbtree_insert(ctx->local.tree, (void *) st) < 0) {
-        csync_file_stat_free(st);
+        SAFE_FREE(st);
        ctx->status_code = CSYNC_STATUS_TREE_ERROR;
        return -1;
      }
      break;
    case REMOTE_REPLICA:
      if (c_rbtree_insert(ctx->remote.tree, (void *) st) < 0) {
-        csync_file_stat_free(st);
+        SAFE_FREE(st);
        ctx->status_code = CSYNC_STATUS_TREE_ERROR;
        return -1;
      }
@@ -56,7 +56,6 @@ void csync_vio_file_stat_destroy(csync_vio_file_stat_t *file_stat) {
  SAFE_FREE(file_stat->directDownloadUrl);
  SAFE_FREE(file_stat->directDownloadCookies);
  SAFE_FREE(file_stat->name);
-  SAFE_FREE(file_stat->original_name);
  SAFE_FREE(file_stat);
 }

@@ -141,7 +141,7 @@ csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle) {
  return file_stat;

 err:
-  csync_vio_file_stat_destroy(file_stat);
+  SAFE_FREE(file_stat);

  return NULL;
 }
@@ -167,20 +167,16 @@ csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle) {
  }
  file_stat->name = c_utf8_from_locale(handle->ffd.cFileName);

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

+    file_stat->flags = CSYNC_VIO_FILE_FLAGS_NONE;
    /* Check for the hidden flag */
    if( handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN ) {
        file_stat->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
@@ -31,6 +31,13 @@ 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($)
@@ -56,8 +56,6 @@ assertLocalAndRemoteDir( '', 0);
 printInfo( "Testing with a .sys.admin#recall#" );
 system("echo 'dir/file2.dat' > ". $tmpdir . ".sys.admin\#recall\#");
 system("echo 'dir/file3.dat' >> ". $tmpdir . ".sys.admin\#recall\#");
-system("echo 'nonexistant' >> ". $tmpdir . ".sys.admin\#recall\#");
-system("echo '/tmp/t_recall/file4.dat' >> ". $tmpdir . ".sys.admin\#recall\#");
 glob_put( "$tmpdir/.sys.admin\#recall\#", "" );

 csync();
@@ -66,14 +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' ) );
-
-assert( !-e glob(localDir().'nonexistant*' ) );
-assert( !-e glob('/tmp/t_recall/file4_.sys.admin#recall#-*.dat' ) );
-assert( -e glob('/tmp/t_recall/file4.dat' ) );
-
 #Remove the recall file
 unlink(localDir() . ".sys.admin#recall#");

@@ -159,8 +159,8 @@ In order to make setup simple, you can use the provided Dockerfile to build your
 1. Assuming you are in the root of the ownCloud Client's source tree, you can
   build an image from this Dockerfile like this::

-    cd admin/win/docker
-    docker build . -t owncloud-client-win32:<version>
+     cd admin/win32/docker
+     docker build . -t ownCloud-client-win32:<version>

   Replace ``<version>`` by the version of the client you are building, e.g.
   |version| for the release of the client that this document describes.
@@ -174,8 +174,8 @@ In order to make setup simple, you can use the provided Dockerfile to build your

 2. From within the source tree Run the docker instance::

-     docker run -v "$PWD:/home/user/client" owncloud-client-win32:<version> \
-        /home/user/client/admin/win/docker/build.sh client/  $(id -u)
+     docker run ownCloud-client-win32:<version> -v "$PWD:/home/jenkins/client" \
+                admin/win32/docker/build.sh $(id -u)

   It will run the build, create an NSIS based installer, as well as run tests.
   You will find the resulting binary in an newly created ``build-win32`` subfolder.
@@ -40,7 +40,7 @@ logs.

 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/1.8/troubleshooting.html#client-logfile )
+(See also http://doc.owncloud.org/desktop/2.2/troubleshooting.html#client-logfile )

 2. Web server error log:

@@ -20,455 +20,7 @@ X-GNOME-Autostart-Delay=3


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

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

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

 /**
-* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
+* Copyright (c) 2014 ownCloud, Inc. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free
@@ -59,22 +59,22 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
    <TargetName>$(ProjectName)_x86</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
    <TargetName>$(ProjectName)_x64</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
    <TargetName>$(ProjectName)_x64</TargetName>
  </PropertyGroup>
@@ -89,13 +89,10 @@
    <Link>
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
      <AdditionalDependencies>OCUtil_x86.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>OCContextMenu.def</ModuleDefinitionFile>
    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
-    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@@ -111,17 +108,14 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
      <AdditionalDependencies>OCUtil_x86.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>OCContextMenu.def</ModuleDefinitionFile>
    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
-    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Link>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
      <ModuleDefinitionFile>OCContextMenu.def</ModuleDefinitionFile>
      <AdditionalDependencies>OCUtil_x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -133,9 +127,6 @@
      <Optimization>Disabled</Optimization>
      <PrecompiledHeader />
    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
-    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
@@ -143,15 +134,12 @@
      <PreprocessorDefinitions>NDEBUG;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
      <AdditionalDependencies>OCUtil_x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>OCContextMenu.def</ModuleDefinitionFile>
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
-    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
    <Text Include="ReadMe.txt" />
@@ -110,17 +110,17 @@ IFACEMETHODIMP OCOverlay::GetPriority(int *pPriority)
 	// we order this in terms of likelyhood
 	switch (_state) {
 	case State_OK:
-		*pPriority = 0; break;
+		*pPriority = 0;
 	case State_OKShared:
-		*pPriority = 1; break;
+		*pPriority = 1;
 	case State_Warning:
-		*pPriority = 2; break;
+		*pPriority = 2;
 	case State_Sync:
-		*pPriority = 3; break;
+		*pPriority = 3;
 	case State_Error:
-		*pPriority = 4; break;
+		*pPriority = 4;
 	default:
-		*pPriority = 5; break;
+		*pPriority = 5;
 	}

 	return S_OK;
@@ -66,25 +66,25 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
    <TargetName>$(ProjectName)_x86</TargetName>
    <TargetExt>.dll</TargetExt>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
    <TargetName>$(ProjectName)_x64</TargetName>
    <TargetExt>.dll</TargetExt>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
    <TargetName>$(ProjectName)_x86</TargetName>
    <TargetExt>.dll</TargetExt>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
    <TargetName>$(ProjectName)_x64</TargetName>
    <TargetExt>.dll</TargetExt>
@@ -99,14 +99,11 @@
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
      <AdditionalDependencies>OCUtil_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile>
      <SubSystem>Windows</SubSystem>
    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
-    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@@ -117,14 +114,11 @@
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
      <AdditionalDependencies>OCUtil_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile>
      <SubSystem>Windows</SubSystem>
    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
-    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@@ -139,14 +133,11 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
      <AdditionalDependencies>OCUtil_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile>
      <SubSystem>Windows</SubSystem>
    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
-    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
@@ -161,14 +152,11 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories>
      <AdditionalDependencies>OCUtil_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile>
      <SubSystem>Windows</SubSystem>
    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories>
-    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="DllMain.cpp" />
@@ -45,7 +45,7 @@ std::wstring getUserName() {
 std::wstring CommunicationSocket::DefaultPipePath()
 {
 	auto pipename = std::wstring(L"\\\\.\\pipe\\");
-	pipename += L"ownCloud-";
+	pipename += L"ownCloud\\";
 	pipename += getUserName();
 	return pipename;
 }
@@ -67,26 +67,26 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <TargetExt>.dll</TargetExt>
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
    <TargetName>$(ProjectName)_x86</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <TargetExt>.dll</TargetExt>
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
    <TargetName>$(ProjectName)_x64</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <TargetName>$(ProjectName)_x64</TargetName>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <TargetExt>.dll</TargetExt>
    <TargetName>$(ProjectName)_x86</TargetName>
    <IntDir>$(Configuration)\$(Platform)\</IntDir>
-    <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@@ -155,7 +155,6 @@
    <ClInclude Include="CommunicationSocket.h" />
    <ClInclude Include="FileUtil.h" />
    <ClInclude Include="RegistryUtil.h" />
-    <ClInclude Include="Version.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="CommunicationSocket.cpp" />
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
+* Copyright (c) 2014 ownCloud, Inc. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
+* Copyright (c) 2014 ownCloud, Inc. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
+* Copyright (c) 2014 ownCloud, Inc. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 ownCloud GmbH. All rights reserved.
+* Copyright (c) 2014 ownCloud, Inc. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free
@@ -1,11 +0,0 @@
-#pragma once
-
-// This is the number that will end up in the version window of the DLLs.
-// Increment this version before committing a new build if you are today's shell_integration build master.
-#define OCEXT_BUILD_NUM 43
-
-#define STRINGIZE2(s) #s
-#define STRINGIZE(s) STRINGIZE2(s)
-
-#define OCEXT_VERSION 1,0,0,OCEXT_BUILD_NUM
-#define OCEXT_VERSION_STRING STRINGIZE(OCEXT_VERSION)
@@ -272,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;
@@ -449,27 +443,16 @@ restart_sync:
    QObject::connect(&engine, SIGNAL(finished(bool)), &app, SLOT(quit()));
    QObject::connect(&engine, SIGNAL(transmissionProgress(ProgressInfo)), &cmd, SLOT(transmissionProgressSlot()));

-
    // Exclude lists
-
-    bool hasUserExcludeFile = !options.exclude.isEmpty();
-    QString systemExcludeFile = ConfigFile::excludeFileFromSystem();
-
-    // Always try to load the user-provided exclude list if one is specified
-    if ( hasUserExcludeFile ) {
+    engine.excludedFiles().addExcludeFilePath(ConfigFile::excludeFileFromSystem());
+    if( QFile::exists(options.exclude) )
        engine.excludedFiles().addExcludeFilePath(options.exclude);
-    }
-    // Load the system list if available, or if there's no user-provided list
-    if ( !hasUserExcludeFile || QFile::exists(systemExcludeFile) ) {
-        engine.excludedFiles().addExcludeFilePath(systemExcludeFile);
-    }
-
    if (!engine.excludedFiles().reloadExcludes()) {
+        // Always make sure at least one list has been loaded
        qFatal("Cannot load system exclude list or list supplied via --exclude");
        return EXIT_FAILURE;
    }

-
    // Have to be done async, else, an error before exec() does not terminate the event loop.
    QMetaObject::invokeMethod(&engine, "startSync", Qt::QueuedConnection);

@@ -72,6 +72,7 @@ set(client_SRCS
    settingsdialog.cpp
    share.cpp
    sharedialog.cpp
+    shareemailwidget.cpp
    sharelinkwidget.cpp
    shareusergroupwidget.cpp
    sharee.cpp
@@ -213,12 +213,14 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings)

    QString authType = settings.value(QLatin1String(authTypeC)).toString();
    QString overrideUrl = Theme::instance()->overrideServerUrl();
-    QString forceAuth = Theme::instance()->forceConfigAuthType();
-    if(!forceAuth.isEmpty() && !overrideUrl.isEmpty() ) {
-        // If forceAuth is set, this might also mean the overrideURL has changed.
-        // See enterprise issues #1126
+    if( !overrideUrl.isEmpty() ) {
+        // if there is a overrideUrl, don't even bother reading from the config as all the accounts
+        // must use the overrideUrl
        acc->setUrl(overrideUrl);
-        authType = forceAuth;
+        auto forceAuth = Theme::instance()->forceConfigAuthType();
+        if (!forceAuth.isEmpty()) {
+            authType = forceAuth;
+        }
    } else {
        acc->setUrl(settings.value(QLatin1String(urlC)).toUrl());
    }
@@ -159,13 +159,7 @@ void AccountSettings::createAccountToolbox()

 void AccountSettings::slotOpenAccountWizard()
 {
-    if (
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
-            qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5" ||
-                // We can't call isSystemTrayAvailable with appmenu-qt5 because it breaks the systemtray
-                // (issue #4693, #4944)
-#endif
-            QSystemTrayIcon::isSystemTrayAvailable()) {
+    if (QSystemTrayIcon::isSystemTrayAvailable()) {
        topLevelWidget()->close();
    }
 #ifdef Q_OS_MAC
@@ -190,8 +190,7 @@ void AccountState::checkConnectivity()
    } else {
        // Check the server and then the auth.

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

@@ -248,6 +248,9 @@ 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,6 +274,7 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list)
            _ui->_notifyScroll->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContentsOnFirstShow);
 #endif
            _widgetForNotifId[activity.ident()] = widget;
+            newNotificationShown = true;
        }

        widget->setActivity( activity );
@@ -365,6 +369,10 @@ 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)
@@ -517,6 +525,7 @@ 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"));
@@ -582,6 +591,13 @@ void ActivitySettings::slotShowIssueItemCount(int cnt)
    _tab->setTabText(_syncIssueTabId, cntText);
 }

+void ActivitySettings::slotShowActivityTab()
+{
+    if (_activityTabId != -1) {
+        _tab->setCurrentIndex(_activityTabId);
+    }
+}
+
 void ActivitySettings::slotCopyToClipboard()
 {
    QString text;
@@ -81,7 +81,7 @@ signals:
    void copyToClipboard();
    void rowsInserted();
    void hideActivityTab(bool);
-    void newNotificationList(const ActivityList& list);
+    void newNotification();

 private slots:
    void slotBuildNotificationDisplay(const ActivityList& list);
@@ -143,6 +143,7 @@ private slots:
    void setActivityTabHidden(bool hidden);
    void slotRegularNotificationCheck();
    void slotShowIssueItemCount(int cnt);
+    void slotShowActivityTab();

 signals:
    void guiLog(const QString&, const QString&);
@@ -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));
@@ -145,7 +139,6 @@ Application::Application(int &argc, char **argv) :
    setupTranslations();

    // Setup global excludes
-    qDebug() << "Loading global exclude list";
    ConfigFile cfg;
    ExcludedFiles& excludes = ExcludedFiles::instance();
    excludes.addExcludeFilePath( cfg.excludeFile(ConfigFile::SystemScope) );
@@ -186,6 +179,8 @@ Application::Application(int &argc, char **argv) :

    connect(FolderMan::instance()->socketApi(), SIGNAL(shareCommandReceived(QString, QString, bool)),
            _gui, SLOT(slotShowShareDialog(QString, QString, bool)));
+    connect(FolderMan::instance()->socketApi(), SIGNAL(shareEmailCommandReceived(QString,QString,bool)),
+            _gui, SLOT(slowSendShareLink(QString, QString, bool)));

    // startup procedure.
    connect(&_checkConnectionTimer, SIGNAL(timeout()), this, SLOT(slotCheckConnection()));
@@ -342,14 +337,6 @@ void Application::slotownCloudWizardDone( int res )
    }
 }

-static void csyncLogCatcher(int /*verbosity*/,
-                        const char */*function*/,
-                        const char *buffer,
-                        void */*userdata*/)
-{
-    Logger::instance()->csyncLog( QString::fromUtf8(buffer) );
-}
-
 void Application::setupLogging()
 {
    // might be called from second instance
@@ -365,9 +352,6 @@ void Application::setupLogging()
                .arg(property("ui_lang").toString())
                .arg(_theme->version());

-    // Setup CSYNC logging to forward to our own logger
-    csync_set_log_callback( csyncLogCatcher );
-    csync_set_log_level( Logger::instance()->isNoop() ? 0 : 11 );
 }

 void Application::slotUseMonoIconsChanged(bool)
@@ -20,7 +20,6 @@
 #include <QMessageBox>
 #include <QNetworkReply>
 #include <QSettings>
-#include <QMainWindow>

 #include "creds/shibboleth/shibbolethwebview.h"
 #include "creds/shibbolethcredentials.h"
@@ -75,23 +74,10 @@ ShibbolethWebView::ShibbolethWebView(AccountPtr account, QWidget* parent)
    connect(page->networkAccessManager()->cookieJar(),
            SIGNAL(newCookiesForUrl (QList<QNetworkCookie>, QUrl)),
            this, SLOT(onNewCookiesForUrl (QList<QNetworkCookie>, QUrl)));
-
    page->mainFrame()->load(account->url());
    this->setPage(page);
    setWindowTitle(tr("%1 - Authenticate").arg(Theme::instance()->appNameGUI()));

-    // Debug view to display the cipher suite
-    if( !qgetenv("OWNCLOUD_SHIBBOLETH_DEBUG").isEmpty() ) {
-        // open an additional window to display some cipher debug info
-        QWebPage *debugPage = new UserAgentWebPage(this);
-        debugPage->mainFrame()->load( QUrl("https://cc.dcsec.uni-hannover.de/"));
-        QWebView *debugView = new QWebView(this);
-        debugView->setPage(debugPage);
-        QMainWindow *window = new QMainWindow(this);
-        window->setWindowTitle(tr("SSL Chipher Debug View"));
-        window->setCentralWidget(debugView);
-        window->show();
-    }
    // If we have a valid cookie, it's most likely expired. We can use this as
    // as a criteria to tell the user why the browser window pops up
    QNetworkCookie shibCookie = ShibbolethCredentials::findShibCookie(_account.data(), ShibbolethCredentials::accountCookies(_account.data()));
@@ -156,6 +142,7 @@ void ShibbolethWebView::slotLoadFinished(bool success)

    if (!success) {
        qDebug() << Q_FUNC_INFO << "Could not load Shibboleth login page to log you in.";
+
    }
 }

@@ -46,6 +46,14 @@

 namespace OCC {

+static void csyncLogCatcher(int /*verbosity*/,
+                        const char */*function*/,
+                        const char *buffer,
+                        void */*userdata*/)
+{
+    Logger::instance()->csyncLog( QString::fromUtf8(buffer) );
+}
+

 Folder::Folder(const FolderDefinition& definition,
               AccountState* accountState,
@@ -113,8 +121,6 @@ Folder::Folder(const FolderDefinition& definition,

 Folder::~Folder()
 {
-    // Reset then engine first as it will abort and try to access members of the Folder
-    _engine.reset();
 }

 void Folder::checkLocalPath()
@@ -314,7 +320,6 @@ void Folder::slotRunEtagJob()
        // sync if it's different.

        _requestEtagJob = new RequestEtagJob(account, remotePath(), this);
-        _requestEtagJob->setTimeout(60*1000);
        // check if the etag is different
        QObject::connect(_requestEtagJob, SIGNAL(etagRetreived(QString)), this, SLOT(etagRetreived(QString)));
        FolderMan::instance()->slotScheduleETagJob(alias(), _requestEtagJob);
@@ -573,10 +578,19 @@ int Folder::slotWipeErrorBlacklist()

 void Folder::slotWatchedPathChanged(const QString& path)
 {
+    // When no sync is running or it's in the prepare phase, we can
+    // always schedule a new sync.
+    if (! _engine->isSyncRunning() || _syncResult.status() == SyncResult::SyncPrepare) {
+        emit watchedFileChangedExternally(path);
+        emit scheduleToSync(this);
+        return;
+    }
+
    // The folder watcher fires a lot of bogus notifications during
    // a sync operation, both for actual user files and the database
    // and log. Therefore we check notifications against operations
    // the sync is doing to filter out our own changes.
+    bool ownChange = false;
 #ifdef Q_OS_MAC
    Q_UNUSED(path)
    // On OSX the folder watcher does not report changes done by our
@@ -586,23 +600,14 @@ void Folder::slotWatchedPathChanged(const QString& path)
    const auto maxNotificationDelay = 15*1000;
    qint64 time = _engine->timeSinceFileTouched(path);
    if (time != -1 && time < maxNotificationDelay) {
-        return;
+        ownChange = true;
    }
 #endif

-    // Check that the mtime actually changed.
-    if (path.startsWith(this->path())) {
-        auto relativePath = path.mid(this->path().size());
-        auto record = _journal.getFileRecord(relativePath);
-        if (record.isValid() && !FileSystem::fileChanged(path, record._fileSize,
-                Utility::qDateTimeToTime_t(record._modtime))) {
-            qDebug() << "Ignoring spurious notification for file" << relativePath;
-            return;  // probably a spurious notification
-        }
+    if (! ownChange) {
+        emit watchedFileChangedExternally(path);
+        emit scheduleToSync(this);
    }
-
-    emit watchedFileChangedExternally(path);
-    emit scheduleToSync(this);
 }

 void Folder::slotThreadTreeWalkResult(const SyncFileItemVector& items)
@@ -625,7 +630,7 @@ void Folder::removeFromSettings() const
 {
    auto  settings = _accountState->settings();
    settings->beginGroup(QLatin1String("Folders"));
-    settings->remove(FolderMan::escapeAlias(_definition.alias));
+    settings->remove(_definition.alias);
 }

 bool Folder::isFileExcludedAbsolute(const QString& fullPath) const
@@ -689,10 +694,6 @@ void Folder::wipe()

 bool Folder::setIgnoredFiles()
 {
-    // Note: Doing this on each sync run and on Folder construction is
-    // unnecessary, because _engine->excludedFiles() persists between
-    // sync runs. This is not a big problem because ExcludedFiles maintains
-    // a QSet of files to load.
    ConfigFile cfg;
    QString systemList = cfg.excludeFile(ConfigFile::SystemScope);
    if( QFile::exists(systemList) ) {
@@ -724,6 +725,8 @@ void Folder::startSync(const QStringList &pathList)
    if (proxyDirty()) {
        setProxyDirty(false);
    }
+    csync_set_log_callback( csyncLogCatcher );
+    csync_set_log_level( Logger::instance()->isNoop() ? 0 : 11 );

    if (isBusy()) {
        qCritical() << "* ERROR csync is still running and new sync requested.";
@@ -998,7 +1001,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)
 void Folder::slotAboutToRestoreBackup(bool *restore)
 {
    QString msg =
-        tr("This sync would reset the files to an erlier time in the sync folder '%1'.\n"
+        tr("This sync would reset the files to an earlier 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. "
@@ -849,8 +849,7 @@ Folder *FolderMan::folderForPath(const QString &path)
    foreach(Folder* folder, this->map().values()) {
        const QString folderPath = folder->cleanPath()+QLatin1Char('/');

-        if(absolutePath.startsWith(folderPath, (Utility::isWindows() || Utility::isMac())?
-                    Qt::CaseInsensitive : Qt::CaseSensitive)) {
+        if(absolutePath.startsWith(folderPath)) {
            //qDebug() << "found folder: " << folder->path() << " for " << absolutePath;
            return folder;
        }
@@ -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());
-    sortedSubfolders.sort();
+    Utility::sortFilenames(sortedSubfolders);

    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 {
@@ -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
@@ -51,14 +51,6 @@ static void callback(
    Q_UNUSED(eventFlags)
    Q_UNUSED(eventIds)

-    const FSEventStreamEventFlags c_interestingFlags
-            = kFSEventStreamEventFlagItemCreated // for new folder/file
-            | kFSEventStreamEventFlagItemRemoved // for rm
-            | kFSEventStreamEventFlagItemInodeMetaMod // for mtime change
-            | kFSEventStreamEventFlagItemRenamed // also coming for moves to trash in finder
-            | kFSEventStreamEventFlagItemModified; // for content change
-    //We ignore other flags, e.g. for owner change, xattr change, Finder label change etc
-
    qDebug() << "FolderWatcherPrivate::callback by OS X";

    QStringList paths;
@@ -70,14 +62,8 @@ static void callback(
        CFIndex pathLength = CFStringGetLength(path);
        qstring.resize(pathLength);
        CFStringGetCharacters(path, CFRangeMake(0, pathLength), reinterpret_cast<UniChar *>(qstring.data()));
-        QString fn = qstring.normalized(QString::NormalizationForm_C);

-        if (!(eventFlags[i] & c_interestingFlags)) {
-            qDebug() << "Ignoring non-content changes for" << fn;
-            continue;
-        }
-
-        paths.append(fn);
+        paths.append(qstring.normalized(QString::NormalizationForm_C));
    }

    reinterpret_cast<FolderWatcherPrivate*>(clientCallBackInfo)->doNotifyParent(paths);
@@ -308,7 +308,7 @@ void FolderWizardRemotePath::slotUpdateDirectories(const QStringList &list)
        root->setData(0, Qt::UserRole, "/");
    }
    QStringList sortedList = list;
-    sortedList.sort();
+    Utility::sortFilenames(sortedList);
    foreach (QString path, sortedList) {
        path.remove(webdavFolder);
        QStringList paths = path.split('/');
@@ -161,4 +161,12 @@ void GeneralSettings::slotIgnoreFilesEditor()
    }
 }

+void GeneralSettings::slotOpenAccountWizard()
+{
+    if (QSystemTrayIcon::isSystemTrayAvailable()) {
+        topLevelWidget()->close();
+    }
+    OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), 0);
+}
+
 } // namespace OCC
@@ -44,6 +44,7 @@ private slots:
    void slotToggleOptionalDesktopNotifications(bool);
    void slotUpdateInfo();
    void slotIgnoreFilesEditor();
+    void slotOpenAccountWizard();

 private:
    void loadMiscSettings();
@@ -47,21 +47,18 @@ int main(int argc, char **argv)
 {
    Q_INIT_RESOURCE(client);

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

 #ifdef Q_OS_MAC
    Mac::CocoaInitializer cocoaInit; // RIIA
@@ -47,19 +47,6 @@ void OcsJob::appendPath(const QString &id)
    setPath(path() + QLatin1Char('/') + id);
 }

-static QList<QPair<QByteArray, QByteArray>>
-percentEncodeQueryItems(
-        const QList<QPair<QString, QString>> & items)
-{
-    QList<QPair<QByteArray, QByteArray>> result;
-    foreach (const auto& item, items) {
-        result.append(qMakePair(
-            QUrl::toPercentEncoding(item.first),
-            QUrl::toPercentEncoding(item.second)));
-    }
-    return result;
-}
-
 void OcsJob::start()
 {
    QNetworkRequest req;
@@ -70,9 +57,7 @@ void OcsJob::start()
    QBuffer *buffer = new QBuffer;

    if (_verb == "GET") {
-        // Note: QUrl::setQueryItems() does not fully percent encode
-        // the query items, see #5042
-        url.setEncodedQueryItems(percentEncodeQueryItems(_params));
+        url.setQueryItems(_params);
    } else if (_verb == "POST" || _verb == "PUT") {
        // Url encode the _postParams and put them in a buffer.
        QByteArray postData;
@@ -88,9 +73,9 @@ void OcsJob::start()
    }

    //We want json data
-    auto queryItems = url.encodedQueryItems();
-    queryItems.append(qMakePair(QByteArray("format"), QByteArray("json")));
-    url.setEncodedQueryItems(queryItems);
+    auto queryItems = url.queryItems();
+    queryItems.append(qMakePair(QString::fromLatin1("format"), QString::fromLatin1("json")));
+    url.setQueryItems(queryItems);

    setReply(davRequest(_verb, url, req, buffer));
    setupConnections(reply());
@@ -20,6 +20,7 @@
 #include "progressdispatcher.h"
 #include "owncloudsetupwizard.h"
 #include "sharedialog.h"
+#include "shareemailwidget.h"
 #if defined(Q_OS_MAC)
 #    include "settingsdialogmac.h"
 #    include "macwindow.h" // qtmacgoodies
@@ -367,7 +368,7 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
            menu->addAction(tr("Managed Folders:"))->setDisabled(true);
        }

-        QAction *action = new QAction( tr("Open folder '%1'").arg(folder->shortGuiLocalPath()), menu );
+        QAction *action = new QAction( tr("Open folder '%1'").arg(folder->shortGuiLocalPath()), this );
        connect(action, SIGNAL(triggered()),_folderOpenActionMapper, SLOT(map()));
        _folderOpenActionMapper->setMapping( action, folder->alias() );
        menu->addAction(action);
@@ -399,26 +400,8 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men

 }

-static bool minimalTrayMenu()
-{
-    static QByteArray var = qgetenv("OWNCLOUD_MINIMAL_TRAY_MENU");
-    return !var.isEmpty();
-}
-
 void ownCloudGui::setupContextMenu()
 {
-    // The tray menu is surprisingly problematic. Being able to switch to
-    // a minimal version of it is a useful workaround and testing tool.
-    if (minimalTrayMenu()) {
-        if (!_contextMenu) {
-            _contextMenu.reset(new QMenu());
-            _recentActionsMenu = new QMenu(tr("Recent Changes"), _contextMenu.data());
-            _tray->setContextMenu(_contextMenu.data());
-            _contextMenu->addAction(_actionQuit);
-        }
-        return;
-    }
-
    auto accountList = AccountManager::instance()->accounts();

    bool isConfigured = (!accountList.isEmpty());
@@ -929,5 +912,27 @@ void ownCloudGui::slotRemoveDestroyedShareDialogs()
    }
 }

+void ownCloudGui::slowSendShareLink(const QString &sharePath, const QString &localPath, bool resharingAllowed)
+{
+    const auto folder = FolderMan::instance()->folderForPath(localPath);
+    if (!folder) {
+        qDebug() << "Could not open share email widget for" << localPath << "no responsible folder found";
+        return;
+    }
+
+    // For https://github.com/owncloud/client/issues/3783
+    _settingsDialog->hide();
+
+    if (!resharingAllowed) {
+        qDebug() << "Could not open share email widget for" << localPath << "no reshare permissions";
+        return;
+    }
+
+    qDebug() << Q_FUNC_INFO << "Opening share email widget" << sharePath << localPath;
+    ShareEmailWidget *w = new ShareEmailWidget(folder->accountState()->account(), sharePath);
+    w->setAttribute( Qt::WA_DeleteOnClose, true );
+    raiseDialog(w);
+}
+

 } // end namespace
@@ -79,6 +79,7 @@ public slots:
    void slotTrayMessageIfServerUnsupported(Account *account);
    void slotShowShareDialog(const QString &sharePath, const QString &localPath, bool resharingAllowed);
    void slotRemoveDestroyedShareDialogs();
+    void slowSendShareLink(const QString &sharePath, const QString &localPath, bool resharingAllowed);

 private slots:
    void slotDisplayIdle();
@@ -173,7 +173,7 @@ void OwncloudSetupWizard::slotNoOwnCloudFoundAuth(QNetworkReply *reply)

    // Allow the credentials dialog to pop up again for the same URL.
    // Maybe the user just clicked 'Cancel' by accident or changed his mind.
-    _ocWizard->account()->resetRejectedCertificates();
+    _ocWizard->account()->resetSslCertErrorState();
 }

 void OwncloudSetupWizard::slotNoOwnCloudFoundAuthTimeout(const QUrl&url)
@@ -121,9 +121,17 @@ void ProtocolWidget::hideEvent(QHideEvent *ev)

 void ProtocolWidget::cleanItems(const QString& folder)
 {
+    int itemCnt = _ui->_treeWidget->topLevelItemCount();
+
+    // Limit the number of items
+    while(itemCnt > 2000) {
+        delete _ui->_treeWidget->takeTopLevelItem(itemCnt - 1);
+        itemCnt--;
+    }
+
    // The issue list is a state, clear it and let the next sync fill it
    // with ignored files and propagation errors.
-    int itemCnt = _issueItemView->topLevelItemCount();
+    itemCnt = _issueItemView->topLevelItemCount();
    for( int cnt = itemCnt-1; cnt >=0 ; cnt-- ) {
        QTreeWidgetItem *item = _issueItemView->topLevelItem(cnt);
        QString itemFolder = item->data(2, Qt::UserRole).toString();
@@ -231,12 +239,6 @@ void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItem
            _issueItemView->insertTopLevelItem(0, line);
            emit issueItemCountUpdated(_issueItemView->topLevelItemCount());
        } else {
-            // Limit the number of items
-            int itemCnt = _ui->_treeWidget->topLevelItemCount();
-            while(itemCnt > 2000) {
-                delete _ui->_treeWidget->takeTopLevelItem(itemCnt - 1);
-                itemCnt--;
-            }
            _ui->_treeWidget->insertTopLevelItem(0, line);
        }
    }
@@ -222,7 +222,7 @@ void SelectiveSyncTreeView::slotUpdateDirectories(QStringList list)
        }
    }

-    list.sort();
+    Utility::sortFilenames(list);
    foreach (QString path, list) {
        auto size = job ? job->_sizes.value(path) : 0;
        path.remove(pathToRemove);
@@ -0,0 +1,59 @@
+#include "shareemailwidget.h"
+#include "share.h"
+
+#include <QDesktopServices>
+#include <QSharedPointer>
+#include <QUrl>
+
+namespace OCC {
+
+ShareEmailWidget::ShareEmailWidget(AccountPtr account,
+                                   const QString &sharePath,
+                                   QWidget *parent)
+    : QWidget(parent),
+     _account(account),
+     _sharePath(sharePath)
+{
+    resize(200,200);
+
+    _layout.addWidget(&_spinner);
+    _layout.addWidget(&_label);
+
+    _label.setText(tr("Fetching share link"));
+    _spinner.startAnimation();
+
+    setLayout(&_layout);
+
+    /*
+     * Create the share manager and connect it properly
+     */
+    _manager = new ShareManager(_account, this);
+    connect(_manager, SIGNAL(linkShareCreated(QSharedPointer<LinkShare>)), this, SLOT(slotLinkShareCreated(QSharedPointer<LinkShare>)));
+
+    _manager->createLinkShare(_sharePath);
+}
+
+ShareEmailWidget::~ShareEmailWidget()
+{
+
+}
+
+void ShareEmailWidget::slotLinkShareCreated(const QSharedPointer<LinkShare> share)
+{
+    QUrl mailto("mailto:");
+
+    QString body = tr("I shared a file with you at %1.").arg(share->getLink().toString());
+
+    if (share->getExpireDate().isValid()) {
+        body += tr("\nThis share expires at %1.").arg(share->getExpireDate().toString());
+    }
+
+    mailto.setQuery("body?"+body);
+
+    // Open app
+    QDesktopServices::openUrl(mailto);
+
+    close();
+}
+
+}
@@ -0,0 +1,46 @@
+#ifndef SHAREEMAILDIALOG_H
+#define SHAREEMAILDIALOG_H
+
+#include "accountfwd.h"
+#include "QProgressIndicator.h"
+#include "share.h"
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSharedPointer>
+#include <QString>
+#include <QWidget>
+
+namespace OCC {
+
+class ShareManager;
+
+class ShareEmailWidget : public QWidget
+{
+public:
+
+    explicit ShareEmailWidget(AccountPtr account,
+                              const QString &sharePath,
+                              QWidget *parent = 0);
+    ~ShareEmailWidget();
+
+private slots:
+    void slotLinkShareCreated(const QSharedPointer<LinkShare> share);
+    void slotPasswordEnterd();
+    void slotPasswordRequired();
+
+private:
+    void share(const QString &sharePath, const QString &password);
+
+    AccountPtr _account;
+    QString _sharePath;
+
+    QHBoxLayout _layout;
+    QLabel _label;
+    QProgressIndicator _spinner;
+
+    ShareManager *_manager;
+};
+
+}
+#endif // SHAREEMAILDIALOG_H
@@ -366,7 +366,6 @@ void ShareLinkWidget::slotCheckBoxShareLinkClicked()
            _ui->checkBox_password->setText(tr("Public sh&aring requires a password"));
            _ui->checkBox_expire->setEnabled(false);
            _ui->checkBox_editing->setEnabled(false);
-            _ui->lineEdit_password->setEnabled(true);
            _ui->lineEdit_password->setFocus();
            _ui->pushButton_copy->hide();
            _ui->widget_shareLink->show();
@@ -433,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());
@@ -248,12 +248,10 @@ void ShareUserGroupWidget::slotCompleterActivated(const QModelIndex & index)
    layout->addWidget(indicator);

    /*
-     * Don't send the reshare permissions for federated shares for servers <9.1
+     * Don't send the reshare permissions for federataed shares
     * https://github.com/owncloud/core/issues/22122#issuecomment-185637344
-     * https://github.com/owncloud/client/issues/4996
     */
-    if (sharee->type() == Sharee::Federated
-            && _account->serverVersionInt() < 0x090100) {
+    if (sharee->type() == Sharee::Federated) {
        int permissions = SharePermissionRead | SharePermissionUpdate;
        if (!_isFile) {
            permissions |= SharePermissionCreate | SharePermissionDelete;
@@ -337,12 +335,10 @@ ShareWidget::ShareWidget(QSharedPointer<Share> share,
    connect(_ui->permissionsEdit,  SIGNAL(clicked(bool)), SLOT(slotEditPermissionsChanged()));

    /*
-     * We don't show permssion share for federated shares with server <9.1
+     * We don't show permssion share for federated shares
     * https://github.com/owncloud/core/issues/22122#issuecomment-185637344
-     * https://github.com/owncloud/client/issues/4996
     */
-    if (share->getShareType() == Share::TypeRemote
-            && share->account()->serverVersionInt() < 0x090100) {
+    if (share->getShareType() == Share::TypeRemote) {
        _ui->permissionShare->setVisible(false);
        _ui->permissionToolButton->setVisible(false);
    }
@@ -74,7 +74,7 @@ SocketApi::SocketApi(QObject* parent)

    if (Utility::isWindows()) {
        socketPath = QLatin1String("\\\\.\\pipe\\")
-                + QLatin1String("ownCloud-")
+                + QLatin1String("ownCloud") + '\\'
                + QString::fromLocal8Bit(qgetenv("USERNAME"));
        // TODO: once the windows extension supports multiple
        // client connections, switch back to the theme name
@@ -453,6 +453,66 @@ void SocketApi::command_SHARE_MENU_TITLE(const QString &, QIODevice* socket)
    sendMessage(socket, QLatin1String("SHARE_MENU_TITLE:") + tr("Share with %1", "parameter is ownCloud").arg(Theme::instance()->appNameGUI()));
 }

+void SocketApi::command_SHARE_EMAIL(const QString& localFile, QIODevice* socket)
+{
+    if (!socket) {
+        qDebug() << Q_FUNC_INFO << "No valid socket object.";
+        return;
+    }
+
+    qDebug() << Q_FUNC_INFO << localFile;
+
+    auto theme = Theme::instance();
+
+    Folder *shareFolder = FolderMan::instance()->folderForPath(localFile);
+    if (!shareFolder) {
+        const QString message = QLatin1String("SHARE_EMAIL:NOP:")+QDir::toNativeSeparators(localFile);
+        // files that are not within a sync folder are not synced.
+        sendMessage(socket, message);
+    } else if (!shareFolder->accountState()->isConnected()) {
+        const QString message = QLatin1String("SHARE_EMAIL:NOTCONNECTED:")+QDir::toNativeSeparators(localFile);
+        // if the folder isn't connected, don't open the share dialog
+        sendMessage(socket, message);
+    } else if (!theme->linkSharing()) {
+        const QString message = QLatin1String("SHARE_EMAIL:NOP:")+QDir::toNativeSeparators(localFile);
+        sendMessage(socket, message);
+    } else {
+        const QString localFileClean = QDir::cleanPath(localFile);
+        const QString file = localFileClean.mid(shareFolder->cleanPath().length()+1);
+        SyncFileStatus fileStatus = shareFolder->syncEngine().syncFileStatusTracker().fileStatus(file);
+
+        // Verify the file is on the server (to our knowledge of course)
+        if (fileStatus.tag() != SyncFileStatus::StatusUpToDate) {
+            const QString message = QLatin1String("SHARE:NOTSYNCED:")+QDir::toNativeSeparators(localFile);
+            sendMessage(socket, message);
+            return;
+        }
+
+        const QString remotePath = QDir(shareFolder->remotePath()).filePath(file);
+
+        // Can't share root folder
+        if (remotePath == "/") {
+            const QString message = QLatin1String("SHARE_EMAIL:CANNOTSHAREROOT:")+QDir::toNativeSeparators(localFile);
+            sendMessage(socket, message);
+            return;
+        }
+
+        SyncJournalFileRecord rec = shareFolder->journalDb()->getFileRecord(localFileClean);
+
+        bool allowReshare = true; // lets assume the good
+        if( rec.isValid() ) {
+            // check the permission: Is resharing allowed?
+            if( !rec._remotePerm.contains('R') ) {
+                allowReshare = false;
+            }
+        }
+        const QString message = QLatin1String("SHARE_EMAIL:OK:")+QDir::toNativeSeparators(localFile);
+        sendMessage(socket, message);
+
+        emit shareEmailCommandReceived(remotePath, localFileClean, allowReshare);
+    }
+}
+
 QString SocketApi::buildRegisterPathMessage(const QString& path)
 {
    QFileInfo fi(path);
@@ -56,6 +56,7 @@ public slots:
 signals:
    void shareCommandReceived(const QString &sharePath, const QString &localPath, bool resharingAllowed);
    void shareUserGroupCommandReceived(const QString &sharePath, const QString &localPath, bool resharingAllowed);
+    void shareEmailCommandReceived(const QString &sharePath, const QString &localPath, bool resharingAllowed);

 private slots:
    void slotNewConnection();
@@ -70,6 +71,7 @@ private:
    Q_INVOKABLE void command_RETRIEVE_FOLDER_STATUS(const QString& argument, QIODevice* socket);
    Q_INVOKABLE void command_RETRIEVE_FILE_STATUS(const QString& argument, QIODevice* socket);
    Q_INVOKABLE void command_SHARE(const QString& localFile, QIODevice* socket);
+    Q_INVOKABLE void command_SHARE_EMAIL(const QString& localFile, QIODevice* socket);

    Q_INVOKABLE void command_VERSION(const QString& argument, QIODevice* socket);

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

@@ -38,6 +38,9 @@ namespace OCC {
 Account::Account(QObject *parent)
    : QObject(parent)
    , _capabilities(QVariantMap())
+    , _am(0)
+    , _credentials(0)
+    , _treatSslErrorsAsFailure(false)
    , _davPath( Theme::instance()->webDavPath() )
    , _wasMigrated(false)
 {
@@ -53,6 +56,8 @@ AccountPtr Account::create()

 Account::~Account()
 {
+    delete _credentials;
+    delete _am;
 }

 QString Account::davPath() const
@@ -113,14 +118,14 @@ bool Account::changed(AccountPtr other, bool ignoreUrlProtocol) const
        changes = (_url == other->_url);
    }

-    changes |= _credentials->changed(other->credentials());
+    changes |= _credentials->changed(other->_credentials);

    return changes;
 }

 AbstractCredentials *Account::credentials() const
 {
-    return _credentials.data();
+    return _credentials;
 }

 void Account::setCredentials(AbstractCredentials *cred)
@@ -131,27 +136,29 @@ void Account::setCredentials(AbstractCredentials *cred)
        jar = _am->cookieJar();
        jar->setParent(0);

-        _am = QSharedPointer<QNetworkAccessManager>();
+        _am->deleteLater();
+    }
+
+    if (_credentials) {
+        credentials()->deleteLater();
    }

    // The order for these two is important! Reading the credential's
-    // settings accesses the account as well as account->_credentials,
-    // so deleteLater must be used.
-    _credentials = QSharedPointer<AbstractCredentials>(cred, &QObject::deleteLater);
+    // settings accesses the account as well as account->_credentials
+    _credentials = cred;
    cred->setAccount(this);

-    _am = QSharedPointer<QNetworkAccessManager>(_credentials->getQNAM(), &QObject::deleteLater);
-
+    _am = _credentials->getQNAM();
    if (jar) {
        _am->setCookieJar(jar);
    }
-    connect(_am.data(), SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
+    connect(_am, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
            SLOT(slotHandleSslErrors(QNetworkReply*,QList<QSslError>)));
-    connect(_am.data(), SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+    connect(_am, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
            SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
-    connect(_credentials.data(), SIGNAL(fetched()),
+    connect(_credentials, SIGNAL(fetched()),
            SLOT(slotCredentialsFetched()));
-    connect(_credentials.data(), SIGNAL(asked()),
+    connect(_credentials, SIGNAL(asked()),
            SLOT(slotCredentialsAsked()));
 }

@@ -190,21 +197,18 @@ void Account::resetNetworkAccessManager()

    qDebug() << "Resetting QNAM";
    QNetworkCookieJar* jar = _am->cookieJar();
-
-    // Use a QSharedPointer to allow locking the life of the QNAM on the stack.
-    // Make it call deleteLater to make sure that we can return to any QNAM stack frames safely.
-    _am = QSharedPointer<QNetworkAccessManager>(_credentials->getQNAM(), &QObject::deleteLater);
-
+    _am->deleteLater();
+    _am = _credentials->getQNAM();
    _am->setCookieJar(jar); // takes ownership of the old cookie jar
-    connect(_am.data(), SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
+    connect(_am, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
            SLOT(slotHandleSslErrors(QNetworkReply*,QList<QSslError>)));
-    connect(_am.data(), SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+    connect(_am, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
            SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
 }

 QNetworkAccessManager *Account::networkAccessManager()
 {
-    return _am.data();
+    return _am;
 }

 QNetworkReply *Account::headRequest(const QString &relPath)
@@ -325,9 +329,9 @@ void Account::addApprovedCerts(const QList<QSslCertificate> certs)
    _approvedCerts += certs;
 }

-void Account::resetRejectedCertificates()
+void Account::resetSslCertErrorState()
 {
-    _rejectedCertificates.clear();
+    _treatSslErrorsAsFailure = false;
 }

 void Account::setSslErrorHandler(AbstractSslErrorHandler *handler)
@@ -408,15 +412,8 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
                     << error.errorString() << "("<< error.error() << ")" << "\n";
    }

-    bool allPreviouslyRejected = true;
-    foreach (const QSslError &error, errors) {
-        if (!_rejectedCertificates.contains(error.certificate())) {
-            allPreviouslyRejected = false;
-        }
-    }
-
-    // If all certs have previously been rejected by the user, don't ask again.
-    if( allPreviouslyRejected ) {
+    if( _treatSslErrorsAsFailure ) {
+        // User decided once not to trust. Honor this decision.
        qDebug() << out << "Certs not trusted by user decision, returning.";
        return;
    }
@@ -427,12 +424,6 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
        return;
    }

-    // SslDialogErrorHandler::handleErrors will run an event loop that might execute
-    // the deleteLater() of the QNAM before we have the chance of unwinding our stack.
-    // Keep a ref here on our stackframe to make sure that it doesn't get deleted before
-    // handleErrors returns.
-    QSharedPointer<QNetworkAccessManager> qnamLock = _am;
-
    if (_sslErrorHandler->handleErrors(errors, reply->sslConfiguration(), &approvedCerts, sharedFromThis())) {
        QSslSocket::addDefaultCaCertificates(approvedCerts);
        addApprovedCerts(approvedCerts);
@@ -445,12 +436,7 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
        // certificate changes.
        reply->ignoreSslErrors(errors);
    } else {
-        // Mark all involved certificates as rejected, so we don't ask the user again.
-        foreach (const QSslError &error, errors) {
-            if (!_rejectedCertificates.contains(error.certificate())) {
-                _rejectedCertificates.append(error.certificate());
-            }
-        }
+        _treatSslErrorsAsFailure = true;
        // if during normal operation, a new certificate was MITM'ed, and the user does not
        // ACK it, the running request must be aborted and the QNAM must be reset, to not
        // treat the new cert as granted. See bug #3283
@@ -462,12 +448,12 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors

 void Account::slotCredentialsFetched()
 {
-    emit credentialsFetched(_credentials.data());
+    emit credentialsFetched(_credentials);
 }

 void Account::slotCredentialsAsked()
 {
-    emit credentialsAsked(_credentials.data());
+    emit credentialsAsked(_credentials);
 }

 void Account::handleInvalidCredentials()
@@ -133,7 +133,7 @@ public:
    // Usually when a user explicitly rejects a certificate we don't
    // ask again. After this call, a dialog will again be shown when
    // the next unknown certificate is encountered.
-    void resetRejectedCertificates();
+    void resetSslCertErrorState();

    // pluggable handler
    void setSslErrorHandler(AbstractSslErrorHandler *handler);
@@ -214,12 +214,9 @@ private:
    QString _serverVersion;
    QScopedPointer<AbstractSslErrorHandler> _sslErrorHandler;
    QuotaInfo *_quotaInfo;
-    QSharedPointer<QNetworkAccessManager> _am;
-    QSharedPointer<AbstractCredentials> _credentials;
-
-    /// Certificates that were explicitly rejected by the user
-    QList<QSslCertificate> _rejectedCertificates;
-
+    QNetworkAccessManager *_am;
+    AbstractCredentials* _credentials;
+    bool _treatSslErrorsAsFailure;
    static QString _configFileName;
    QByteArray _pemCertificate; 
    QString _pemPrivateKey;  
@@ -73,8 +73,7 @@ bool Capabilities::shareResharing() const

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

 bool Capabilities::isValid() const
@@ -106,7 +106,7 @@ void ConnectionValidator::slotCheckServerAndAuth()
    checkJob->setTimeout(timeoutToUseMsec);
    checkJob->setIgnoreCredentialFailure(true);
    connect(checkJob, SIGNAL(instanceFound(QUrl,QVariantMap)), SLOT(slotStatusFound(QUrl,QVariantMap)));
-    connect(checkJob, SIGNAL(instanceNotFound(QNetworkReply*)), SLOT(slotNoStatusFound(QNetworkReply*)));
+    connect(checkJob, SIGNAL(networkError(QNetworkReply*)), SLOT(slotNoStatusFound(QNetworkReply*)));
    connect(checkJob, SIGNAL(timeout(QUrl)), SLOT(slotJobTimeout(QUrl)));
    checkJob->start();
 }
@@ -12,7 +12,6 @@
 */

 #include "excludedfiles.h"
-#include "utility.h"

 #include <QFileInfo>

@@ -43,7 +42,7 @@ ExcludedFiles& ExcludedFiles::instance()

 void ExcludedFiles::addExcludeFilePath(const QString& path)
 {
-    _excludeFiles.insert(path);
+    _excludeFiles.append(path);
 }

 bool ExcludedFiles::reloadExcludes()
@@ -64,7 +63,7 @@ bool ExcludedFiles::isExcluded(
        const QString& basePath,
        bool excludeHidden) const
 {
-    if (!filePath.startsWith(basePath, Utility::fsCasePreserving() ? Qt::CaseInsensitive : Qt::CaseSensitive)) {
+    if (!filePath.startsWith(basePath)) {
        // Mark paths we're not responsible for as excluded...
        return true;
    }
@@ -16,8 +16,7 @@
 #include "owncloudlib.h"

 #include <QObject>
-#include <QSet>
-#include <QString>
+#include <QStringList>

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

 } // namespace OCC
@@ -496,16 +496,16 @@ QString FileSystem::fileSystemForPath(const QString & path)
 }
 #endif

-#define BUFSIZE qint64(500*1024)  // 500 KiB
+#define BUFSIZE 1024*1024*10

 static QByteArray readToCrypto( const QString& filename, QCryptographicHash::Algorithm algo )
 {
-    QFile file(filename);
-    const qint64 bufSize = qMin(BUFSIZE, file.size() + 1);
-    QByteArray buf(bufSize, Qt::Uninitialized);
+    const qint64 bufSize = BUFSIZE;
+    QByteArray buf(bufSize,0);
    QByteArray arr;
    QCryptographicHash crypto( algo );

+    QFile file(filename);
    if (file.open(QIODevice::ReadOnly)) {
        qint64 size;
        while (!file.atEnd()) {
@@ -532,11 +532,11 @@ QByteArray FileSystem::calcSha1( const QString& filename )
 #ifdef ZLIB_FOUND
 QByteArray FileSystem::calcAdler32( const QString& filename )
 {
-    QFile file(filename);
-    const qint64 bufSize = qMin(BUFSIZE, file.size() + 1);
-    QByteArray buf(bufSize, Qt::Uninitialized);
-
    unsigned int adler = adler32(0L, Z_NULL, 0);
+    const qint64 bufSize = BUFSIZE;
+    QByteArray buf(bufSize, 0);
+
+    QFile file(filename);
    if (file.open(QIODevice::ReadOnly)) {
        qint64 size;
        while (!file.atEnd()) {
@@ -111,9 +111,9 @@ bool OWNCLOUDSYNC_EXPORT rename(const QString& originFileName,
 *
 * @return true if the file's mtime or size are not what is expected.
 */
-bool OWNCLOUDSYNC_EXPORT fileChanged(const QString& fileName,
-                                     qint64 previousSize,
-                                     time_t previousMtime);
+bool fileChanged(const QString& fileName,
+                 qint64 previousSize,
+                 time_t previousMtime);

 /**
 * @brief Like !fileChanged() but with verbose logging if the file *did* change.
@@ -695,12 +695,6 @@ void PropagateDirectory::finalize()
    bool ok = true;
    if (!_item->isEmpty() && _hasError == SyncFileItem::NoStatus) {
        if( !_item->_renameTarget.isEmpty() ) {
-            if(_item->_instruction == CSYNC_INSTRUCTION_RENAME
-                    && _item->_originalFile != _item->_renameTarget) {
-                // Remove the stale entries from the database.
-                _propagator->_journal->deleteFileRecord(_item->_originalFile, true);
-            }
-
            _item->_file = _item->_renameTarget;
        }

@@ -768,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;
@@ -778,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;
        }
    }
@@ -388,7 +388,6 @@ private:
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    // access to signals which are protected in Qt4
    friend class PropagateDownloadFileQNAM;
-    friend class PropagateUploadFileQNAM;
 #endif
 };

@@ -410,10 +409,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>"
@@ -155,37 +155,16 @@ bool ProgressInfo::isUpdatingEstimates() const
    return _updateEstimatesTimer.isActive();
 }

-static bool shouldCountProgress(const SyncFileItem &item)
-{
-    const auto instruction = item._instruction;
-
-    // Don't worry about directories that won't have propagation
-    // jobs associated with them.
-    if (item._isDirectory
-            && (instruction == CSYNC_INSTRUCTION_NONE
-                || instruction == CSYNC_INSTRUCTION_SYNC
-                || instruction == CSYNC_INSTRUCTION_CONFLICT)) {
-        return false;
-    }
-
-    // Skip any ignored or error files, we do nothing with them.
-    if (instruction == CSYNC_INSTRUCTION_IGNORE
-            || instruction == CSYNC_INSTRUCTION_ERROR) {
-        return false;
-    }
-
-    return true;
-}
-
 void ProgressInfo::adjustTotalsForFile(const SyncFileItem &item)
 {
-    if (!shouldCountProgress(item)) {
-        return;
-    }
-
-    _fileProgress._total += item._affectedItems;
-    if (isSizeDependent(item)) {
-        _sizeProgress._total += item._size;
+    if (!item._isDirectory) {
+        _fileProgress._total++;
+        if (isSizeDependent(item)) {
+            _sizeProgress._total += item._size;
+        }
+    } else if (item._instruction != CSYNC_INSTRUCTION_NONE) {
+        // Added or removed directories certainly count.
+        _fileProgress._total++;
    }
 }

@@ -216,10 +195,6 @@ quint64 ProgressInfo::completedSize() const

 void ProgressInfo::setProgressComplete(const SyncFileItem &item)
 {
-    if (!shouldCountProgress(item)) {
-        return;
-    }
-
    _currentItems.remove(item._file);
    _fileProgress.setCompleted(_fileProgress._completed + item._affectedItems);
    if (ProgressInfo::isSizeDependent(item)) {
@@ -231,10 +206,6 @@ void ProgressInfo::setProgressComplete(const SyncFileItem &item)

 void ProgressInfo::setProgressItem(const SyncFileItem &item, quint64 completed)
 {
-    if (!shouldCountProgress(item)) {
-        return;
-    }
-
    _currentItems[item._file]._item = item;
    _currentItems[item._file]._progress._total = item._size;
    _currentItems[item._file]._progress.setCompleted(completed);
@@ -617,47 +617,29 @@ static QString makeRecallFileName(const QString &fn)
    return recallFileName;
 }

-void handleRecallFile(const QString& filePath, const QString& folderPath, SyncJournalDb& journal)
+static void handleRecallFile(const QString &fn)
 {
-    qDebug() << "handleRecallFile: " << filePath;
+    qDebug() << "handleRecallFile: " << fn;

-    FileSystem::setFileHidden(filePath, true);
+    FileSystem::setFileHidden(fn, true);

-    QFile file(filePath);
+    QFile file(fn);
    if (!file.open(QIODevice::ReadOnly)) {
        qWarning() << "Could not open recall file" << file.errorString();
        return;
    }
-    QFileInfo existingFile(filePath);
-    QDir baseDir = existingFile.dir();
+    QFileInfo existingFile(fn);
+    QDir thisDir = existingFile.dir();

    while (!file.atEnd()) {
        QByteArray line = file.readLine();
        line.chop(1); // remove trailing \n
+        QString fpath = thisDir.filePath(line);
+        QString rpath = makeRecallFileName(fpath);

-        QString recalledFile = QDir::cleanPath(baseDir.filePath(line));
-        if (!recalledFile.startsWith(folderPath) || !recalledFile.startsWith(baseDir.path())) {
-            qDebug() << "Ignoring recall of " << recalledFile;
-            continue;
-        }
-
-        // Path of the recalled file in the local folder
-        QString localRecalledFile = recalledFile.mid(folderPath.size());
-
-        SyncJournalFileRecord record = journal.getFileRecord(localRecalledFile);
-        if (!record.isValid()) {
-            qDebug() << "No db entry for recall of" << localRecalledFile;
-            continue;
-        }
-
-        qDebug() << "Recalling" << localRecalledFile << "Checksum:" << record._contentChecksumType << record._contentChecksum;
-
-        QString targetPath = makeRecallFileName(recalledFile);
-
-        qDebug() << "Copy recall file: " << recalledFile << " -> " << targetPath;
-        // Remove the target first, QFile::copy will not overwrite it.
-        FileSystem::remove(targetPath);
-        QFile::copy(recalledFile, targetPath);
+        qDebug() << "Copy recall file: " << fpath << " -> " << rpath;
+        QString error;
+        FileSystem::uncheckedRenameReplace(fpath, rpath, &error);
    }
 }

@@ -814,10 +796,8 @@ void PropagateDownloadFileQNAM::downloadFinished()
    done(isConflict ? SyncFileItem::Conflict : SyncFileItem::Success);

    // handle the special recall file
-    if(!_item->_remotePerm.contains("S")
-            && (_item->_file == QLatin1String(".sys.admin#recall#")
-                || _item->_file.endsWith("/.sys.admin#recall#"))) {
-        handleRecallFile(fn, _propagator->_localDir, *_propagator->_journal);
+    if(_item->_file == QLatin1String(".sys.admin#recall#") || _item->_file.endsWith("/.sys.admin#recall#")) {
+        handleRecallFile(fn);
    }

    qint64 duration = _stopwatch.elapsed();
@@ -97,9 +97,7 @@ void PUTFileJob::start() {
 }

 void PUTFileJob::slotTimeout() {
-    qDebug() << "Timeout" << (reply() ? reply()->request().url() : path());
-    if (!reply())
-        return;
+    qDebug() << "Timeout" << reply()->request().url();
    _errorString =  tr("Connection Timeout");
    reply()->abort();
 }
@@ -234,8 +232,6 @@ void PropagateUploadFileQNAM::slotComputeContentChecksum()

    connect(computeChecksum, SIGNAL(done(QByteArray,QByteArray)),
            SLOT(slotComputeTransmissionChecksum(QByteArray,QByteArray)));
-    connect(computeChecksum, SIGNAL(done(QByteArray,QByteArray)),
-            computeChecksum, SLOT(deleteLater()));
    computeChecksum->start(filePath);
 }

@@ -270,8 +266,6 @@ void PropagateUploadFileQNAM::slotComputeTransmissionChecksum(const QByteArray&

    connect(computeChecksum, SIGNAL(done(QByteArray,QByteArray)),
            SLOT(slotStartUpload(QByteArray,QByteArray)));
-    connect(computeChecksum, SIGNAL(done(QByteArray,QByteArray)),
-            computeChecksum, SLOT(deleteLater()));
    const QString filePath = _propagator->getFilePath(_item->_file);
    computeChecksum->start(filePath);
 }
@@ -779,8 +773,6 @@ void PropagateUploadFileQNAM::slotPutFinished()
             << _stopWatch.durationOfLap(QLatin1String("ContentChecksum"))
             << _stopWatch.durationOfLap(QLatin1String("TransmissionChecksum"))
             << _item->_requestDuration;
-    // The job might stay alive for the whole sync, release this tiny bit of memory.
-    _stopWatch.reset();

    finalize(*_item);
 }
@@ -101,10 +101,10 @@ SyncEngine::SyncEngine(AccountPtr account, const QString& localPath,
 SyncEngine::~SyncEngine()
 {
    abort();
-    _thread.quit();
-    _thread.wait();
    _excludedFiles.reset();
    csync_destroy(_csync_ctx);
+    _thread.quit();
+    _thread.wait();
 }

 //Convert an error code from csync to a user readable string.
@@ -765,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()));
@@ -851,12 +847,9 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)

    _hasNoneFiles = false;
    _hasRemoveFile = false;
-    _hasForwardInTimeFiles = false;
-    _backInTimeFiles = 0;
    bool walkOk = true;
    _seenFiles.clear();
    _temporarilyUnavailablePaths.clear();
-    _renamedFolders.clear();

    if( csync_walk_local_tree(_csync_ctx, &treewalkLocal, 0) < 0 ) {
        qDebug() << "Error in local treewalk.";
@@ -1386,13 +1379,13 @@ AccountPtr SyncEngine::account() const

 void SyncEngine::abort()
 {
-    // Sets a flag for the update phase
-    csync_request_abort(_csync_ctx);
    qDebug() << Q_FUNC_INFO << _discoveryMainThread;
    // Aborts the discovery phase job
    if (_discoveryMainThread) {
        _discoveryMainThread->abort();
    }
+    // Sets a flag for the update phase
+    csync_request_abort(_csync_ctx);
    // For the propagator
    if(_propagator) {
        _propagator->abort();
@@ -76,6 +76,7 @@ SyncFileStatusTracker::SyncFileStatusTracker(SyncEngine *syncEngine)
            SLOT(slotAboutToPropagate(SyncFileItemVector&)));
    connect(syncEngine, SIGNAL(itemCompleted(const SyncFileItem&, const PropagatorJob&)),
            SLOT(slotItemCompleted(const SyncFileItem&)));
+    connect(syncEngine, SIGNAL(started()), SLOT(slotClearDirtyPaths()));
    connect(syncEngine, SIGNAL(started()), SLOT(slotSyncEngineRunningChanged()));
    connect(syncEngine, SIGNAL(finished(bool)), SLOT(slotSyncEngineRunningChanged()));
 }
@@ -93,11 +94,9 @@ SyncFileItem SyncFileStatusTracker::rootSyncFileItem()

 SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& relativePath)
 {
-    // normalization is required for OS X to match file names properly
-    QString normalizedRelativePath = relativePath.normalized(QString::NormalizationForm_C);
-    Q_ASSERT(!normalizedRelativePath.endsWith(QLatin1Char('/')));
+    Q_ASSERT(!relativePath.endsWith(QLatin1Char('/')));

-    if (normalizedRelativePath.isEmpty()) {
+    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 create one manually.
        return syncFileItemStatus(rootSyncFileItem());
    }
@@ -108,22 +107,22 @@ 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() + normalizedRelativePath,
+    if( _syncEngine->excludedFiles().isExcluded(_syncEngine->localPath() + relativePath,
                                                _syncEngine->localPath(),
                                                _syncEngine->ignoreHiddenFiles()) ) {
        return SyncFileStatus(SyncFileStatus::StatusWarning);
    }

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

-    SyncFileItem* item = _syncEngine->findSyncItem(normalizedRelativePath);
+    SyncFileItem* item = _syncEngine->findSyncItem(relativePath);
    if (item) {
        return syncFileItemStatus(*item);
    }

    // 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);
+    SyncJournalFileRecord rec = _syncEngine->journal()->getFileRecord(relativePath);
    if (rec.isValid()) {
        return syncFileItemStatus(rec.toSyncFileItem());
    }
@@ -155,18 +154,9 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)
        } else if (showWarningInSocketApi(*item)) {
            _syncProblems[item->_file] = SyncFileStatus::StatusWarning;
        }
-        _dirtyPaths.remove(item->destination());
        emit fileStatusChanged(getSystemDestination(item->destination()), syncFileItemStatus(*item));
    }

-    // Some metadata status won't trigger files to be synced, make sure that we
-    // push the OK status for dirty files that don't need to be propagated.
-    // Swap into a copy since fileStatus() reads _dirtyPaths to determine the status
-    QSet<QString> oldDirtyPaths;
-    std::swap(_dirtyPaths, oldDirtyPaths);
-    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
    // (like an error file being deleted from disk)
    for (auto it = _syncProblems.begin(); it != _syncProblems.end(); ++it)
@@ -201,6 +191,13 @@ void SyncFileStatusTracker::slotSyncEngineRunningChanged()
    emit fileStatusChanged(_syncEngine->localPath(), syncFileItemStatus(rootSyncFileItem()));
 }

+void SyncFileStatusTracker::slotClearDirtyPaths()
+{
+    // We just assume that during a sync all dirty statuses will be resolved
+    // one way or the other.
+    _dirtyPaths.clear();
+}
+
 SyncFileStatus SyncFileStatusTracker::syncFileItemStatus(const SyncFileItem& item)
 {
    // Hack to know if the item was taken from the sync engine (Sync), or from the database (UpToDate)
@@ -47,6 +47,7 @@ private slots:
    void slotAboutToPropagate(SyncFileItemVector& items);
    void slotItemCompleted(const SyncFileItem& item);
    void slotSyncEngineRunningChanged();
+    void slotClearDirtyPaths();

 private:
    SyncFileStatus syncFileItemStatus(const SyncFileItem& item);
@@ -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>")
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Roeland Jago Douma	b6dd13f353	First step in getting share by email to work	2016-06-01 15:02:13 +02:00
Jenkins for ownCloud	e031f7d090	[tx-robot] updated from transifex	2016-06-01 01:18:50 -04:00
Stephen Colebrook	d4b72132d6	Search results are filtered by server. Don't filter a second time. Also allows searching on attributes other than displayname in ldap configurations. Search results match web and mobile apps. (#4902 )	2016-05-31 09:45:38 +02:00
Daniel Molkentin	763016bd8f	Merge pull request #4916 from mwleeds/patch-1 Fix typo in folder.cpp	2016-05-27 18:13:05 +02:00
Matthew Leeds	7f0cc5b699	Fix typo in folder.cpp	2016-05-27 11:13:18 -04:00
Jenkins for ownCloud	d3a93cbaeb	[tx-robot] updated from transifex	2016-05-27 01:15:50 -04:00
Daniel Molkentin	85d3c7a263	Merge remote-tracking branch 'origin/2.2'	2016-05-26 10:19:50 +02:00
Olivier Goffart	159535fe90	Merge branch '2.2'	2016-05-25 16:30:17 +02:00
Markus Goetz	088a294fac	Update issue_template.md Use 2.2 link	2016-05-25 11:33:10 +02:00
Jenkins for ownCloud	813bc15a78	[tx-robot] updated from transifex	2016-05-22 01:15:47 -04:00
ckamm	567fe87e98	Use natural sorting for filenames if available #4859 (#4864 )	2016-05-19 15:36:46 +02:00
Christian Kamm	a1ba23eea9	Activity: When a new notification arrives, switch to that tab #4805	2016-05-19 14:13:07 +02:00
Olivier Goffart	194db066b6	Merge remote-tracking branch 'origin/2.2'	2016-05-17 10:04:31 +02:00
Jocelyn Turcotte	129c17651a	Revert "Overlay icon fixes (#4765 )" The pull request should have been done against the 2.2 branch, and the branch would better be merged instead of squashed to keep the history easier to lookup. This reverts commit `0469236d80`.	2016-05-03 12:59:17 +02:00
Jocelyn Turcotte	0469236d80	Overlay icon fixes (#4765 ) * Fix the sync status push for parent directories #4682 As before, we rely on metadata-update SyncFileItem entries for parent directories to notify us that a directory contains files to propagate, and to know when all children were propagated through its itemCompleted signal. Those metadata SyncFileItems however have a None direction and we need to add a explicit directory check to show them as Sync. This fix also handles new files as well as existing ones, so no need to keep a separate logic for new files. * Fix the root item sync status #4682 Make sure that we push the new status when the status of the SyncEngine changed. SyncEngine::started comes a bit late, only when the propagation starts, although it's better in this case since child folders will only switch to Sync in aboutToPropagate. Also fix an issue with SyncEngine::findSyncItem when using an empty fileName; this would match and return the wrong item, even though not currently happening with the code since fileStatus won't call it with an empty fileName anymore. * Simplify the root status logic Go through fileStatus like other cases to make sure that all use cases go through the same code path. This also makes sure to use lookupProblem which will use lower_bound which is more efficient for larger sets of sync problems. This also fixes the issue with lookupProblem that prevented it to properly match an empty pathToMatch, caused by the fact that the problem map contains relative paths not starting with a slash. * Avoid a SyncFileStatusTracker private overload with the same name Having an overload as a private function in the same class makes the code harder to follow. Rename the private fileStatus to syncFileItemStatus. * [osx] Fix missing overlay icons on client startup Since the statuses are cached and that we can't invalidate the cache, sending NOP would need to be overwritten by the default OK status once the client successfully connected. But instead of remembering which files we NOPed, rather wait until we are ready to sync before sending the REGISTER_PATH message to the socket API client. It will also prevent the client from sending unnecessary RETRIEVE_FILE_STATUS requests. Also remove AccountState::canSync, since it does the same as isConnected and syncing is not an account responsibility.	2016-05-02 16:33:17 +02:00
Olivier Goffart	93e0d52dd3	Merge pull request #4769 from orion1024/curl-check-in-perl-tests Adding CURL check in t6.pl	2016-04-30 14:25:21 +02:00
orion1024	9f3e576348	Adding CURL check in t6.pl Aborts immediately if CURL not found, to avoid misleading errors later.	2016-04-30 11:44:16 +02:00
Olivier Goffart	5479aaeb5b	Merge remote-tracking branch 'origin/2.2'	2016-04-28 16:38:46 +02:00
Christian Kamm	8dc178a9f3	Share link: Consistent order of options owncloud/core#24122	2016-04-26 07:45:41 +02:00
Klaas Freitag	35d4b96339	Set base version to 2.3.0. For 2.2, please use the branch 2.2	2016-04-25 14:15:17 +02:00