Skip to content

build(User/Account): update deprecation notes and add to overrides #16483

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
AndyScherzinger merged 5 commits into from
Feb 8, 2026
+32 −2
Merged

build(User/Account): update deprecation notes and add to overrides #16483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7089ed6
build(User/Account): update deprecation notes and add to overrides
joshtrichards Feb 8, 2026
7ce8e0f
chore: add deprecation warnings to overrides in AnonymousUser
joshtrichards Feb 8, 2026
3160ced
chore: add deprecation warnings to overrides in MockUser
joshtrichards Feb 8, 2026
ea50cf8
chore: add deprecation warnings to overrides in RegisteredUser
joshtrichards Feb 8, 2026
cae5468
style: reformat deprecation text
AndyScherzinger 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
8 changes: 8 additions & 0 deletions app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,16 @@ internal data class AnonymousUser(private val accountType: String) :
override val server = Server(URI.create(""), MainApp.MINIMUM_SUPPORTED_SERVER_VERSION)
override val isAnonymous = true

@Deprecated(
"Temporary workaround: Legacy Android Account access. Refactor code to use User object " +
"directly instead of platform Account."
)
override fun toPlatformAccount(): Account = Account(accountName, accountType)

@Deprecated(
"Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object " +
"directly instead of OwnCloudAccount."
)
override fun toOwnCloudAccount(): OwnCloudAccount = OwnCloudAccount(Uri.EMPTY, OwnCloudBasicCredentials("", ""))

override fun nameEquals(user: User?): Boolean = user?.accountName.equals(accountName, true)
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/com/nextcloud/client/account/MockUser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,16 @@ data class MockUser(override val accountName: String, val accountType: String) :
override val server = Server(URI.create(""), MainApp.MINIMUM_SUPPORTED_SERVER_VERSION)
override val isAnonymous = false

@Deprecated(
"Temporary workaround: Legacy Android Account access. Refactor code to use User object " +
"directly instead of platform Account."
)
override fun toPlatformAccount(): Account = Account(accountName, accountType)

@Deprecated(
"Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object " +
"directly instead of OwnCloudAccount."
)
override fun toOwnCloudAccount(): OwnCloudAccount = OwnCloudAccount(Uri.EMPTY, OwnCloudBasicCredentials("", ""))

override fun nameEquals(user: User?): Boolean = user?.accountName.equals(accountName, true)
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,16 @@ internal data class RegisteredUser(
return account.name
}

@Deprecated(
"Temporary workaround: Legacy Android Account access. Refactor code to use User object " +
"directly instead of platform Account."
)
override fun toPlatformAccount(): Account = account

@Deprecated(
"Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object " +
"directly instead of OwnCloudAccount."
)
override fun toOwnCloudAccount(): OwnCloudAccount = ownCloudAccount

override fun nameEquals(user: User?): Boolean = nameEquals(user?.accountName)
Expand Down
10 changes: 8 additions & 2 deletions app/src/main/java/com/nextcloud/client/account/User.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ interface User :
*
* @return Account instance that is associated with this User object.
*/
@Deprecated("Temporary workaround")
@Deprecated(
"Temporary workaround: Legacy Android Account access. Refactor code to use User object " +
"directly instead of platform Account."
)
override fun toPlatformAccount(): Account

/**
Expand All @@ -39,7 +42,10 @@ interface User :
*
* @return OwnCloudAccount instance that is associated with this User object.
*/
@Deprecated("Temporary workaround")
@Deprecated(
"Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object " +
"directly instead of OwnCloudAccount."
)
fun toOwnCloudAccount(): OwnCloudAccount

/**
Expand Down
Loading