diff --git a/res/values/strings.xml b/res/values/strings.xml index 555a3fdc87..e8e7e04686 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -416,7 +416,7 @@ %s called you Called %s Missed call from %s - %s is on Signal, say hey! + %s joined Signal! You set disappearing message time to %1$s. %1$s set disappearing message time to %2$s. Your safety number with %s has changed. @@ -589,7 +589,7 @@ Called you Missed call Media message - %s is on Signal, say hey! + %s joined Signal! Disappearing message time set to %s Your safety number with %s has changed. diff --git a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java index 1da0a55d85..7e77e9c5d8 100644 --- a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java @@ -107,7 +107,7 @@ public abstract class MessageRecord extends DisplayRecord { } else if (isMissedCall()) { return emphasisAdded(context.getString(R.string.MessageRecord_missed_call_from, getIndividualRecipient().toShortString())); } else if (isJoined()) { - return emphasisAdded(context.getString(R.string.MessageRecord_s_is_on_signal_say_hey, getIndividualRecipient().toShortString())); + return emphasisAdded(context.getString(R.string.MessageRecord_s_joined_signal, getIndividualRecipient().toShortString())); } else if (isExpirationTimerUpdate()) { String time = ExpirationUtil.getExpirationDisplayValue(context, (int)(getExpiresIn() / 1000)); return isOutgoing() ? emphasisAdded(context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time)) diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java index 8f39fd379b..84a1c9d514 100644 --- a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java @@ -98,7 +98,7 @@ public class ThreadRecord extends DisplayRecord { } else if (SmsDatabase.Types.isMissedCall(type)) { return emphasisAdded(context.getString(org.thoughtcrime.securesms.R.string.ThreadRecord_missed_call)); } else if (SmsDatabase.Types.isJoinedType(type)) { - return emphasisAdded(context.getString(R.string.ThreadRecord_s_is_on_signal_say_hey, getRecipients().getPrimaryRecipient().toShortString())); + return emphasisAdded(context.getString(R.string.ThreadRecord_s_joined_signal, getRecipients().getPrimaryRecipient().toShortString())); } else if (SmsDatabase.Types.isExpirationTimerUpdate(type)) { String time = ExpirationUtil.getExpirationDisplayValue(context, (int) (getExpiresIn() / 1000)); return emphasisAdded(context.getString(R.string.ThreadRecord_disappearing_message_time_updated_to_s, time));