|
|
@ -91,6 +91,8 @@ public abstract class MessageRecord extends DisplayRecord {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public SpannableString getDisplayBody(@NonNull Context context) {
|
|
|
|
public SpannableString getDisplayBody(@NonNull Context context) {
|
|
|
|
if (isGroupUpdate() && isOutgoing()) {
|
|
|
|
if (isGroupUpdate() && isOutgoing()) {
|
|
|
|
|
|
|
|
return new SpannableString(context.getString(R.string.MessageRecord_you_updated_group));
|
|
|
|
|
|
|
|
} else if (isGroupUpdate()) {
|
|
|
|
return new SpannableString(GroupDescription.Companion.getDescription(context, getBody()).toString(getIndividualRecipient()));
|
|
|
|
return new SpannableString(GroupDescription.Companion.getDescription(context, getBody()).toString(getIndividualRecipient()));
|
|
|
|
} else if (isGroupQuit() && isOutgoing()) {
|
|
|
|
} else if (isGroupQuit() && isOutgoing()) {
|
|
|
|
return new SpannableString(context.getString(R.string.MessageRecord_left_group));
|
|
|
|
return new SpannableString(context.getString(R.string.MessageRecord_left_group));
|
|
|
@ -105,14 +107,14 @@ public abstract class MessageRecord extends DisplayRecord {
|
|
|
|
} else if (isJoined()) {
|
|
|
|
} else if (isJoined()) {
|
|
|
|
return new SpannableString(context.getString(R.string.MessageRecord_s_joined_signal, getIndividualRecipient().toShortString()));
|
|
|
|
return new SpannableString(context.getString(R.string.MessageRecord_s_joined_signal, getIndividualRecipient().toShortString()));
|
|
|
|
} else if (isExpirationTimerUpdate()) {
|
|
|
|
} else if (isExpirationTimerUpdate()) {
|
|
|
|
int seconds = (int) (getExpiresIn() / 1000);
|
|
|
|
int seconds = (int)(getExpiresIn() / 1000);
|
|
|
|
if (seconds <= 0) {
|
|
|
|
if (seconds <= 0) {
|
|
|
|
return isOutgoing() ? new SpannableString(context.getString(R.string.MessageRecord_you_disabled_disappearing_messages))
|
|
|
|
return isOutgoing() ? new SpannableString(context.getString(R.string.MessageRecord_you_disabled_disappearing_messages))
|
|
|
|
: new SpannableString(context.getString(R.string.MessageRecord_s_disabled_disappearing_messages, getIndividualRecipient().toShortString()));
|
|
|
|
: new SpannableString(context.getString(R.string.MessageRecord_s_disabled_disappearing_messages, getIndividualRecipient().toShortString()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
String time = ExpirationUtil.getExpirationDisplayValue(context, seconds);
|
|
|
|
String time = ExpirationUtil.getExpirationDisplayValue(context, seconds);
|
|
|
|
return isOutgoing() ? new SpannableString(context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time))
|
|
|
|
return isOutgoing() ? new SpannableString(context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time))
|
|
|
|
: new SpannableString(context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, getIndividualRecipient().toShortString(), time));
|
|
|
|
: new SpannableString(context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, getIndividualRecipient().toShortString(), time));
|
|
|
|
} else if (isIdentityUpdate()) {
|
|
|
|
} else if (isIdentityUpdate()) {
|
|
|
|
return new SpannableString(context.getString(R.string.MessageRecord_your_safety_number_with_s_has_changed, getIndividualRecipient().toShortString()));
|
|
|
|
return new SpannableString(context.getString(R.string.MessageRecord_your_safety_number_with_s_has_changed, getIndividualRecipient().toShortString()));
|
|
|
|
} else if (isIdentityVerified()) {
|
|
|
|
} else if (isIdentityVerified()) {
|
|
|
|