Skip to content
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

Fix inbox loading all pages on startup instead of set unread/all mode #1007

Merged
merged 1 commit into from
Jul 10, 2023
Merged

Fix inbox loading all pages on startup instead of set unread/all mode #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 24 additions & 6 deletions app/src/main/java/com/jerboa/model/InboxViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.jerboa.model

import android.content.Context
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.lifecycle.ViewModel
Expand Down Expand Up @@ -78,11 +79,11 @@ class InboxViewModel : ViewModel(), Initializable {
private var blockPersonRes: ApiState<BlockPersonResponse> by
mutableStateOf(ApiState.Empty)

var pageReplies by mutableStateOf(1)
var pageReplies by mutableIntStateOf(1)
private set
var pageMentions by mutableStateOf(1)
var pageMentions by mutableIntStateOf(1)
private set
var pageMessages by mutableStateOf(1)
var pageMessages by mutableIntStateOf(1)
private set
var unreadOnly by mutableStateOf(true)
private set
Expand All @@ -98,9 +99,9 @@ class InboxViewModel : ViewModel(), Initializable {
}

fun resetPages() {
pageMentions = 1
pageReplies = 1
pageMessages = 1
resetPageMentions()
resetPageMessages()
resetPageReplies()
}

fun updateUnreadOnly(unreadOnly: Boolean) {
Expand Down Expand Up @@ -517,4 +518,21 @@ class InboxViewModel : ViewModel(), Initializable {
auth = jwt,
)
}

fun getFormMentions(jwt: String): GetPersonMentions {
return GetPersonMentions(
unread_only = unreadOnly,
sort = CommentSortType.New,
page = pageMentions,
auth = jwt,
)
}

fun getFormMessages(jwt: String): GetPrivateMessages {
return GetPrivateMessages(
unread_only = unreadOnly,
page = pageMessages,
auth = jwt,
)
}
}
49 changes: 8 additions & 41 deletions app/src/main/java/com/jerboa/ui/components/inbox/InboxActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ import com.jerboa.*
import com.jerboa.api.ApiState
import com.jerboa.datatypes.types.BlockPerson
import com.jerboa.datatypes.types.CommentReplyView
import com.jerboa.datatypes.types.CommentSortType
import com.jerboa.datatypes.types.CreateCommentLike
import com.jerboa.datatypes.types.GetPersonMentions
import com.jerboa.datatypes.types.GetPrivateMessages
import com.jerboa.datatypes.types.GetReplies
import com.jerboa.datatypes.types.GetUnreadCount
import com.jerboa.datatypes.types.MarkAllAsRead
import com.jerboa.datatypes.types.MarkCommentReplyAsRead
Expand Down Expand Up @@ -86,19 +82,13 @@ fun InboxActivity(
if (account != null) {
inboxViewModel.resetPages()
inboxViewModel.getReplies(
GetReplies(
auth = account.jwt,
),
inboxViewModel.getFormReplies(account.jwt),
)
inboxViewModel.getMentions(
GetPersonMentions(
auth = account.jwt,
),
inboxViewModel.getFormMentions(account.jwt),
)
inboxViewModel.getMessages(
GetPrivateMessages(
auth = account.jwt,
),
inboxViewModel.getFormMessages(account.jwt),
)
}
}
Expand All @@ -117,27 +107,13 @@ fun InboxActivity(
inboxViewModel.resetPages()
inboxViewModel.updateUnreadOnly(unreadOrAll == UnreadOrAll.Unread)
inboxViewModel.getReplies(
GetReplies(
unread_only = inboxViewModel.unreadOnly,
sort = CommentSortType.New,
page = inboxViewModel.pageReplies,
auth = acct.jwt,
),
inboxViewModel.getFormReplies(acct.jwt),
)
inboxViewModel.getMentions(
GetPersonMentions(
unread_only = inboxViewModel.unreadOnly,
sort = CommentSortType.New,
page = inboxViewModel.pageMentions,
auth = acct.jwt,
),
inboxViewModel.getFormMentions(acct.jwt),
)
inboxViewModel.getMessages(
GetPrivateMessages(
unread_only = inboxViewModel.unreadOnly,
page = inboxViewModel.pageMessages,
auth = acct.jwt,
),
inboxViewModel.getFormMessages(acct.jwt),
)
}
},
Expand Down Expand Up @@ -436,12 +412,7 @@ fun InboxTabs(
account?.also { acct ->
inboxViewModel.resetPageMentions()
inboxViewModel.getMentions(
GetPersonMentions(
unread_only = inboxViewModel.unreadOnly,
sort = CommentSortType.New,
page = inboxViewModel.pageMentions,
auth = acct.jwt,
),
inboxViewModel.getFormMentions(acct.jwt),
ApiState.Refreshing,
)
}
Expand Down Expand Up @@ -607,11 +578,7 @@ fun InboxTabs(
account?.also { acct ->
inboxViewModel.resetPageMessages()
inboxViewModel.getMessages(
GetPrivateMessages(
unread_only = inboxViewModel.unreadOnly,
page = inboxViewModel.pageMessages,
auth = acct.jwt,
),
inboxViewModel.getFormMessages(acct.jwt),
ApiState.Refreshing,
)
}
Expand Down