Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add various backup fixes for polls.

Browse Source
This commit is contained in:
Michelle Tang
2025-10-29 09:54:40 -04:00
committed by jeffrey-signal
parent 3f5a4ebf7b
commit 47201f4955
39 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/database/PollTables.kt
View File

@@ -607,7 +607,7 @@ class PollTables(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
/**
* Maps message ids to its associated poll (if it exists)
*/
fun getPollsForMessages(messageIds: Collection<Long>): Map<Long, PollRecord> {
fun getPollsForMessages(messageIds: Collection<Long>, includePending: Boolean = true): Map<Long, PollRecord> {
if (messageIds.isEmpty() || !Recipient.isSelfSet) {
return emptyMap()
}
@@ -625,9 +625,9 @@ class PollTables(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
val (pendingAdds, pendingRemoves) = getPendingVotes(pollId)
val pollOptions = getPollOptions(pollId).map { option ->
val voters = pollVotes[option.key] ?: emptyList()
val voteState = if (pendingAdds.contains(option.key)) {
val voteState = if (includePending && pendingAdds.contains(option.key)) {
VoteState.PENDING_ADD
} else if (pendingRemoves.contains(option.key)) {
} else if (includePending && pendingRemoves.contains(option.key)) {
VoteState.PENDING_REMOVE
} else if (voters.any { it.id == self }) {
VoteState.ADDED