blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug causing incorrect mention suggestions.

master^2
Cody Henthorne 2020-10-13 10:57:00 -04:00 committed by Alan Evans
parent e778ab2e3a
commit c7389ddaa7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,6 +366,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
private ConversationViewModel viewModel; private ConversationViewModel viewModel;
private InviteReminderModel inviteReminderModel; private InviteReminderModel inviteReminderModel;
private ConversationGroupViewModel groupViewModel; private ConversationGroupViewModel groupViewModel;
private MentionsPickerViewModel mentionsViewModel;
private LiveRecipient recipient; private LiveRecipient recipient;
private long threadId; private long threadId;
@ -1980,7 +1981,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
} }
private void initializeMentionsViewModel() { private void initializeMentionsViewModel() {
MentionsPickerViewModel mentionsViewModel = ViewModelProviders.of(this, new MentionsPickerViewModel.Factory()).get(MentionsPickerViewModel.class); mentionsViewModel = ViewModelProviders.of(this, new MentionsPickerViewModel.Factory()).get(MentionsPickerViewModel.class);
recipient.observe(this, r -> { recipient.observe(this, r -> {
if (r.isPushV2Group() && !mentionsSuggestions.resolved()) { if (r.isPushV2Group() && !mentionsSuggestions.resolved()) {
@ -2122,6 +2123,10 @@ public class ConversationActivity extends PassphraseRequiredActivity
if (groupViewModel != null) { if (groupViewModel != null) {
groupViewModel.onRecipientChange(recipient); groupViewModel.onRecipientChange(recipient);
} }
if (mentionsViewModel != null) {
mentionsViewModel.onRecipientChange(recipient);
}
} }
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)