Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-27 04:04:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add nickname and notes fields to the RecipientTable.

Browse Source
This commit is contained in:
Alex Hart
2024-03-19 13:52:06 -03:00
committed by Nicholas Tinsley
parent 50149a3803
commit 7de2f0f460
8 changed files with 86 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@@ -139,6 +139,8 @@ public class Recipient {
private final CallLinkRoomId callLinkRoomId;
private final Optional<GroupRecord> groupRecord;
private final PhoneNumberSharingState phoneNumberSharing;
private final ProfileName nickname;
private final String note;
/**
* Returns a {@link LiveRecipient}, which contains a {@link Recipient} that may or may not be
@@ -429,6 +431,8 @@ public class Recipient {
this.callLinkRoomId = null;
this.groupRecord = Optional.empty();
this.phoneNumberSharing = PhoneNumberSharingState.UNKNOWN;
this.nickname = ProfileName.EMPTY;
this.note = null;
}
public Recipient(@NonNull RecipientId id, @NonNull RecipientDetails details, boolean resolved) {
@@ -485,6 +489,8 @@ public class Recipient {
this.callLinkRoomId = details.callLinkRoomId;
this.groupRecord = details.groupRecord;
this.phoneNumberSharing = details.phoneNumberSharing;
this.nickname = details.nickname;
this.note = details.note;
}
public @NonNull RecipientId getId() {
@@ -549,6 +555,7 @@ public class Recipient {
*/
public boolean hasAUserSetDisplayName(@NonNull Context context) {
return !TextUtils.isEmpty(getGroupName(context)) ||
!TextUtils.isEmpty(getNickname().toString()) ||
!TextUtils.isEmpty(systemContactName) ||
!TextUtils.isEmpty(getProfileName().toString());
}
@@ -577,6 +584,10 @@ public class Recipient {
private @Nullable String getNameFromLocalData(@NonNull Context context) {
String name = getGroupName(context);
if (Util.isEmpty(name)) {
name = getNickname().toString();
}
if (Util.isEmpty(name)) {
name = systemContactName;
}
@@ -600,6 +611,11 @@ public class Recipient {
String name = isSelf ? getProfileName().toString() : getGroupName(context);
name = StringUtil.isolateBidi(name);
if (Util.isEmpty(name)) {
name = isSelf ? getGroupName(context) : getNickname().toString();
name = StringUtil.isolateBidi(name);
}
if (Util.isEmpty(name)) {
name = isSelf ? getGroupName(context) : systemContactName;
name = StringUtil.isolateBidi(name);
@@ -627,6 +643,7 @@ public class Recipient {
public @NonNull String getShortDisplayName(@NonNull Context context) {
String name = Util.getFirstNonEmpty(getGroupName(context),
getNickname().getGivenName(),
getSystemProfileName().getGivenName(),
getProfileName().getGivenName(),
getUsername().orElse(null),
@@ -825,6 +842,10 @@ public class Recipient {
return requireSmsAddress();
}
public @NonNull ProfileName getNickname() {
return nickname;
}
public @NonNull ProfileName getProfileName() {
return signalProfileName;
}
@@ -960,6 +981,7 @@ public class Recipient {
else if (isGroupInternal()) return fallbackPhotoProvider.getPhotoForGroup();
else if (isGroup()) return fallbackPhotoProvider.getPhotoForGroup();
else if (!TextUtils.isEmpty(groupName)) return fallbackPhotoProvider.getPhotoForRecipientWithName(groupName, targetSize);
else if (!nickname.isEmpty()) return fallbackPhotoProvider.getPhotoForRecipientWithName(nickname.toString(), targetSize);
else if (!TextUtils.isEmpty(systemContactName)) return fallbackPhotoProvider.getPhotoForRecipientWithName(systemContactName, targetSize);
else if (!signalProfileName.isEmpty()) return fallbackPhotoProvider.getPhotoForRecipientWithName(signalProfileName.toString(), targetSize);
else return fallbackPhotoProvider.getPhotoForRecipientWithoutName();
@@ -1394,7 +1416,9 @@ public class Recipient {
Objects.equals(badges, other.badges) &&
isActiveGroup == other.isActiveGroup &&
Objects.equals(callLinkRoomId, other.callLinkRoomId) &&
phoneNumberSharing == other.phoneNumberSharing;
phoneNumberSharing == other.phoneNumberSharing &&
Objects.equals(nickname, other.nickname) &&
Objects.equals(note, other.note);
}
private static boolean allContentsAreTheSame(@NonNull List<Recipient> a, @NonNull List<Recipient> b) {

12
app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.kt
View File

@@ -81,7 +81,9 @@ class RecipientDetails private constructor(
@JvmField val needsPniSignature: Boolean,
@JvmField val callLinkRoomId: CallLinkRoomId?,
@JvmField val groupRecord: Optional<GroupRecord>,
@JvmField val phoneNumberSharing: PhoneNumberSharingState
@JvmField val phoneNumberSharing: PhoneNumberSharingState,
@JvmField val nickname: ProfileName,
@JvmField val note: String?
) {
@VisibleForTesting
@@ -146,7 +148,9 @@ class RecipientDetails private constructor(
needsPniSignature = record.needsPniSignature,
callLinkRoomId = record.callLinkRoomId,
groupRecord = groupRecord,
phoneNumberSharing = record.phoneNumberSharing
phoneNumberSharing = record.phoneNumberSharing,
nickname = record.nickname,
note = record.note
)
companion object {
@@ -275,7 +279,9 @@ class RecipientDetails private constructor(
isActiveGroup = false,
callLinkRoomId = null,
groupRecord = Optional.empty(),
phoneNumberSharing = PhoneNumberSharingState.UNKNOWN
phoneNumberSharing = PhoneNumberSharingState.UNKNOWN,
nickname = ProfileName.EMPTY,
note = ""
)
}
}