Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.

Fixes - #15834
NullPointerException in ToolbarActivity
NullPointerException in OCFileListFragment
ClassCastException in Intent extra
Changes
This PR addresses several issues related to shortcut creation and handling in
FileDisplayActivity.Nullability Issues in ToolbarActivities and Related Components
Previously, view elements in
ToolbarActivitieswere nullable, causing crashes when accessed directly.Simple null checks were insufficient because other dependencies, such as
accountManagerinhandlePendingDownloadFile, could also be null whenonOpenFileIntentwas triggered directly via a shortcut.To solve that:
supportFragmentManager.executePendingTransactions()was added into theonOpenFileIntent.Shortcut Creation Issues
The previous implementation of
addShortcutToHomescreenpassed only the file’sremotePath.FileDisplayActivitywas relying on theEXTRA_FILEparcelable argument (OCFile) for direct file access.Since
ShortcutInfoCompat.Buildercannot accept anOCFileobject directly, a newEXTRA_FILE_REMOTE_PATHargument was added toFileDisplayActivity.ShortcutInfoCompatcan be created for multiple files. The requestCode for each shortcut is now derived from file.hashCode() to guarantee uniqueness for every file item.Demo
Screen.Recording.2025-10-27.at.10.32.34.mp4