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

Show profile name in call screen

Browse Source 
Fixes #7020
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-10-03 13:29:49 -07:00
parent 04fcb9c531
commit a929bf91f1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
View File

@ -27,6 +27,7 @@ import android.support.design.widget.FloatingActionButton;
import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewCompat;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
@ -304,8 +305,13 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientModifiedLi
}.execute(); }.execute();
this.name.setText(recipient.getName()); this.name.setText(recipient.getName());
if (recipient.getName() == null && !TextUtils.isEmpty(recipient.getProfileName())) {
this.phoneNumber.setText(recipient.getAddress().serialize() + " (~" + recipient.getProfileName() + ")");
} else {
this.phoneNumber.setText(recipient.getAddress().serialize()); this.phoneNumber.setText(recipient.getAddress().serialize());
} }
}
private void setCard(Recipient recipient, String status) { private void setCard(Recipient recipient, String status) {
setPersonInfo(recipient); setPersonInfo(recipient);