Skip to content

🪪 Add further profile items including enablement switch #5936

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
mahibi merged 2 commits into from
Mar 10, 2026
Merged

🪪 Add further profile items including enablement switch #5936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fc51cc
feat(profile): Add further profile items including enablement switch
AndyScherzinger Mar 6, 2026
580f830
fix(profile): Add missing element to landscape profile and adapt to t…
AndyScherzinger Mar 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
72 changes: 70 additions & 2 deletions app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,62 @@ data class UserProfileData(
var website: String?,

@JsonField(name = ["websiteScope"], typeConverter = ScopeConverter::class)
var websiteScope: Scope?
var websiteScope: Scope?,

@JsonField(name = ["biography"])
var biography: String?,

@JsonField(name = ["biographyScope"], typeConverter = ScopeConverter::class)
var biographyScope: Scope?,

@JsonField(name = ["fediverse"])
var fediverse: String?,

@JsonField(name = ["fediverseScope"], typeConverter = ScopeConverter::class)
var fediverseScope: Scope?,

@JsonField(name = ["headline"])
var headline: String?,

@JsonField(name = ["headlineScope"], typeConverter = ScopeConverter::class)
var headlineScope: Scope?,

@JsonField(name = ["organisation"])
var organisation: String?,

@JsonField(name = ["organisationScope"], typeConverter = ScopeConverter::class)
var organisationScope: Scope?,

@JsonField(name = ["profile_enabled"])
var profileEnabled: String?,

@JsonField(name = ["profile_enabledScope"], typeConverter = ScopeConverter::class)
var profileEnabledScope: Scope?,

@JsonField(name = ["pronouns"])
var pronouns: String?,

@JsonField(name = ["pronounsScope"], typeConverter = ScopeConverter::class)
var pronounsScope: Scope?,

@JsonField(name = ["role"])
var role: String?,

@JsonField(name = ["roleScope"], typeConverter = ScopeConverter::class)
var roleScope: Scope?,

@JsonField(name = ["bluesky"])
var bluesky: String?,

@JsonField(name = ["blueskyScope"], typeConverter = ScopeConverter::class)
var blueskyScope: Scope?
) : Parcelable {
// This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
constructor() : this(null, null, null, null, null, null, null, null, null, null, null, null, null, null)
constructor() : this(
null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null
)

fun getValueByField(field: ProfileActivity.Field?): String? =
when (field) {
Expand All @@ -70,6 +122,14 @@ data class UserProfileData(
ProfileActivity.Field.ADDRESS -> address
ProfileActivity.Field.WEBSITE -> website
ProfileActivity.Field.TWITTER -> twitter
ProfileActivity.Field.BIOGRAPHY -> biography
ProfileActivity.Field.FEDIVERSE -> fediverse
ProfileActivity.Field.HEADLINE -> headline
ProfileActivity.Field.ORGANISATION -> organisation
ProfileActivity.Field.PROFILE_ENABLED -> profileEnabled
ProfileActivity.Field.PRONOUNS -> pronouns
ProfileActivity.Field.ROLE -> role
ProfileActivity.Field.BLUESKY -> bluesky
else -> ""
}

Expand All @@ -81,6 +141,14 @@ data class UserProfileData(
ProfileActivity.Field.ADDRESS -> addressScope
ProfileActivity.Field.WEBSITE -> websiteScope
ProfileActivity.Field.TWITTER -> twitterScope
ProfileActivity.Field.BIOGRAPHY -> biographyScope
ProfileActivity.Field.FEDIVERSE -> fediverseScope
ProfileActivity.Field.HEADLINE -> headlineScope
ProfileActivity.Field.ORGANISATION -> organisationScope
ProfileActivity.Field.PROFILE_ENABLED -> profileEnabledScope
ProfileActivity.Field.PRONOUNS -> pronounsScope
ProfileActivity.Field.ROLE -> roleScope
ProfileActivity.Field.BLUESKY -> blueskyScope
else -> null
}
}
Loading
Loading