TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 12:05:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crash & empty nickname bug

Browse Source
This commit is contained in:
Ryan ZHAO 2021-04-30 15:36:50 +10:00
parent a1edfb13ee
commit e64ac14b77
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,7 +417,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}); });
String nickname = DatabaseFactory.getStorage(this).getDisplayName(getRecipient().getAddress().serialize()); String nickname = DatabaseFactory.getStorage(this).getDisplayName(getRecipient().getAddress().serialize());
titleTextView.setText(nickname); titleTextView.setText(nickname);
titleTextView.setSelection(nickname.length()); if (nickname != null) {
titleTextView.setSelection(nickname.length());
}
imm.showSoftInput(v, 0); imm.showSoftInput(v, 0);
cancelButtonContainer.setVisibility(View.VISIBLE); cancelButtonContainer.setVisibility(View.VISIBLE);
} }

1
app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt
View File

@ -21,6 +21,7 @@ class ProfileManager: SSKEnvironment.ProfileManagerProtocol {
override fun setProfileName(context: Context, recipient: Recipient, profileName: String) { override fun setProfileName(context: Context, recipient: Recipient, profileName: String) {
val database = DatabaseFactory.getRecipientDatabase(context) val database = DatabaseFactory.getRecipientDatabase(context)
database.setProfileName(recipient, profileName) database.setProfileName(recipient, profileName)
recipient.notifyListeners()
} }
override fun setProfilePictureURL(context: Context, recipient: Recipient, profilePictureURL: String) { override fun setProfilePictureURL(context: Context, recipient: Recipient, profilePictureURL: String) {

2
libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java
View File

@ -288,7 +288,7 @@ public class Recipient implements RecipientModifiedListener {
public synchronized @Nullable String getName() { public synchronized @Nullable String getName() {
String displayName = MessagingModuleConfiguration.shared.getStorage().getDisplayName(this.address.toString()); String displayName = MessagingModuleConfiguration.shared.getStorage().getDisplayName(this.address.toString());
if (displayName != null) { return displayName; } if (displayName != null && !displayName.isEmpty()) { return displayName; }
if (this.name == null && isMmsGroupRecipient()) { if (this.name == null && isMmsGroupRecipient()) {
List<String> names = new LinkedList<>(); List<String> names = new LinkedList<>();