[ToteMeiSter]

Follow-up to the review of #6863: decodeAvatarToFile logged with a hardcoded "PickImage" tag instead of the shared TAG constant.

Change

TAG moves from the PickImage companion object to file level, next to FULL_QUALITY, so the top-level decodeAvatarToFile uses it as well. The tag value stays "PickImage". No behaviour change.

How to test

• PickImageTest passes (6 tests).
• Optional: pick a remote avatar whose thumbnail does not decode; logcat shows E PickImage: Avatar thumbnail could not be decoded, as before.

🏁 Checklist

• ⛑️ Tests (unit and/or integration) are included or not needed
• 🔖 Capability is checked or not needed
• 🔙 Backport requests are created or not needed: /backport to stable-xx.x
• 📅 Milestone is set
• 🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

🤖 AI (if applicable)

• The content of this PR was partly or fully generated using AI (Claude Code, Assisted-by trailer in the commit)

🤖 Generated with Claude Code

[github-actions]

📱 QA build

Download	app-qa-debug.apk
QR code	Open the QR code for this download
Commit	ac35b89
Version	6912
Available until	7 days after this build

The QA build installs alongside a released Nextcloud app, so you can keep
using your existing install while testing.

Downloading the file requires a GitHub account, so open this link on the
device you want to test on, or transfer the APK to it.

[github-actions]

Codacy

Lint

Type	master	PR
Warnings	138	138
Errors	15	15

SpotBugs

Category	Base	New
Bad practice	7	7
Correctness	8	8
Dodgy code	40	40
Internationalization	3	3
Malicious code vulnerability	3	3
Performance	8	8
Security	11	11
Total	80	80

[rapterjet2004]

LGTM, thanks for the follow-up.

[mahibi]

Thank you for you contributions. We will try to review this soon!
If there are merge conflicts or other open points from review, please try to solve it or let us know which other PRs from you should be reviewed beforehand.

[ToteMeiSter]

Thanks for flagging this. You are right: several of my open PRs conflict not only with master but also with each other, so merging one changes what the next one needs.

I checked every pair against master (0777ecc1b7): 20 of 276 pairs conflict, the rest are independent. This is the order that needs the least rework:

1. refactor(avatar): log avatar decoding errors with the shared PickImage TAG #6912 2. fix(chat): do not retry a long poll while the chat is paused #6847 3. fix(chat): send the read marker while the newest messages are on screen #6845 4. fix(chat): wait for the music of another app to stop before a voice recording starts #6930 5. fix(chat): do not send a read marker below the user's own message #6844 6. fix(conversations): do not apply server responses older than the stored entry #6852 7. fix(chat): let the voice message notification go right after a pause #6932 8. fix(chat): read contacts and the shared file off the main thread #6860 9. fix(chat): keep X-Chat-Last-Common-Read from the read marker response #6846 10. fix(chat): pause the music of another app while a voice or video message plays #6931 11. fix(call): keep the incoming call window open on a sleeping phone #6851 12. fix(call): show the incoming call from the push payload #6843 13. fix(call): do not ring for the push of the call the user is in #6953 14. fix(call): do not leave the call when rejoining alone in it #6951 15. fix(login): resume browser login after returning via the launcher icon #6811 16. fix(chat): show typing only from participants of the current conversation #6905 17. feat(chat): select several messages and forward each on its own #6926 18. fix(upload): resume chunked uploads from the parts the server already has #6827 19. fix(upload): keep an upload running in a foreground service and retry it by the kind of its error #6828 20. fix(share): do not log the path of a rejected share intent uri #6949 21. feat(chat): record video messages from the message input #6818 22. feat(chat): replace the attachment menu with a media bottom sheet #6819 23. feat(chat): take photos with an in-app camera and edit attachments before sending #6820 24. feat(mediaviewer): show the position, add forward and draw actions to the media viewer #6823

The first eight are already approved. #6827 → #6828 and #6818 → #6819 → #6820 → #6823 are stacks and go in that order.

I am resolving the conflicts with master on my side. After each merge I will update the next PR in this list myself, so nothing is left for you to resolve.

The conflict check was prepared with Claude Code; I reviewed the results.