RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: issue where status circle is inaccurate 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2023-10-22 19:21:53 +02:00
parent f1e92544c9
commit 717e9f7890
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/chat/revolt/components/screens/settings/UserOverview.kt
View File

@ -140,7 +140,7 @@ fun RawUserOverview(user: User, profile: Profile? = null) {
userId = user.id ?: ULID.makeSpecial(0), userId = user.id ?: ULID.makeSpecial(0),
avatar = user.avatar, avatar = user.avatar,
size = 48.dp, size = 48.dp,
presence = presenceFromStatus(user.status?.presence) presence = presenceFromStatus(user.status?.presence, user.online ?: false)
) )
Spacer(modifier = Modifier.width(12.dp)) Spacer(modifier = Modifier.width(12.dp))

6
app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
View File

@ -764,7 +764,8 @@ fun Sidebar(
} }
?: "", ?: "",
presence = presenceFromStatus( presence = presenceFromStatus(
RevoltAPI.userCache[RevoltAPI.selfId]?.status?.presence RevoltAPI.userCache[RevoltAPI.selfId]?.status?.presence,
RevoltAPI.userCache[RevoltAPI.selfId]?.online ?: false
), ),
userId = RevoltAPI.selfId ?: "", userId = RevoltAPI.selfId ?: "",
avatar = RevoltAPI.userCache[RevoltAPI.selfId]?.avatar, avatar = RevoltAPI.userCache[RevoltAPI.selfId]?.avatar,
@ -821,7 +822,8 @@ fun Sidebar(
) )
} ?: it.name ?: "?", } ?: it.name ?: "?",
presence = presenceFromStatus( presence = presenceFromStatus(
partner?.status?.presence partner?.status?.presence,
partner?.online ?: false
), ),
userId = partner?.id ?: it.id ?: "", userId = partner?.id ?: it.id ?: "",
avatar = partner?.avatar ?: it.icon, avatar = partner?.avatar ?: it.icon,

5
app/src/main/java/chat/revolt/sheets/StatusSheet.kt
View File

@ -44,7 +44,10 @@ fun StatusSheet(onBeforeNavigation: () -> Unit, onGoSettings: () -> Unit) {
userId = selfUser.id ?: ULID.makeSpecial(0), userId = selfUser.id ?: ULID.makeSpecial(0),
avatar = selfUser.avatar, avatar = selfUser.avatar,
size = 48.dp, size = 48.dp,
presence = presenceFromStatus(selfUser.status?.presence) presence = presenceFromStatus(
selfUser.status?.presence,
selfUser.online ?: false
)
) )
Spacer(modifier = Modifier.width(12.dp)) Spacer(modifier = Modifier.width(12.dp))