Skip to content

sync: from linuxdeepin/dde-session-shell #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2025
Merged

Conversation

deepin-ci-robot
Copy link
Contributor

@deepin-ci-robot deepin-ci-robot commented May 15, 2025

Synchronize source files from linuxdeepin/dde-session-shell.

Source-pull-request: linuxdeepin/dde-session-shell#7

Summary by Sourcery

Bug Fixes:

  • Add guard in GreeterWorker::prepareShutdownSound to verify the D-Bus sound player interface and current user before calling PrepareShutdownSound, logging a warning and returning early if invalid.

Synchronize source files from linuxdeepin/dde-session-shell.

Source-pull-request: linuxdeepin/dde-session-shell#7
@deepin-ci-robot
Copy link
Contributor Author

deepin pr auto review

关键摘要:

  • prepareShutdownSound函数中,注释掉的soundPlayerInter.call调用应该被取消注释,否则函数将不会执行任何操作。
  • 添加了对soundPlayerInter.isValid()m_model->currentUser()的检查,这是一个好的做法,可以防止潜在的空指针异常。

是否建议立即修改:

  • 是,应该取消注释soundPlayerInter.call调用,以确保函数能够执行其预期功能。
  • 是,保持对soundPlayerInter.isValid()m_model->currentUser()的检查,这是一个重要的安全措施。

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 @deepin-ci-robot - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟡 General issues: 1 issue found
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

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.

@@ -1209,6 +1209,11 @@ void GreeterWorker::prepareShutdownSound()
{
QDBusInterface soundPlayerInter("org.deepin.dde.SoundThemePlayer1", "/org/deepin/dde/SoundThemePlayer1",
"org.deepin.dde.SoundThemePlayer1", QDBusConnection::systemBus());
soundPlayerInter.call("PrepareShutdownSound", static_cast<int>(m_model->currentUser()->uid()));
if (!soundPlayerInter.isValid() || !m_model->currentUser()) {
qCWarning(DDE_SHELL) << "Sound player interface is not valid or current user is null:" << soundPlayerInter.isValid();
Copy link

Choose a reason for hiding this comment

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

suggestion: Improve warning log to distinguish invalid interface vs null user

Log both conditions separately, for example include both soundPlayerInter.isValid() and whether m_model->currentUser() is null in the warning.

Suggested change
qCWarning(DDE_SHELL) << "Sound player interface is not valid or current user is null:" << soundPlayerInter.isValid();
qCWarning(DDE_SHELL) << "Cannot prepare shutdown sound, interface valid? " << soundPlayerInter.isValid()
<< ", current user null? " << (m_model->currentUser() == nullptr);

Copy link

sourcery-ai bot commented May 15, 2025

Reviewer's Guide

Introduces guard checks around the SoundThemePlayer DBus call in greeterworker to validate the interface and user before invoking shutdown sound, logging warnings and preventing invalid calls.

File-Level Changes

Change Details Files
Added safety checks and early exit in prepareShutdownSound to avoid invalid DBus calls
  • Check soundPlayerInter.isValid() and m_model->currentUser() before proceeding
  • Log a warning if validation fails
  • Return early when interface or user is invalid
  • Comment out the original PrepareShutdownSound invocation
src/lightdm-deepin-greeter/greeterworker.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

@deepin-ci-robot
Copy link
Contributor Author

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: deepin-ci-robot, yixinshark

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

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

@yixinshark yixinshark merged commit 733bca0 into master May 15, 2025
25 of 27 checks passed
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