Skip to content

Commit e5b4d0a

Browse files
Merge pull request #16483 from nextcloud/jtr/build-deprecated-Account-warnings
build(User/Account): update deprecation notes and add to overrides
2 parents f2428b0 + cae5468 commit e5b4d0a

4 files changed

Lines changed: 32 additions & 2 deletions

File tree

app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,16 @@ internal data class AnonymousUser(private val accountType: String) :
4949
override val server = Server(URI.create(""), MainApp.MINIMUM_SUPPORTED_SERVER_VERSION)
5050
override val isAnonymous = true
5151

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

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

5664
override fun nameEquals(user: User?): Boolean = user?.accountName.equals(accountName, true)

app/src/main/java/com/nextcloud/client/account/MockUser.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,16 @@ data class MockUser(override val accountName: String, val accountType: String) :
4444
override val server = Server(URI.create(""), MainApp.MINIMUM_SUPPORTED_SERVER_VERSION)
4545
override val isAnonymous = false
4646

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

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

5159
override fun nameEquals(user: User?): Boolean = user?.accountName.equals(accountName, true)

app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,16 @@ internal data class RegisteredUser(
4141
return account.name
4242
}
4343

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

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

4856
override fun nameEquals(user: User?): Boolean = nameEquals(user?.accountName)

app/src/main/java/com/nextcloud/client/account/User.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ interface User :
2727
*
2828
* @return Account instance that is associated with this User object.
2929
*/
30-
@Deprecated("Temporary workaround")
30+
@Deprecated(
31+
"Temporary workaround: Legacy Android Account access. Refactor code to use User object " +
32+
"directly instead of platform Account."
33+
)
3134
override fun toPlatformAccount(): Account
3235

3336
/**
@@ -39,7 +42,10 @@ interface User :
3942
*
4043
* @return OwnCloudAccount instance that is associated with this User object.
4144
*/
42-
@Deprecated("Temporary workaround")
45+
@Deprecated(
46+
"Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object " +
47+
"directly instead of OwnCloudAccount."
48+
)
4349
fun toOwnCloudAccount(): OwnCloudAccount
4450

4551
/**

0 commit comments

Comments
 (0)