From 388c4a238f08c4aad3a4539b25a6459e095df73c Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 8 Feb 2026 11:25:46 -0500 Subject: [PATCH 1/3] refactor: drop deprecated getCurrentAccount in DrawerActivity Signed-off-by: Josh --- .../java/com/owncloud/android/ui/activity/DrawerActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index 6fb5f421af7c..9b6e6dcbe1af 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -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) { From f09b1070145bdf6b6c34b513b59f8223496a2ef8 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 8 Feb 2026 11:29:43 -0500 Subject: [PATCH 2/3] refactor: remove deprecated getCurrentAccount() from CurrentAccountProvider Remove getCurrentAccount() method from CurrentAccountProvider interface. The method was deprecated in favor of getUser() and had only one external caller (DrawerActivity), which has been migrated to use getUser() instead. The implementation in UserAccountManagerImpl remains as it's still used internally by getUser(), but removing it from the interface prevents new code from depending on the deprecated Account-based API. Refs: #4853, #4835 Signed-off-by: Josh --- .../client/account/CurrentAccountProvider.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java b/app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java index b74bb3f0add0..0f2daf5f0841 100644 --- a/app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java +++ b/app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java @@ -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. * From 691e33b697436b04a281b411a1ed261d16e621b2 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 8 Feb 2026 11:32:56 -0500 Subject: [PATCH 3/3] chore: make getCurrentAccount private in UserAccountManagerImpl Signed-off-by: Josh --- .../com/nextcloud/client/account/UserAccountManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java b/app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java index 3aec76281df3..77cdce85741b 100644 --- a/app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java +++ b/app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java @@ -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);