Skip to content

fix: show lockscreen only if the logind session is removed#692

Closed
calsys456 wants to merge 2 commits intolinuxdeepin:masterfrom
calsys456:fix
Closed

fix: show lockscreen only if the logind session is removed#692
calsys456 wants to merge 2 commits intolinuxdeepin:masterfrom
calsys456:fix

Conversation

@calsys456
Copy link
Collaborator

@calsys456 calsys456 commented Jan 15, 2026

This will work as intended.

Since updateLocketState will do its things, no additional changes needed. Only remove redundant code is enough.

Summary by Sourcery

Bug Fixes:

  • Prevent the lockscreen state from being updated prematurely on logout by removing redundant login state changes.

This will work as intended.

Since updateLocketState will do its things, no additional changes
needed. Only remove redundant code is enough.
There's a bunch of shit in this obsolete code, but this quickfix can
temporarily make it behave well...
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: calsys456

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sourcery-ai
Copy link

sourcery-ai bot commented Jan 15, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Removes redundant internal login state updates from the greeter logout flow so that lockscreen visibility relies solely on logind session removal handled by updateLocketState().

Sequence diagram for updated greeter logout and lockscreen behavior

sequenceDiagram
    actor User
    participant GreeterUI
    participant GreeterProxy
    participant Helper
    participant Session
    participant Logind
    participant LockScreenManager

    User->>GreeterUI: initiateLogout()
    GreeterUI->>GreeterProxy: logout()

    rect rgb(230,230,250)
        note over GreeterProxy: Previous behavior (removed)
        GreeterProxy-xGreeterProxy: set d.isLoggedIn = false
        GreeterProxy-xGreeterProxy: emit isLoggedInChanged
    end

    GreeterProxy->>Helper: activeSession()
    Helper-->>GreeterProxy: weak_ptr<Session>
    GreeterProxy->>Session: getId()
    GreeterProxy->>Logind: sendLogoutMessage(sessionId)

    Logind-->>Session: removeSession()
    Session-->>LockScreenManager: updateLocketState()
    LockScreenManager-->>LockScreenManager: evaluateLockscreenVisibility()
    LockScreenManager-->>GreeterUI: updateLockscreenShownState()
Loading

File-Level Changes

Change Details Files
Simplified greeter logout handling to avoid manually toggling the isLoggedIn state and emitting its change signal.
  • Removed manual assignment of the internal isLoggedIn flag during logout.
  • Removed explicit emission of isLoggedInChanged() on logout, relying instead on updateLocketState() and session updates for state changes.
  • Kept the logout message over the socket unchanged so the session is still terminated via GreeterMessages::Logout.
src/greeter/greeterproxy.cpp

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've left some high level feedback:

  • Now that logout() no longer updates d->isLoggedIn, double-check whether isLoggedIn is still needed as a member at all and consider removing it or consolidating responsibility for its updates to a single place.
  • Consider whether there are any edge cases where logout() is called but the logind session removal (and corresponding updateLocketState) might not occur, and if so whether the UI would be left in an inconsistent state without emitting isLoggedInChanged() here.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Now that `logout()` no longer updates `d->isLoggedIn`, double-check whether `isLoggedIn` is still needed as a member at all and consider removing it or consolidating responsibility for its updates to a single place.
- Consider whether there are any edge cases where `logout()` is called but the logind session removal (and corresponding `updateLocketState`) might not occur, and if so whether the UI would be left in an inconsistent state without emitting `isLoggedInChanged()` here.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@github-actions
Copy link

github-actions bot commented Jan 15, 2026

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@calsys456 calsys456 marked this pull request as draft January 15, 2026 09:28
@deepin-bot
Copy link

deepin-bot bot commented Jan 15, 2026

TAG Bot

New tag: 0.8.1
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #691

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants