store the public share link url instead of sync URL for public share

fix save/load cycle when we restart client with public share links

Signed-off-by: Matthieu Gallien <[email protected]>

Author: mgallien

src/gui/accountmanager.cpp

@@ -220,7 +220,11 @@ void AccountManager::saveAccountState(AccountState *a)
 void AccountManager::saveAccountHelper(Account *acc, QSettings &settings, bool saveCredentials)
 {
     settings.setValue(QLatin1String(versionC), maxAccountVersion);
-    settings.setValue(QLatin1String(urlC), acc->_url.toString());
+    if (acc->isPublicShareLink()) {
+        settings.setValue(QLatin1String(urlC), acc->publicShareLinkUrl().toString());
+    } else {
+        settings.setValue(QLatin1String(urlC), acc->_url.toString());
+    }
     settings.setValue(QLatin1String(davUserC), acc->_davUser);
     settings.setValue(QLatin1String(serverVersionC), acc->_serverVersion);
     if (acc->_credentials) {

src/libsync/account.cpp

@@ -443,13 +443,24 @@ void Account::setUrl(const QUrl &url)
         _url.setUserName(isPublicLink.captured(2));
         setDavUser(isPublicLink.captured(2));
         _isPublicLink = true;
+        _publicShareLinkUrl = url;
     } else {
         _url = url;
     }
 
     _userVisibleUrl = url;
 }
 
+QUrl Account::url() const
+{
+    return _url;
+}
+
+QUrl Account::publicShareLinkUrl() const
+{
+    return _publicShareLinkUrl;
+}
+
 void Account::setUserVisibleHost(const QString &host)
 {
     _userVisibleUrl.setHost(host);

src/libsync/account.h

@@ -114,7 +114,8 @@ class OWNCLOUDSYNC_EXPORT Account : public QObject
 
     /** Server url of the account */
     void setUrl(const QUrl &url);
-    QUrl url() const { return _url; }
+    QUrl url() const;
+    QUrl publicShareLinkUrl() const;
 
     bool isPublicShareLink() const
     {
@@ -331,6 +332,7 @@ protected Q_SLOTS:
 #endif
     QMap<QString, QVariant> _settingsMap;
     QUrl _url;
+    QUrl _publicShareLinkUrl;
     bool _isPublicLink = false;
 
     /** If url to use for any user-visible urls.