Show 'return to call' if local user is in the call group.

alex-signal · alan-signal · commit 198281aa4795 · 2021-01-06T17:03:21.000-04:00
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -212,10 +212,12 @@ private void present(ConversationMessage conversationMessage, @NonNull Optional<
 
       int text = 0;
       if (Util.hasItems(uuids)) {
-        if (GroupCallUpdateDetailsUtil.parse(conversationMessage.getMessageRecord().getBody()).getIsCallFull()) {
+        if (uuids.contains(TextSecurePreferences.getLocalUuid(getContext()))) {
+          text = R.string.ConversationUpdateItem_return_to_call;
+        } else if (GroupCallUpdateDetailsUtil.parse(conversationMessage.getMessageRecord().getBody()).getIsCallFull()) {
           text = R.string.ConversationUpdateItem_call_is_full;
         } else {
-          text = uuids.contains(TextSecurePreferences.getLocalUuid(getContext())) ? R.string.ConversationUpdateItem_return_to_call : R.string.ConversationUpdateItem_join_call;
+          text = R.string.ConversationUpdateItem_join_call;
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -212,10 +212,12 @@ private void present(ConversationMessage conversationMessage, @NonNull Optional<`
`212`	`212`
`213`	`213`	`int text = 0;`
`214`	`214`	`if (Util.hasItems(uuids)) {`
`215`		`- if (GroupCallUpdateDetailsUtil.parse(conversationMessage.getMessageRecord().getBody()).getIsCallFull()) {`
	`215`	`+ if (uuids.contains(TextSecurePreferences.getLocalUuid(getContext()))) {`
	`216`	`+ text = R.string.ConversationUpdateItem_return_to_call;`
	`217`	`+ } else if (GroupCallUpdateDetailsUtil.parse(conversationMessage.getMessageRecord().getBody()).getIsCallFull()) {`
`216`	`218`	`text = R.string.ConversationUpdateItem_call_is_full;`
`217`	`219`	`} else {`
`218`		`- text = uuids.contains(TextSecurePreferences.getLocalUuid(getContext())) ? R.string.ConversationUpdateItem_return_to_call : R.string.ConversationUpdateItem_join_call;`
	`220`	`+ text = R.string.ConversationUpdateItem_join_call;`
`219`	`221`	`}`
`220`	`222`	`}`
`221`	`223`