Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

fix note not displaying correctly in EditProfileActivity

This commit is contained in:
Conny Duck 2018-04-05 21:46:34 +02:00
parent 8bca651f53
commit 21344866d3
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
View File

@ -139,7 +139,7 @@ class EditProfileActivity : BaseActivity(), Injectable {
} }
val me = response.body() val me = response.body()
oldDisplayName = me!!.displayName oldDisplayName = me!!.displayName
oldNote = me.note.toString() oldNote = me.source?.note
oldLocked = me.locked oldLocked = me.locked
displayNameEditText.setText(oldDisplayName) displayNameEditText.setText(oldDisplayName)

11
app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
View File

@ -38,7 +38,9 @@ data class Account(
val locked: Boolean = false, val locked: Boolean = false,
@SerializedName("followers_count") val followersCount: Int, @SerializedName("followers_count") val followersCount: Int,
@SerializedName("following_count") val followingCount: Int, @SerializedName("following_count") val followingCount: Int,
@SerializedName("statuses_count") val statusesCount: Int @SerializedName("statuses_count") val statusesCount: Int,
val source: AccountSource?
) : Parcelable { ) : Parcelable {
val name: String val name: String
@ -67,3 +69,10 @@ data class Account(
} }
} }
@Parcelize
data class AccountSource(
val privacy: Status.Visibility,
val sensitive: Boolean,
val note: String
): Parcelable