fix compilation with TOKEN_AUTH_ONLY

diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 52360e1ab66d9c8e9f9c4a494e9fcac6505f2a26..ca56c3e4e02b78e462f2330574f01a580f2b90bf 100644 (file)
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -67,11 +67,16 @@ 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

diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp
index 822f5bac9da4c78961e30c810d5e085e85b50a44..a0541c5255716b4e59bffb8a1e148e6603a29c75 100644 (file)
--- a/src/libsync/accessmanager.cpp
+++ b/src/libsync/accessmanager.cpp
@@ -24,10 +24,6 @@
 #include "accessmanager.h"
 #include "utility.h"
 
-#include <QInputDialog>
-#include <QMutexLocker>
-#include <QApplication>
-
 namespace OCC
 {
 

diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp
index fbe78fadd733e8b8fa5ac6c30f6bdab4debc1473..0530a52e5bd3c8ce56e6d2082244e3706d34d78b 100644 (file)
--- a/src/libsync/creds/httpcredentials.cpp
+++ b/src/libsync/creds/httpcredentials.cpp
@@ -17,7 +17,6 @@
 #include <QDebug>
 #include <QNetworkReply>
 #include <QSettings>
-#include <QInputDialog>
 
 #include <keychain.h>
 

diff --git a/src/libsync/creds/tokencredentials.cpp b/src/libsync/creds/tokencredentials.cpp
index 217e0f8ef116ce53660bfd3f20dd531549a1c8e4..97b6be57163395adceafc036af0e0a7e4b444d04 100644 (file)
--- a/src/libsync/creds/tokencredentials.cpp
+++ b/src/libsync/creds/tokencredentials.cpp
@@ -121,11 +121,17 @@ bool TokenCredentials::ready() const
     return _ready;
 }
 
-void TokenCredentials::fetch()
+void TokenCredentials::fetchFromKeychain()
 {
     Q_EMIT fetched();
 }
 
+void TokenCredentials::askFromUser()
+{
+    emit asked();
+}
+
+
 bool TokenCredentials::stillValid(QNetworkReply *reply)
 {
     return ((reply->error() != QNetworkReply::AuthenticationRequiredError)

diff --git a/src/libsync/creds/tokencredentials.h b/src/libsync/creds/tokencredentials.h
index adcf32883047024982452337797209c5e6359367..cf42a4b24fe31abd6b48409aef96fae78f7cc040 100644 (file)
--- a/src/libsync/creds/tokencredentials.h
+++ b/src/libsync/creds/tokencredentials.h
@@ -44,7 +44,8 @@ public:
     QString authType() const Q_DECL_OVERRIDE;
     QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE;
     bool ready() const Q_DECL_OVERRIDE;
-    void fetch() Q_DECL_OVERRIDE;
+    void askFromUser() Q_DECL_OVERRIDE;
+    void fetchFromKeychain() Q_DECL_OVERRIDE;
     bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
     void persist() Q_DECL_OVERRIDE;
     QString user() const Q_DECL_OVERRIDE;