Try to fix comments finally!

pr0gramm-com · Jun 18, 2018 · 9d25b41 · 9d25b41
1 parent b2fbe8e
commit 9d25b41
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/app/src/main/java/com/pr0gramm/app/services/VoteService.kt b/app/src/main/java/com/pr0gramm/app/services/VoteService.kt
@@ -208,6 +208,9 @@ class VoteService(private val api: Api,
             for (cachedVote in cachedVotes)
                 result.put(cachedVote.itemId, cachedVote.vote)
 
+            // add "NEUTRAL" votes for every unknown item
+            ids.forEach { result.putIfAbsent(it, Vote.NEUTRAL) }
+
             result
         }
     }

diff --git a/app/src/main/java/com/pr0gramm/app/ui/fragments/PostFragment.kt b/app/src/main/java/com/pr0gramm/app/ui/fragments/PostFragment.kt
@@ -584,9 +584,9 @@ class PostFragment : BaseFragment("PostFragment"), NewTagDialogFragment.OnAddNew
         commentVoteSubscription?.unsubscribe()
 
         commentVoteSubscription = comments
-                .switchMap {
+                .switchMap { comments ->
                     voteService
-                            .getCommentVotes(it)
+                            .getCommentVotes(comments)
                             .subscribeOnBackground()
                             .onErrorResumeEmpty()
                 }

diff --git a/app/src/main/java/com/pr0gramm/app/ui/views/CommentsAdapter.kt b/app/src/main/java/com/pr0gramm/app/ui/views/CommentsAdapter.kt
@@ -83,7 +83,13 @@ class CommentsAdapter(
 
     fun updateVotes(votes: TLongObjectMap<Vote>) {
         val currentVotes = TLongObjectHashMap(votes)
-        val baseVotes = state.baseVotes ?: TLongObjectHashMap(votes)
+
+        // add new votes as base votes
+        val baseVotes = TLongObjectHashMap(state.baseVotes ?: votes)
+        votes.forEachEntry { id, vote ->
+            baseVotes.putIfAbsent(id, vote)
+            true
+        }
 
         state = state.copy(baseVotes = baseVotes, currentVotes = currentVotes)
     }