This commit is contained in:
Niels Andriesse 2019-11-20 09:17:31 +11:00
parent 0e7c1b1aca
commit 549631848d

View File

@ -2845,14 +2845,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
int lastCharacterIndex = text.length() - 1; int lastCharacterIndex = text.length() - 1;
char lastCharacter = text.charAt(lastCharacterIndex); char lastCharacter = text.charAt(lastCharacterIndex);
char secondLastChar = ' '; char secondToLastCharacter = ' ';
if (lastCharacterIndex > 0) { if (lastCharacterIndex > 0) {
secondLastChar = text.charAt(lastCharacterIndex - 1); secondToLastCharacter = text.charAt(lastCharacterIndex - 1);
} }
String userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(ConversationActivity.this); String userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(ConversationActivity.this);
LokiThreadDatabase threadDatabase = DatabaseFactory.getLokiThreadDatabase(ConversationActivity.this); LokiThreadDatabase threadDatabase = DatabaseFactory.getLokiThreadDatabase(ConversationActivity.this);
LokiUserDatabase userDatabase = DatabaseFactory.getLokiUserDatabase(ConversationActivity.this); LokiUserDatabase userDatabase = DatabaseFactory.getLokiUserDatabase(ConversationActivity.this);
if (lastCharacter == '@' && Character.isWhitespace(secondLastChar)) { if (lastCharacter == '@' && Character.isWhitespace(secondToLastCharacter)) {
List<Mention> mentionCandidates = LokiAPI.Companion.getMentionCandidates("", threadId, userHexEncodedPublicKey, threadDatabase, userDatabase); List<Mention> mentionCandidates = LokiAPI.Companion.getMentionCandidates("", threadId, userHexEncodedPublicKey, threadDatabase, userDatabase);
currentMentionStartIndex = lastCharacterIndex; currentMentionStartIndex = lastCharacterIndex;
mentionCandidateSelectionView.show(mentionCandidates, threadId); mentionCandidateSelectionView.show(mentionCandidates, threadId);