Bump to 1.5.4

CMakeLists.txt

@@ -41,7 +41,6 @@ get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 # if we cannot get it from git, directly try .tag (packages)
 # this will work if the tar balls have been properly created
 # via git-archive.
-if (GIT_SHA1)
 if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
     file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
     string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
@@ -50,7 +49,6 @@ if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
         set (GIT_SHA1 "${sha1_candidate}")
     endif()
 endif()
-endif()
 
 set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
 set(DATADIR ${DATA_INSTALL_DIR})
@@ -74,30 +72,13 @@ else()
 endif()
 #####
 
-# this option removes Http authentication, keychain, shibboleth etc and is intended for
-# external authentication mechanisms
-option(TOKEN_AUTH_ONLY "TOKEN_AUTH_ONLY" OFF)
-if(TOKEN_AUTH_ONLY)
-   message("Compiling with token authentication")
-   add_definitions(-DTOKEN_AUTH_ONLY=1)
-endif()
-
-# this option creates only libocsync and libowncloudsync
-option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)
-
 #### find libs
 #find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest QtWebkit REQUIRED )
 #if( UNIX AND NOT APPLE ) # Fdo notifications
 #    find_package(Qt4 4.7.0 COMPONENTS QtDBus REQUIRED )
 #endif()
 find_package(Neon REQUIRED)
-
-if(NOT TOKEN_AUTH_ONLY)
-	find_package(QtKeychain REQUIRED)
-	set(WITH_QTKEYCHAIN ${QTKEYCHAIN_FOUND})
-else()	
-endif()
-
+find_package(QtKeychain REQUIRED)
 Find_package(Sparkle)
 if(UNIX)
 find_package(INotify REQUIRED)
@@ -107,7 +88,7 @@ endif()
 find_package(Sphinx)
 find_package(PdfLatex)
 
-
+set(WITH_QTKEYCHAIN ${QTKEYCHAIN_FOUND})
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 

ChangeLog

@@ -1,6 +1,9 @@
 ChangeLog
 =========
 
+version 1.5.4 (release 2014-04-11 )
+  * Source identical release, with only version number bumped
+
 version 1.5.3 (release 2014-03-10 )
   * Fix usage of proxies after first sync run (#1502, #1524, #1459, #1521)
   * Do not wipe the credentials from config for reconnect (#1499, #1503)

VERSION.cmake

@@ -1,6 +1,6 @@
 set( MIRALL_VERSION_MAJOR 1 )
 set( MIRALL_VERSION_MINOR 5 )
-set( MIRALL_VERSION_PATCH 3 )
+set( MIRALL_VERSION_PATCH 4 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )

cmake/modules/DefineInstallationPaths.cmake

@@ -33,10 +33,6 @@ if (UNIX)
     "${EXEC_INSTALL_PREFIX}/libexec"
     CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
   )
-  SET(LIB_PRIVATE_INSTALL_DIR
-	  "${LIB_INSTALL_DIR}/${APPLICATION_SHORT_NAME}"
-	  CACHE PATH "The subdirectory relative to the install prefix where private libs are installed"
-	  )
   SET(PLUGIN_INSTALL_DIR
     "${LIB_INSTALL_DIR}/${APPLICATION_SHORT_NAME}"
     CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_SHORT_NAME})"

csync/src/CMakeLists.txt

@@ -32,6 +32,7 @@ set(CSYNC_LIBRARY
 )
 
 set(CSYNC_LINK_LIBRARIES
+  ${CSYNC_LIBRARY}
   ${CSTDLIB_LIBRARY}
   ${CSYNC_REQUIRED_LIBRARIES}
   ${SQLITE3_LIBRARIES}
@@ -99,11 +100,8 @@ include_directories(
 )
 
 add_library(${CSYNC_LIBRARY} SHARED ${csync_SRCS})
-add_library(${CSYNC_LIBRARY}_static STATIC ${csync_SRCS})
-
-target_link_libraries(${CSYNC_LIBRARY} ${CSYNC_LINK_LIBRARIES})
-target_link_libraries(${CSYNC_LIBRARY}_static ${CSYNC_LINK_LIBRARIES})
 
+target_link_libraries(${CSYNC_LINK_LIBRARIES})
 
 set_target_properties(
   ${CSYNC_LIBRARY}
@@ -118,9 +116,9 @@ INSTALL(
   TARGETS
     ${CSYNC_LIBRARY}
   LIBRARY DESTINATION
-    ${PLUGIN_INSTALL_DIR}
+    ${LIB_INSTALL_DIR}
   ARCHIVE DESTINATION
-    ${PLUGIN_INSTALL_DIR}
+    ${LIB_INSTALL_DIR}
   RUNTIME DESTINATION
     ${BIN_INSTALL_DIR}
 )

csync/src/csync_owncloud.c

@@ -480,13 +480,13 @@ static int dav_connect(const char *base_url) {
     DEBUG_WEBDAV("* port %u", port );
     DEBUG_WEBDAV("* path %s", path );
 
-    if( strcmp( scheme, "owncloud" ) == 0 || strcmp( scheme, "http" ) == 0 ) {
+    if( strcmp( scheme, "owncloud" ) == 0 ) {
         strcpy( protocol, "http");
-    } else if( strcmp( scheme, "ownclouds" ) == 0 || strcmp( scheme, "https") == 0 ) {
+    } else if( strcmp( scheme, "ownclouds" ) == 0 ) {
         strcpy( protocol, "https");
         useSSL = 1;
     } else {
-        DEBUG_WEBDAV("Invalid scheme %s, go out here!", scheme );
+        DEBUG_WEBDAV("Invalid scheme %s, go outa here!", scheme );
         rc = -1;
         goto out;
     }
@@ -497,6 +497,15 @@ static int dav_connect(const char *base_url) {
         port = ne_uri_defaultport(protocol);
     }
 
+#if 0
+    rc = ne_sock_init();
+    DEBUG_WEBDAV("ne_sock_init: %d", rc );
+    if (rc < 0) {
+        rc = -1;
+        goto out;
+    }
+#endif
+
     dav_session.ctx = ne_session_create( protocol, host, port);
 
     if (dav_session.ctx == NULL) {
@@ -970,10 +979,7 @@ static csync_vio_method_handle_t *owncloud_opendir(const char *uri) {
 
     DEBUG_WEBDAV("opendir method called on %s", uri );
 
-    if (dav_connect( uri ) < 0) {
-        DEBUG_WEBDAV("connection failed");
-        return NULL;
-    }
+    dav_connect( uri );
 
     curi = _cleanPath( uri );
     if (is_first_propfind && !dav_session.no_recursive_propfind) {

src/CMakeLists.txt

@@ -85,30 +85,19 @@ set(libsync_SRCS
     mirall/clientproxy.cpp
     creds/dummycredentials.cpp
     creds/abstractcredentials.cpp
+    creds/httpcredentials.cpp
     creds/credentialsfactory.cpp
     creds/http/httpconfigfile.cpp
+    creds/shibbolethcredentials.cpp
+    creds/shibboleth/shibbolethaccessmanager.cpp
+    creds/shibboleth/shibbolethcookiejar.cpp
+    creds/shibboleth/shibbolethwebview.cpp
+    creds/shibboleth/shibbolethrefresher.cpp
+    creds/shibboleth/shibbolethconfigfile.cpp
+    creds/shibboleth/authenticationdialog.cpp
     creds/credentialscommon.cpp
     3rdparty/qjson/json.cpp
 )
-if(TOKEN_AUTH_ONLY)
-	set (libsync_SRCS
-		${libsync_SRCS}
-		creds/tokencredentials.cpp
-	)
-	else()
-		set (libsync_SRCS
-			${libsync_SRCS}
-	    	creds/httpcredentials.cpp		
-	    	creds/shibbolethcredentials.cpp
-	    	creds/shibboleth/shibbolethaccessmanager.cpp
-	    	creds/shibboleth/shibbolethcookiejar.cpp
-	    	creds/shibboleth/shibbolethwebview.cpp
-	    	creds/shibboleth/shibbolethrefresher.cpp
-	    	creds/shibboleth/shibbolethconfigfile.cpp
-	    	creds/shibboleth/authenticationdialog.cpp		
-	)	
-endif()
-
 
 set(libsync_HEADERS
     mirall/folderman.h
@@ -130,30 +119,19 @@ set(libsync_HEADERS
     mirall/clientproxy.h
     creds/abstractcredentials.h
     creds/dummycredentials.h
+    creds/httpcredentials.h
     creds/credentialsfactory.h
     creds/http/httpconfigfile.h
+    creds/shibbolethcredentials.h
+    creds/shibboleth/shibbolethaccessmanager.h
+    creds/shibboleth/shibbolethcookiejar.h
+    creds/shibboleth/shibbolethwebview.h
+    creds/shibboleth/shibbolethrefresher.h
+    creds/shibboleth/shibbolethconfigfile.h
+    creds/shibboleth/authenticationdialog.h
     creds/credentialscommon.h
     3rdparty/qjson/json.h
 )
-if(TOKEN_AUTH_ONLY)
-	set (libsync_HEADERS
-	    ${libsync_HEADERS}
-	    creds/tokencredentials.h
-	)
-else()
-	set (libsync_HEADERS
-	    ${libsync_HEADERS}
-	    creds/httpcredentials.h	
-		 creds/shibbolethcredentials.h
-       creds/shibboleth/shibbolethaccessmanager.h
-       creds/shibboleth/shibbolethcookiejar.h
-       creds/shibboleth/shibbolethwebview.h
-       creds/shibboleth/shibbolethrefresher.h
-       creds/shibboleth/shibbolethconfigfile.h
-       creds/shibboleth/authenticationdialog.h
-    )
-endif()
-
 
 IF( NOT WIN32 AND NOT APPLE )
     set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_linux.cpp)
@@ -223,22 +201,15 @@ if(NEON_FOUND)
 endif()
 
 add_library(${synclib_NAME} SHARED ${libsync_SRCS} ${syncMoc})
-add_library(${synclib_NAME}_static STATIC ${libsync_SRCS} ${syncMoc})
 
 qt5_use_modules(${synclib_NAME} Widgets Network Xml WebKitWidgets Sql)
-qt5_use_modules(${synclib_NAME}_static Widgets Network Xml WebKitWidgets Sql)
 
 set_target_properties( ${synclib_NAME}  PROPERTIES
 	VERSION ${MIRALL_VERSION}
 	SOVERSION ${MIRALL_SOVERSION}
 )
-set_target_properties( ${synclib_NAME}_static  PROPERTIES
-	VERSION ${MIRALL_VERSION}
-	SOVERSION ${MIRALL_SOVERSION}
-)
 
 target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
-target_link_libraries(${synclib_NAME}_static ${libsync_LINK_TARGETS} )
 
 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     install(TARGETS ${synclib_NAME}
@@ -305,8 +276,6 @@ set(mirall_SRCS
     mirall/sslbutton.cpp
 )
 
-
-
 set(mirall_HEADERS
     mirall/application.h
     mirall/systray.h
@@ -401,14 +370,14 @@ endif(WITH_DBUS)
 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
-if(NOT WIN32 AND NOT BUILD_LIBRARIES_ONLY)
+if(NOT WIN32)
 	file( GLOB _icons "${theme_dir}/colored/${ICON_APP_NAME}-icon-*.png" )
     foreach( _file ${_icons} )
 	    string( REPLACE "${theme_dir}/colored/${ICON_APP_NAME}-icon-" "" _res ${_file} )
         string( REPLACE ".png" "" _res ${_res} )
 	install( FILES ${_file} RENAME ${ICON_APP_NAME}.png DESTINATION ${DATADIR}/icons/hicolor/${_res}x${_res}/apps )
     endforeach( _file )
-endif(NOT WIN32 AND NOT BUILD_LIBRARIES_ONLY)
+endif(NOT WIN32)
 
     install(FILES ${mirall_I18N} DESTINATION share/${APPLICATION_EXECUTABLE}/i18n)
 
@@ -417,7 +386,7 @@ endif(NOT WIN32 AND NOT BUILD_LIBRARIES_ONLY)
     # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
     add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
     qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
-elseif(NOT BUILD_LIBRARIES_ONLY)
+else()
     set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
     include(DeployQt4)
 
@@ -440,28 +409,25 @@ add_library(updater STATIC ${updater_SRCS} ${updaterMoc})
 target_link_libraries(updater ${synclib_NAME})
 qt5_use_modules(updater Widgets Network Xml)
 
-if(NOT BUILD_LIBRARIES_ONLY)
-  set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
-          RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
-  )
-  target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
-  target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
-  target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
-  target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
-
-  install(TARGETS ${APPLICATION_EXECUTABLE}
-          RUNTIME DESTINATION bin
-          LIBRARY DESTINATION lib
-          ARCHIVE DESTINATION lib
-          BUNDLE  DESTINATION "."
- )
-endif()
+set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
+)
+target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
+target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
+target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
+target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
 
+install(TARGETS ${APPLICATION_EXECUTABLE}
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+        BUNDLE  DESTINATION "."
+)
 
 #FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary
 # currently it needs to be done because the code right above needs to be executed no matter
 # if building a bundle or not and the install_qt4_executable needs to be called afterwards
-if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
+if(BUILD_OWNCLOUD_OSX_BUNDLE)
     install_qt4_executable(${OWNCLOUD_OSX_BUNDLE} "qtaccessiblewidgets;qsqlite")
 endif()
 
@@ -477,16 +443,13 @@ endif()
 
 set(owncloudcmd_NAME ${APPLICATION_EXECUTABLE}cmd)
 set(OWNCLOUDCMD_SRC owncloudcmd/owncloudcmd.cpp)
-if(NOT BUILD_LIBRARIES_ONLY)
-   add_executable(${owncloudcmd_NAME}  ${OWNCLOUDCMD_SRC})
-	qt5_use_modules(${owncloudcmd_NAME} Network Sql)
-	set_target_properties(${owncloudcmd_NAME} PROPERTIES
-		        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
-	target_link_libraries(${owncloudcmd_NAME} ${synclib_NAME})
-endif()
-
+add_executable(${owncloudcmd_NAME}  ${OWNCLOUDCMD_SRC})
+qt5_use_modules(${owncloudcmd_NAME} Network Sql)
+set_target_properties(${owncloudcmd_NAME} PROPERTIES
+	        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
+target_link_libraries(${owncloudcmd_NAME} ${synclib_NAME})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mirall)
-if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
+if(BUILD_OWNCLOUD_OSX_BUNDLE)
     install(TARGETS ${owncloudcmd_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
     if (SPARKLE_FOUND)
         install(FILES ${CMAKE_SOURCE_DIR}/admin/osx/deny_autoupdate_com.owncloud.desktopclient.plist
@@ -494,7 +457,7 @@ if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
         install(FILES ${CMAKE_SOURCE_DIR}/admin/osx/sparkle/dsa_pub.pem
                 DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources)
     endif()
-elseif(NOT BUILD_LIBRARIES_ONLY)
+else()
     install(TARGETS ${owncloudcmd_NAME}
 	    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 	    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

src/creds/credentialsfactory.cpp

@@ -13,13 +13,9 @@
 
 #include <QString>
 
-#ifdef TOKEN_AUTH_ONLY
-#include "creds/tokencredentials.h"
-#else
 #include "creds/httpcredentials.h"
 #include "creds/dummycredentials.h"
 #include "creds/shibbolethcredentials.h"
-#endif
 
 namespace Mirall
 {
@@ -29,10 +25,6 @@ namespace CredentialsFactory
 
 AbstractCredentials* create(const QString& type)
 {
-#ifdef TOKEN_AUTH_ONLY
-	return new TokenCredentials;
-#else
-	
     // empty string might happen for old version of configuration
     if (type == "http" || type == "") {
         return new HttpCredentials;
@@ -44,7 +36,6 @@ AbstractCredentials* create(const QString& type)
         qWarning("Unknown credentials type: %s", qPrintable(type));
         return new DummyCredentials;
     }
-#endif
 }
 
 } // ns CredentialsFactory

src/creds/httpcredentials.cpp

@@ -266,11 +266,13 @@ void HttpCredentials::slotReadJobDone(QKeychain::Job *job)
 
 QString HttpCredentials::queryPassword(bool *ok)
 {
+    qDebug() << AccountManager::instance()->account()->state();
     if (ok) {
         QString str = QInputDialog::getText(0, tr("Enter Password"),
                                      tr("Please enter %1 password for user '%2':")
                                      .arg(Theme::instance()->appNameGUI(), _user),
                                      QLineEdit::Password, QString(), ok);
+        qDebug() << AccountManager::instance()->account()->state();
         return str;
     } else {
         return QString();

src/creds/tokencredentials.cpp

@@ -1,240 +0,0 @@
-/*
- * Copyright (C) by Klaas Freitag <freitag@kde.org>
- * Copyright (c) by Markus Goetz <guruz@owncloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-#include <QMutex>
-#include <QDebug>
-#include <QNetworkReply>
-#include <QSettings>
-#include <QInputDialog>
-
-
-#include "mirall/account.h"
-#include "mirall/mirallaccessmanager.h"
-#include "mirall/utility.h"
-#include "mirall/theme.h"
-#include "creds/credentialscommon.h"
-#include "creds/tokencredentials.h"
-
-
-namespace Mirall
-{
-
-namespace
-{
-
-int getauth(const char *prompt,
-            char *buf,
-            size_t len,
-            int echo,
-            int verify,
-            void *userdata)
-{
-    int re = 0;
-    QMutex mutex;
-    // ### safe?
-    TokenCredentials* http_credentials = qobject_cast<TokenCredentials*>(AccountManager::instance()->account()->credentials());
-
-    if (!http_credentials) {
-      qDebug() << "Not a HTTP creds instance!";
-      return -1;
-    }
-
-    QString qPrompt = QString::fromLatin1( prompt ).trimmed();
-    QString user = http_credentials->user();
-    QString pwd  = http_credentials->password();
-
-    if( qPrompt == QLatin1String("Enter your username:") ) {
-        // qDebug() << "OOO Username requested!";
-        QMutexLocker locker( &mutex );
-        qstrncpy( buf, user.toUtf8().constData(), len );
-    } else if( qPrompt == QLatin1String("Enter your password:") ) {
-        QMutexLocker locker( &mutex );
-        // qDebug() << "OOO Password requested!";
-        qstrncpy( buf, pwd.toUtf8().constData(), len );
-    } else {
-        re = handleNeonSSLProblems(prompt, buf, len, echo, verify, userdata);
-    }
-    return re;
-}
-
-const char userC[] = "user";
-
-} // ns
-
-class TokenCredentialsAccessManager : public MirallAccessManager {
-public:
-    TokenCredentialsAccessManager(const TokenCredentials *cred, QObject* parent = 0)
-        : MirallAccessManager(parent), _cred(cred) {}
-protected:
-    QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) {
-        QByteArray credHash = QByteArray(_cred->user().toUtf8()+":"+_cred->password().toUtf8()).toBase64();
-        QNetworkRequest req(request);
-        req.setRawHeader(QByteArray("Authorization"), QByteArray("Basic ") + credHash);
-        //qDebug() << "Request for " << req.url() << "with authorization" << QByteArray::fromBase64(credHash);
-        return MirallAccessManager::createRequest(op, req, outgoingData);
-    }
-private:
-    const TokenCredentials *_cred;
-};
-
-TokenCredentials::TokenCredentials()
-    : _user(),
-      _password(),
-      _ready(false)
-{
-}
-
-TokenCredentials::TokenCredentials(const QString& user, const QString& password)
-    : _user(user),
-      _password(password),
-      _ready(true)
-{
-}
-
-void TokenCredentials::syncContextPreInit (CSYNC* ctx)
-{
-    csync_set_auth_callback (ctx, getauth);
-}
-
-void TokenCredentials::syncContextPreStart (CSYNC* ctx)
-{
-    // TODO: This should not be a part of this method, but we don't have
-    // any way to get "session_key" module property from csync. Had we
-    // have it, then we could remove this code and keep it in
-    // csyncthread code (or folder code, git remembers).
-    QList<QNetworkCookie> cookies(AccountManager::instance()->account()->lastAuthCookies());
-    QString cookiesAsString;
-
-    // Stuff cookies inside csync, then we can avoid the intermediate HTTP 401 reply
-    // when https://github.com/owncloud/core/pull/4042 is merged.
-    foreach(QNetworkCookie c, cookies) {
-        cookiesAsString += c.name();
-        cookiesAsString += '=';
-        cookiesAsString += c.value();
-        cookiesAsString += "; ";
-    }
-
-    csync_set_module_property(ctx, "session_key", cookiesAsString.toLatin1().data());
-}
-
-bool TokenCredentials::changed(AbstractCredentials* credentials) const
-{
-    TokenCredentials* other(dynamic_cast< TokenCredentials* >(credentials));
-
-    if (!other || (other->user() != this->user())) {
-        return true;
-    }
-
-    return false;
-}
-
-QString TokenCredentials::authType() const
-{
-    return QString::fromLatin1("http");
-}
-
-QString TokenCredentials::user() const
-{
-    return _user;
-}
-
-QString TokenCredentials::password() const
-{
-    return _password;
-}
-
-QNetworkAccessManager* TokenCredentials::getQNAM() const
-{
-    MirallAccessManager* qnam = new TokenCredentialsAccessManager(this);
-
-    connect( qnam, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
-             this, SLOT(slotAuthentication(QNetworkReply*,QAuthenticator*)));
-
-    return qnam;
-}
-
-bool TokenCredentials::ready() const
-{
-    return _ready;
-}
-
-QString TokenCredentials::fetchUser(Account* account)
-{
-    _user = account->credentialSetting(QLatin1String(userC)).toString();
-    return _user;
-}
-
-void TokenCredentials::fetch(Account *account)
-{
-    if( !account ) {
-        return;
-    }
-    Q_EMIT fetched();
-}
-bool TokenCredentials::stillValid(QNetworkReply *reply)
-{
-    return ((reply->error() != QNetworkReply::AuthenticationRequiredError)
-            // returned if user or password is incorrect
-            && (reply->error() != QNetworkReply::OperationCanceledError));
-}
-
-QString TokenCredentials::queryPassword(bool *ok)
-{
-    qDebug() << AccountManager::instance()->account()->state();
-    if (ok) {
-        QString str = QInputDialog::getText(0, tr("Enter Password"),
-                                     tr("Please enter %1 password for user '%2':")
-                                     .arg(Theme::instance()->appNameGUI(), _user),
-                                     QLineEdit::Password, QString(), ok);
-        qDebug() << AccountManager::instance()->account()->state();
-        return str;
-    } else {
-        return QString();
-    }
-}
-
-void TokenCredentials::invalidateToken(Account *account)
-{
-    _password = QString();
-    _ready = false;
-
-    // User must be fetched from config file to generate a valid key
-    fetchUser(account);
-
-    const QString kck = keychainKey(account->url().toString(), _user);
-    if( kck.isEmpty() ) {
-        qDebug() << "InvalidateToken: User is empty, bailing out!";
-        return;
-    }
-
-    account->clearCookieJar();
-}
-
-void TokenCredentials::persist(Account *account)
-{
-}
-
-
-void TokenCredentials::slotAuthentication(QNetworkReply* reply, QAuthenticator* authenticator)
-{
-    Q_UNUSED(authenticator)
-    // we cannot use QAuthenticator, because it sends username and passwords with latin1
-    // instead of utf8 encoding. Instead, we send it manually. Thus, if we reach this signal,
-    // those credentials were invalid and we terminate.
-    qDebug() << "Stop request: Authentication failed for " << reply->url().toString();
-    reply->close();
-}
-
-} // ns Mirall

src/creds/tokencredentials.h

@@ -1,67 +0,0 @@
-/*
- * Copyright (C) by Klaas Freitag <freitag@kde.org>
- * Copyright (c) by Markus Goetz <guruz@owncloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-#ifndef MIRALL_CREDS_HTTP_CREDENTIALS_H
-#define MIRALL_CREDS_HTTP_CREDENTIALS_H
-
-#include <QMap>
-
-#include "creds/abstractcredentials.h"
-
-class QNetworkReply;
-class QAuthenticator;
-
-namespace QKeychain {
-class Job;
-}
-
-namespace Mirall
-{
-
-class TokenCredentials : public AbstractCredentials
-{
-    Q_OBJECT
-
-public:
-    TokenCredentials();
-    TokenCredentials(const QString& user, const QString& password);
-
-    void syncContextPreInit(CSYNC* ctx);
-    void syncContextPreStart(CSYNC* ctx);
-    bool changed(AbstractCredentials* credentials) const;
-    QString authType() const;
-    QNetworkAccessManager* getQNAM() const;
-    bool ready() const;
-    void fetch(Account *account);
-    bool stillValid(QNetworkReply *reply);
-    void persist(Account *account);
-    QString user() const;
-    QString password() const;
-    QString queryPassword(bool *ok);
-    void invalidateToken(Account *account);
-    QString fetchUser(Account *account);
-
-private Q_SLOTS:
-    void slotAuthentication(QNetworkReply*, QAuthenticator*);
-
-private:
-    QString _user;
-    QString _password;
-    bool _ready;
-};
-
-} // ns Mirall
-
-#endif

src/mirall/csyncthread.cpp

@@ -335,7 +335,6 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote )
             // No need to do anything.
             _hasFiles = true;
 
-            emit syncItemDisconvered(item);
             return re;
         }
         break;
@@ -376,7 +375,6 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote )
     }
     _syncedItems.append(item);
 
-    emit syncItemDisconvered(item);
     return re;
 }
 
@@ -490,6 +488,8 @@ void CSyncThread::startSync()
     // }
 
     // csync_set_auth_callback( _csync_ctx, getauth );
+    csync_set_log_callback( csyncLogCatcher );
+    csync_set_log_level( 11 );
 
     _syncTime.start();
 

src/mirall/csyncthread.h

@@ -62,11 +62,6 @@ signals:
     void csyncError( const QString& );
     void csyncWarning( const QString& );
     void csyncUnavailable();
-
-    // before actual syncing (after update+reconcile)
-    void syncItemDisconvered(const SyncFileItem&);
-
-    // after sync is done
     void treeWalkResult(const SyncFileItemVector&);
 
     void transmissionProgress( const Progress::Info& progress );

src/mirall/folderwatcher_linux.cpp

@@ -22,7 +22,6 @@
 #include <QDebug>
 #include <QStringList>
 #include <QObject>
-#include <QVarLengthArray>
 
 namespace Mirall {
 
@@ -130,10 +129,13 @@ void FolderWatcherPrivate::slotReceivedNotification(int fd)
     struct inotify_event* event;
     int i;
     int error;
-    QVarLengthArray<char, 2048> buffer(2048);
+    char *buffer = NULL;
+    int buf_size = 2048;
+
+    buffer = (char*) malloc(buf_size);
 
     do {
-         len = read(fd, buffer.data(), buffer.size());
+         len = read(fd, buffer, buf_size);
          error = errno;
          /**
           * From inotify documentation:
@@ -147,7 +149,8 @@ void FolderWatcherPrivate::slotReceivedNotification(int fd)
          if (len < 0 && error == EINVAL)
          {
              // double the buffer size
-             buffer.resize(buffer.size() * 2);
+             buf_size *= 2;
+             buffer = (char *) realloc(buffer, buf_size);
              /* and try again ... */
              continue;
          }

src/mirall/networkjobs.cpp

@@ -531,11 +531,9 @@ void CheckQuotaJob::finished()
                     reader.namespaceUri() == QLatin1String("DAV:")) {
                 QString name = reader.name().toString();
                 if (name == QLatin1String("quota-available-bytes")) {
-                    // I have seen the server returning frational bytes:
-                    //   <d:quota-available-bytes>1374532061.2</d:quota-available-bytes>
-                    quotaAvailableBytes = reader.readElementText().toDouble();
+                    quotaAvailableBytes = reader.readElementText().toLongLong();
                 } else if (name == QLatin1String("quota-used-bytes")) {
-                    quotaUsedBytes = reader.readElementText().toDouble();
+                    quotaUsedBytes = reader.readElementText().toLongLong();
                 }
             }
         }

src/mirall/owncloudpropagator.cpp

@@ -122,10 +122,6 @@ bool PropagateItemJob::checkForProblemsWithShared(const QString& msg)
             } else if (downloadItem._instruction == CSYNC_INSTRUCTION_SYNC) {
                 // we modified the file locally, jsut create a conflict then
                 downloadItem._instruction = CSYNC_INSTRUCTION_CONFLICT;
-
-                // HACK to avoid continuation: See task #1448:  We do not know the _modtime from the
-                //  server, at this point, so just set the current one. (rather than the one locally)
-                downloadItem._modtime = Utility::qDateTimeToTime_t(QDateTime::currentDateTime());
             } else {
                 // the file was removed or renamed, just recover the old one
                 downloadItem._instruction = CSYNC_INSTRUCTION_SYNC;

src/mirall/quotainfo.cpp

@@ -52,10 +52,10 @@ void QuotaInfo::slotAccountStateChanged(int state)
     switch (state) {
     case Account::SignedOut: // fall through
     case Account::InvalidCredidential:
-    case Account::Disconnected:
         _jobRestartTimer->stop();
         break;
     case Account::Connected: // fall through
+    case Account::Disconnected:
         slotCheckQuota();
     }
 }
@@ -75,8 +75,7 @@ void QuotaInfo::slotRequestFailed()
 
 void QuotaInfo::slotCheckQuota()
 {
-    if (!_account.isNull() && _account->state() == Account::Connected
-            && _account->credentials() && _account->credentials()->ready()) {
+    if (!_account.isNull() && _account->credentials() && _account->credentials()->ready()) {
         CheckQuotaJob *job = new CheckQuotaJob(_account, "/", this);
         connect(job, SIGNAL(quotaRetrieved(qint64,qint64)), SLOT(slotUpdateLastQuota(qint64,qint64)));
         connect(job, SIGNAL(networkError(QNetworkReply*)), SLOT(slotRequestFailed()));

src/mirall/utility_unix.cpp

@@ -26,30 +26,17 @@ static void setupFavLink_private(const QString &folder) {
     }
 }
 
-// returns the autostart directory the linux way
-// and respects the XDG_CONFIG_HOME env variable
-// can be replaces for qt5 with QStandardPaths
-QString getUserAutostartDir_private()
-{
-    QString config = QLatin1String(qgetenv("XDG_CONFIG_HOME"));
-
-    if (config.isEmpty()) {
-        config = QDir::homePath()+QLatin1String("/.config");
-    }
-    config += QLatin1String("/autostart/");
-    return config;
-}
-
 bool hasLaunchOnStartup_private(const QString &appName)
 {
-    QString desktopFileLocation = getUserAutostartDir_private()+appName+QLatin1String(".desktop");
+    QString userAutoStartPath = QDir::homePath()+QLatin1String("/.config/autostart/");
+    QString desktopFileLocation = userAutoStartPath+appName+QLatin1String(".desktop");
     return QFile::exists(desktopFileLocation);
 }
 
 
 void setLaunchOnStartup_private(const QString &appName, const QString& guiName, bool enable)
 {
-    QString userAutoStartPath = getUserAutostartDir_private();
+    QString userAutoStartPath = QDir::homePath()+QLatin1String("/.config/autostart/");
     QString desktopFileLocation = userAutoStartPath+appName+QLatin1String(".desktop");
     if (enable) {
         if (!QDir().exists(userAutoStartPath) && !QDir().mkdir(userAutoStartPath)) {

src/owncloudcmd/owncloudcmd.cpp

@@ -126,7 +126,6 @@ int main(int argc, char **argv) {
         qFatal("ne_sock_init failed!");
     }
 
-    csync_set_log_callback( csyncLogCatcher );
     csync_set_log_level(11);
     csync_enable_conflictcopys(_csync_ctx);
     Logger::instance()->setLogFile("-");
@@ -178,10 +177,7 @@ int main(int argc, char **argv) {
     SyncJournalDb db(options.source_dir);
     CSyncThread csyncthread(_csync_ctx, options.source_dir, QUrl(options.target_url).path(), &db);
     QObject::connect(&csyncthread, SIGNAL(finished()), &app, SLOT(quit()));
-
-    // Have to be done async, else, an error while updating does not terminate the event loop.
-    QMetaObject::invokeMethod(&csyncthread, "startSync", Qt::QueuedConnection);
-
+    csyncthread.startSync();
 
     app.exec();