TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 00:17:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rendering issue when deleting the last message in a conversation.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-12-09 14:39:22 -05:00
parent ffc0a230be
commit ec8793c6fe
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@@ -250,8 +250,11 @@ public class ConversationFragment extends LoggingFragment {
this.messageCountsViewModel = ViewModelProviders.of(requireActivity()).get(MessageCountsViewModel.class); this.messageCountsViewModel = ViewModelProviders.of(requireActivity()).get(MessageCountsViewModel.class);
this.conversationViewModel = ViewModelProviders.of(requireActivity(), new ConversationViewModel.Factory()).get(ConversationViewModel.class); this.conversationViewModel = ViewModelProviders.of(requireActivity(), new ConversationViewModel.Factory()).get(ConversationViewModel.class);
conversationViewModel.getMessages().observe(this, list -> { conversationViewModel.getMessages().observe(this, messages -> {
getListAdapter().submitList(list); ConversationAdapter adapter = getListAdapter();
if (adapter != null) {
getListAdapter().submitList(messages);
}
}); });
conversationViewModel.getConversationMetadata().observe(this, this::presentConversationMetadata); conversationViewModel.getConversationMetadata().observe(this, this::presentConversationMetadata);

6
paging/lib/src/main/java/org/signal/paging/FixedSizePagingController.java
View File

@@ -6,6 +6,7 @@ import androidx.lifecycle.MutableLiveData;
import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log; import org.signal.core.util.logging.Log;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@@ -57,6 +58,11 @@ class FixedSizePagingController<E> implements PagingController {
return; return;
} }
if (loadState.size() == 0) {
liveData.postValue(Collections.emptyList());
return;
}
int leftPageBoundary = (aroundIndex / config.pageSize()) * config.pageSize(); int leftPageBoundary = (aroundIndex / config.pageSize()) * config.pageSize();
int rightPageBoundary = leftPageBoundary + config.pageSize(); int rightPageBoundary = leftPageBoundary + config.pageSize();
int buffer = config.bufferPages() * config.pageSize(); int buffer = config.bufferPages() * config.pageSize();