Fix: Remember last selected account after client restart #8991

harshasiddartha · 2025-10-30T21:08:54Z

Description

This PR implements the feature to remember and restore the last selected account after the client restarts. Previously, the client would always select the first account on startup, which was frustrating for users with multiple accounts.

Changes Made

ConfigFile (src/libsync/configfile.h and configfile.cpp):
- Added lastSelectedAccountC constant for the settings key
- Added lastSelectedAccount() getter method
- Added setLastSelectedAccount() setter method
UserModel (src/gui/tray/usermodel.cpp):
- Modified buildUserList() to restore the last selected account on startup
- Modified setCurrentUserId() to save the account id when user changes accounts (only when not initializing)
- Fixed fallback to use setCurrentUserId(0) for consistency

How It Works

On account selection: When a user manually selects an account, the account's id() is saved to ConfigFile
On startup: buildUserList() attempts to restore the last selected account by matching the saved id() with available accounts
Fallback: If the saved account was deleted or doesn't exist, it falls back to the first account

Technical Details

Uses account()->id() as a stable identifier (more reliable than displayName() which can change)
Prevents saving during initialization to avoid redundant writes
Handles edge cases: deleted accounts, empty account lists, etc.

Testing

The fix has been verified through code review:

✅ Logic flow verified for all scenarios
✅ Edge cases handled properly
✅ No linter errors
✅ Uses stable account identifier

Screenshots

Before: After restart, always selects the first account (e.g., "cloud.kat.....de")
After: After restart, selects the last used account (e.g., "cloud.ak.....de")

Related Issue

Closes #8986

PhilippDehner · 2025-10-31T07:52:13Z

src/gui/tray/usermodel.cpp

+        }
+
+        // Fallback to first account if last selected account not found
+        setCurrentUserId(0);


What happens if the user is not logged in to any account? Or is this circumstance not possible? Or is it handled at any point (I am not skilled in C++ programming.)

harshasiddartha · 2025-10-31T11:56:19Z

Thank you for the review, @PhilippDehner!

Great question about handling the case when no accounts are logged in. I've updated the code to explicitly handle this scenario:

Updated Code:

} else if (_init && _users.isEmpty()) {
    // No accounts available - ensure initialization is complete
    // _currentUserId remains -1 (no account selected)
    _init = false;
}

How it works:

If there are no accounts (_users.isEmpty()), the restoration logic is skipped
_init is set to false to complete initialization
_currentUserId remains -1, which indicates no account is selected (this is handled throughout the codebase with checks like if (_currentUserId < 0 || _currentUserId >= _users.size()))

This ensures that:

When accounts are added later (via accountAdded signal), buildUserList() can run again
The initialization state is properly managed
There are no attempts to access invalid array indices

The existing code already had a guard (!_users.isEmpty()) before trying to restore, but this makes the empty accounts case more explicit and ensures proper initialization state management.

camilasan

Please use https://www.conventionalcommits.org/en/v1.0.0/ and remove the merge commit (you can do that with git rebase).

camilasan · 2025-10-31T17:31:44Z

src/gui/tray/usermodel.cpp

+    if (_init && !_users.isEmpty()) {
+        // Try to restore the last selected account
+        ConfigFile cfg;
+        const QString lastSelectedAccountId = cfg.lastSelectedAccount();


use auto

Suggested change

const QString lastSelectedAccountId = cfg.lastSelectedAccount();

const auto lastSelectedAccountId = cfg.lastSelectedAccount();

harshasiddartha · 2025-10-31T17:53:52Z

Hi @camilasan,

Thank you for the review! I've addressed your feedback:

✅ Fixed commit message: Now follows Conventional Commits format: fix(gui): remember last selected account after client restart

✅ Removed merge commit: Rebased onto master to remove the merge commit

✅ Used auto: Changed const QString lastSelectedAccountId to const auto lastSelectedAccountId

The PR has been rebased and force-pushed with a clean history. All changes are now in a single commit following the Conventional Commits specification.

Ready for review!

Fixes nextcloud#8986 - Add ConfigFile methods to save/load last selected account identifier - Save account id when user changes accounts (not during initialization) - Restore last selected account on startup - Fallback to first account if saved account was deleted - Handle empty accounts case explicitly Uses account()->id() as a stable identifier and prevents saving during initialization to avoid redundant writes.

harshasiddartha · 2025-10-31T18:00:43Z

Hi @camilasan,

I've updated the code to use auto as requested:

const auto lastSelectedAccountId = cfg.lastSelectedAccount();

The change has been amended to the commit and force-pushed. All reviewer feedback has been addressed:

✅ Conventional Commits format
✅ Merge commit removed
✅ Using auto instead of const QString

Ready for review!

Aiiaiiio · 2025-11-03T09:53:51Z

src/gui/tray/usermodel.cpp

    }
