From 7089ed6890b1969b5afcd00322b6b5dd817c08fd Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 8 Feb 2026 10:43:55 -0500 Subject: [PATCH 1/5] build(User/Account): update deprecation notes and add to overrides Signed-off-by: Josh --- app/src/main/java/com/nextcloud/client/account/User.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/account/User.kt b/app/src/main/java/com/nextcloud/client/account/User.kt index 856bb0b53f8f..509e6556b5e6 100644 --- a/app/src/main/java/com/nextcloud/client/account/User.kt +++ b/app/src/main/java/com/nextcloud/client/account/User.kt @@ -27,7 +27,7 @@ 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 /** @@ -39,7 +39,7 @@ 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 /** From 7ce8e0f463cba7285463f4c784714b66f7112524 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 8 Feb 2026 10:45:36 -0500 Subject: [PATCH 2/5] chore: add deprecation warnings to overrides in AnonymousUser Signed-off-by: Josh --- app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt b/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt index 746e999904eb..993838a4f3a6 100644 --- a/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt +++ b/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt @@ -49,8 +49,10 @@ 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) From 3160ced212094164f555433ead222d9a6fc30ee2 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 8 Feb 2026 10:54:50 -0500 Subject: [PATCH 3/5] chore: add deprecation warnings to overrides in MockUser Signed-off-by: Josh --- app/src/main/java/com/nextcloud/client/account/MockUser.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/nextcloud/client/account/MockUser.kt b/app/src/main/java/com/nextcloud/client/account/MockUser.kt index 7cbf71773d09..759cda1e2f30 100644 --- a/app/src/main/java/com/nextcloud/client/account/MockUser.kt +++ b/app/src/main/java/com/nextcloud/client/account/MockUser.kt @@ -44,8 +44,10 @@ 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) From ea50cf8356d7161a79a2020171fa71721f1c4d05 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 8 Feb 2026 10:55:54 -0500 Subject: [PATCH 4/5] chore: add deprecation warnings to overrides in RegisteredUser Signed-off-by: Josh --- .../main/java/com/nextcloud/client/account/RegisteredUser.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt b/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt index d73a99a747fb..6de6c06e440d 100644 --- a/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt +++ b/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt @@ -41,8 +41,10 @@ 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) From cae54689b47b1434fa516644729ba6c90f442eb0 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sun, 8 Feb 2026 19:50:34 +0100 Subject: [PATCH 5/5] style: reformat deprecation text Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/client/account/AnonymousUser.kt | 10 ++++++++-- .../main/java/com/nextcloud/client/account/MockUser.kt | 10 ++++++++-- .../com/nextcloud/client/account/RegisteredUser.kt | 10 ++++++++-- app/src/main/java/com/nextcloud/client/account/User.kt | 10 ++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt b/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt index 993838a4f3a6..64e8feef41f6 100644 --- a/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt +++ b/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt @@ -49,10 +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.") + @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.") + @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) diff --git a/app/src/main/java/com/nextcloud/client/account/MockUser.kt b/app/src/main/java/com/nextcloud/client/account/MockUser.kt index 759cda1e2f30..abf90b58875a 100644 --- a/app/src/main/java/com/nextcloud/client/account/MockUser.kt +++ b/app/src/main/java/com/nextcloud/client/account/MockUser.kt @@ -44,10 +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.") + @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.") + @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) diff --git a/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt b/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt index 6de6c06e440d..cce88ac0c6bc 100644 --- a/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt +++ b/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt @@ -41,10 +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.") + @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.") + @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) diff --git a/app/src/main/java/com/nextcloud/client/account/User.kt b/app/src/main/java/com/nextcloud/client/account/User.kt index 509e6556b5e6..1a7da61d61f7 100644 --- a/app/src/main/java/com/nextcloud/client/account/User.kt +++ b/app/src/main/java/com/nextcloud/client/account/User.kt @@ -27,7 +27,10 @@ interface User : * * @return Account instance that is associated with this User object. */ - @Deprecated("Temporary workaround: Legacy Android Account access. Refactor code to use User object directly instead of platform Account.") + @Deprecated( + "Temporary workaround: Legacy Android Account access. Refactor code to use User object " + + "directly instead of platform Account." + ) override fun toPlatformAccount(): Account /** @@ -39,7 +42,10 @@ interface User : * * @return OwnCloudAccount instance that is associated with this User object. */ - @Deprecated("Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object directly instead of OwnCloudAccount.") + @Deprecated( + "Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object " + + "directly instead of OwnCloudAccount." + ) fun toOwnCloudAccount(): OwnCloudAccount /**