Merge remote-tracking branch 'origin/main'

This commit is contained in:
Hosted Weblate
2024-08-04 16:12:01 +00:00
2 changed files with 1 additions and 5 deletions
@@ -64,10 +64,6 @@ public class DcChat {
return getType() == DC_CHAT_TYPE_BROADCAST;
}
public boolean canVideochat() {
return canSend() && !isSelfTalk();
}
public boolean isHalfBlocked() {
return isProtectionBroken() || isContactRequest();
}
@@ -453,7 +453,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
menu.findItem(R.id.menu_show_map).setVisible(false);
}
if (!DcHelper.isWebrtcConfigOk(dcContext) || !dcChat.canVideochat()) {
if (!DcHelper.isWebrtcConfigOk(dcContext) || !dcChat.canSend()) {
menu.findItem(R.id.menu_videochat_invite).setVisible(false);
}