TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-12 23:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix up the crash of mention.
fix up the '@' issue.

Browse Source
This commit is contained in:
ryanzhao 2019-11-18 17:10:28 +11:00
parent a307a8e207
commit 2677599953
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/components/AvatarImageView.java
View File

@ -109,7 +109,7 @@ public class AvatarImageView extends AppCompatImageView {
public void update(String hexEncodedPublicKey) { public void update(String hexEncodedPublicKey) {
Address address = Address.fromSerialized(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); this.recipient = Recipient.from(getContext(), address, false);
updateImage(); updateImage();
} }

6
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -2845,10 +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 = ' ';
if (lastCharacterIndex > 0) {
secondLastChar = 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 == '@') { if (lastCharacter == '@' && Character.isWhitespace(secondLastChar)) {
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);