ownCloud 2.1.1 rc1

.gitignore

@@ -7,6 +7,7 @@ CMakeLists.txt.user*
 doc/_build/*
 *.kate-swp
 *.kdev4
+win/
 admin/win/nsi/l10n/pofiles/*.po
 *.swp
 *~$

ChangeLog

@@ -1,6 +1,6 @@
 ChangeLog
 =========
-version 2.1.1 (release 2016-02-10)
+version 2.1.1 (release 2016-01-2x)
  * UI improvements for HiDPI screens, error messages, RTL languages
  * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used
  * Fix undeliberate WiFi scanning done by Qt Network classes
@@ -14,11 +14,9 @@ version 2.1.1 (release 2016-02-10)
  * Allow changeable upload chunk size in owncloud.cfg
  * Crash fixes on account deletion
  * Forget password on explicit sign-out
- * OS X: Fix the file system watcher ignoring unicode paths (#4424)
- * Windows Installer: Update to NSIS 2.50, fixes possible DLL injection
  * Sync Engine: .lnk files
  * Sync Engine: symlinked syn directories
- * Sync Engine: Windows: Fix deleting and replacing of read-only files (#4308, #4277)
+ * Sync Engine: Windows: Fix deleting and replacing of read-only files (#4308 #4277)
  * Sync Engine: Fixes for files becoming directories and vice versa (#4302)
  * Misc other fixes/improvements
 

VERSION.cmake

@@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 1 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "rc1") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

admin/osx/macdeployqt.py

@@ -262,8 +262,8 @@ def CopyFramework(source_dylib):
       dest_dylib_path = os.path.join(frameworks_dir, *parts[i:-1])
       break
   if os.path.exists(dest_path):
-    print dest_path, "already exists, skipping copy..."
-    return os.path.join(dest_dylib_path, dylib_name)
+    print dest_path, "already exists, skipping..."
+    return
 
   args = ['mkdir', '-p', dest_dylib_path]
   commands.append(args)

admin/win/docker/Dockerfile

@@ -1,37 +0,0 @@
-FROM opensuse:42.1
-
-MAINTAINER Daniel Molkentin <danimo@owncloud.com>
-
-ENV TERM ansi
-ENV HOME /root
-
-ENV REFRESHED_AT 20160202
-
-RUN zypper --non-interactive --gpg-auto-import-keys refresh
-RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_42.1/windows:mingw.repo
-RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/isv:ownCloud:toolchains:mingw:win32:2.1/openSUSE_Leap_42.1/isv:ownCloud:toolchains:mingw:win32:2.1.repo
-RUN zypper --non-interactive --gpg-auto-import-keys install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
-                      mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
-                      mingw32-headers mingw32-runtime site-config mingw32-libwebp \
-                      mingw32-cross-libqt5-qmake mingw32-cross-libqt5-qttools mingw32-libqt5* \
-                      mingw32-qt5keychain* mingw32-angleproject* \
-                      mingw32-cross-nsis mingw32-libopenssl* \
-                      mingw32-sqlite* kdewin-png2ico \
-                      osslsigncode wget
-
-# RPM depends on curl for installs from HTTP
-RUN zypper --non-interactive --gpg-auto-import-keys install curl
-
-# sudo needed for building as user
-RUN zypper --non-interactive --gpg-auto-import-keys install sudo
-
-# Use packaged UAC dependencies
-RUN zypper --non-interactive --gpg-auto-import-keys install mingw32-cross-nsis-plugin-uac mingw32-cross-nsis-plugin-nsprocess
-
-# Required for checksumming
-RUN zypper --non-interactive --gpg-auto-import-keys install mingw32-zlib-devel
-
-# Required for windres not to crash
-RUN zypper --non-interactive --gpg-auto-import-keys install glibc-locale
-
-CMD /bin/bash

admin/win/docker/build.sh

@@ -7,13 +7,13 @@ fi
 
 useradd user -u ${2:-1000}
 su - user << EOF
-  cd /home/user/$1
-  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 .
+cd /home/user/$1
+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 .
 EOF

admin/win/nsi/l10n/Portuguese.nsh

@@ -1,6 +1,6 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Processos(s) ${APPLICATION_EXECUTABLE} em execução. Estes processos precisam de ser interrompidos.$\nDeseja que o instalador os termine automaticamente?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Processos(s) ${APPLICATION_EXECUTABLE} em execução. Estes processos precisam de ser interrompidos.$\\nDeseja que o instalador os 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."

admin/win/nsi/l10n/SpanishInternational.nsh

@@ -1,6 +1,6 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de la versión"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Se encontrarion ${APPLICATION_EXECUTABLE} proceso(s) que debe/n ser detenidos.$\"$\n$\"¿Quiere que el instalador lo haga por usted?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Se encontrarion ${APPLICATION_EXECUTABLE} proceso(s) que debe/n ser detenidos.$\"$\\n$\"¿Quiere que el instalador lo haga por usted?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Parando el proceso ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proceso a detener no encontrado!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} esta instalada en el sistema. Es recomendado que quite esta versión antes de instalar. Elija la operación a realizar y seleccione Siguiente para continuar."

admin/win/nsi/l10n/bin/build_locale_nsi.py

@@ -108,8 +108,7 @@ def escapeNSIS(st):
              .replace('\n', r'$\n')\
              .replace('\"', r'$\"')\
              .replace('$$\\', '$\\')\
-             .replace('$\\n', r'$\n')\
-             .replace('$\\\\n', r'$\n')
+             .replace('$\\n', r'$\n')
 
 
 translationCache = {}

csync/src/csync_update.c

@@ -106,42 +106,6 @@ static bool _last_db_return_error(CSYNC* ctx) {
     return ctx->statedb.lastReturnValue != SQLITE_OK && ctx->statedb.lastReturnValue != SQLITE_DONE && ctx->statedb.lastReturnValue != SQLITE_ROW;
 }
 
-/*
- * This static method is needed because the type members of the two structs use
- * different enum values. A direct comparion is not neccessarily correct.
- *
- * tmp is csync_file_stat_t
- * fs  is csync_vio_file_stat_t with this vio type:
- *  enum csync_vio_file_type_e {
- *              CSYNC_VIO_FILE_TYPE_UNKNOWN,
- *              CSYNC_VIO_FILE_TYPE_REGULAR,
- *              CSYNC_VIO_FILE_TYPE_DIRECTORY,
- *              CSYNC_VIO_FILE_TYPE_FIFO,
- *              CSYNC_VIO_FILE_TYPE_SOCKET,
- *              CSYNC_VIO_FILE_TYPE_CHARACTER_DEVICE,
- *              CSYNC_VIO_FILE_TYPE_BLOCK_DEVICE,
- *              CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK
- *            };
- *
- * csync_file_stat_t can be:
- * CSYNC_FTW_TYPE_SKIP, CSYNC_FTW_TYPE_FILE
- * CSYNC_FTW_TYPE_DIR, CSYNC_FTW_TYPE_SLINK
- */
-static bool _csync_filetype_different( const csync_file_stat_t *tmp, const csync_vio_file_stat_t *fs)
-{
-    if( !(tmp && fs)) return false;
-
-    if( tmp->type == CSYNC_FTW_TYPE_SKIP ) return true;
-
-    if( tmp->type == CSYNC_FTW_TYPE_DIR && fs->type != CSYNC_VIO_FILE_TYPE_DIRECTORY )
-        return true;
-    if( tmp->type == CSYNC_FTW_TYPE_FILE && fs->type != CSYNC_VIO_FILE_TYPE_REGULAR )
-        return true;
-    if( tmp->type == CSYNC_FTW_TYPE_SLINK && fs->type != CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK )
-        return true;
-
-    return false; // both are NOT different.
-}
 
 /* Return true if two mtime are considered equal
  * We consider mtime that are one hour difference to be equal if they are one hour appart
@@ -310,9 +274,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
             st->instruction = CSYNC_INSTRUCTION_EVAL;
 
             // Preserve the EVAL flag later on if the type has changed.
-            if (_csync_filetype_different(tmp, fs)) {
+            if (tmp->type != fs->type)
                 st->child_modified = 1;
-            }
 
             goto out;
         }
@@ -340,9 +303,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
             }
 
             // Preserve the EVAL flag later on if the type has changed.
-            if (_csync_filetype_different(tmp, fs)) {
+            if (tmp->type != fs->type)
                 st->child_modified = 1;
-            }
 
             st->instruction = CSYNC_INSTRUCTION_EVAL;
             goto out;
@@ -391,12 +353,10 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
             }
 
             /* translate the file type between the two stat types csync has. */
