Skip to content

Fixed incorrect wall post open from conversation #15

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

Open
scorpioza wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed incorrect wall post open from conversation #15

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
74a9a5a
fixed incorrect wall post open from conversation
daidalvi Feb 10, 2023
b78e97b
fixed incorrect wall post open from conversation
daidalvi Feb 10, 2023
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/twoeightnine/root/xvii/model/WallPost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ data class WallPost(
) : Parcelable {

val stringId: String
get() = "${fromId}_$id"
get() = "${ownerId}_$id"

fun getPhoto() = attachments?.mapNotNull { it.photo } ?: arrayListOf()

Expand Down
31 changes: 26 additions & 5 deletions app/src/main/java/com/twoeightnine/root/xvii/wallpost/WallPostFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import com.twoeightnine.root.xvii.base.FragmentPlacementActivity.Companion.start
import com.twoeightnine.root.xvii.chats.attachments.AttachmentsInflater
import com.twoeightnine.root.xvii.managers.Prefs
import com.twoeightnine.root.xvii.model.Group
import com.twoeightnine.root.xvii.model.User
import com.twoeightnine.root.xvii.model.WallPost
import com.twoeightnine.root.xvii.model.attachments.Doc
import com.twoeightnine.root.xvii.model.attachments.Video
Expand Down Expand Up @@ -112,19 +113,30 @@ class WallPostFragment : BaseFragment() {
}

private fun putViews(holder: WallViewHolder, post: WallPost, level: Int = 0) {
val group = getGroup(-post.fromId)

val (title, avatar) = when{
post.fromId < 0 -> {
val group = getGroup(-post.fromId)
Pair(group.name, group.photo100)
}
else -> {
val user = getUser(post.fromId)
Pair(user.getTitle(), user.photo100)
}
}

if (level == 0) {
xviiToolbar.tvChatTitle.text = group.name
xviiToolbar.tvChatTitle.text = title
xviiToolbar.tvChatTitle.lowerIf(Prefs.lowerTexts)

xviiToolbar.civAvatar.load(group.photo100)
xviiToolbar.civAvatar.load(avatar)
xviiToolbar.tvSubtitle.text = getTime(post.date, withSeconds = Prefs.showSeconds)
holder.rlHeader.hide()
} else {
holder.tvTitle.text = group.name
holder.tvTitle.text = title
holder.tvTitle.lowerIf(Prefs.lowerTexts)

holder.civAvatar.load(group.photo100)
holder.civAvatar.load(avatar)
holder.tvDate.text = getTime(post.date, withSeconds = Prefs.showSeconds)
}
holder.tvPost.text = post.text
Expand All @@ -137,6 +149,15 @@ class WallPostFragment : BaseFragment() {
}
}

private fun getUser(fromId: Int): User {
for (user in postResponse.profiles) {
if (user.id == fromId) {
return user
}
}
return User()
}

private fun getGroup(fromId: Int): Group {
for (group in postResponse.groups) {
if (group.id == fromId) {
Expand Down