Don't persist cookies (#9668)

3 files changed, 0 insertions, 85 deletions

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 0087eba0e..2b18fa52d 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -199,7 +199,6 @@ void Account::clearCookieJar()
     OC_ASSERT(jar);
     qCInfo(lcAccount) << "Clearing cookies";
     jar->setAllCookies(QList<QNetworkCookie>());
-    emit wantsAccountSaved(this);
 }
 
 /*! This shares our official cookie jar (containing all the tasty
diff --git a/src/libsync/cookiejar.cpp b/src/libsync/cookiejar.cpp
index 75535d876..72d3f4cbb 100644
--- a/src/libsync/cookiejar.cpp
+++ b/src/libsync/cookiejar.cpp
@@ -27,46 +27,6 @@ namespace OCC {
 
 Q_LOGGING_CATEGORY(lcCookieJar, "sync.cookiejar", QtInfoMsg)
 
-namespace {
-    const unsigned int JAR_VERSION = 23;
-}
-
-QDataStream &operator<<(QDataStream &stream, const QList<QNetworkCookie> &list)
-{
-    stream << JAR_VERSION;
-    stream << quint32(list.size());
-    for (int i = 0; i < list.size(); ++i)
-        stream << list.at(i).toRawForm();
-    return stream;
-}
-
-QDataStream &operator>>(QDataStream &stream, QList<QNetworkCookie> &list)
-{
-    list.clear();
-
-    quint32 version;
-    stream >> version;
-
-    if (version != JAR_VERSION)
-        return stream;
-
-    quint32 count;
-    stream >> count;
-    for (quint32 i = 0; i < count; ++i) {
-        QByteArray value;
-        stream >> value;
-        QList<QNetworkCookie> newCookies = QNetworkCookie::parseCookies(value);
-        if (newCookies.count() == 0 && value.length() != 0) {
-            qCWarning(lcCookieJar) << "CookieJar: Unable to parse saved cookie:" << value;
-        }
-        for (int j = 0; j < newCookies.count(); ++j)
-            list.append(newCookies.at(j));
-        if (stream.atEnd())
-            break;
-    }
-    return stream;
-}
-
 CookieJar::CookieJar(QObject *parent)
     : QNetworkCookieJar(parent)
 {
@@ -98,47 +58,6 @@ void CookieJar::clearSessionCookies()
     setAllCookies(removeExpired(allCookies()));
 }
 
-bool CookieJar::save(const QString &fileName)
-{
-    const QFileInfo info(fileName);
-    if (!info.dir().exists())
-    {
-        info.dir().mkpath(QStringLiteral("."));
-    }
-
-    qCDebug(lcCookieJar) << fileName;
-    QFile file(fileName);
-    if (!file.open(QIODevice::WriteOnly))
-    {
-        return false;
-    }
-    QDataStream stream(&file);
-    stream << removeExpired(allCookies());
-    file.close();
-    return true;
-}
-
-bool CookieJar::restore(const QString &fileName)
-{
-    const QFileInfo info(fileName);
-    if (!info.exists())
-    {
-        return false;
-    }
-
-    QFile file(fileName);
-    if (!file.open(QIODevice::ReadOnly))
-    {
-        return false;
-    }
-    QDataStream stream(&file);
-    QList<QNetworkCookie> list;
-    stream >> list;
-    setAllCookies(removeExpired(list));
-    file.close();
-    return true;
-}
-
 QList<QNetworkCookie> CookieJar::removeExpired(const QList<QNetworkCookie> &cookies)
 {
     QList<QNetworkCookie> updatedList;
diff --git a/src/libsync/cookiejar.h b/src/libsync/cookiejar.h
index 6d3703aaa..2346f1b4a 100644
--- a/src/libsync/cookiejar.h
+++ b/src/libsync/cookiejar.h
@@ -39,9 +39,6 @@ public:
     using QNetworkCookieJar::setAllCookies;
     using QNetworkCookieJar::allCookies;
 
-    bool save(const QString &fileName);
-    bool restore(const QString &fileName);
-
 signals:
     void newCookiesForUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url);