Merge pull request #44 from RyanRory/mention

Mention

src/org/thoughtcrime/securesms/components/AvatarImageView.java

@@ -109,7 +109,7 @@ public class AvatarImageView extends AppCompatImageView {
 
   public void update(String hexEncodedPublicKey) {
     Address address = Address.fromSerialized(hexEncodedPublicKey);
-    if (!address.equals(recipient.getAddress())) {
+    if (recipient == null || !address.equals(recipient.getAddress())) {
       this.recipient = Recipient.from(getContext(), address, false);
       updateImage();
     }

src/org/thoughtcrime/securesms/conversation/ConversationActivity.java

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