feat: preserve the last selected account between runs

Added an extra setting in the config that contains an account id to
  store the last one selected

Modified usermodel logic to auto select the account using the id from
  the config

Signed-off-by: Dmytro Syzov <[email protected]>

Author: DmySyz

src/gui/tray/usermodel.cpp

@@ -1334,7 +1334,6 @@ 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();
     }
@@ -1343,14 +1342,26 @@ UserModel::UserModel(QObject *parent)
         this, &UserModel::buildUserList);
 }
 
+// TODO: refactor buildUserList usage. Currently it is called for every account
 void UserModel::buildUserList()
 {
     for (int i = 0; i < AccountManager::instance()->accounts().size(); i++) {
         auto user = AccountManager::instance()->accounts().at(i);
         addUser(user);
     }
+
+    // TODO: consider generating random IDs in the future instead of 0, 1, 2 etc
+    if(!_users.isEmpty()) {
+        ConfigFile cfg;
+        const int lastSelectedAccountId = cfg.lastSelectedAccount();
+        if(lastSelectedAccountId < _users.size() && lastSelectedAccountId >= 0) {
+            setCurrentUserId(lastSelectedAccountId);
+        } else {
+            setCurrentUserId(0);
+        }
+    }
+
     if (_init) {
-        _users.first()->setCurrentUser(true);
         _init = false;
     }
 }
@@ -1524,6 +1535,11 @@ void UserModel::setCurrentUserId(const int id)
         // order has changed, index remained the same
         emit currentUserChanged();
     } else if (_currentUserId != id) {
+        // avoid overwriting as it will always be set to 0 at first
+        if (_currentUserId >= 0) {
+            ConfigFile cfg;
+            cfg.setLastSelectedAccount(id);
+        }
         _currentUserId = id;
         emit currentUserChanged();
     }

src/libsync/configfile.cpp

@@ -96,6 +96,8 @@ static const QString defaultEnterpriseChannel = "enterprise";
 
 static constexpr char languageC[] = "language";
 
+static constexpr char lastSelectedAccountC[] = "lastSelectedAccount";
+
 static constexpr int deleteFilesThresholdDefaultValue = 100;
 }
 
@@ -1255,6 +1257,18 @@ void ConfigFile::setLanguage(const QString& language)
     settings.setValue(QLatin1String(languageC), language);
 }
 
+int ConfigFile::lastSelectedAccount() const
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    return settings.value(QLatin1String(lastSelectedAccountC), QLatin1String("")).toInt();
+}
+
+void ConfigFile::setLastSelectedAccount(const int 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

@@ -238,6 +238,10 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
     [[nodiscard]] QString language() const;
     void setLanguage(const QString &language);
 
+    /// Store and retrieve the last selected account identifier
+    [[nodiscard]] int lastSelectedAccount() const;
+    void setLastSelectedAccount(const int 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);