Skip to content

refactor: remove deprecated getCurrentAccount() from interface #16484

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

Open
joshtrichards wants to merge 3 commits into
base: master
Choose a base branch
from
Open

refactor: remove deprecated getCurrentAccount() from interface #16484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
388c4a2
refactor: drop deprecated getCurrentAccount in DrawerActivity
joshtrichards Feb 8, 2026
f09b107
refactor: remove deprecated getCurrentAccount() from CurrentAccountPr…
joshtrichards Feb 8, 2026
691e33b
chore: make getCurrentAccount private in UserAccountManagerImpl
joshtrichards Feb 8, 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
10 changes: 0 additions & 10 deletions app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@
* @see UserAccountManager
*/
public interface CurrentAccountProvider {
/**
* Get currently active account.
* Replaced by getUser()
*
* @return Currently selected {@link Account} or first valid {@link Account} registered in OS or null, if not available at all.
*/
@Deprecated
@NonNull
Account getCurrentAccount();

/**
* Get currently active user profile. If there is no active user, anonymous user is returned.
*
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,8 @@ public boolean exists(Account account) {
}
}

@Override
@NonNull
public Account getCurrentAccount() {
private Account getCurrentAccount() {
Account[] ocAccounts = getAccounts();

ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {

// current account has changed
if (data.getBooleanExtra(ManageAccountsActivity.KEY_CURRENT_ACCOUNT_CHANGED, false)) {
setAccount(accountManager.getCurrentAccount(), false);
setUser(accountManager.getUser());
restart();
}
} else if (requestCode == PassCodeManager.PASSCODE_ACTIVITY && data != null) {
Expand Down
Loading