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

remove soft disable flag when attempting call

Browse source
This commit is contained in:
Daniel Gultsch 2023-10-18 18:18:16 +02:00
parent f042efd550
commit 69425e677c
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/entities/Account.java
View file

@ -258,6 +258,9 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
} }
public boolean setOption(final int option, final boolean value) { public boolean setOption(final int option, final boolean value) {
if (value && (option == OPTION_DISABLED || option == OPTION_SOFT_DISABLED)) {
this.setStatus(State.OFFLINE);
}
final int before = this.options; final int before = this.options;
if (value) { if (value) {
this.options |= 1 << option; this.options |= 1 << option;

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

@ -1609,6 +1609,10 @@ public class ConversationFragment extends XmppFragment
.show(); .show();
return; return;
} }
final Account account = conversation.getAccount();
if (account.setOption(Account.OPTION_SOFT_DISABLED, false)) {
activity.xmppConnectionService.updateAccount(account);
}
final Contact contact = conversation.getContact(); final Contact contact = conversation.getContact();
if (RtpCapability.jmiSupport(contact)) { if (RtpCapability.jmiSupport(contact)) {
triggerRtpSession(contact.getAccount(), contact.getJid().asBareJid(), action); triggerRtpSession(contact.getAccount(), contact.getJid().asBareJid(), action);