-            if( tmp && tmp->type == CSYNC_FTW_TYPE_FILE ) {
+            if( tmp && tmp->type == 0 ) {
                 tmp_vio_type = CSYNC_VIO_FILE_TYPE_REGULAR;
-            } else if( tmp && tmp->type == CSYNC_FTW_TYPE_DIR) {
+            } else if( tmp && tmp->type == 2 ) {
                 tmp_vio_type = CSYNC_VIO_FILE_TYPE_DIRECTORY;
-            } else if( tmp && tmp->type == CSYNC_FTW_TYPE_SLINK ) {
-                tmp_vio_type = CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK;
             } else {
                 tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;
             }
@@ -429,7 +389,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
                 return -1;
             }
             if(tmp ) {                           /* tmp existing at all */
-                if ( _csync_filetype_different(tmp, fs)) {
+                if ((tmp->type == CSYNC_FTW_TYPE_DIR && fs->type != CSYNC_VIO_FILE_TYPE_DIRECTORY) ||
+                        (tmp->type == CSYNC_FTW_TYPE_FILE && fs->type != CSYNC_VIO_FILE_TYPE_REGULAR)) {
                     CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "WARN: file types different is not!");
                     st->instruction = CSYNC_INSTRUCTION_NEW;
                     goto out;
@@ -820,9 +781,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
      * local stat function.
      */
     if( d_name[0] == '.' ) {
-        if (strcmp(".sys.admin#recall#", d_name) != 0) { /* recall file shall not be ignored (#4420) */
-            dirent->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
-        }
+        dirent->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
     }
 
     if( res == 0) {

doc/building.rst

@@ -28,6 +28,9 @@ Linux
 
 4. (Optional) Call ``make install`` to install the client to the ``/usr/local/bin`` directory.
 
+.. note:: This step requires the ``mingw32-cross-nsis`` packages be installed on
+          Windows.
+
 Mac OS X
 --------
 
@@ -60,17 +63,15 @@ To set up your build environment for development using HomeBrew_:
 
 5. For compilation of the client, follow the :ref:`generic-build-instructions`.
 
-6. Install the Packages_ package creation tool.
-
-7. In the build directory, run ``admin/osx/create_mac.sh <build_dir>
+6. In the build directory, run ``admin/osx/create_mac.sh <build_dir>
    <install_dir>``. If you have a developer signing certificate, you can specify
    its Common Name as a third parameter (use quotes) to have the package
    signed automatically.
 
-   .. note:: Contrary to earlier versions, ownCloud 1.7 and later are packaged
-             as a ``pkg`` installer. Do not call "make package" at any time when
-             compiling for OS X, as this will build a disk image, and will not
-             work correctly.
+.. note:: Contrary to earlier versions, ownCloud 1.7 and later are packaged
+          as a ``pkg`` installer. Do not call "make package" at any time when
+          compiling for OS X, as this will build a disk image, and will not
+          work correctly.
 
 Windows Development Build
 -----------------------
@@ -110,62 +111,64 @@ follow `Windows Installer Build (Cross-Compile)`_ instead.
 
 6. Create the build directory::
 
-     mkdir client-build
-     cd client-build
+    mkdir client-build
+    cd client-build
 
 7. Build the client::
 
-     cmake -G "MinGW Makefiles" ../client
-     mingw32-make
+    cmake -G "MinGW Makefiles" ../client
+    mingw32-make
 
-   .. note:: You can try using ninja to build in parallel using
-      ``cmake -G Ninja ../client`` and ``ninja`` instead.
-   .. note:: Refer to the :ref:`generic-build-instructions` section for additional options.
+  .. note:: You can try using ninja to build in parallel using
+     ``cmake -G Ninja ../client`` and ``ninja`` instead.
+  .. note:: Refer to the :ref:`generic-build-instructions` section for additional options.
 
-   The ownCloud binary will appear in the ``bin`` directory.
+  The ownCloud binary will appear in the ``bin`` directory.
 
 Windows Installer Build (Cross-Compile)
 ---------------------------------------
 
 Due to the large number of dependencies, building the client installer for Windows
 is **currently only officially supported on openSUSE**, by using the MinGW cross compiler.
-You can set up any currently supported version of openSUSE in a virtual machine if you do not
+You can set up openSUSE 13.1, 13.2 or openSUSE Factory in a virtual machine if you do not
 have it installed already.
 
-In order to make setup simple, you can use the provided Dockerfile to build your own image. 
+To cross-compile:
 
-1. Assuming you are in the root of the ownCloud Client's source tree, you can
-   build an image from this Dockerfile like this::
+1. Add the following repository using YaST or ``zypper ar`` (adjust when using another openSUSE version)::
 
-     cd admin/win32/docker
-     docker build . -t ownCloud-client-win32:<version>
+    zypper ar https://build.opensuse.org/project/show/isv:ownCloud:toolchains:mingw:win32:stable
 
-   Replace ``<version>`` by the version of the client you are building, e.g.
-   |version| for the release of the client that this document describes.
-   If you do not wish to use docker, you can run the commands in ``RUN`` manually
-   in a shell, e.g. to create your own build environment in a virtual machine.
+2. Install the cross-compiler packages and the cross-compiled dependencies::
 
-   .. note:: Docker images are specific to releases. This one refers to |version|.
-             Newer releases may have different dependencies, and thus require a later
-             version of the docker image! Always pick the docker image fitting your release
-             of ownCloud client!
+   zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
+                mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
+                mingw32-headers mingw32-runtime site-config mingw32-libwebp \
+                mingw32-cross-libqt5-qmake mingw32-cross-libqt5-qttools mingw32-libqt5*
 
-2. From within the source tree Run the docker instance::
+3. For the installer, install the NSIS installer package::
 
-     docker run ownCloud-client-win32:<version> -v "$PWD:/home/jenkins/client" \
-                admin/win32/docker/build.sh $(id -u)
+    zypper install mingw32-cross-nsis mingw32-cross-nsis-plugin-uac mingw32-cross-nsis-plugin-nsprocess
 
-   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.
+4. Follow the :ref:`generic-build-instructions`
 
-   If you do not wish to use docker, and ran the ``RUN`` commands above in a virtual machine,
-   you can run the indented commands in the lower section of ``build.sh`` manually in your
-   source tree.
+.. note:: When building for Windows platforms, you must specify a special
+     toolchain file that enables cmake to locate the platform-specific tools. To add
+     this parameter to the call to cmake, enter
+     ``-DCMAKE_TOOLCHAIN_FILE=../client/admin/win/Toolchain-mingw32-openSUSE.cmake``.
 
-4. Finally, you should sign the installer to avoid warnings upon installation.
-   This requires a `Microsoft Authenticode`_ Certificate ``osslsigncode`` to sign the installer::
+5. Build by running ``make``.
 
-     osslsigncode -pkcs12 $HOME/.codesign/packages.pfx -h sha256 \
+.. note:: Using ``make package`` produces an NSIS-based installer, provided
+    the NSIS mingw32 packages are installed.
+
+6. If you want to sign the installer, acquire a `Microsoft Authenticode`_ Certificate and install ``osslsigncode`` to sign the installer::
+
+    zypper install osslsigncode
+
+7. Sign the package::
+
+    osslsigncode -pkcs12 $HOME/.codesign/packages.pfx -h sha1 \
                -pass yourpass \
                -n "ACME Client" \
                -i "http://acme.com" \
@@ -176,7 +179,6 @@ In order to make setup simple, you can use the provided Dockerfile to build your
    for ``-in``, use the URL to the time stamping server provided by your CA along with the Authenticode certificate. Alternatively,
    you may use the official Microsoft ``signtool`` utility on Microsoft Windows.
 
-   If you're familiar with docker, you can use the version of ``osslsigncode`` that is part of the docker image.
 
 .. _generic-build-instructions:
 
@@ -191,31 +193,31 @@ You can download the desktop sync client from the ownCloud `Client Download Page
 
 To build the most up to date version of the client:
 
-1. Clone the latest versions of the client from Git_ as follows::
+1. Clone the latest versions of the client from Git_ as follows:
 
-     git clone git://github.com/owncloud/client.git
-     git submodule init
-     git submodule update
+  ``git clone git://github.com/owncloud/client.git``
+  ``git submodule init``
+  ``git submodule update``
 
-2. Create the build directory::
+2. Create the build directory:
 
-     mkdir client-build
-     cd client-build
+  ``mkdir client-build``
+  ``cd client-build``
 
-3. Configure the client build::
+3. Configure the client build:
 
-     cmake -DCMAKE_BUILD_TYPE="Debug" ../client
+  ``cmake -DCMAKE_BUILD_TYPE="Debug" ../client``
 
-   .. note:: You must use absolute paths for the ``include`` and ``library``
-            directories.
+  ..note:: You must use absolute paths for the ``include`` and ``library``
+           directories.
 
-   .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
-            where ``target`` is a private location, i.e. in parallel to your build
-            dir by specifying ``../install``.
+  ..note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
+           where ``target`` is a private location, i.e. in parallel to your build
+           dir by specifying ``../install``.
 
 4. Call ``make``.
 
-   The owncloud binary will appear in the ``bin`` directory.
+  The owncloud binary will appear in the ``bin`` directory.
 
 The following are known cmake parameters:
 
@@ -239,4 +241,3 @@ The following are known cmake parameters:
 .. _Qt: http://www.qt.io/download
 .. _`Microsoft Authenticode`: https://msdn.microsoft.com/en-us/library/ie/ms537361%28v=vs.85%29.aspx
 .. _QtKeychain: https://github.com/frankosterfeld/qtkeychain
-.. _Packages: http://s.sudre.free.fr/Software/Packages/about.html

doc/conf.py.in

@@ -288,5 +288,3 @@ epub_copyright = u'2013, The ownCloud developers'
 
 # Include todos?
 todo_include_todos = True
-
-rst_epilog =  '.. |version| replace:: %s' % version

shell_integration/nautilus/createnemoplugin.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# this script creates a plugin for nemo, just be replacing
-# all occurences of Nautilus with Nemo.
-
-sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py

shell_integration/nautilus/setappname.sh

@@ -3,4 +3,4 @@
 # this script replaces the line
 #  appname = 'ownCloud'
 # with the correct branding name in the syncstate.py script
-sed -i.org -e 's/appname\s*=\s*'"'"'ownCloud'"'/appname = '$1'/" syncstate.py
+/usr/bin/sed -i.org -e 's/appname\s*=\s*'"'"'ownCloud'"'/appname = '$1'/" syncstate.py

src/gui/folderwatcher_mac.cpp

@@ -63,7 +63,7 @@ static void callback(
         qstring.resize(pathLength);
         CFStringGetCharacters(path, CFRangeMake(0, pathLength), reinterpret_cast<UniChar *>(qstring.data()));
 
-        paths.append(qstring.normalized(QString::NormalizationForm_C));
+        paths.append(qstring);
     }
 
     reinterpret_cast<FolderWatcherPrivate*>(clientCallBackInfo)->doNotifyParent(paths);

src/libsync/CMakeLists.txt

@@ -67,16 +67,11 @@ set(libsync_SRCS
     creds/dummycredentials.cpp
     creds/abstractcredentials.cpp
     creds/credentialscommon.cpp
+    creds/httpcredentials.cpp
     ../3rdparty/qjson/json.cpp
     ../3rdparty/certificates/p12topem.cpp
 )
 
-if(TOKEN_AUTH_ONLY)
-    set (libsync_SRCS ${libsync_SRCS} creds/tokencredentials.cpp)
-else()
-    set (libsync_SRCS ${libsync_SRCS} creds/httpcredentials.cpp)
-endif()
-
 # These headers are installed for libowncloudsync to be used by 3rd party apps
 set(owncloudsync_HEADERS
     account.h

src/libsync/accessmanager.cpp

@@ -24,6 +24,10 @@
 #include "accessmanager.h"
 #include "utility.h"
 
+#include <QInputDialog>
+#include <QMutexLocker>
+#include <QApplication>
+
 namespace OCC
 {
 

src/libsync/creds/httpcredentials.cpp

@@ -17,6 +17,7 @@
 #include <QDebug>
 #include <QNetworkReply>
 #include <QSettings>
+#include <QInputDialog>
 
 #include <keychain.h>
 

src/libsync/creds/tokencredentials.cpp

@@ -121,17 +121,11 @@ bool TokenCredentials::ready() const
     return _ready;
 }
 
-void TokenCredentials::fetchFromKeychain()
+void TokenCredentials::fetch()
 {
     Q_EMIT fetched();
 }
 
-void TokenCredentials::askFromUser()
-{
-    emit asked();
-}
-
-
 bool TokenCredentials::stillValid(QNetworkReply *reply)
 {
     return ((reply->error() != QNetworkReply::AuthenticationRequiredError)

src/libsync/creds/tokencredentials.h

@@ -44,8 +44,7 @@ public:
     QString authType() const Q_DECL_OVERRIDE;
     QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE;
     bool ready() const Q_DECL_OVERRIDE;
-    void askFromUser() Q_DECL_OVERRIDE;
-    void fetchFromKeychain() Q_DECL_OVERRIDE;
+    void fetch() Q_DECL_OVERRIDE;
     bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
     void persist() Q_DECL_OVERRIDE;
     QString user() const Q_DECL_OVERRIDE;

src/libsync/discoveryphase.cpp

@@ -325,6 +325,9 @@ void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(QString file, con
         if( slashPos > -1 ) {
             fileRef = file.midRef(slashPos+1);
         }
+        if( fileRef.startsWith(QChar('.')) ) {
+            file_stat->flags = CSYNC_VIO_FILE_FLAGS_HIDDEN;
+        }
         //qDebug() << "!!!!" << file_stat << file_stat->name << file_stat->file_id << map.count();
         _results.append(file_stat);
     }

translations/client_ca.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Aturat per l&apos;usuari</translation>
     </message>

translations/client_cs.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Zrušeno uživatelem</translation>
     </message>

translations/client_de.ts

@@ -518,7 +518,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Abbruch durch den Benutzer</translation>
     </message>
@@ -2368,7 +2368,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
     <message>
         <location filename="../src/gui/shareusergroupwidget.cpp" line="217"/>
         <source>No results for &apos;%1&apos;</source>
-        <translation>Keine Ergebnisse für &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>

translations/client_el.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Ματαιώθηκε από το χρήστη</translation>
     </message>

translations/client_en.ts

@@ -519,7 +519,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation type="unfinished"></translation>
     </message>

translations/client_es.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Interrumpido por el usuario</translation>
     </message>

translations/client_es_AR.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Interrumpido por el usuario</translation>
     </message>

translations/client_et.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Kasutaja poolt tühistatud</translation>
     </message>

translations/client_eu.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Erabiltzaileak bertan behera utzita</translation>
     </message>
@@ -2855,7 +2855,7 @@ Ez da gomendagarria erabltzea.</translation>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="826"/>
         <source>File name contains at least one invalid character</source>
-        <translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="1015"/>

translations/client_fa.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>متوقف شده توسط کاربر</translation>
     </message>

translations/client_fi.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Keskeytetty käyttäjän toimesta</translation>
     </message>

translations/client_fr.ts

@@ -340,7 +340,7 @@
     <message>
         <location filename="../src/gui/activitywidget.cpp" line="419"/>
         <source>List of ignored or erroneous files</source>
-        <translation>Liste des fichiers ignorés ou en erreur</translation>
+        <translation>Liste de fichiers ignorés ou erronés</translation>
     </message>
     <message>
         <location filename="../src/gui/activitywidget.cpp" line="423"/>
@@ -355,7 +355,7 @@
     <message>
         <location filename="../src/gui/activitywidget.cpp" line="429"/>
         <source>Not Synced</source>
-        <translation>Fichiers non synchronisés</translation>
+        <translation>Non Synchronisé</translation>
     </message>
     <message>
         <location filename="../src/gui/activitywidget.cpp" line="450"/>
@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Interrompu par l&apos;utilisateur</translation>
     </message>
@@ -1123,7 +1123,7 @@ Temps restant total %5</translation>
     <message>
         <location filename="../src/gui/generalsettings.ui" line="129"/>
         <source>S&amp;how crash reporter</source>
-        <translation>Affic&amp;her le rapport d&apos;incident</translation>
+        <translation>A&amp;fficher le rapport d&apos;incident</translation>
     </message>
     <message>
         <location filename="../src/gui/generalsettings.ui" line="156"/>
@@ -1457,7 +1457,7 @@ Les éléments dont la suppression automatique est permise seront supprimés s&a
     <message>
         <location filename="../src/gui/networksettings.cpp" line="128"/>
         <source>Qt &gt;= 5.4 is required in order to use the bandwidth limit</source>
-        <translation>Qt &gt;= 5.4 est requis pour utiliser la limite de bande passante</translation>
+        <translation>Qt &gt;= 5.4 est requis pour pouvoir utiliser la limite de bande passante</translation>
     </message>
 </context>
 <context>
@@ -1492,7 +1492,7 @@ L&apos;assistant peut demander des privilèges additionnels durant le processus.
     <message>
         <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
         <source>%1 version %2 available. Restart application to start the update.</source>
-        <translation>%1 version %2 disponible. Redémarrez l&apos;application pour commencer la mise à jour.</translation>
+        <translation>%1 version %2 disponible. Redémarrez l&apos;application pour démarrer la mise à jour.</translation>
     </message>
     <message>
         <location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
@@ -2352,7 +2352,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
         <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
         <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
         <source>&amp;Share link</source>
-        <translation>Partager par &amp;lien public</translation>
+        <translation>&amp;Partager par lien public</translation>
     </message>
 </context>
 <context>

translations/client_gl.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Interrompido polo usuario</translation>
     </message>

translations/client_hu.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Felhasználó megszakította</translation>
     </message>

translations/client_it.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Interrotto dall&apos;utente</translation>
     </message>

translations/client_ja.ts

@@ -322,7 +322,7 @@
     <message>
         <location filename="../src/gui/activityitemdelegate.cpp" line="147"/>
         <source>%1 on %2 (disconnected)</source>
-        <translation>%2 中 %1 (切断しました)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>ユーザーによって中止されました</translation>
     </message>
@@ -3329,7 +3329,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/gui/application.cpp" line="571"/>
         <source>QT_LAYOUT_DIRECTION</source>
-        <translation>QT_LAYOUT_DIRECTION</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>

translations/client_nb_NO.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Avbrutt av brukeren</translation>
     </message>

translations/client_nl.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Afgebroken door de gebruiker</translation>
     </message>

translations/client_pl.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Anulowane przez użytkownika</translation>
     </message>

translations/client_pt.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Cancelado pelo utilizador</translation>
     </message>

translations/client_pt_BR.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Abortado pelo usuário</translation>
     </message>

translations/client_ru.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Прервано пользов</translation>
     </message>
@@ -3336,7 +3336,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/gui/application.cpp" line="571"/>
         <source>QT_LAYOUT_DIRECTION</source>
-        <translation>QT_LAYOUT_DIRECTION</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>

translations/client_sk.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Zrušené používateľom</translation>
     </message>

translations/client_sl.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
     </message>

translations/client_sr.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Прекинуо корисник</translation>
     </message>

translations/client_sv.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Avbruten av användare</translation>
     </message>

translations/client_th.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>ยกเลิกโดยผู้ใช้</translation>
     </message>

translations/client_tr.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Kullanıcı tarafından iptal edildi</translation>
     </message>

translations/client_uk.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>Перервано користувачем</translation>
     </message>

translations/client_zh_CN.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>用户撤销</translation>
     </message>

translations/client_zh_TW.ts

@@ -517,7 +517,7 @@
 <context>
     <name>OCC::DiscoveryMainThread</name>
     <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
         <source>Aborted by the user</source>
         <translation>使用者中斷</translation>
     </message>