[BugFix] Add (me) suffix to local's user name. Sort participant list (A…

…zure-Samples#104)
pereiralex · Feb 1, 2022 · fc4d79e · fc4d79e
1 parent 378e313
commit fc4d79e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...ng/app/src/main/java/com/azure/samples/communication/calling/activities/CallActivity.java b/...ng/app/src/main/java/com/azure/samples/communication/calling/activities/CallActivity.java
@@ -62,6 +62,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -342,7 +343,7 @@ private void initializeCallNotification() {
     private void initParticipantViews() {
         // load local participant's view
         localParticipantView = new LocalParticipantView(this);
-        localParticipantView.setDisplayName(callingContext.getDisplayName() + " (Me)");
+        localParticipantView.setDisplayName(getLocalUserName());
         localParticipantView.setVideoDisplayed(callingContext.getCameraOn());
         localParticipantView.setSwitchCameraButtonDisplayed(callingContext.getCameraOn());
         localParticipantView.setIsMuted(!callingContext.getMicOn());
@@ -586,18 +587,24 @@ private void openParticipantList() {
 
     private void refreshParticipantList() {
         final List<ParticipantInfo> participantInfo = new ArrayList<>();
-        participantInfo.add(new ParticipantInfo(callingContext.getDisplayName(), !callingContext.getMicOn()));
+        participantInfo.add(new ParticipantInfo(getLocalUserName(), !callingContext.getMicOn()));
         callingContext.getRemoteParticipants().stream().forEach(remoteParticipant ->
                 participantInfo.add(new ParticipantInfo(remoteParticipant.getDisplayName(),
                         remoteParticipant.isMuted())));
 
+        participantInfo.sort(Comparator.comparing(a -> a.getDisplayName().toLowerCase()));
+
         if (participantListPopupWindow == null) {
             participantListPopupWindow = new ParticipantListPopupWindow(this, participantInfo);
         }
 
         participantListPopupWindow.setParticipantInfo(participantInfo);
     }
 
+    private String getLocalUserName() {
+        return callingContext.getDisplayName().isEmpty() ? "(me)" : callingContext.getDisplayName() + " (me)";
+    }
+
     private void openHangupDialog() {
         if (callHangupOverlay.getVisibility() != View.VISIBLE) {
             callHangupOverlay.setVisibility(View.VISIBLE);