Fix bug causing incorrect mention suggestions.
parent
e778ab2e3a
commit
c7389ddaa7
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue