Skip to content

[stable-25.0.x] Fix detekt issues - #6584

Merged
AndyScherzinger merged 1 commit into
stable-25.0.xfrom
backport/6583/stable-25.0.x
Aug 26, 2026
Merged

[stable-25.0.x] Fix detekt issues#6584
AndyScherzinger merged 1 commit into
stable-25.0.xfrom
backport/6583/stable-25.0.x

Conversation

@backportbot

@backportbot backportbot Bot commented Aug 26, 2026

Copy link
Copy Markdown

Backport of #6583

Warning, This backport's changes differ from the original and might be incomplete 鈿狅笍

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot
backportbot Bot requested a review from AndyScherzinger August 26, 2026 06:37
@backportbot backportbot Bot added 3. to review Waiting for reviews technical debt Technical issue labels Aug 26, 2026
@backportbot backportbot Bot added this to the 25.0.0 milestone Aug 26, 2026
@AndyScherzinger
AndyScherzinger marked this pull request as ready for review August 26, 2026 06:37
BaseActivity imported MainActivity from its own package, which detekt
flagged as NoUnusedImports. Dropping it takes stable-25.0.x from 110
to 109 issues, back under the maxIssues limit.

The NotificationWorker half of #6583 is deliberately left out: the
Boolean-returning initDecryptedData() it refactors only arrives with
#6580, so there is no ReturnCount finding to fix here yet.

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@AndyScherzinger
AndyScherzinger force-pushed the backport/6583/stable-25.0.x branch from 02cac95 to 7780d9f Compare August 26, 2026 06:49
AndyScherzinger added a commit that referenced this pull request Aug 26, 2026
Returning Boolean from initDecryptedData() gave it a third return
statement, which detekt flags as ReturnCount. Split the cleartext and
encrypted subject paths into their own helpers so each has a single
exit.

The complexity the early bail-out adds to doWork() is left as is, since
master carries that same finding. Once the import removal from #6584
is in, the score lands at exactly 110.

Assisted-by: Claude Code:claude-opus-5
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@AndyScherzinger
AndyScherzinger merged commit e57364a into stable-25.0.x Aug 26, 2026
12 of 15 checks passed
@AndyScherzinger
AndyScherzinger deleted the backport/6583/stable-25.0.x branch August 26, 2026 06:56
AndyScherzinger added a commit that referenced this pull request Aug 26, 2026
Returning Boolean from initDecryptedData() gave it a third return
statement, which detekt flags as ReturnCount. Split the cleartext and
encrypted subject paths into their own helpers so each has a single
exit.

The complexity the early bail-out adds to doWork() is left as is, since
master carries that same finding. Once the import removal from #6584
is in, the score lands at exactly 110.

Assisted-by: Claude Code:claude-opus-5
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@github-actions

Copy link
Copy Markdown
Contributor

APK file: https://github.com/nextcloud/talk-android/actions/runs/32939840642/artifacts/9596434260
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

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

Labels

3. to review Waiting for reviews technical debt Technical issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant