Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 22:29:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1359-conversation-progress' into 'master'

Browse Source 
Fix progress feel over messages in Conversation view

Closes #1359

See merge request briar/briar!911
This commit is contained in:
akwizgran
2018-09-14 11:59:42 +00:00
parent d7bf1ee374 ced0f72fba
commit e32771f964
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java
View File

@@ -378,8 +378,8 @@ public class ConversationActivity extends BriarActivity
textInputView.setSendButtonEnabled(true); textInputView.setSendButtonEnabled(true);
List<ConversationItem> items = createItems(headers, List<ConversationItem> items = createItems(headers,
introductions, invitations); introductions, invitations);
if (items.isEmpty()) list.showData(); adapter.addAll(items);
else adapter.addAll(items); list.showData();
// Scroll to the bottom // Scroll to the bottom
list.scrollToPosition(adapter.getItemCount() - 1); list.scrollToPosition(adapter.getItemCount() - 1);
} else { } else {