[ibrahim-iqbal]

Fixes #4998

Crash

java.lang.NullPointerException
  at com.owncloud.android.datamodel.FileDataStorageManager.<init>
  at com.owncloud.android.ui.activity.BaseActivity.getStorageManager
  at com.owncloud.android.ui.activity.FileDisplayActivity.navigateTo
  at com.owncloud.android.ui.activity.FileDisplayActivity.navigateToOption
  at com.owncloud.android.ui.activity.DrawerActivity.bottomBarNavigationTo

Root cause

FileDataStorageManager's constructor takes a non-null Account. BaseActivity.getStorageManager() has:

public FileDataStorageManager getStorageManager() {
    if (mStorageManager == null) {
        if (getAccount() == null) {
            swapToDefaultAccount();
        }
        return mStorageManager = new FileDataStorageManager(getAccount());
    }
    ...
}

swapToDefaultAccount() only sets mCurrentAccount when a valid account is found; when none exists (e.g. the last account was just removed from the device, or the app reaches this state before onboarding), it instead calls createAccount(true) to launch the setup flow and returns with the account still null. The very next line then passes that still-null getAccount() straight into the non-null Kotlin constructor → NPE.

A bottom navigation bar click (DrawerActivity.bottomBarNavigationTo → navigateToOption → FileDisplayActivity.navigateTo → getStorageManager()) can land in exactly that window, while the account-setup activity is launching but hasn't taken focus yet.

Fix

Added a navigateToOptionIfAccountReady wrapper in DrawerActivity that no-ops when account == null, used at the three navigateToOption call sites in bottomBarNavigationTo (All Files, Spaces, Available Offline, Shared by Link). The account-setup screen is already on its way, so there's nothing useful to navigate to — silently skipping is correct instead of crashing. The Uploads nav item is untouched since it launches UploadListActivity directly and never touches the storage manager.

This doesn't change getStorageManager()'s own (non-null) contract or any other caller — it stops the crash at the one site where a UI click could race the account-setup redirect.

Testing

• ./gradlew :owncloudApp:compileOriginalDebugKotlin — compiles clean, no errors.
• No device available to reproduce the exact "last account removed" state; the fix is a direct, minimal guard against the documented null read in the stack trace.

AI assistance

Drafted with AI assistance; I reviewed every line and traced the full call chain from the stack trace in the issue to the root cause in BaseActivity.getStorageManager().

🤖 Generated with Claude Code

[joragua]

Thanks for the contribution @ibrahim-iqbal! 🙌🏻

Some notes before the CR:

1. Every commit must be GPG/PGP signed and include a Signed-off-by line. Use the command: git commit -s -S -m "..."for that. Unfortunately, we won't be able to merge the PR until all commits are properly signed.

2. Could you add a new commit (chore: add calens file) including all the changelog information? Please don't forget to read the TEMPLATE.md before adding it.

Let us know if you have any doubts and we will help you! 😄

[ibrahim-iqbal]

Thanks for the quick review! Both done:

1. Both commits are now GPG-signed with a Signed-off-by line.
2. Added the changelog entry at changelog/unreleased/4998.

Ready for another look.

[joragua]

Good job @ibrahim-iqbal! Some comments about your PR

[ibrahim-iqbal]

Thanks for the review, @joragua! All addressed:

1. Renamed the calens file to 5012 and reworded the description per your suggestion - amended into the same chore: add calens file commit rather than adding a new one.
2. Removed the AI-generated doc comment on navigateToOptionIfAccountReady and inlined the null-check at the top of bottomBarNavigationTo as suggested, in a separate commit.

Ready for another look.

[joragua]

@ibrahim-iqbal just check the comment above and it's ready

EDIT: I mean, this comment should be removed

// #4998: account can be null here if the last account was just removed and
// BaseActivity.swapToDefaultAccount() is already launching account setup;
// navigateToOption() would NPE on getStorageManager() in that case.

[ibrahim-iqbal]

Removed, thanks — missed that one, good catch.

[joragua]

LGTM! 💯

The branch now needs to be rebased against master before it can be merged. Please let us know if you have any problems and we will help you!

[jesmrec]

@ibrahim-iqbal please rebase the branch and it will be straight merged. Thanks!

[ibrahim-iqbal]

Rebased onto current master (8f500b1). All commits remain GPG-signed with Signed-off-by. Ready to merge.

[jesmrec]

Merged! thanks again @ibrahim-iqbal!! your contribution will be part of 5.0 release.