narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

hrukudah #15

Closed
bodqhrohro wants to merge 30 commits from hrukudah into master
pull from: hrukudah
merge into: narayana:master
Conversation 0 Commits 30 Files changed 54 +6 -3
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4431eccc98 - Show all commits

9
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -1410,10 +1410,10 @@ public class ConversationFragment extends XmppFragment
final MenuItem startSecretChat = menu.findItem(R.id.action_start_secret_chat);
final MenuItem encryption = menu.findItem(R.id.action_security);
boolean considerAsSecretChat = conversation.getMode() == Conversational.MODE_SINGLE &&
conversation.getNextCounterpart() != null && conversation.hasPermanentCounterpart();
if (conversation != null) {
boolean considerAsSecretChat = conversation.getMode() == Conversational.MODE_SINGLE &&
conversation.getNextCounterpart() != null && conversation.hasPermanentCounterpart();
if (conversation.getMode() == Conversation.MODE_MULTI) {
menuContactDetails.setVisible(false);
menuInviteContact.setVisible(conversation.getMucOptions().canInvite() && conversation.getNextCounterpart() == null);
@ -1425,6 +1425,9 @@ public class ConversationFragment extends XmppFragment
menuOngoingCall.setVisible(false);
startSecretChat.setVisible(false);
} else {
if (considerAsSecretChat) {
startSecretChat.setVisible(false);
}
menuMucParticipants.setVisible(false);
final XmppConnectionService service =
activity == null ? null : activity.xmppConnectionService;