blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Display "You" at end of members list in ConversationTitleView.

master
Alex Hart 2020-05-26 14:20:57 -03:00 committed by Greyson Parrelli
parent 41ebaf3938
commit 82ba7e2b8b
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
View File

@ -2,9 +2,6 @@ package org.thoughtcrime.securesms.conversation;
import android.annotation.SuppressLint;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
@ -12,6 +9,9 @@ import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.annimon.stream.Collectors;
import com.annimon.stream.Stream;
@ -22,7 +22,6 @@ import org.thoughtcrime.securesms.recipients.LiveRecipient;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.ExpirationUtil;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil;
@ -152,8 +151,6 @@ public class ConversationTitleView extends RelativeLayout {
}
private void setGroupRecipientTitle(Recipient recipient) {
String localNumber = TextSecurePreferences.getLocalNumber(getContext());
if (FeatureFlags.profileDisplay()) {
this.title.setText(recipient.getDisplayName(getContext()));
} else {
@ -161,8 +158,9 @@ public class ConversationTitleView extends RelativeLayout {
}
this.subtitle.setText(Stream.of(recipient.getParticipants())
.filterNot(Recipient::isLocalNumber)
.map(r -> r.toShortString(getContext()))
.sorted((a, b) -> Boolean.compare(a.isLocalNumber(), b.isLocalNumber()))
.map(r -> r.isLocalNumber() ? getResources().getString(R.string.ConversationTitleView_you)
: r.getDisplayName(getContext()))
.collect(Collectors.joining(", ")));
updateSubtitleVisibility();

1
app/src/main/res/values/strings.xml
View File

@ -353,6 +353,7 @@
<!-- ConversationTitleView -->
<string name="ConversationTitleView_verified">Verified</string>
<string name="ConversationTitleView_you">You</string>
<!-- CreateProfileActivity -->
<string name="CreateProfileActivity__profile">Profile</string>