Skip to content

fix(ManageSpaceActivity): call clearApplicationUserData() after logout #2971

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.

Sign up for GitHub

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
brandonpage merged 5 commits into from
Jul 21, 2026
Merged

fix(ManageSpaceActivity): call clearApplicationUserData() after logout #2971

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb487d7
docs(push): expand push notification documentation (W-23493430)
wmathurin Jul 17, 2026
e0a32cc
Revert "docs(push): expand push notification documentation (W-23493430)"
wmathurin Jul 17, 2026
eb3fa74
fix(ManageSpaceActivity): call clearApplicationUserData() after logout
wmathurin Jul 17, 2026
844b0fb
fix(ManageSpaceActivity): use ActivityManager.clearApplicationUserDat…
wmathurin Jul 17, 2026
ee6a850
fix(ManageSpaceActivity): log out all users before clearing app data
wmathurin Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ManageSpaceActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
package com.salesforce.androidsdk.ui

import android.annotation.SuppressLint
import android.app.ActivityManager
import android.content.Context
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
Expand Down Expand Up @@ -103,6 +105,7 @@ open class ManageSpaceActivity : ComponentActivity() {
showLoginPage = false,
reason = USER_LOGOUT
)
(getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager).clearApplicationUserData()

@brandonpage brandonpage Jul 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

What happens if there are multiple users logged in? account = null will only result in the current user being logged out.

And what do we not clear already on logout?

@wmathurin wmathurin Jul 18, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good catch — you're right on both counts.

Multiple users: logout(account=null) resolves to clientMgr.account → the current user only. Other accounts never got SDK teardown before clearApplicationUserData() wiped their data at the OS level.

Fix: Now calls UserAccountManager.getAuthenticatedUsers() and loops, calling signoutUser(user, activity, false, USER_LOGOUT) per account so each one goes through proper SDK cleanup (SmartStore, DPoP key deletion, token revocation). Falls back to logout(account=null) only when the user list is null/empty (fresh install / already logged out).

What logout() clears that clearApplicationUserData() would already wipe: The OS call is a superset of SDK logout — it wipes all SharedPrefs, databases, files, caches, then restarts the process. Calling signoutUser first still matters for server-side cleanup (push un-registration, refresh token revocation) and to give the SDK a clean teardown path before the process is killed.

4 unit tests added: single user, 3 users, null list, empty list.

},
titleText = stringResource(sf__manage_space_title),
textText = stringResource(sf__manage_space_confirmation),
Expand Down
Loading