-    if (_init) {
-        _users.first()->setCurrentUser(true);
+    if (_init && !_users.isEmpty()) {


Complexity could be reduced here a bit, but more importantly, return at the middle might not be optimal. If later we add some more functionality after the _init setup, it's very easy to miss that return.

Suggested change

if (_init && !_users.isEmpty()) {

if (_init) {

if(!_users.isEmpty()) {

// Try to restore the last selected account

ConfigFile cfg;

const auto lastSelectedAccountId = cfg.lastSelectedAccount();

bool lastSelectedAccountFound = false;

if (!lastSelectedAccountId.isEmpty()) {

// Find the account by id (more stable than displayName)

int foundIndex = -1;

for (int i = 0; i < _users.size(); i++) {

if (_users[i]->account()->id() == lastSelectedAccountId) {

foundIndex = i;

break;

}

}

if (foundIndex >= 0 && foundIndex < _users.size()) {

setCurrentUserId(foundIndex);

lastSelectedAccountFound = true;

}

}

if(!lastSelectedAccountFound ) {

// Fallback to first account if last selected account not found

setCurrentUserId(0);

}

}

_init = false;

}

Aiiaiiio · 2025-11-03T09:56:55Z

src/gui/tray/usermodel.cpp

        _currentUserId = id;
+
+        // Save the last selected account identifier (but not during initialization)
+        if (!_init) {


I think we should save the last selected account id even during initialization. What if the last selected account was an account that has been deleted somehow? Then the newly selected account won't be saved to config. Not a practical issue, but for the sake of consistency, I would remove this condition.

harshasiddartha · 2025-11-03T12:55:48Z

Hi @Aiiaiiio, thanks for the thoughtful review — I’ve addressed both points:

Restructured the _init logic to avoid early return and reduce complexity. New flow:

if (_init) {
    if (!_users.isEmpty()) {
        // restore by id; fallback to first account
        // ...
    }
    _init = false;
}

This follows your suggested structure and ensures any logic after initialization won’t be skipped inadvertently.

Always save last selected account id, even during initialization. I removed the _init guard in setCurrentUserId so we persist consistently, including when we fallback to the first account.

I’ve amended the commit to keep a clean history (Conventional Commits) and pushed updates to the branch.

Please let me know if you’d like me to further tweak naming or split the restoration into a helper for readability.

Aiiaiiio · 2025-11-04T09:10:42Z

Hi @Aiiaiiio, thanks for the thoughtful review — I’ve addressed both points:
1. Restructured the `_init` logic to avoid early return and reduce complexity. New flow:
if (_init) {
    if (!_users.isEmpty()) {
        // restore by id; fallback to first account
        // ...
    }
    _init = false;
}
This follows your suggested structure and ensures any logic after initialization won’t be skipped inadvertently.
2. Always save last selected account id, even during initialization. I removed the `_init` guard in `setCurrentUserId` so we persist consistently, including when we fallback to the first account.
I’ve amended the commit to keep a clean history (Conventional Commits) and pushed updates to the branch.

Please let me know if you’d like me to further tweak naming or split the restoration into a helper for readability.

I don't see any changes. Did you forget to push?

github-actions · 2025-11-14T02:13:38Z

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

harshasiddartha requested review from Aiiaiiio, camilasan, i2h3, mgallien and nilsding as code owners October 30, 2025 21:08

PhilippDehner reviewed Oct 31, 2025

View reviewed changes

harshasiddartha requested a review from PhilippDehner October 31, 2025 11:56

PhilippDehner approved these changes Oct 31, 2025

View reviewed changes

camilasan requested changes Oct 31, 2025

View reviewed changes

harshasiddartha closed this Oct 31, 2025

harshasiddartha force-pushed the fix/remember-last-selected-account branch from c5f3a30 to 8c757ba Compare October 31, 2025 17:51

harshasiddartha reopened this Oct 31, 2025

harshasiddartha requested a review from camilasan October 31, 2025 17:55

harshasiddartha force-pushed the fix/remember-last-selected-account branch 2 times, most recently from d91a934 to 0e11c9f Compare October 31, 2025 17:58

harshasiddartha force-pushed the fix/remember-last-selected-account branch from 0e11c9f to f855b69 Compare October 31, 2025 18:00

Aiiaiiio requested changes Nov 3, 2025

View reviewed changes

Rello assigned Aiiaiiio Nov 4, 2025

github-actions bot added the feedback-requested label Nov 14, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix: Remember last selected account after client restart #8991

Fix: Remember last selected account after client restart #8991

Uh oh!

harshasiddartha commented Oct 30, 2025

Uh oh!

PhilippDehner Oct 31, 2025

Uh oh!

harshasiddartha commented Oct 31, 2025

Uh oh!

camilasan left a comment

Uh oh!

camilasan Oct 31, 2025

Uh oh!

harshasiddartha commented Oct 31, 2025

Uh oh!

harshasiddartha commented Oct 31, 2025

Uh oh!

Aiiaiiio Nov 3, 2025

Uh oh!

Aiiaiiio Nov 3, 2025

Uh oh!

harshasiddartha commented Nov 3, 2025

Uh oh!

Aiiaiiio commented Nov 4, 2025

Uh oh!

github-actions bot commented Nov 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	const QString lastSelectedAccountId = cfg.lastSelectedAccount();
	const auto lastSelectedAccountId = cfg.lastSelectedAccount();

-    if (_init && !_users.isEmpty()) {
+    if (_init) {
+        if(!_users.isEmpty()) {
+            // Try to restore the last selected account
+            ConfigFile cfg;
+            const auto lastSelectedAccountId = cfg.lastSelectedAccount();
+            bool lastSelectedAccountFound = false;
+            if (!lastSelectedAccountId.isEmpty()) {
+                // Find the account by id (more stable than displayName)
+                int foundIndex = -1;
+                for (int i = 0; i < _users.size(); i++) {
+                    if (_users[i]->account()->id() == lastSelectedAccountId) {
+                        foundIndex = i;
+                        break;
+                    }
+                }
+                if (foundIndex >= 0 && foundIndex < _users.size()) {
+                    setCurrentUserId(foundIndex);
+                    lastSelectedAccountFound = true;
+                }
+            }
+            if(!lastSelectedAccountFound ) {
+                // Fallback to first account if last selected account not found
+                setCurrentUserId(0);
+            }
+        }
+        _init = false;
+    }

Fix: Remember last selected account after client restart #8991

Are you sure you want to change the base?

Fix: Remember last selected account after client restart #8991

Uh oh!

Conversation

harshasiddartha commented Oct 30, 2025

Description

Changes Made

How It Works

Technical Details

Testing

Screenshots

Related Issue

Uh oh!

PhilippDehner Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

harshasiddartha commented Oct 31, 2025

Uh oh!

camilasan left a comment

Choose a reason for hiding this comment

Uh oh!

camilasan Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

harshasiddartha commented Oct 31, 2025

Uh oh!

harshasiddartha commented Oct 31, 2025

Uh oh!

Aiiaiiio Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

Aiiaiiio Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

harshasiddartha commented Nov 3, 2025

Uh oh!

Aiiaiiio commented Nov 4, 2025

Uh oh!

github-actions bot commented Nov 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants