Merge pull request #9061 from DmySyz/preserve-selected-account-between-runs

feat: preserve the last selected account between runs

Author: mgallien

src/gui/accountmanager.cpp

@@ -108,18 +108,21 @@ AccountManager::AccountsRestoreResult AccountManager::restore(const bool alsoRes
     if (skipSettingsKeys.contains(settings->group())) {
         // Should not happen: bad container keys should have been deleted
         qCWarning(lcAccountManager) << "Accounts structure is too new, ignoring";
+        emit(accountListInitialized());
         return AccountsRestoreSuccessWithSkipped;
     }
 
     // If there are no accounts, check the old format.
 #if !DISABLE_ACCOUNT_MIGRATION
     if (settings->childGroups().isEmpty() && !settings->contains(QLatin1String(versionC)) && alsoRestoreLegacySettings) {
         restoreFromLegacySettings();
+        emit(accountListInitialized());
         return AccountsRestoreSuccessFromLegacyVersion;
     }
 #endif
 
     if (settings->childGroups().isEmpty()) {
+        emit(accountListInitialized());
         return AccountsNotFound;
     }
 
@@ -149,6 +152,8 @@ AccountManager::AccountsRestoreResult AccountManager::restore(const bool alsoRes
         }
     }
 
+    emit(accountListInitialized());
+
     ConfigFile().cleanupGlobalNetworkConfiguration();
     ClientProxy().cleanupGlobalNetworkConfiguration();   
 

src/gui/accountmanager.h

@@ -108,6 +108,7 @@ public slots:
     void removeAccountFolders(OCC::AccountState *account);
     void forceLegacyImportChanged();
     void capabilitiesChanged();
+    void accountListInitialized();
 
 private:
     // saving and loading Account to settings

src/gui/tray/usermodel.cpp

@@ -1334,13 +1334,14 @@ UserModel *UserModel::instance()
 UserModel::UserModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    // TODO: Remember selected user from last quit via settings file
     if (AccountManager::instance()->accounts().size() > 0) {
-        buildUserList();
+        setInitialUser();
     }
 
     connect(AccountManager::instance(), &AccountManager::accountAdded,
-        this, &UserModel::buildUserList);
+        this, &UserModel::addAccsToUserList);
+    connect(AccountManager::instance(), &AccountManager::accountListInitialized,
+        this, &UserModel::setInitialUser);
 }
 
 void UserModel::buildUserList()
@@ -1349,10 +1350,41 @@ void UserModel::buildUserList()
         auto user = AccountManager::instance()->accounts().at(i);
         addUser(user);
     }
+}
+
+void UserModel::addAccsToUserList()
+{
     if (_init) {
-        _users.first()->setCurrentUser(true);
-        _init = false;
+        return;
     }
+
+    buildUserList();
+}
+
+void UserModel::setInitialUser()
+{
+    if (!_init) {
+        return;
+    }
+
+    buildUserList();
+
+    if(!_users.isEmpty()) {
+        ConfigFile cfg;
+        const uint lastSelectedAccountId = cfg.lastSelectedAccount();
+
+        for (int i = 0; i <  _users.size(); i++) {
+            if (_users.at(i)->account()->id().toUInt() == lastSelectedAccountId) {
+                setCurrentUserId(i);
+            }
+        }
+
+        if (_currentUserId < 0) {
+            setCurrentUserId(0);
+        }
+    }
+
+    _init = false;
 }
 
 int UserModel::numUsers()
@@ -1430,7 +1462,7 @@ void UserModel::addUser(AccountStatePtr &user, const bool &isCurrent)
         });
 
         _users << u;
-        if (isCurrent || _currentUserId < 0) {
+        if (isCurrent || (_currentUserId < 0 && !_init)) {
             setCurrentUserId(_users.size() - 1);
         }
 
@@ -1524,6 +1556,8 @@ void UserModel::setCurrentUserId(const int id)
         // order has changed, index remained the same
         emit currentUserChanged();
     } else if (_currentUserId != id) {
+        ConfigFile cfg;
+        cfg.setLastSelectedAccount(_users[id]->account()->id().toUInt());
         _currentUserId = id;
         emit currentUserChanged();
     }

src/gui/tray/usermodel.h

@@ -292,6 +292,8 @@ public slots:
     bool _init = true;
 
     void buildUserList();
+    void addAccsToUserList();
+    void setInitialUser();
 };
 
 class ImageProvider : public QQuickAsyncImageProvider

src/libsync/configfile.cpp

@@ -83,6 +83,9 @@ static const QStringList enterpriseUpdateChannelsList { QStringLiteral("stable")
 static const QString defaultEnterpriseChannel = "enterprise";
 
 static constexpr char languageC[] = "language";
+
+static constexpr char lastSelectedAccountC[] = "lastSelectedAccount";
+
 static constexpr int deleteFilesThresholdDefaultValue = 100;
 }
 
@@ -1227,6 +1230,18 @@ void ConfigFile::setLanguage(const QString& language)
     settings.setValue(QLatin1String(languageC), language);
 }
 
+uint ConfigFile::lastSelectedAccount() const
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    return settings.value(QLatin1String(lastSelectedAccountC), QLatin1String("")).toUInt();
+}
+
+void ConfigFile::setLastSelectedAccount(const uint accountId)
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    settings.setValue(QLatin1String(lastSelectedAccountC), accountId);
+}
+
 Q_GLOBAL_STATIC(QString, g_configFileName)
 
 std::unique_ptr<QSettings> ConfigFile::settingsWithGroup(const QString &group, QObject *parent)

src/libsync/configfile.h

@@ -242,6 +242,10 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
     [[nodiscard]] QString language() const;
     void setLanguage(const QString &language);
 
+    /// Store and retrieve the last selected account identifier
+    [[nodiscard]] uint lastSelectedAccount() const;
+    void setLastSelectedAccount(const uint accountId);
+
     /**  Returns a new settings pre-set in a specific group.  The Settings will be created
          with the given parent. If no parent is specified, the caller must destroy the settings */
     static std::unique_ptr<QSettings> settingsWithGroup(const QString &group, QObject *parent = nullptr);